Imported Upstream version 2.4.9upstream/2.4.9

1 files changed, 24 insertions, 48 deletions

diff --git a/docs/manual/mod/mod_access_compat.html.en b/docs/manual/mod/mod_access_compat.html.en
index aaf5062d..a97aa5a6 100644
--- a/docs/manual/mod/mod_access_compat.html.en
+++ b/docs/manual/mod/mod_access_compat.html.en
@@ -9,7 +9,7 @@
 <link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
 <link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
 <link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link rel="stylesheet" type="text/css" href="../style/css/prettify.css" />
-<script src="../style/scripts/prettify.js" type="text/javascript">
+<script src="../style/scripts/prettify.min.js" type="text/javascript">
 </script>
 
 <link href="../images/favicon.ico" rel="shortcut icon" /></head>
@@ -123,10 +123,8 @@ server</td></tr>
       <dt>A (partial) domain-name</dt>
 
       <dd>
-      <pre class="prettyprint lang-config">
-Allow from example.org
-Allow from .net example.edu
-      </pre>
+      <pre class="prettyprint lang-config">Allow from example.org
+Allow from .net example.edu</pre>
 
       <p>Hosts whose names match, or end in, this string are allowed
       access. Only complete components are matched, so the above
@@ -143,20 +141,16 @@ Allow from .net example.edu
       <dt>A full IP address</dt>
 
       <dd>
-      <pre class="prettyprint lang-config">
-Allow from 10.1.2.3
-Allow from 192.168.1.104 192.168.1.205
-      </pre>
+      <pre class="prettyprint lang-config">Allow from 10.1.2.3
+Allow from 192.168.1.104 192.168.1.205</pre>
 
       <p>An IP address of a host allowed access</p></dd>
 
       <dt>A partial IP address</dt>
 
       <dd>
-      <pre class="prettyprint lang-config">
-Allow from 10.1
-Allow from 10 172.20 192.168.2
-      </pre>
+      <pre class="prettyprint lang-config">Allow from 10.1
+Allow from 10 172.20 192.168.2</pre>
 
       <p>The first 1 to 3 bytes of an IP address, for subnet
       restriction.</p></dd>
@@ -164,9 +158,7 @@ Allow from 10 172.20 192.168.2
       <dt>A network/netmask pair</dt>
 
       <dd>
-      <pre class="prettyprint lang-config">
-        Allow from 10.1.0.0/255.255.0.0
-      </pre>
+      <pre class="prettyprint lang-config">Allow from 10.1.0.0/255.255.0.0</pre>
 
       <p>A network a.b.c.d, and a netmask w.x.y.z. For more
       fine-grained subnet restriction.</p></dd>
@@ -174,9 +166,7 @@ Allow from 10 172.20 192.168.2
       <dt>A network/nnn CIDR specification</dt>
 
       <dd>
-      <pre class="prettyprint lang-config">
-        Allow from 10.1.0.0/16
-      </pre>
+      <pre class="prettyprint lang-config">Allow from 10.1.0.0/16</pre>
 
       <p>Similar to the previous case, except the netmask consists of
       nnn high-order 1 bits.</p></dd>
@@ -188,10 +178,8 @@ Allow from 10 172.20 192.168.2
     <p>IPv6 addresses and IPv6 subnets can be specified as shown
     below:</p>
 
-    <pre class="prettyprint lang-config">
-Allow from 2001:db8::a00:20ff:fea7:ccea
-Allow from 2001:db8::a00:20ff:fea7:ccea/10
-    </pre>
+    <pre class="prettyprint lang-config">Allow from 2001:db8::a00:20ff:fea7:ccea
+Allow from 2001:db8::a00:20ff:fea7:ccea/10</pre>
 
 
     <p>The third format of the arguments to the
@@ -210,14 +198,12 @@ Allow from 2001:db8::a00:20ff:fea7:ccea/10
     <code>User-Agent</code> (browser type), <code>Referer</code>, or
     other HTTP request header fields.</p>
 
-    <pre class="prettyprint lang-config">
-SetEnvIf User-Agent ^KnockKnock/2\.0 let_me_in
+    <pre class="prettyprint lang-config">SetEnvIf User-Agent ^KnockKnock/2\.0 let_me_in
 &lt;Directory /docroot&gt;
     Order Deny,Allow
     Deny from all
     Allow from env=let_me_in
-&lt;/Directory&gt;
-    </pre>
+&lt;/Directory&gt;</pre>
 
 
     <p>In this case, browsers with a user-agent string beginning
@@ -340,11 +326,9 @@ evaluated.</td></tr>
     <p>In the following example, all hosts in the example.org domain
     are allowed access; all other hosts are denied access.</p>
 
-    <pre class="prettyprint lang-config">
-Order Deny,Allow
+    <pre class="prettyprint lang-config">Order Deny,Allow
 Deny from all
-Allow from example.org
-    </pre>
+Allow from example.org</pre>
 
 
     <p>In the next example, all hosts in the example.org domain are
@@ -354,11 +338,9 @@ Allow from example.org
     state is to <code class="directive"><a href="#deny">Deny</a></code>
     access to the server.</p>
 
-    <pre class="prettyprint lang-config">
-Order Allow,Deny
+    <pre class="prettyprint lang-config">Order Allow,Deny
 Allow from example.org
-Deny from foo.example.org
-    </pre>
+Deny from foo.example.org</pre>
 
 
     <p>On the other hand, if the <code class="directive">Order</code> in the
@@ -377,11 +359,9 @@ Deny from foo.example.org
     directives because of its effect on the default access state. For
     example,</p>
 
-    <pre class="prettyprint lang-config">
-&lt;Directory /www&gt;
+    <pre class="prettyprint lang-config">&lt;Directory /www&gt;
     Order Allow,Deny
-&lt;/Directory&gt;
-    </pre>
+&lt;/Directory&gt;</pre>
 
 
     <p>will Deny all access to the <code>/www</code> directory
@@ -439,11 +419,9 @@ later</td></tr>
     people outside of your network provide a password, you could use a
     configuration similar to the following:</p>
 
-    <pre class="prettyprint lang-config">
-Require valid-user
+    <pre class="prettyprint lang-config">Require valid-user
 Allow from 192.168.1
-Satisfy Any
-    </pre>
+Satisfy Any</pre>
 
 
     <p>
@@ -451,16 +429,14 @@ Satisfy Any
     is to relax access restrictions for a subdirectory:
     </p>
 
-    <pre class="prettyprint lang-config">
-&lt;Directory /var/www/private&gt;
+    <pre class="prettyprint lang-config">&lt;Directory /var/www/private&gt;
     Require valid-user
 &lt;/Directory&gt;
 
 &lt;Directory /var/www/private/public&gt;
     Allow from all
     Satisfy Any
-&lt;/Directory&gt;
-    </pre>
+&lt;/Directory&gt;</pre>
 
 
     <p>In the above example, authentication will be required for the
@@ -506,7 +482,7 @@ var comments_identifier = 'http://httpd.apache.org/docs/2.4/mod/mod_access_compa
     }
 })(window, document);
 //--><!]]></script></div><div id="footer">
-<p class="apache">Copyright 2013 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="apache">Copyright 2014 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') {
     prettyPrint();