From: Colm MacCarthaigh Date: Fri, 26 Aug 2005 16:14:46 +0000 (+0000) Subject: Update the transformations to reflect the new graceful-stop argument. X-Git-Tag: 2.3.0~3068 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae0455044bd01393f144dc59ba65ae39179407dc;p=thirdparty%2Fapache%2Fhttpd.git Update the transformations to reflect the new graceful-stop argument. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@240275 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/man/apachectl.8 b/docs/man/apachectl.8 index a4865d2bd31..054550f9e8c 100644 --- a/docs/man/apachectl.8 +++ b/docs/man/apachectl.8 @@ -19,7 +19,7 @@ .el .ne 3 .IP "\\$1" \\$2 .. -.TH "APACHECTL" 8 "2005-05-03" "Apache HTTP Server" "apachectl" +.TH "APACHECTL" 8 "2005-08-26" "Apache HTTP Server" "apachectl" .SH NAME apachectl \- Apache HTTP Server Control Interface @@ -79,6 +79,9 @@ Displays a brief status report\&. Similar to the fullstatus option, except that graceful Gracefully restarts the Apache httpd daemon\&. If the daemon is not running, it is started\&. This differs from a normal restart in that currently open connections are not aborted\&. A side effect is that old log files will not be closed immediately\&. This means that if used in a log rotation script, a substantial delay may be necessary to ensure that the old log files are closed before processing them\&. This command automatically checks the configuration files as in configtest before initiating the restart to make sure Apache doesn't die\&. This is equivalent to apachectl -k graceful\&. .TP +graceful-stop +Gracefully stops the Apache httpd daemon\&. This differs from a normal stop in that currently open connections are not aborted\&. A side effect is that old log files will not be closed immediately\&. This is equivalent to apachectl -k graceful-stop\&. +.TP configtest Run a configuration file syntax test\&. It parses the configuration files and either reports Syntax Ok or detailed information about the particular syntax error\&. This is equivalent to apachectl -t\&. diff --git a/docs/man/httpd.8 b/docs/man/httpd.8 index 8c24dec7889..124456d953a 100644 --- a/docs/man/httpd.8 +++ b/docs/man/httpd.8 @@ -19,7 +19,7 @@ .el .ne 3 .IP "\\$1" \\$2 .. -.TH "HTTPD" 8 "2004-07-10" "Apache HTTP Server" "httpd" +.TH "HTTPD" 8 "2005-08-26" "Apache HTTP Server" "httpd" .SH NAME httpd \- Apache Hypertext Transfer Protocol Server @@ -27,7 +27,7 @@ httpd \- Apache Hypertext Transfer Protocol Server .SH "SYNOPSIS" .PP -\fBhttpd\fR [ -\fBd\fR \fIserverroot\fR ] [ -\fBf\fR \fIconfig\fR ] [ -\fBC\fR \fIdirective\fR ] [ -\fBc\fR \fIdirective\fR ] [ -\fBD\fR \fIparameter\fR ] [ -\fBe\fR \fIlevel\fR ] [ -\fBE\fR \fIfile\fR ] [ \fB-k\fR start|restart|graceful|stop ] [ -\fBR\fR \fIdirectory\fR ] [ -\fBh\fR ] [ -\fBl\fR ] [ -\fBL\fR ] [ -\fBS\fR ] [ -\fBt\fR ] [ -\fBv\fR ] [ -\fBV\fR ] [ -\fBX\fR ] [ -\fBM\fR ] +\fBhttpd\fR [ -\fBd\fR \fIserverroot\fR ] [ -\fBf\fR \fIconfig\fR ] [ -\fBC\fR \fIdirective\fR ] [ -\fBc\fR \fIdirective\fR ] [ -\fBD\fR \fIparameter\fR ] [ -\fBe\fR \fIlevel\fR ] [ -\fBE\fR \fIfile\fR ] [ \fB-k\fR start|restart|graceful|stop|graceful-stop ] [ -\fBR\fR \fIdirectory\fR ] [ -\fBh\fR ] [ -\fBl\fR ] [ -\fBL\fR ] [ -\fBS\fR ] [ -\fBt\fR ] [ -\fBv\fR ] [ -\fBV\fR ] [ -\fBX\fR ] [ -\fBM\fR ] .PP On Windows systems, the following additional arguments are available: @@ -55,7 +55,7 @@ Set the initial value for the ServerRoot directive to \fIserverroot\fR\&. This c -f \fIconfig\fR Uses the directives in the file \fIconfig\fR on startup\&. If \fIconfig\fR does not begin with a /, then it is taken to be a path relative to the ServerRoot\&. The default is conf/httpd\&.conf\&. .TP --k start|restart|graceful|stop +-k start|restart|graceful|stop|graceful-stop Signals httpd to start, restart, or stop\&. See Stopping Apache for more information\&. .TP -C \fIdirective\fR diff --git a/docs/manual/mod/directives.html.en b/docs/manual/mod/directives.html.en index 5475d43294f..35b50d1be6c 100644 --- a/docs/manual/mod/directives.html.en +++ b/docs/manual/mod/directives.html.en @@ -197,7 +197,8 @@
  • ForceLanguagePriority
  • ForceType
  • ForensicLog
    • -
  • Group
    • +
  • GracefulShutdownTimeout
    • +
  • Group
  • Header
  • HeaderName
  • HostnameLookups
    • diff --git a/docs/manual/mod/mod_cgid.xml.ja b/docs/manual/mod/mod_cgid.xml.ja index 3c92243cf9c..27b2641adae 100644 --- a/docs/manual/mod/mod_cgid.xml.ja +++ b/docs/manual/mod/mod_cgid.xml.ja @@ -1,7 +1,7 @@ - + + + + + + + + + +