rse 98/03/16 07:58:53
Modified: src/main http_main.c src/support apachectl.1 httpd.8 Log: Even more cleanups for command line interface and corresponding manual pages Revision Changes Path 1.305 +4 -0 apache-1.3/src/main/http_main.c Index: http_main.c =================================================================== RCS file: /export/home/cvs/apache-1.3/src/main/http_main.c,v retrieving revision 1.304 retrieving revision 1.305 diff -u -r1.304 -r1.305 --- http_main.c 1998/03/16 12:09:54 1.304 +++ http_main.c 1998/03/16 15:58:48 1.305 @@ -3873,7 +3873,11 @@ setup_prelinked_modules(); +#ifdef DEBUG_SIGSTOP while ((c = getopt(argc, argv, "C:c:Xd:f:vVhlZ:")) != -1) { +#else + while ((c = getopt(argc, argv, "C:c:Xd:f:vVhl")) != -1) { +#endif char **new; switch (c) { case 'c': 1.3 +4 -4 apache-1.3/src/support/apachectl.1 Index: apachectl.1 =================================================================== RCS file: /export/home/cvs/apache-1.3/src/support/apachectl.1,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- apachectl.1 1998/01/07 16:47:10 1.2 +++ apachectl.1 1998/03/16 15:58:52 1.3 @@ -51,13 +51,13 @@ apachectl \- Apache HTTP server control interface .SH SYNOPSIS .B apachectl -command [...] +\fIcommand\fP [...] .SH DESCRIPTION .B apachectl is a front end to the Apache HyperText Transfer Protocol (HTTP) server. It is designed to help the administrator control the functioning of the Apache -.B httpd(8) +.B httpd daemon. .PP .B NOTE: @@ -77,7 +77,7 @@ .B http://www.apache.org/ . .SH OPTIONS -The command can be any one or more of the following options: +The \fIcommand\fP can be any one or more of the following options: .TP 12 .BI start Start the Apache daemon. Gives an error if it is already running. @@ -93,7 +93,7 @@ Displays a full status report from .B mod_status. For this to work, you need to have mod_status enabled on your server -and a text-based browser such as lynx available on your system. The +and a text-based browser such as \fIlynx\fP available on your system. The URL used to access the status report can be set by editing the .B STATUSURL variable in the script. 1.5 +47 -5 apache-1.3/src/support/httpd.8 Index: httpd.8 =================================================================== RCS file: /export/home/cvs/apache-1.3/src/support/httpd.8,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- httpd.8 1998/01/07 16:47:13 1.4 +++ httpd.8 1998/03/16 15:58:52 1.5 @@ -54,12 +54,34 @@ .SH SYNOPSIS .B httpd [ -.B \-hlvX? +.B \-X ] [ .BI \-d " serverroot" ] [ .BI \-f " config" +] [ +.BI \-C " directive" +] [ +.BI \-c " directive" ] + +.B httpd +[ +.B \-h +] +[ +.B \-l +] +[ +.B \-v +] +[ +.B \-V +] +[ +.B \-? +] + .SH DESCRIPTION .B httpd is the Apache HyperText Transfer Protocol (HTTP) server program. It is @@ -73,10 +95,13 @@ time a connection to the HTTP service is made. .PP This manual page only lists the command line arguments. For details -of the directives necessary to configure httpd see the Apache manual, +of the directives necessary to configure +.B httpd +see the Apache manual, which is part of the Apache distribution or can be found at http://www.apache.org/. Paths in this manual may not reflect those -compiled into httpd. +compiled into +.B httpd. .SH OPTIONS .TP 12 .BI \-d " serverroot" @@ -89,6 +114,12 @@ does not begin with a /, then it is taken to be a path relative to the ServerRoot. The default is \fBconf/httpd.conf\fP. .TP +.BI \-C " directive" +Process the configuration \fIdirective\fP before reading config files. +.TP +.BI \-c " directive" +Process the configuration \fIdirective\fP after reading config files. +.TP .B \-h Output a list of directives together with expected arguments and places where the directive is valid. @@ -102,10 +133,19 @@ to provide ordinary web service. .TP .B \-v -Print the version of httpd, and then exit. +Print the version of +.B httpd +, and then exit. +.TP +.B \-V +Print the version and build parameters of +.B httpd +, and then exit. .TP .B \-? -Print a list of the httpd options, and then exit. +Print a list of the +.B httpd +options, and then exit. .SH FILES .PD 0 .B /usr/local/apache/conf/httpd.conf @@ -115,6 +155,8 @@ .B /usr/local/apache/conf/access.conf .br .B /usr/local/apache/conf/mime.types +.br +.B /usr/local/apache/conf/magic .br .B /usr/local/apache/logs/error_log .br