Removes more instances of 'allow from' and 'deny from' syntax. I think

that's the last of them.

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

diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index d012303757094d644a10219ceee7c9c58a39dc4c..0c7ad073c921834ef805d7ed1b14840efccab054 100644 (file)
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -735,7 +735,7 @@ named file-system directory, sub-directories, and their contents.</td></tr>
     be applied.</p>
 
    <p><strong>Note that the default access for
-    <code>&lt;Directory /&gt;</code> is <code>Allow from All</code>.
+    <code>&lt;Directory /&gt;</code> is to permit all access.
     This means that Apache httpd will serve any file mapped from an URL. It is
     recommended that you change this with a block such
     as</strong></p>
@@ -743,8 +743,7 @@ named file-system directory, sub-directories, and their contents.</td></tr>
     <div class="example"><p><code>
       &lt;Directory /&gt;<br />
       <span class="indent">
-        Order Deny,Allow<br />
-        Deny from All<br />
+        Require all denied<br />
       </span>
       &lt;/Directory&gt;
     </code></p></div>

diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index d5f114b194d12feb6b96b938a4d4648dc7da4383..a3c7d2dec0b6baf211fc0147c07ff29263655517 100644 (file)
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -682,7 +682,7 @@ named file-system directory, sub-directories, and their contents.</description>
     be applied.</p>
 
    <p><strong>Note that the default access for
-    <code>&lt;Directory /&gt;</code> is <code>Allow from All</code>.
+    <code>&lt;Directory /&gt;</code> is to permit all access.
     This means that Apache httpd will serve any file mapped from an URL. It is
     recommended that you change this with a block such
     as</strong></p>
@@ -690,8 +690,7 @@ named file-system directory, sub-directories, and their contents.</description>
     <example>
       &lt;Directory /&gt;<br />
       <indent>
-        Order Deny,Allow<br />
-        Deny from All<br />
+        Require all denied<br />
       </indent>
       &lt;/Directory&gt;
     </example>

diff --git a/docs/manual/mod/mod_authn_anon.html.en b/docs/manual/mod/mod_authn_anon.html.en
index 394aaf1d8edd331a1512c0ee71fdb642b5bfb1e4..fde11d7ea301b5d18b711e5ac0b7cd4b37ba9272 100644 (file)
--- a/docs/manual/mod/mod_authn_anon.html.en
+++ b/docs/manual/mod/mod_authn_anon.html.en
@@ -104,8 +104,7 @@
         Anonymous_LogEmail on<br />
         Anonymous anonymous guest www test welcome<br />
         <br />
-        Order Deny,Allow<br />
-        Allow from all<br />
+        Require all granted<br />
         <br />
         Require valid-user<br />
       </span>

diff --git a/docs/manual/mod/mod_authn_anon.xml b/docs/manual/mod/mod_authn_anon.xml
index 2f782f0d3bdb2f2d7d0fc3e8d29ba5a1ad57db97..57696d7b2c043f11163bf9b5dd02739d9cd190bd 100644 (file)
--- a/docs/manual/mod/mod_authn_anon.xml
+++ b/docs/manual/mod/mod_authn_anon.xml
@@ -94,8 +94,7 @@
         Anonymous_LogEmail on<br />
         Anonymous anonymous guest www test welcome<br />
         <br />
-        Order Deny,Allow<br />
-        Allow from all<br />
+        Require all granted<br />
         <br />
         Require valid-user<br />
       </indent>

diff --git a/docs/manual/mod/mod_authz_core.html.en b/docs/manual/mod/mod_authz_core.html.en
index 3364b292dd601c4f577aac6312cf9437c4a47eb0..d63eba9aa345ee72e9d1a520f9b07a09c3998bdf 100644 (file)
--- a/docs/manual/mod/mod_authz_core.html.en
+++ b/docs/manual/mod/mod_authz_core.html.en
@@ -95,8 +95,7 @@
           Alias /secure /webpages/secure<br />
           &lt;Directory /webpages/secure&gt;<br />
           <span class="indent">
-             Order deny,allow<br />
-             Allow from all<br /><br />
+             Require all granted<br /><br />
         
              AuthBasicProvider file<br /><br />
         

diff --git a/docs/manual/mod/mod_ldap.html.en b/docs/manual/mod/mod_ldap.html.en
index e156891d8791d89d0ce5e7c8060b70f492b076f2..1cd14b414c3fffb544a91a515a7bb15bde6ea12b 100644 (file)
--- a/docs/manual/mod/mod_ldap.html.en
+++ b/docs/manual/mod/mod_ldap.html.en
@@ -104,9 +104,9 @@ by other LDAP modules</td></tr>
       &lt;Location /ldap-status&gt;<br />
       <span class="indent">
         SetHandler ldap-status<br />
