Change mentions of 'Deny from' and 'Allow from' to new Require syntax.

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

diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index 53e4c58149fb0665a84494eff32db65d67b0058f..d4393e6c82b50cc49c4298757a31f0b6a8feff93 100644 (file)
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -2281,9 +2281,7 @@ URLs</td></tr>
       &lt;Location /status&gt;<br />
       <span class="indent">
         SetHandler server-status<br />
-        Order Deny,Allow<br />
-        Deny from all<br />
-        Allow from .example.com<br />
+        Require host example.com<br />
       </span>
       &lt;/Location&gt;
     </code></p></div>

diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index e713791a846b4e2ece51100a5075ab2cd5a7ab0e..7947efb252d976d31c440fa8290d97e518caaa62 100644 (file)
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -2282,9 +2282,7 @@ URLs</description>
       &lt;Location /status&gt;<br />
       <indent>
         SetHandler server-status<br />
-        Order Deny,Allow<br />
-        Deny from all<br />
-        Allow from .example.com<br />
+        Require host example.com<br />
       </indent>
       &lt;/Location&gt;
     </example>

diff --git a/docs/manual/mod/mod_alias.html.en b/docs/manual/mod/mod_alias.html.en
index 39e08574caeb2d14ac2cd1236e1f4f01f7e82d0c..a29aa261bc1ecdce62d16484c9c1d9d5112626c3 100644 (file)
--- a/docs/manual/mod/mod_alias.html.en
+++ b/docs/manual/mod/mod_alias.html.en
@@ -158,8 +158,7 @@
         Alias /image /ftp/pub/image<br />
         &lt;Directory /ftp/pub/image&gt;<br />
         <span class="indent">
-            Order allow,deny<br />
-            Allow from all<br />
+            Require all granted<br />
         </span>
         &lt;/Directory&gt;
     </code></p></div>

diff --git a/docs/manual/mod/mod_alias.xml b/docs/manual/mod/mod_alias.xml
index 48ea9eebcb1f162bfb355b548d1e9bf63dc23471..513367504bf621d5cf91e8314dea8e4b5f9d31ed 100644 (file)
--- a/docs/manual/mod/mod_alias.xml
+++ b/docs/manual/mod/mod_alias.xml
@@ -147,8 +147,7 @@ href="../urlmapping.html">Mapping URLs to the filesystem</a></seealso>
         Alias /image /ftp/pub/image<br />
         &lt;Directory /ftp/pub/image&gt;<br />
         <indent>
-            Order allow,deny<br />
-            Allow from all<br />
+            Require all granted<br />
         </indent>
         &lt;/Directory&gt;
     </example>

diff --git a/docs/manual/mod/mod_dav.html.en b/docs/manual/mod/mod_dav.html.en
index 324be9c0ca5a2a25bd9c2a3e58d900547e046045..8ddccab3ce1c3383aaafbb8785b3a2d7d6cc0dc1 100644 (file)
--- a/docs/manual/mod/mod_dav.html.en
+++ b/docs/manual/mod/mod_dav.html.en
@@ -94,8 +94,7 @@
       <br />
       &lt;Directory /usr/local/apache2/htdocs/foo&gt;<br />
       <span class="indent">
-        Order Allow,Deny<br />
-        Allow from all<br />
+        Require all granted<br />
         Dav On<br />
         <br />
         AuthType Basic<br />

diff --git a/docs/manual/mod/mod_dav.xml b/docs/manual/mod/mod_dav.xml
index 06bd77eb2808cd83b4eb2e954ceb6e75738ed83d..b598ba305674256d3dee03333e05a2cf18d668b9 100644 (file)
--- a/docs/manual/mod/mod_dav.xml
+++ b/docs/manual/mod/mod_dav.xml
@@ -81,8 +81,7 @@
       <br />
       &lt;Directory /usr/local/apache2/htdocs/foo&gt;<br />
       <indent>
-        Order Allow,Deny<br />
-        Allow from all<br />
+        Require all granted<br />
         Dav On<br />
         <br />
         AuthType Basic<br />

diff --git a/docs/manual/mod/mod_info.html.en b/docs/manual/mod/mod_info.html.en
index 4936263e71049d79bee6b40a4559e53605e1e80c..ce96d2bbf469a52304a198b41ccd7dd8f172cfe3 100644 (file)
--- a/docs/manual/mod/mod_info.html.en
+++ b/docs/manual/mod/mod_info.html.en
@@ -53,9 +53,7 @@ configuration</td></tr>
       &lt;Location /server-info&gt;<br />
       <span class="indent">
         SetHandler server-info<br />
-        Order deny,allow<br />
-        Deny from all<br />
-        Allow from yourcompany.com<br />
+        Require host yourcompany.com<br />
       </span>
       &lt;/Location&gt;
     </code></p></div>

diff --git a/docs/manual/mod/mod_info.xml b/docs/manual/mod/mod_info.xml
index 2fd7c64a21e84dc5aa868b16276e064bc75fbb76..fea553bac70494abf283be9d6cd0ed66559b3730 100644 (file)
--- a/docs/manual/mod/mod_info.xml
+++ b/docs/manual/mod/mod_info.xml
@@ -50,9 +50,7 @@ configuration</description>
       &lt;Location /server-info&gt;<br />
       <indent>
         SetHandler server-info<br />
-        Order deny,allow<br />
-        Deny from all<br />
-        Allow from yourcompany.com<br />
+        Require host yourcompany.com<br />
       </indent>
       &lt;/Location&gt;
     </example>

