From: Erik Abele
Date: Tue, 6 Jan 2004 01:05:33 +0000 (+0000)
Subject: Backport several improvements from HEAD. The docs are now in sync again.
X-Git-Tag: 2.0.49~251
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=06aaa393f384edd22a212af0ccc68323ce62918d;p=thirdparty%2Fapache%2Fhttpd.git
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 4eba2ae6909..1e6c864e416 100644
--- a/docs/manual/programs/ab.xml
+++ b/docs/manual/programs/ab.xml
@@ -68,7 +68,7 @@
-e csv-file
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'.
diff --git a/docs/manual/programs/configure.xml b/docs/manual/programs/configure.xml
index e081b3e33e8..28b11377f6e 100644
--- a/docs/manual/programs/configure.xml
+++ b/docs/manual/programs/configure.xml
@@ -114,11 +114,16 @@
Define a directory layout
-
--enable-layout=LAYOUT
- Configure the source code and build scripts to assume an
- installation tree based on the layout LAYOUT. The default
- layout is
Apache
.
+ installation tree based on the layout LAYOUT. This allows
+ you to separately specify the locations for each type of file within
+ the Apache HTTP Server installation. The config.layout
+ 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 <Layout
+ FOO>...</Layout>
sections and referred to by name as
+ in FOO
. The default layout is Apache
.
diff --git a/docs/manual/programs/dbmmanage.xml b/docs/manual/programs/dbmmanage.xml
index 3c78229afde..0d09da64bf4 100644
--- 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 dbmmanage
will attempt to use for all DBM file
transactions. This ordering is slightly different than the standard
- @AnyDBM::ISA
ordering in perl, as well as the ordering used by
+ @AnyDBM::ISA
ordering in Perl, as well as the ordering used by
the simple dbmopen()
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 3ec73a454fd..5979b2abc73 100644
--- a/docs/manual/programs/httpd.xml
+++ b/docs/manual/programs/httpd.xml
@@ -128,7 +128,7 @@ shows the virtualhost settings).
-t
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
DUMP_VHOSTS is also set, details of the virtual host
configuration will be printed.
diff --git a/docs/manual/programs/rotatelogs.xml b/docs/manual/programs/rotatelogs.xml
index 845793f9c25..22459b270e2 100644
--- a/docs/manual/programs/rotatelogs.xml
+++ b/docs/manual/programs/rotatelogs.xml
@@ -17,10 +17,10 @@
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.
+ synchronize cron scripts with it). At the end of each rotation
+ time (here after 24 hours) a new log is started.
-
+
CustomLog "|bin/rotatelogs /var/logs/logfile 5M" common
@@ -103,4 +103,4 @@ extensions.
-
\ No newline at end of file
+
diff --git a/docs/manual/programs/suexec.xml b/docs/manual/programs/suexec.xml
index d75bb05bfd2..b7422aaa902 100644
--- a/docs/manual/programs/suexec.xml
+++ b/docs/manual/programs/suexec.xml
@@ -31,7 +31,7 @@
If you are root
, this option displays the compile options of
suexec
. For security reasons all configuration options are
-changable only at compile time.
+changeable only at compile time.