You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ja...@apache.org on 2013/02/26 10:19:21 UTC
svn commit: r1450091 - in /httpd/httpd/branches/2.4.x/docs/manual:
content-negotiation.xml developer/modules.xml mod/core.xml
programs/httxt2dbm.xml
Author: jailletc36
Date: Tue Feb 26 09:19:21 2013
New Revision: 1450091
URL: http://svn.apache.org/r1450091
Log:
Backport some small documentation tweeks from trunk.
Modified:
httpd/httpd/branches/2.4.x/docs/manual/content-negotiation.xml
httpd/httpd/branches/2.4.x/docs/manual/developer/modules.xml
httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml
httpd/httpd/branches/2.4.x/docs/manual/programs/httxt2dbm.xml
Modified: httpd/httpd/branches/2.4.x/docs/manual/content-negotiation.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/content-negotiation.xml?rev=1450091&r1=1450090&r2=1450091&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/content-negotiation.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/content-negotiation.xml Tue Feb 26 09:19:21 2013
@@ -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
Modified: httpd/httpd/branches/2.4.x/docs/manual/developer/modules.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/developer/modules.xml?rev=1450091&r1=1450090&r2=1450091&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/developer/modules.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/developer/modules.xml Tue Feb 26 09:19:21 2013
@@ -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>
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml?rev=1450091&r1=1450090&r2=1450091&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml Tue Feb 26 09:19:21 2013
@@ -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">
Modified: httpd/httpd/branches/2.4.x/docs/manual/programs/httxt2dbm.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/programs/httxt2dbm.xml?rev=1450091&r1=1450090&r2=1450091&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/programs/httxt2dbm.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/programs/httxt2dbm.xml Tue Feb 26 09:19:21 2013
@@ -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>