From: Eric Covener <covener@apache.org>
Date: Mon, 8 Aug 2011 12:38:12 +0000 (+0000)
Subject: xforms
X-Git-Tag: 2.2.20~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a50038a8dd2c0a9e0b4d5350e07609ce226d63dc;p=thirdparty%2Fapache%2Fhttpd.git

xforms


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

diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index 7b8b33cc815..a84d368e164 100644
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -506,7 +506,16 @@ NoDecode option available in 2.2.18 and later.</td></tr>
       features (<code class="directive"><a href="#options">Options</a></code> and
       <code class="directive"><a href="../mod/mod_include.html#xbithack">XBitHack</a></code>).
       An equal sign may be given followed by a comma (but no spaces)
-      separated lists of options that may be set using the <code class="directive"><a href="#options">Options</a></code> command.</dd>
+      separated lists of options that may be set using the <code class="directive"><a href="#options">Options</a></code> command.
+
+      <div class="note"><h3>Implicit disabling of Options</h3>
+      <p>Even though the list of options that may be used in .htaccess files 
+         can be limited with this directive, as long as any <code class="directive"><a href="#options">Options</a></code> directive is allowed any
+         other inherited option can be disabled by using the non-relative
+         syntax.  In other words, this mechanism cannot force a specific option
+         to remain <em>set</em> while allowing any others to be set.
+      </p></div>
+      </dd>
     </dl>
 
     <p>Example:</p>
diff --git a/docs/manual/mod/mod_alias.html.en b/docs/manual/mod/mod_alias.html.en
index 11277cf8cf1..d44c5902fee 100644
--- a/docs/manual/mod/mod_alias.html.en
+++ b/docs/manual/mod/mod_alias.html.en
@@ -127,10 +127,10 @@
       Alias /image /ftp/pub/image
     </code></p></div>
 
-    <p>A request for <code>http://myserver/image/foo.gif</code> would cause
+    <p>A request for <code>http://example.com/image/foo.gif</code> would cause
     the server to return the file <code>/ftp/pub/image/foo.gif</code>.  Only
     complete path segments are matched, so the above alias would not match a
-    request for <code>http://myserver/imagefoo.gif</code>.  For more complex
+    request for <code>http://example.com/imagefoo.gif</code>.  For more complex
     matching using regular expressions, see the <code class="directive"><a href="#aliasmatch">AliasMatch</a></code> directive.</p>
 
     <p>Note that if you include a trailing / on the
@@ -421,7 +421,7 @@ target as a CGI script</td></tr>
       ScriptAlias /cgi-bin/ /web/cgi-bin/
     </code></p></div>
 
-    <p>A request for <code>http://myserver/cgi-bin/foo</code> would cause the
+    <p>A request for <code>http://example.com/cgi-bin/foo</code> would cause the
     server to run the script <code>/web/cgi-bin/foo</code>.  This configuration
     is essentially equivalent to:</p>
     <div class="example"><p><code>
diff --git a/docs/manual/mod/mod_dir.html.en b/docs/manual/mod/mod_dir.html.en
index 20151b9284e..cf9e7e4c660 100644
--- a/docs/manual/mod/mod_dir.html.en
+++ b/docs/manual/mod/mod_dir.html.en
@@ -91,8 +91,8 @@ a directory</td></tr>
       DirectoryIndex index.html
     </code></p></div>
 
-    <p>then a request for <code>http://myserver/docs/</code> would
-    return <code>http://myserver/docs/index.html</code> if it
+    <p>then a request for <code>http://example.com/docs/</code> would
+    return <code>http://example.com/docs/index.html</code> if it
     exists, or would list the directory if it did not.</p>
 
     <p>Note that the documents do not need to be relative to the