diff --git a/features/commandline.xml b/features/commandline.xml
index cf9c86c3bf..2bf0ef0bf1 100644
--- a/features/commandline.xml
+++ b/features/commandline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.47 $ -->
+<!-- $Revision: 1.48 $ -->
 <chapter id="features.commandline">
  <title>Using PHP from the command line</title>
  <para>
@@ -361,7 +361,7 @@ Usage: php [options] [-f] <file> [--] [args...]
        php [options] -- [args...]
        php [options] -a
 
-  -a               Run as interactive shell
+  -a               Run interactively
   -c <path>|<file> Look for php.ini file in this directory
   -n               No php.ini file will be used
   -d foo[=bar]     Define INI entry foo with value 'bar'
@@ -385,6 +385,8 @@ Usage: php [options] [-f] <file> [--] [args...]
   args...          Arguments passed to script. Use -- args when first argument
                    starts with - or script is read from stdin
 
+  --ini            Show configuration file names
+
   --rf <name>      Show information about function <name>.
   --rc <name>      Show information about class <name>.
   --re <name>      Show information about extension <name>.
@@ -979,6 +981,28 @@ Zend Engine v1.3.0, Copyright (c) 1998-2002 Zend Technologies
        </para>
       </entry>
      </row>
+     <row>
+      <entry></entry>
+      <entry>--ini</entry>
+      <entry>
+       <para>
+        Shows configuration file names and scanned directories. Available as
+        of PHP 5.2.3.
+        <example>
+         <title><literal>--ini</literal> example</title>
+         <programlisting role="shell">
+<![CDATA[
+$ php --ini
+Configuration File (php.ini) Path: /usr/dev/php/5.2/lib
+Loaded Configuration File:         /usr/dev/php/5.2/lib/php.ini
+Scan for additional .ini files in: (none)
+Additional .ini files parsed:      (none)
+]]>
+         </programlisting>
+        </example>
+       </para>
+      </entry>
+     </row>
      <row>
       <entry>--rf</entry>
       <entry>--rfunction</entry>
@@ -987,6 +1011,10 @@ Zend Engine v1.3.0, Copyright (c) 1998-2002 Zend Technologies
         Shows information about the given function or class method (e.g.
         number and name of the parameters). Available as of PHP 5.1.2.
        </para>
+       <para>
+        This option is only available if PHP was compiled with
+        <link linkend="language.oop5.reflection">Reflection</link> support.
+       </para>
        <para>
         <example>
          <title>basic <literal>--rf</literal> usage</title>
@@ -1014,7 +1042,11 @@ Function [ <internal> public function var_dump ] {
         Show information about the given class (list of constants, properties
         and methods). Available as of PHP 5.1.2.
        </para>
-      </entry>
+       <para>
+        This option is only available if PHP was compiled with
+        <link linkend="language.oop5.reflection">Reflection</link> support.
+       </para>
+     </entry>
      </row>
      <row>
       <entry>--re</entry>
@@ -1024,6 +1056,10 @@ Function [ <internal> public function var_dump ] {
         Show information about the given extension (list of &php.ini; options,
         defined functions, constants and classes). Available as of PHP 5.1.2.
        </para>
+       <para>
+        This option is only available if PHP was compiled with
+        <link linkend="language.oop5.reflection">Reflection</link> support.
+       </para>
       </entry>
      </row>
      <row>