diff --git a/docs/manual/mod/mod_proxy.html.en b/docs/manual/mod/mod_proxy.html.en
index 81c34adc11095a2fb2f3a606f12232429c78758a..852428d9a5d69074346c39c04e96bff59d97dbe1 100644 (file)
--- a/docs/manual/mod/mod_proxy.html.en
+++ b/docs/manual/mod/mod_proxy.html.en
@@ -179,9 +179,7 @@
     <br />
     &lt;Proxy *&gt;<br />
     <span class="indent">
-      Order deny,allow<br />
-      Deny from all<br />
-      Allow from internal.example.com<br />
+      Require host internal.example.com<br />
     </span>
     &lt;/Proxy&gt;
     </code></p></div>
@@ -309,9 +307,7 @@
       <div class="example"><p><code>
         &lt;Proxy *&gt;<br />
         <span class="indent">
-          Order Deny,Allow<br />
-          Deny from all<br />
-          Allow from 192.168.0<br />
+          Require ip 192.168.0<br />
         </span>
         &lt;/Proxy&gt;
       </code></p></div>
@@ -600,9 +596,7 @@ directly</td></tr>
     <div class="example"><p><code>
       &lt;Proxy *&gt;<br />
       <span class="indent">
-        Order Deny,Allow<br />
-        Deny from all<br />
-        Allow from yournetwork.example.com<br />
+        Require host yournetwork.example.com<br />
       </span>
       &lt;/Proxy&gt;
     </code></p></div>

diff --git a/docs/manual/mod/mod_proxy.xml b/docs/manual/mod/mod_proxy.xml
index fc5dfeb7ba18955553c16a18f72e0dacdc719537..cc4a896d8502684035a950b9a46126c797993b20 100644 (file)
--- a/docs/manual/mod/mod_proxy.xml
+++ b/docs/manual/mod/mod_proxy.xml
@@ -139,9 +139,7 @@
     <br />
     &lt;Proxy *&gt;<br />
     <indent>
-      Order deny,allow<br />
-      Deny from all<br />
-      Allow from internal.example.com<br />
+      Require host internal.example.com<br />
     </indent>
     &lt;/Proxy&gt;
     </example>
@@ -271,9 +269,7 @@
       <example>
         &lt;Proxy *&gt;<br />
         <indent>
-          Order Deny,Allow<br />
-          Deny from all<br />
-          Allow from 192.168.0<br />
+          Require ip 192.168.0<br />
         </indent>
         &lt;/Proxy&gt;
       </example>
@@ -425,9 +421,7 @@
     <example>
       &lt;Proxy *&gt;<br />
       <indent>
-        Order Deny,Allow<br />
-        Deny from all<br />
-        Allow from yournetwork.example.com<br />
+        Require host yournetwork.example.com<br />
       </indent>
       &lt;/Proxy&gt;
     </example>

diff --git a/docs/manual/mod/mod_proxy_balancer.html.en b/docs/manual/mod/mod_proxy_balancer.html.en
index c56bc3d768982367a86336619b015eff7bb6bbbd..aca16fb73e4e5075846273fb5667e6b325a28f51 100644 (file)
--- a/docs/manual/mod/mod_proxy_balancer.html.en
+++ b/docs/manual/mod/mod_proxy_balancer.html.en
@@ -204,9 +204,7 @@
     &lt;Location /balancer-manager&gt;<br />
     SetHandler balancer-manager<br />
 <br />
-    Order Deny,Allow<br />
-    Deny from all<br />
-    Allow from .example.com<br />
+    Require host example.com<br />
     &lt;/Location&gt;
 </code></p></div>
 

diff --git a/docs/manual/mod/mod_proxy_balancer.xml b/docs/manual/mod/mod_proxy_balancer.xml
index 4ef91aa735a063f31c75bbbeebbe7544eb30bcb9..fb1ee78b008c7dcd5fb5ac76ecf792d54962484a 100644 (file)
--- a/docs/manual/mod/mod_proxy_balancer.xml
+++ b/docs/manual/mod/mod_proxy_balancer.xml
@@ -188,9 +188,7 @@
     &lt;Location /balancer-manager&gt;<br />
     SetHandler balancer-manager<br />
 <br />
-    Order Deny,Allow<br />
-    Deny from all<br />
-    Allow from .example.com<br />
+    Require host example.com<br />
     &lt;/Location&gt;
 </example>
 

diff --git a/docs/manual/mod/mod_status.html.en b/docs/manual/mod/mod_status.html.en
index 1f8ece9edc6e9b2f05820f17988b462ffcad1328..eec9f6f2682e20cb372f8ef4e451a69f158fdbd5 100644 (file)
--- a/docs/manual/mod/mod_status.html.en
+++ b/docs/manual/mod/mod_status.html.en
@@ -94,9 +94,7 @@ performance</td></tr>
     &lt;Location /server-status&gt;<br />
     SetHandler server-status<br />
 <br />
-    Order Deny,Allow<br />
-    Deny from all<br />
-    Allow from .example.com<br />
+    Require host example.com<br />
     &lt;/Location&gt;
 </code></p></div>
 

diff --git a/docs/manual/mod/mod_status.xml b/docs/manual/mod/mod_status.xml
index e834f517ba9a5f9621763155e585b35238f922d9..75614562e19d16cc8e2b3c3cef830f15a03bb76b 100644 (file)
--- a/docs/manual/mod/mod_status.xml
+++ b/docs/manual/mod/mod_status.xml
@@ -81,9 +81,7 @@ performance</description>
     &lt;Location /server-status&gt;<br />
     SetHandler server-status<br />
 <br />
-    Order Deny,Allow<br />
-    Deny from all<br />
-    Allow from .example.com<br />
+    Require host example.com<br />
     &lt;/Location&gt;
 </example>