From: Mike Rumph Date: Wed, 6 Aug 2014 23:31:12 +0000 (+0000) Subject: Generated doc changes. X-Git-Tag: 2.5.0-alpha~3898 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7b3b8595f36bc63995cb2e432a22d410a9100f84;p=apache Generated doc changes. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1616371 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/man/rotatelogs.8 b/docs/man/rotatelogs.8 index 6619c284dc..fcdc635a57 100644 --- a/docs/man/rotatelogs.8 +++ b/docs/man/rotatelogs.8 @@ -19,7 +19,7 @@ .el .ne 3 .IP "\\$1" \\$2 .. -.TH "ROTATELOGS" 8 "2014-06-26" "Apache HTTP Server" "rotatelogs" +.TH "ROTATELOGS" 8 "2014-08-06" "Apache HTTP Server" "rotatelogs" .SH NAME rotatelogs \- Piped logging program to rotate Apache logs @@ -71,7 +71,7 @@ Create log file for each interval, even if empty\&. Use a circular list of filenames without timestamps\&. With -n 3, the series of log files opened would be "logfile", "logfile\&.1", "logfile\&.2", then overwriting "logfile"\&. Available in 2\&.4\&.5 and later\&. .TP \fIlogfile\fR -.PP The path plus basename of the logfile\&. If \fIlogfile\fR includes any '%' characters, it is treated as a format string for strftime(3)\&. Otherwise, the suffix \fI\&.nnnnnnnnnn\fR is automatically added and is the time in seconds (unless the -t option is used)\&. Both formats compute the start time from the beginning of the current period\&. For example, if a rotation time of 86400 is specified, the hour, minute, and second fields created from the strftime(3) format will all be zero, referring to the beginning of the current 24-hour period (midnight)\&. .PP When using strftime(3) filename formatting, be sure the log file format has enough granularity to produce a different file name each time the logs are rotated\&. Otherwise rotation will overwrite the same file instead of starting a new one\&. For example, if \fIlogfile\fR was /var/logs/errorlog\&.%Y-%m-%d with log rotation at 5 megabytes, but 5 megabytes was reached twice in the same day, the same log file name would be produced and log rotation would keep writing to the same file\&. +.PP The path plus basename of the logfile\&. If \fIlogfile\fR includes any '%' characters, it is treated as a format string for strftime(3)\&. Otherwise, the suffix \fI\&.nnnnnnnnnn\fR is automatically added and is the time in seconds (unless the -t option is used)\&. Both formats compute the start time from the beginning of the current period\&. For example, if a rotation time of 86400 is specified, the hour, minute, and second fields created from the strftime(3) format will all be zero, referring to the beginning of the current 24-hour period (midnight)\&. .PP When using strftime(3) filename formatting, be sure the log file format has enough granularity to produce a different file name each time the logs are rotated\&. Otherwise rotation will overwrite the same file instead of starting a new one\&. For example, if \fIlogfile\fR was /var/log/errorlog\&.%Y-%m-%d with log rotation at 5 megabytes, but 5 megabytes was reached twice in the same day, the same log file name would be produced and log rotation would keep writing to the same file\&. .TP \fIrotationtime\fR The time between log file rotations in seconds\&. The rotation occurs at the beginning of this interval\&. For example, if the rotation time is 3600, the log file will be rotated at the beginning of every hour; if the rotation time is 86400, the log file will be rotated every night at midnight\&. (If no data is logged during an interval, no file will be created\&.) @@ -86,25 +86,25 @@ The number of minutes offset from UTC\&. If omitted, zero is assumed and UTC is .nf - CustomLog "|bin/rotatelogs /var/logs/logfile 86400" common + CustomLog "|bin/rotatelogs /var/log/logfile 86400" common .fi .PP -This creates the files /var/logs/logfile\&.nnnn where nnnn is the system time at which the log nominally starts (this time will always be a multiple of the rotation time, so you can synchronize cron scripts with it)\&. At the end of each rotation time (here after 24 hours) a new log is started\&. +This creates the files /var/log/logfile\&.nnnn where nnnn is the system time at which the log nominally starts (this time will always be a multiple of the rotation time, so you can synchronize cron scripts with it)\&. At the end of each rotation time (here after 24 hours) a new log is started\&. .nf - CustomLog "|bin/rotatelogs -l /var/logs/logfile\&.%Y\&.%m\&.%d 86400" common + CustomLog "|bin/rotatelogs -l /var/log/logfile\&.%Y\&.%m\&.%d 86400" common .fi .PP -This creates the files /var/logs/logfile\&.yyyy\&.mm\&.dd where yyyy is the year, mm is the month, and dd is the day of the month\&. Logging will switch to a new file every day at midnight, local time\&. +This creates the files /var/log/logfile\&.yyyy\&.mm\&.dd where yyyy is the year, mm is the month, and dd is the day of the month\&. Logging will switch to a new file every day at midnight, local time\&. .nf - CustomLog "|bin/rotatelogs /var/logs/logfile 5M" common + CustomLog "|bin/rotatelogs /var/log/logfile 5M" common .fi @@ -113,7 +113,7 @@ This configuration will rotate the logfile whenever it reaches a size of 5 megab .nf - ErrorLog "|bin/rotatelogs /var/logs/errorlog\&.%Y-%m-%d-%H_%M_%S 5M" + ErrorLog "|bin/rotatelogs /var/log/errorlog\&.%Y-%m-%d-%H_%M_%S 5M" .fi @@ -122,12 +122,12 @@ This configuration will rotate the error logfile whenever it reaches a size of 5 .nf - CustomLog "|bin/rotatelogs -t /var/logs/logfile 86400" common + CustomLog "|bin/rotatelogs -t /var/log/logfile 86400" common .fi .PP -This creates the file /var/logs/logfile, truncating the file at startup and then truncating the file once per day\&. It is expected in this scenario that a separate process (such as tail) would process the file in real time\&. +This creates the file /var/log/logfile, truncating the file at startup and then truncating the file once per day\&. It is expected in this scenario that a separate process (such as tail) would process the file in real time\&. .SH "PORTABILITY" diff --git a/docs/manual/expr.html.en b/docs/manual/expr.html.en index 3a48fefa3a..9cef1e9860 100644 --- a/docs/manual/expr.html.en +++ b/docs/manual/expr.html.en @@ -197,7 +197,7 @@ listfunction ::= listfuncname "(" word ")"REMOTE_HOST The host name of the remote host REMOTE_USER - The name of the authenticated user (if any) + The name of the authenticated user, if any (not available during <If >) REMOTE_IDENT The user name set by mod_ident SERVER_NAME @@ -231,7 +231,7 @@ listfunction ::= listfuncname "(" word ")"The configured AuthType (e.g. "basic") CONTENT_TYPE - The content type of the response + The content type of the response (not available during <If >) HANDLER The name of the handler creating the response @@ -242,7 +242,7 @@ listfunction ::= listfuncname "(" word ")""on" if the connection uses IPv6, "off" otherwise REQUEST_STATUS - The HTTP error status of the request + The HTTP error status of the request (not available during <If >) REQUEST_LOG_ID The error log id of the request (see ErrorLogFormat) diff --git a/docs/manual/programs/rotatelogs.html.en b/docs/manual/programs/rotatelogs.html.en index a0678530d2..9210ac9d58 100644 --- a/docs/manual/programs/rotatelogs.html.en +++ b/docs/manual/programs/rotatelogs.html.en @@ -138,7 +138,7 @@ be sure the log file format has enough granularity to produce a different file name each time the logs are rotated. Otherwise rotation will overwrite the same file instead of starting a new one. For example, if logfile was -/var/logs/errorlog.%Y-%m-%d with log rotation at 5 +/var/log/errorlog.%Y-%m-%d with log rotation at 5 megabytes, but 5 megabytes was reached twice in the same day, the same log file name would be produced and log rotation would keep writing to the same file.

