Merge branch '2.2'

keradus · keradus · commit 02339feee54b · 2017-04-07T12:46:18.000+02:00
diff --git a/README.rst b/README.rst
@@ -190,7 +190,7 @@ The ``--show-progress`` option allows you to choose the way process progress is
 
 * ``none``: disables progress output;
 * ``run-in``: simple single-line progress output;
-* ``evaluating``: multiline progress output with number of files and percentage on each line. Note that with this option, the files list is evaluated before processing to get the total number of files and then kept in memory to avoid using the file iterator twice. This has an impact on memory usage so using this option is not recommended on very large projects.
+* ``estimating``: multiline progress output with number of files and percentage on each line. Note that with this option, the files list is evaluated before processing to get the total number of files and then kept in memory to avoid using the file iterator twice. This has an impact on memory usage so using this option is not recommended on very large projects.
 
 If the option is not provided, it defaults to ``run-in`` unless a config file that disables output is used, in which case it defaults to ``none``. This option has no effect if the verbosity of the command is less than ``verbose``.
 
diff --git a/src/Console/Command/CommandHelp.php b/src/Console/Command/CommandHelp.php
@@ -91,7 +91,7 @@ public static function getHelpCopy()
 
 * <comment>none</comment>: disables progress output;
 * <comment>run-in</comment>: simple single-line progress output;
-* <comment>evaluating</comment>: multiline progress output with number of files and percentage on each line. Note that with this option, the files list is evaluated before processing to get the total number of files and then kept in memory to avoid using the file iterator twice. This has an impact on memory usage so using this option is not recommended on very large projects.
+* <comment>estimating</comment>: multiline progress output with number of files and percentage on each line. Note that with this option, the files list is evaluated before processing to get the total number of files and then kept in memory to avoid using the file iterator twice. This has an impact on memory usage so using this option is not recommended on very large projects.
 
 If the option is not provided, it defaults to <comment>run-in</comment> unless a config file that disables output is used, in which case it defaults to <comment>none</comment>. This option has no effect if the verbosity of the command is less than <comment>verbose</comment>.
 
