diff --git a/features/commandline.xml b/features/commandline.xml
index 285c9c933f..3ac76b8107 100644
--- a/features/commandline.xml
+++ b/features/commandline.xml
@@ -181,6 +181,26 @@
          </para>
          </entry>
         </row>
+        <row>
+         <entry><link linkend="ini.output-buffering">output_buffering</link></entry>
+         <entry>&false;</entry>
+         <entry>
+          <para>
+           Altough the INI setting is hardcoded to &false; the
+           <link linkend="book.outcontrol">Output buffering</link> functions
+           are available.
+          </para>
+         </entry>
+        </row>
+        <row>
+         <entry><link linkend="ini.max-input-time">max_input_time</link></entry>
+         <entry>&false;</entry>
+         <entry>
+          <para>
+           The PHP CLI doesn't not support GET, POST or file uploads.
+          </para>
+         </entry>
+        </row>
        </tbody>
       </tgroup>
      </table>
@@ -390,9 +410,9 @@ Usage: php [options] [-f] <file> [--] [args...]
   -F <file>        Parse and execute <file> for every input line
   -E <end_code>    Run PHP <end_code> after processing all input lines
   -H               Hide any passed arguments from external tools.
-  -s               Display colour syntax highlighted source.
+  -s               Output HTML syntax highlighted source.
   -v               Version number
-  -w               Display source with stripped comments and whitespace.
+  -w               Output source with stripped comments and whitespace.
   -z <file>        Load Zend extension <file>.
 
   args...          Arguments passed to script. Use -- args when first argument