From 13e5a9f6802180a28ad1aba6f0515350f575d925 Mon Sep 17 00:00:00 2001
From: Christophe Jaillet <jailletc36@apache.org>
Date: Fri, 23 Mar 2018 21:34:10 +0000
Subject: [PATCH] Document the 3rd argument of 'RewriteMap' (r1664575 in trunk)
Compatibility note will be added in the next commit.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1827600 13f79535-47bb-0310-9956-ffa450edef68
---
docs/manual/mod/mod_rewrite.xml | 6 ++++++
docs/manual/rewrite/rewritemap.xml | 9 +++++----
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/docs/manual/mod/mod_rewrite.xml b/docs/manual/mod/mod_rewrite.xml
index e96a583f8d..7c5a2b5c9e 100644
--- a/docs/manual/mod/mod_rewrite.xml
+++ b/docs/manual/mod/mod_rewrite.xml
@@ -300,6 +300,7 @@ LogLevel alert rewrite:trace3
<name>RewriteMap</name>
<description>Defines a mapping function for key-lookup</description>
<syntax>RewriteMap <em>MapName</em> <em>MapType</em>:<em>MapSource</em>
+ <em>MapTypeOptions</em>
</syntax>
<contextlist><context>server config</context><context>virtual host</context>
</contextlist>
@@ -347,6 +348,11 @@ RewriteMap examplemap "txt:/path/to/file/map.txt"
RewriteRule "^/ex/(.*)" "${examplemap:$1}"
</highlight>
+ <p>The meaning of the <em>MapTypeOptions</em> argument depends on
+ particular <em>MapType</em>. See the
+ <a href="../rewrite/rewritemap.html">Using RewriteMap</a> for
+ more information.</p>
+
<p>The following combinations for <em>MapType</em> and
<em>MapSource</em> can be used:</p>
diff --git a/docs/manual/rewrite/rewritemap.xml b/docs/manual/rewrite/rewritemap.xml
index 94a1935a5c..b3bba5f25f 100644
--- a/docs/manual/rewrite/rewritemap.xml
+++ b/docs/manual/rewrite/rewritemap.xml
@@ -366,10 +366,11 @@ by many requests.
module="mod_rewrite">RewriteEngine</directive> set to
<code>on</code>.</p>
- <p>By default, external rewriting programs are started as root.
- This can be changed on UNIX systems by passing user name and
- group name as third argument to <directive module="mod_rewrite">
- RewriteMap</directive> in the <code>username:groupname</code> format.</p>
+ <p>By default, external rewriting programs are run as the
+ user:group who started httpd. This can be changed on UNIX systems
+ by passing user name and group name as third argument to
+ <directive module="mod_rewrite">RewriteMap</directive> in the
+ <code>username:groupname</code> format.</p>
<p>This feature utilizes the <code>rewrite-map</code> mutex,
which is required for reliable communication with the program.
--
2.40.0