@@ -178,32 +178,32 @@ an offset.

Examples

- CustomLog "|bin/rotatelogs /var/logs/logfile 86400" common + CustomLog "|bin/rotatelogs /var/log/logfile 86400" common

-

This creates the files /var/logs/logfile.nnnn where nnnn is +

This creates the files /var/log/logfile.nnnn where nnnn is the system time at which the log nominally starts (this time will always be a multiple of the rotation time, so you can synchronize cron scripts with it). At the end of each rotation time (here after 24 hours) a new log is started.

- CustomLog "|bin/rotatelogs -l /var/logs/logfile.%Y.%m.%d 86400" common + CustomLog "|bin/rotatelogs -l /var/log/logfile.%Y.%m.%d 86400" common

-

This creates the files /var/logs/logfile.yyyy.mm.dd where +

This creates the files /var/log/logfile.yyyy.mm.dd where yyyy is the year, mm is the month, and dd is the day of the month. Logging will switch to a new file every day at midnight, local time.

- CustomLog "|bin/rotatelogs /var/logs/logfile 5M" common + CustomLog "|bin/rotatelogs /var/log/logfile 5M" common

This configuration will rotate the logfile whenever it reaches a size of 5 megabytes.

- ErrorLog "|bin/rotatelogs /var/logs/errorlog.%Y-%m-%d-%H_%M_%S 5M" + ErrorLog "|bin/rotatelogs /var/log/errorlog.%Y-%m-%d-%H_%M_%S 5M"

This configuration will rotate the error logfile whenever it reaches a size of 5 megabytes, and the suffix to the logfile name @@ -211,10 +211,10 @@ an offset. errorlog.YYYY-mm-dd-HH_MM_SS.

- CustomLog "|bin/rotatelogs -t /var/logs/logfile 86400" common + CustomLog "|bin/rotatelogs -t /var/log/logfile 86400" common

-

This creates the file /var/logs/logfile, truncating the file at +

This creates the file /var/log/logfile, truncating the file at startup and then truncating the file once per day. It is expected in this scenario that a separate process (such as tail) would process the file in real time.

diff --git a/docs/manual/programs/rotatelogs.xml.ko b/docs/manual/programs/rotatelogs.xml.ko index c71f6a9ffa..ab6bd3fd7c 100644 --- a/docs/manual/programs/rotatelogs.xml.ko +++ b/docs/manual/programs/rotatelogs.xml.ko @@ -1,7 +1,7 @@ - + +