From: Daniel Gruno <humbedooh@apache.org>
Date: Wed, 9 May 2012 07:25:01 +0000 (+0000)
Subject: xforms (and my 400th commit, yaay)
X-Git-Tag: 2.5.0-alpha~6854
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc6c8bf97dcaae27bae29465af22f8d73d6b076c;p=thirdparty%2Fapache%2Fhttpd.git

xforms (and my 400th commit, yaay)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1335952 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/rewrite/access.html.en b/docs/manual/rewrite/access.html.en
index 5ef881f5eeb..7ebdf82ac61 100644
--- a/docs/manual/rewrite/access.html.en
+++ b/docs/manual/rewrite/access.html.en
@@ -185,7 +185,10 @@ RewriteRule ^/secret/files/   -   [F]
       <pre class="prettyprint lang-config">
 SetEnvIfNoCase User-Agent ^NameOfBadRobot goaway
 &lt;Location /secret/files&gt;
-    Require not env goaway
+    &lt;RequireAll&gt;
+        Require all granted
+        Require not env goaway
+    &lt;/RequireAll&gt;
 &lt;/Location&gt;
       </pre>
 
@@ -309,25 +312,26 @@ http://badguys.example.com/bad/index3.html   http://somewhere.example.com/
 <p><span>Available Languages: </span><a href="../en/rewrite/access.html" title="English">&nbsp;en&nbsp;</a></p>
 </div><div class="top"><a href="#page-header"><img src="../images/up.gif" alt="top" /></a></div><div class="section"><h2><a id="comments_section" name="comments_section">Comments</a></h2><div class="warning"><strong>This section is experimental!</strong><br />Comments placed here should not be expected 
 to last beyond the testing phase of this system, nor do we in any way guarantee that we'll read them.</div>
-<div id="disqus_thread">
-</div><script type="text/javascript"><!--//--><![CDATA[//><!--
-var lang = 'en';
+<script type="text/javascript"><!--//--><![CDATA[//><!--
 var disqus_shortname = 'httpd';
-var disqus_identifier = window.location.href.replace(/(current|trunk)/, "2.4").replace(/\/[a-z]{2}\//, "/").replace(window.location.protocol, "http:") + '.' + lang;
-if (disqus_identifier.indexOf("httpd.apache.org") != -1) {
-    (function() {
-                var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-                dsq.src = window.location.protocol + '//' + disqus_shortname + '.disqus.com/embed.js';
-            (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-        })();
-} else {
-    var text = document.createTextNode("Comments have been disabled for offline viewing.");
-    document.getElementById('disqus_thread').appendChild(text);
-}
+var disqus_identifier = 'http://httpd.apache.org/docs/2.4/rewrite/access.html.en';
+(function(w, d) {
+    if (w.location.hostname.toLowerCase() == "httpd.apache.org") {
+        d.write('<div id="disqus_thread"><\/div>');
+        var s = d.createElement('script');
+        s.type = 'text/javascript';
+        s.async = true;
+        s.src = 'http' + '://' + disqus_shortname + '.disqus.com/embed.js';
+        (d.getElementsByTagName('head')[0] || d.getElementsByTagName('body')[0]).appendChild(s);
+    }
+    else {
+        d.write('<div id="disqus_thread">Comments have been disabled for offline viewing.<\/div>');
+    }
+})(window, document);
 //--><!]]></script></div><div id="footer">
 <p class="apache">Copyright 2012 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="http://wiki.apache.org/httpd/FAQ">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div><script type="text/javascript"><!--//--><![CDATA[//><!--
-if (typeof(prettyPrint) !== undefined) {
+if (typeof(prettyPrint) !== 'undefined') {
     prettyPrint();
 }
 //--><!]]></script>