Fix Argon2 config descriptions

Companion commit for: nextcloud/server#23319 Signed-off-by: MichaIng <micha@dietpi.com>
nextcloud · Dec 18, 2020 · ee3675b · ee3675b
1 parent 29cd4a3
commit ee3675b
Showing 1 changed file with 13 additions and 17 deletions.
diff --git a/admin_manual/configuration_server/config_sample_php_parameters.rst b/admin_manual/configuration_server/config_sample_php_parameters.rst
@@ -1743,34 +1743,30 @@ own and exposes its configuration options as following. More information can
 be found at: https://www.php.net/manual/en/function.password-hash.php
 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
-
 ::
 
-	'hashingMemoryCost' => PASSWORD_ARGON2_DEFAULT_MEMORY_COST,
+	'hashingThreads' => PASSWORD_ARGON2_DEFAULT_THREADS,
 
-The allowed maximum memory in KiB to be used by the algorithm for computing a
-hash. The smallest possible value is 8. Values that undershoot the minimum
-will be ignored in favor of the default.
+The number of CPU threads to be used by the algorithm for computing a hash.
+The value must be an integer, and the minimum value is 1. Rationally it does
+not help to provide a number higher than the available threads on the machine.
+Values that undershoot the minimum will be ignored in favor of the minimum.
 
 ::
 
-	'hashingTimeCost' => PASSWORD_ARGON2_DEFAULT_TIME_COST,
-
-The allowed maximum time in seconds that can be used by the algorithm for
-computing a hash. The value must be an integer, and the minimum value is 1.
+	'hashingMemoryCost' => PASSWORD_ARGON2_DEFAULT_MEMORY_COST,
 
-Values that undershoot the minimum will be ignored in favor of the default.
+The memory in KiB to be used by the algorithm for computing a hash. The value
+must be an integer, and the minimum value is 8 times the number of CPU threads.
+Values that undershoot the minimum will be ignored in favor of the minimum.
 
 ::
 
-	'hashingThreads' => PASSWORD_ARGON2_DEFAULT_THREADS,
-
-The allowed number of CPU threads that can be used by the algorithm for
-computing a hash. The value must be an integer, and the minimum value is 1.
+	'hashingTimeCost' => PASSWORD_ARGON2_DEFAULT_TIME_COST,
 
-Rationally it does not help to provide a number higher than the available
-threads on the machine. Values that undershoot the minimum will be ignored
-in favor of the default.
+The number of iterations that are used by the algorithm for computing a hash.
+The value must be an integer, and the minimum value is 1. Values that
+undershoot the minimum will be ignored in favor of the minimum.
 
 ::