diff options
Diffstat (limited to 'docs/manual/programs')
| -rw-r--r-- | docs/manual/programs/apachectl.xml | 6 | ||||
| -rw-r--r-- | docs/manual/programs/apxs.xml | 8 | ||||
| -rw-r--r-- | docs/manual/programs/configure.xml | 2 | ||||
| -rw-r--r-- | docs/manual/programs/dbmmanage.xml | 12 | ||||
| -rw-r--r-- | docs/manual/programs/htcacheclean.xml | 4 | ||||
| -rw-r--r-- | docs/manual/programs/htpasswd.xml | 4 | ||||
| -rw-r--r-- | docs/manual/programs/httpd.xml | 4 | ||||
| -rw-r--r-- | docs/manual/programs/httxt2dbm.xml | 2 | ||||
| -rw-r--r-- | docs/manual/programs/logresolve.xml | 2 | ||||
| -rw-r--r-- | docs/manual/programs/other.xml | 4 | ||||
| -rw-r--r-- | docs/manual/programs/rotatelogs.xml | 16 |
11 files changed, 32 insertions, 32 deletions
diff --git a/docs/manual/programs/apachectl.xml b/docs/manual/programs/apachectl.xml index a6f3620701..bae6512a7c 100644 --- a/docs/manual/programs/apachectl.xml +++ b/docs/manual/programs/apachectl.xml @@ -127,9 +127,9 @@ restart to make sure Apache doesn't die. This is equivalent to <dt><code>graceful-stop</code></dt> -<dd>Gracefully stops the Apache <program>httpd</program> 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. +<dd>Gracefully stops the Apache <program>httpd</program> 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 <code>apachectl -k graceful-stop</code>.</dd> <dt><code>configtest</code></dt> diff --git a/docs/manual/programs/apxs.xml b/docs/manual/programs/apxs.xml index b136e9abb9..309fccfe11 100644 --- a/docs/manual/programs/apxs.xml +++ b/docs/manual/programs/apxs.xml @@ -132,12 +132,12 @@ <section id="options.query"><title>Query Options</title> <dl> <dt><code>-q</code></dt> - <dd>Performs a query for variables and environment settings used to - build <code>httpd</code>. When invoked without <var>query</var> parameters, - it prints all known variables and their values. The optional <code>-v</code> + <dd>Performs a query for variables and environment settings used to + build <code>httpd</code>. When invoked without <var>query</var> parameters, + it prints all known variables and their values. The optional <code>-v</code> parameter formats the list output. - <p>Use this to manually determine settings used to build the + <p>Use this to manually determine settings used to build the <code>httpd</code> that will load your module. For instance use</p> <example> INC=-I`apxs -q INCLUDEDIR` diff --git a/docs/manual/programs/configure.xml b/docs/manual/programs/configure.xml index 33c7f7337b..23fbebad06 100644 --- a/docs/manual/programs/configure.xml +++ b/docs/manual/programs/configure.xml @@ -331,7 +331,7 @@ <dl> <dt><code>--with-mpm=MPM</code></dt> <dd> - <p>Choose the default MPM for your server. If MPMs are built as DSO + <p>Choose the default MPM for your server. If MPMs are built as DSO modules (see <code>--enable-mpms-shared</code>), this directive selects the MPM which will be loaded in the default configuration file. Otherwise, this directive selects the only available MPM, diff --git a/docs/manual/programs/dbmmanage.xml b/docs/manual/programs/dbmmanage.xml index 29a3132f5b..f3d1d38063 100644 --- a/docs/manual/programs/dbmmanage.xml +++ b/docs/manual/programs/dbmmanage.xml @@ -110,27 +110,27 @@ <dt><code>add</code></dt> <dd>Adds an entry for <var>username</var> to <var>filename</var> using the encrypted password <var>encpasswd</var>. - + <example>dbmmanage passwords.dat add rbowen foKntnEF3KSXA</example> </dd> <dt><code>adduser</code></dt> <dd>Asks for a password and then adds an entry for <var>username</var> to <var>filename</var>. - + <example>dbmmanage passwords.dat adduser krietz</example> </dd> <dt><code>check</code></dt> <dd>Asks for a password and then checks if <var>username</var> is in <var>filename</var> and if it's password matches the specified one. - + <example>dbmmanage passwords.dat check rbowen</example> </dd> <dt><code>delete</code></dt> <dd>Deletes the <var>username</var> entry from <var>filename</var>. - + <example>dbmmanage passwords.dat delete rbowen</example> </dd> @@ -142,14 +142,14 @@ <dt><code>update</code></dt> <dd>Same as the <code>adduser</code> command, except that it makes sure <var>username</var> already exists in <var>filename</var>. - + <example>dbmmanage passwords.dat update rbowen</example> </dd> <dt><code>view</code></dt> <dd>Just displays the contents of the DBM file. If you specify a <var>username</var>, it displays the particular record only. - + <example>dbmmanage passwords.dat view</example> </dd> </dl> diff --git a/docs/manual/programs/htcacheclean.xml b/docs/manual/programs/htcacheclean.xml index a6a5cedbfc..8f75d1ff1e 100644 --- a/docs/manual/programs/htcacheclean.xml +++ b/docs/manual/programs/htcacheclean.xml @@ -49,7 +49,7 @@ -<strong>p</strong><var>path</var> [-<strong>l</strong><var>limit</var>| -<strong>L</strong><var>limit</var>]</code></p> - + <p><code><strong>htcacheclean</strong> [ -<strong>n</strong> ] [ -<strong>t</strong> ] @@ -113,7 +113,7 @@ removed, however with some configurations the large number of directories created may require attention. If your configuration requires a very large number of directories, to the point that - inode or file allocation table exhaustion may become an issue, use + inode or file allocation table exhaustion may become an issue, use of this option is advised.</dd> <dt><code>-p<var>path</var></code></dt> diff --git a/docs/manual/programs/htpasswd.xml b/docs/manual/programs/htpasswd.xml index 259af6cd83..f08caf37c7 100644 --- a/docs/manual/programs/htpasswd.xml +++ b/docs/manual/programs/htpasswd.xml @@ -65,7 +65,7 @@ distribution.</seealso> [ -<strong>m</strong> | -<strong>d</strong> | -<strong>p</strong> | - -<strong>s</strong> ] + -<strong>s</strong> ] [ -<strong>D</strong> ] <var>passwdfile</var> <var>username</var> <var>password</var></code></p> @@ -122,7 +122,7 @@ distribution.</seealso> <dt><code>-D</code></dt> <dd>Delete user. If the username exists in the specified htpasswd file, it will be deleted.</dd> - + <dt><code><var>passwdfile</var></code></dt> <dd>Name of the file to contain the user name and password. If <code>-c</code> is given, this file is created if it does not already exist, diff --git a/docs/manual/programs/httpd.xml b/docs/manual/programs/httpd.xml index 6ef9eb3b66..c20a027b99 100644 --- a/docs/manual/programs/httpd.xml +++ b/docs/manual/programs/httpd.xml @@ -51,7 +51,7 @@ [ -<strong>C</strong> <var>directive</var> ] [ -<strong>c</strong> <var>directive</var> ] [ -<strong>D</strong> <var>parameter</var> ] [ -<strong>e</strong> <var>level</var> ] [ -<strong>E</strong> - <var>file</var> ] + <var>file</var> ] [ <strong>-k</strong> start|restart|graceful|stop|graceful-stop ] [ -<strong>R</strong> <var>directory</var> ] [ -<strong>h</strong> ] [ -<strong>l</strong> ] [ -<strong>L</strong> ] [ -<strong>S</strong> ] @@ -192,7 +192,7 @@ the Apache service; and uninstall the Apache service.</dd> <dt><code>-w</code></dt> -<dd>Keep the console window open on error so that the error message can +<dd>Keep the console window open on error so that the error message can be read.</dd> </dl> diff --git a/docs/manual/programs/httxt2dbm.xml b/docs/manual/programs/httxt2dbm.xml index a0715d52d6..f2eb029263 100644 --- a/docs/manual/programs/httxt2dbm.xml +++ b/docs/manual/programs/httxt2dbm.xml @@ -27,7 +27,7 @@ <summary> <p><code>httxt2dbm</code> is used to generate dbm files from text input, for - use in <directive module="mod_rewrite">RewriteMap</directive> with the + use in <directive module="mod_rewrite">RewriteMap</directive> with the <code>dbm</code> map type. </p> </summary> diff --git a/docs/manual/programs/logresolve.xml b/docs/manual/programs/logresolve.xml index 0646c61ddf..867f91ce64 100644 --- a/docs/manual/programs/logresolve.xml +++ b/docs/manual/programs/logresolve.xml @@ -23,7 +23,7 @@ <manualpage metafile="logresolve.xml.meta"> <parentdocument href="./">Programs</parentdocument> - <title>logresolve - Resolve IP-addresses to hostnames in Apache + <title>logresolve - Resolve IP-addresses to hostnames in Apache log files</title> <summary> diff --git a/docs/manual/programs/other.xml b/docs/manual/programs/other.xml index 8fe9700401..334dfd3a32 100644 --- a/docs/manual/programs/other.xml +++ b/docs/manual/programs/other.xml @@ -52,9 +52,9 @@ combined_plus_vhost<br /> CustomLog logs/access_log combined_plus_vhost </example> - + <p>Log files will be created, in the directory where are running the - script, for each virtual host name that appears in the combined log file. + script, for each virtual host name that appears in the combined log file. These logfiles will named after the hostname, with a <code>.log</code> file extension.</p> diff --git a/docs/manual/programs/rotatelogs.xml b/docs/manual/programs/rotatelogs.xml index 63c08d17a8..4eee1b1854 100644 --- a/docs/manual/programs/rotatelogs.xml +++ b/docs/manual/programs/rotatelogs.xml @@ -41,7 +41,7 @@ [ -<strong>v</strong> ] [ -<strong>e</strong> ] <var>logfile</var> - <var>rotationtime</var>|<var>filesize</var>(B|K|M|G) + <var>rotationtime</var>|<var>filesize</var>(B|K|M|G) [ <var>offset</var> ]</code></p> </section> @@ -51,13 +51,13 @@ <dt><code>-l</code></dt> <dd>Causes the use of local time rather than GMT as the base for the -interval or for <code>strftime(3)</code> formatting with size-based +interval or for <code>strftime(3)</code> formatting with size-based rotation.</dd> <dt><code>-L</code> <var>linkname</var></dt> <dd>Causes a hard link to be made from the current logfile to the specified link name. This can be used to watch -the log continuously across rotations using a command like +the log continuously across rotations using a command like <code>tail -F linkname</code>.</dd> <dt><code>-p</code> <var>program</var></dt> @@ -114,7 +114,7 @@ period (midnight).</p> 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 <var>logfile</var> was +one. For example, if <var>logfile</var> was <code>/var/logs/errorlog.%Y-%m-%d</code> 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 @@ -186,7 +186,7 @@ an offset.</dd> reaches a size of 5 megabytes, and the suffix to the logfile name will be created of the form <code>errorlog.YYYY-mm-dd-HH_MM_SS</code>.</p> - + <example> CustomLog "|bin/rotatelogs -t /var/logs/logfile 86400" common </example> @@ -219,11 +219,11 @@ extensions.</p> <tr><td><code>%m</code></td><td>2-digit month</td></tr> <tr><td><code>%p</code></td><td>am/pm of 12 hour clock (localized)</td></tr> <tr><td><code>%S</code></td><td>2-digit second</td></tr> -<tr><td><code>%U</code></td><td>2-digit week of year +<tr><td><code>%U</code></td><td>2-digit week of year (Sunday first day of week)</td></tr> -<tr><td><code>%W</code></td><td>2-digit week of year +<tr><td><code>%W</code></td><td>2-digit week of year (Monday first day of week)</td></tr> -<tr><td><code>%w</code></td><td>1-digit weekday +<tr><td><code>%w</code></td><td>1-digit weekday (Sunday first day of week)</td></tr> <tr><td><code>%X</code></td><td>time (localized)</td></tr> <tr><td><code>%x</code></td><td>date (localized)</td></tr> |