Backport several improvements from HEAD. The docs are now in sync again.

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

diff --git a/docs/manual/programs/ab.xml b/docs/manual/programs/ab.xml
index 4eba2ae6909cfc244ed7a4dc5f130b8dcca26693..1e6c864e416af715835475b064e3a01b0a9f5ac5 100644 (file)
--- a/docs/manual/programs/ab.xml
+++ b/docs/manual/programs/ab.xml
@@ -68,7 +68,7 @@
 
     <dt><code>-e <var>csv-file</var></code></dt>
     <dd>Write a Comma separated value (CSV) file which contains for each
-    percentage (from 1% to 100%) the time (in milli seconds) it took to serve
+    percentage (from 1% to 100%) the time (in milliseconds) it took to serve
     that percentage of the requests. This is usually more useful than the
     'gnuplot' file; as the results are already 'binned'.</dd>
 

diff --git a/docs/manual/programs/configure.xml b/docs/manual/programs/configure.xml
index e081b3e33e86a1be186c8ce83451bb19f15a2633..28b11377f6e464cfe4851deef7edd90a652675d8 100644 (file)
--- a/docs/manual/programs/configure.xml
+++ b/docs/manual/programs/configure.xml
@@ -114,11 +114,16 @@
 
     <section id="layout"><title>Define a directory layout</title>
       <dl>
-        <!-- further explanation needed -->
         <dt><code>--enable-layout=<var>LAYOUT</var></code></dt>
         <dd>Configure the source code and build scripts to assume an
-          installation tree based on the layout <var>LAYOUT</var>. The default
-          layout is <code>Apache</code>.</dd>
+          installation tree based on the layout <var>LAYOUT</var>. This allows
+          you to separately specify the locations for each type of file within
+          the Apache HTTP Server installation. The <code>config.layout</code>
+          file contains several example configurations, and you can also create
+          your own custom configuration following the examples. The different
+          layouts in this file are grouped into <code>&lt;Layout
+            FOO&gt;...&lt;/Layout&gt;</code> sections and referred to by name as
+          in <code>FOO</code>. The default layout is <code>Apache</code>.</dd>
       </dl>
     </section>
 

diff --git a/docs/manual/programs/dbmmanage.xml b/docs/manual/programs/dbmmanage.xml
index 3c78229afdeae78b29ba7f15f02d641976b6dc21..0d09da64bf44acc47054a6ebcb3b77aac0638733 100644 (file)
--- a/docs/manual/programs/dbmmanage.xml
+++ b/docs/manual/programs/dbmmanage.xml
@@ -137,7 +137,7 @@
     then NDBM, then GDBM and then SDBM. The first library found will be the
     library <code>dbmmanage</code> will attempt to use for all DBM file
     transactions. This ordering is slightly  different than the standard
-    <code>@AnyDBM::ISA</code> ordering in perl, as well as the ordering used by
+    <code>@AnyDBM::ISA</code> ordering in Perl, as well as the ordering used by
     the simple <code>dbmopen()</code> call in Perl, so if you use any other
     utilities to manage your DBM files, they must also follow this preference
     ordering. Similar care must be taken if using programs in other languages,

diff --git a/docs/manual/programs/httpd.xml b/docs/manual/programs/httpd.xml
index 3ec73a454fddcf315fe92c3a7b0a664a8512c53e..5979b2abc7359d68281fc95798e59c520162d93c 100644 (file)
--- a/docs/manual/programs/httpd.xml
+++ b/docs/manual/programs/httpd.xml
@@ -128,7 +128,7 @@ shows the virtualhost settings).</dd>
 <dt><code>-t</code></dt>
 
 <dd>Run syntax tests for configuration files only.  The program
-immediately exits after these syntax parsing with either a return code
+immediately exits after these syntax parsing tests with either a return code
 of 0 (Syntax OK) or return code not equal to 0 (Syntax Error).  If -D
 <var>DUMP</var>_<var>VHOSTS </var>is also set, details of the virtual host
 configuration will be printed.</dd>

diff --git a/docs/manual/programs/rotatelogs.xml b/docs/manual/programs/rotatelogs.xml
index 845793f9c25ccfce6612a78874c9353a5165f4c6..22459b270e26c8ada2dbd761e51f1e88cb50bd0b 100644 (file)
--- a/docs/manual/programs/rotatelogs.xml
+++ b/docs/manual/programs/rotatelogs.xml
@@ -17,10 +17,10 @@
      <p>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 rota-
-     tion time (here after 24 hours) a new log is started.</p>
+     synchronize cron scripts with it).  At the end of each rotation
+     time (here after 24 hours) a new log is started.</p>
 
-<example>       
+<example>
      CustomLog "|bin/rotatelogs /var/logs/logfile 5M" common
 </example>
 
@@ -103,4 +103,4 @@ extensions.</p>
 </table>
 
 </section>
-</manualpage>
\ No newline at end of file
+</manualpage>

diff --git a/docs/manual/programs/suexec.xml b/docs/manual/programs/suexec.xml
index d75bb05bfd2757d2e3af0f7eb2f0e8669f91c6c4..b7422aaa902a7bf02248bb261893588e2ad35744 100644 (file)
--- a/docs/manual/programs/suexec.xml
+++ b/docs/manual/programs/suexec.xml
@@ -31,7 +31,7 @@
 
 <dd>If you are <code>root</code>, this option displays the compile options of
 <code>suexec</code>. For security reasons all configuration options are
-changable only at compile time.</dd>
+changeable only at compile time.</dd>
 
 </dl>
 </section>