From: Takashi Sato <takashi@apache.org>
Date: Sat, 10 May 2008 03:08:13 +0000 (+0000)
Subject: Merge r349476 from trunk:
X-Git-Tag: 2.2.9~188
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=236f5e4ba145c6d909c047181f0a403a9da05653;p=thirdparty%2Fapache%2Fhttpd.git

Merge r349476 from trunk:
- try to add a note to explain the behaviour of clients use a pipelined
  connection wrt to MaxRequestsPerChild and KeepAlive.

Merge r413683 from trunk:
A little bit more detail, and an example, for how DocumentRoot is
handled. Examples good.

Merge r449032 from trunk:
Capitalization consistency
Submitted by Vincent Bray

Merge r649076 from trunk:
Replace reference to obsolete RFC. Submitted by: Igor Galić.

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

diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index c2fb49d80cc..e01312de92f 100644
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -565,7 +565,7 @@ headers</description>
 <usage>
     <p>This directive enables the generation of
     <code>Content-MD5</code> headers as defined in RFC1864
-    respectively RFC2068.</p>
+    respectively RFC2616.</p>
 
     <p>MD5 is an algorithm for computing a "message digest"
     (sometimes called "fingerprint") of arbitrary-length data, with
@@ -842,8 +842,8 @@ from the web</description>
     <p>The <directive>DocumentRoot</directive> should be specified without
     a trailing slash.</p>
 </usage>
-<seealso><a href="../urlmapping.html">Mapping URLs to Filesystem
-Location</a></seealso>
+<seealso><a href="../urlmapping.html#documentroot">Mapping URLs to Filesystem
+Locations</a></seealso>
 </directivesynopsis>
 
 <directivesynopsis>
@@ -1549,6 +1549,10 @@ the server configuration files</description>
     unless otherwise specified. If the client requests it, chunked
     encoding will be used in order to send content of unknown
     length over persistent connections.</p>
+
+    <p>When a client uses a Keep-Alive connection it will be counted
+    as a single "request" for the MaxRequestsPerChild directive, regardless
+    of how many requests are sent using the connection.</p>
 </usage>
 
 <seealso><directive module="core">MaxKeepAliveRequests</directive></seealso>
@@ -1792,8 +1796,8 @@ will be accepted from the client</description>
 <name>LimitRequestFieldSize</name>
 <description>Limits the size of the HTTP request header allowed from the
 client</description>
-<syntax>LimitRequestFieldsize <var>bytes</var></syntax>
-<default>LimitRequestFieldsize 8190</default>
+<syntax>LimitRequestFieldSize <var>bytes</var></syntax>
+<default>LimitRequestFieldSize 8190</default>
 <contextlist><context>server config</context></contextlist>
 
 <usage>
diff --git a/docs/manual/mod/core.xml.de b/docs/manual/mod/core.xml.de
index fa0c00830d7..7866248b7e5 100644
--- a/docs/manual/mod/core.xml.de
+++ b/docs/manual/mod/core.xml.de
@@ -518,7 +518,7 @@ HTTP-Response-Headern</description>
 
 <usage>
     <p>Die Direktive aktiviert die Generierung von
-    <code>Content-MD5</code>-Headern, wie sie in RFC1864 bzw. RFC2068
+    <code>Content-MD5</code>-Headern, wie sie in RFC1864 bzw. RFC2616
     definiert sind.</p>
 
     <p>MD5 ist ein Algorithmus zur Berechnung eines "Datenextrakts"
diff --git a/docs/manual/mod/core.xml.ja b/docs/manual/mod/core.xml.ja
index 089856ccf8c..73f02685d8f 100644
--- a/docs/manual/mod/core.xml.ja
+++ b/docs/manual/mod/core.xml.ja
@@ -546,7 +546,7 @@
 <status>Experimental</status>
 
 <usage>
-    <p>$B$3$N%G%#%l%/%F%#%V$O!"(BRFC1864 $B5Z$S(B RFC2068 $B$K$*$$$FDj5A$5$l$F$$$k(B
+    <p>$B$3$N%G%#%l%/%F%#%V$O!"(BRFC1864 $B5Z$S(B RFC2616 $B$K$*$$$FDj5A$5$l$F$$$k(B
     <code>Content-MD5</code> $B%X%C%@!<$N@8@.$rM-8z$K$7$^$9!#(B</p>
 
     <p>MD5 $B$O!"G$0UD9$N%G!<%?$N!V%a%C%;!<%8%@%$%8%'%9%H!W(B($B!V;XLf!W(B
@@ -1789,8 +1789,8 @@ module="core">Directory</directive></seealso>
 <name>LimitRequestFieldSize</name>
 <description>$B%/%i%$%"%s%H$+$i$N(B HTTP $B%j%/%(%9%H$N%X%C%@$N(B
 $B%5%$%:$r@)8B$9$k(B</description>
-<syntax>LimitRequestFieldsize <var>bytes</var></syntax>
-<default>LimitRequestFieldsize 8190</default>
+<syntax>LimitRequestFieldSize <var>bytes</var></syntax>
+<default>LimitRequestFieldSize 8190</default>
 <contextlist><context>server config</context></contextlist>
 
 <usage>
diff --git a/docs/manual/urlmapping.xml b/docs/manual/urlmapping.xml
index 721182da445..7b7eec374f3 100644
--- a/docs/manual/urlmapping.xml
+++ b/docs/manual/urlmapping.xml
@@ -74,6 +74,12 @@
     make up the basic document tree which will be visible from the
     web.</p>
 
+    <p>For example, if <directive module="core">DocumentRoot</directive>
+    were set to <code>/var/www/html</code> then a request for
+    <code>http://www.example.com/fish/guppies.html</code> would result
+    in the file <code>/var/www/html/fish/guppies.html</code> being
+    served to the requesting client.</p>
+
     <p>Apache is also capable of <a href="vhosts/">Virtual
     Hosting</a>, where the server receives requests for more than one
     host. In this case, a different <directive
@@ -83,6 +89,11 @@
     be used to dynamically determine the appropriate place from which
     to serve content based on the requested IP address or
     hostname.</p>
+
+    <p>The <directive module="core">DocumentRoot</directive> directive
+    is set in your main server configuration file
+    (<code>httpd.conf</code>) and, possibly, once per additional <a
+    href="vhosts/">Virtual Host</a> you create.</p>
 </section>
 
 <section id="outside"><title>Files Outside the DocumentRoot</title>