Backport some small documentation tweeks from trunk.

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

diff --git a/docs/manual/content-negotiation.xml b/docs/manual/content-negotiation.xml
index fbd70a00f94f8750bfe08a5efcbbd864994ace1a..dafedd4752c1cb96132d595677ef506da1aff33d 100644 (file)
--- a/docs/manual/content-negotiation.xml
+++ b/docs/manual/content-negotiation.xml
@@ -74,7 +74,7 @@
     <p>httpd supports 'server driven' content negotiation, as
     defined in the HTTP/1.1 specification. It fully supports the
     <code>Accept</code>, <code>Accept-Language</code>,
-    <code>Accept-Charset</code> and<code>Accept-Encoding</code>
+    <code>Accept-Charset</code> and <code>Accept-Encoding</code>
     request headers. httpd also supports 'transparent'
     content negotiation, which is an experimental negotiation
     protocol defined in RFC 2295 and RFC 2296. It does not offer

diff --git a/docs/manual/developer/modules.xml b/docs/manual/developer/modules.xml
index 49f13cc2abbf4b8c5848534defc46e8671106eb0..87e48f13661c2ef7fe842461d9c087b98aed114c 100644 (file)
--- a/docs/manual/developer/modules.xml
+++ b/docs/manual/developer/modules.xml
@@ -120,7 +120,7 @@ static void register_hooks(void)
 
       <p>In the <code>mod_mmap_static</code> case I didn't care about the
       <code>post_config</code> stage, but the <code>mmap_static_xlat</code>
-      <strong>must</strong> be called after the core module had done it's name
+      <strong>must</strong> be called after the core module had done its name
       translation, hence the use of the aszPre to define a modifier to the
       position <code>HOOK_LAST</code>.</p>
     </section>

diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index 860dafa226481f9e94ee6c940c8e265de74bf3bc..7f559812d02339f4226ea75f6c191c1a372529f8 100644 (file)
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -615,7 +615,7 @@ headers</description>
     <p>The <directive>DefaultRuntimeDir</directive> directive sets the
     directory in which the server will create various run-time files
     (shared memory, locks, etc.). If set as a relative path, the full path
-    will be relative to <directive>ServerRoot</directive></p>
+    will be relative to <directive>ServerRoot</directive>.</p>
 
     <p><strong>Example</strong></p>
    <highlight language="config">

diff --git a/docs/manual/programs/httxt2dbm.xml b/docs/manual/programs/httxt2dbm.xml
index 4bcc56d2bedbfd0628ff7ef97507f61de8365a14..195201e63d15882de0c31e5870cfbf2cb59ac34e 100644 (file)
--- a/docs/manual/programs/httxt2dbm.xml
+++ b/docs/manual/programs/httxt2dbm.xml
@@ -28,8 +28,10 @@
 <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
-    <code>dbm</code> map type.
-    </p>
+    <code>dbm</code> map type.</p>
+    
+    <p>If the output file already exists, it will not be truncated. New keys will be
+    added and existing keys will be updated.</p>
 </summary>
 <seealso><program>httpd</program></seealso>
 <seealso><module>mod_rewrite</module></seealso>