-        Order deny,allow<br />
-        Deny from all<br />
-        Allow from yourdomain.example.com<br />
+
+        Require host yourdomain.example.com<br />
+
         Satisfy any<br />
         AuthType Basic<br />
         AuthName "LDAP Protected"<br />
@@ -247,9 +247,9 @@ by other LDAP modules</td></tr>
       &lt;Location /ldap-status&gt;<br />
       <span class="indent">
         SetHandler ldap-status<br />
-        Order deny,allow<br />
-        Deny from all<br />
-        Allow from yourdomain.example.com<br />
+
+        Require host yourdomain.example.com<br />
+
         Satisfy any<br />
         AuthType Basic<br />
         AuthName "LDAP Protected"<br />
@@ -270,9 +270,9 @@ by other LDAP modules</td></tr>
       &lt;Location /ldap-status&gt;<br />
       <span class="indent">
         SetHandler ldap-status<br />
-        Order deny,allow<br />
-        Deny from all<br />
-        Allow from yourdomain.example.com<br />
+
+        Require host yourdomain.example.com<br />
+
         Satisfy any<br />
         AuthType Basic<br />
         AuthName "LDAP Protected"<br />
@@ -324,9 +324,9 @@ by other LDAP modules</td></tr>
             &lt;Location /ldap-status&gt;<br />
             <span class="indent">
                 SetHandler ldap-status<br />
-                Order deny,allow<br />
-                Deny from all<br />
-                Allow from yourdomain.example.com<br />
+
+                Require host yourdomain.example.com<br />
+
                 Satisfy any<br />
                 AuthType Basic<br />
                 AuthName "LDAP Protected"<br />
@@ -395,9 +395,9 @@ by other LDAP modules</td></tr>
             &lt;Location /ldap-status&gt;<br />
             <span class="indent">
                 SetHandler ldap-status<br />
-                Order deny,allow<br />
-                Deny from all<br />
-                Allow from yourdomain.example.com<br />
+
+                Require host yourdomain.example.com<br />
+
                 LDAPTrustedClientCert CERT_BASE64 /certs/cert1.pem<br />
                 LDAPTrustedClientCert KEY_BASE64 /certs/key1.pem<br />
                 # CA certs respecified due to per-directory client certs<br />

diff --git a/docs/manual/mod/mod_ldap.xml b/docs/manual/mod/mod_ldap.xml
index e64bce3a70cd2cad6d59ea9bcce266e15e9483fd..dee8c745d081ef803f33d5f839e08f9d50941f3d 100644 (file)
--- a/docs/manual/mod/mod_ldap.xml
+++ b/docs/manual/mod/mod_ldap.xml
@@ -76,9 +76,9 @@ by other LDAP modules</description>
       &lt;Location /ldap-status&gt;<br />
       <indent>
         SetHandler ldap-status<br />
-        Order deny,allow<br />
-        Deny from all<br />
-        Allow from yourdomain.example.com<br />
+
+        Require host yourdomain.example.com<br />
+
         Satisfy any<br />
         AuthType Basic<br />
         AuthName "LDAP Protected"<br />
@@ -221,9 +221,9 @@ by other LDAP modules</description>
       &lt;Location /ldap-status&gt;<br />
       <indent>
         SetHandler ldap-status<br />
-        Order deny,allow<br />
-        Deny from all<br />
-        Allow from yourdomain.example.com<br />
+
+        Require host yourdomain.example.com<br />
+
         Satisfy any<br />
         AuthType Basic<br />
         AuthName "LDAP Protected"<br />
@@ -244,9 +244,9 @@ by other LDAP modules</description>
       &lt;Location /ldap-status&gt;<br />
       <indent>
         SetHandler ldap-status<br />
-        Order deny,allow<br />
-        Deny from all<br />
-        Allow from yourdomain.example.com<br />
+
+        Require host yourdomain.example.com<br />
+
         Satisfy any<br />
         AuthType Basic<br />
         AuthName "LDAP Protected"<br />
@@ -298,9 +298,9 @@ by other LDAP modules</description>
             &lt;Location /ldap-status&gt;<br />
             <indent>
                 SetHandler ldap-status<br />
-                Order deny,allow<br />
-                Deny from all<br />
-                Allow from yourdomain.example.com<br />
+
+                Require host yourdomain.example.com<br />
+
                 Satisfy any<br />
                 AuthType Basic<br />
                 AuthName "LDAP Protected"<br />
@@ -369,9 +369,9 @@ by other LDAP modules</description>
             &lt;Location /ldap-status&gt;<br />
             <indent>
                 SetHandler ldap-status<br />
-                Order deny,allow<br />
-                Deny from all<br />
-                Allow from yourdomain.example.com<br />
+
+                Require host yourdomain.example.com<br />
+
                 LDAPTrustedClientCert CERT_BASE64 /certs/cert1.pem<br />
                 LDAPTrustedClientCert KEY_BASE64 /certs/key1.pem<br />
                 # CA certs respecified due to per-directory client certs<br />