Try to avoid some confusion from the changing of command line arguments,

by documenting the meanings of the arguments for each different version of
Apache. This is important since the current live site now documents the
"new" behaviour (for -L, -l, h) even though there is no released Apache
for which that documentation is valid. Even after releasing 1.3.4 users of
older versions will be accessing the documentation.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@82625 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/invoking.html b/docs/manual/invoking.html
index bcabbd79fd19e88dc765bf9bbc396749696ba49b..1a19d121e64b0fccb48151e9f7797836bb522df6 100644 (file)
--- a/docs/manual/invoking.html
+++ b/docs/manual/invoking.html
@@ -79,15 +79,39 @@ behavior and performance of the apache server (<EM>e.g.</EM>,
 then exit.
 
 <DT><A NAME="help"><CODE>-L</CODE></A>
-<DD>Give a list of directives together with expected arguments and
-places where the directive is valid. (New in Apache 1.2)
+<DD>
+
+Give a list of directives together with expected arguments and places
+where the directive is valid, then exit.  (Apache 1.3.4 and
+later. Earlier versions used -l instead).
+
+
+<DT><CODE>-l</CODE></A>
+<DD>
+
+Give a list of all modules compiled into the server, then exit.
+(Apache 1.3.4 and later. Earlier versions used -h instead).<br>
+
+Give a list of directives together with expected arguments and places
+where the directive is valid, then exit. (Apache 1.2 to 1.3.3. Later
+versions use -L instead).
+
+
+
+<DT><CODE>-h</CODE>
+<DD>
+
+Print a list of the httpd options, then exit. (Apache 1.3.4 and
+later. Earlier versions used -? instead).<br>
+
+Give a list of all modules compiled into the server, then exit. (Up to
+Apache 1.3.3. Later versions use -l instead).<br>
 
-<DT><CODE>-l</CODE>
-<DD>Give a list of all modules compiled into the server.
 
 <DT><CODE>-S</CODE>
 <DD>Show the settings as parsed from the config file (currently only
-shows a breakdown of the vhost settings).
+shows a breakdown of the vhost settings) but do not start the
+server. (Up to Apache 1.3.3, this option also started the server).
 
 <DT><CODE>-t</CODE>
 <DD>Test the configuration file syntax (<EM>i.e.</EM>, read all configuration files
@@ -97,10 +121,12 @@ otherwise display "Syntax OK" and terminate with a zero exit status.
 
 <DT><CODE>-k</CODE> <EM>option</EM>
 <DD>Windows only: signal Apache to restart or shutdown. <EM>option</EM> 
-is one of "shutdown" or "restart". (New in Apache 1.3.3).
+is one of "shutdown" or "restart". (Apache 1.3.3 and later).
 
 <DT><CODE>-?</CODE>
-<DD>Print a list of the httpd options, and then exit.
+<DD>Print a list of the httpd options, and then exit (up to Apache
+1.3.3. Later version use -h instead).
+
 </DL>
 
 <H2>Configuration files</H2>

diff --git a/docs/manual/invoking.html.en b/docs/manual/invoking.html.en
index bcabbd79fd19e88dc765bf9bbc396749696ba49b..1a19d121e64b0fccb48151e9f7797836bb522df6 100644 (file)
--- a/docs/manual/invoking.html.en
+++ b/docs/manual/invoking.html.en
@@ -79,15 +79,39 @@ behavior and performance of the apache server (<EM>e.g.</EM>,
 then exit.
 
 <DT><A NAME="help"><CODE>-L</CODE></A>
-<DD>Give a list of directives together with expected arguments and
-places where the directive is valid. (New in Apache 1.2)
+<DD>
+
+Give a list of directives together with expected arguments and places
+where the directive is valid, then exit.  (Apache 1.3.4 and
+later. Earlier versions used -l instead).
+
+
+<DT><CODE>-l</CODE></A>
+<DD>
+
+Give a list of all modules compiled into the server, then exit.
+(Apache 1.3.4 and later. Earlier versions used -h instead).<br>
+
+Give a list of directives together with expected arguments and places
+where the directive is valid, then exit. (Apache 1.2 to 1.3.3. Later
+versions use -L instead).
+
+
+
+<DT><CODE>-h</CODE>
+<DD>
+
+Print a list of the httpd options, then exit. (Apache 1.3.4 and
+later. Earlier versions used -? instead).<br>
+
+Give a list of all modules compiled into the server, then exit. (Up to
+Apache 1.3.3. Later versions use -l instead).<br>
 
-<DT><CODE>-l</CODE>
-<DD>Give a list of all modules compiled into the server.
 
 <DT><CODE>-S</CODE>
 <DD>Show the settings as parsed from the config file (currently only
-shows a breakdown of the vhost settings).
+shows a breakdown of the vhost settings) but do not start the
+server. (Up to Apache 1.3.3, this option also started the server).
 
 <DT><CODE>-t</CODE>
 <DD>Test the configuration file syntax (<EM>i.e.</EM>, read all configuration files
@@ -97,10 +121,12 @@ otherwise display "Syntax OK" and terminate with a zero exit status.
 
 <DT><CODE>-k</CODE> <EM>option</EM>
 <DD>Windows only: signal Apache to restart or shutdown. <EM>option</EM> 
-is one of "shutdown" or "restart". (New in Apache 1.3.3).
+is one of "shutdown" or "restart". (Apache 1.3.3 and later).
 
 <DT><CODE>-?</CODE>
-<DD>Print a list of the httpd options, and then exit.
+<DD>Print a list of the httpd options, and then exit (up to Apache
+1.3.3. Later version use -h instead).
+
 </DL>
 
 <H2>Configuration files</H2>