From: Daniel Gruno Date: Wed, 25 Apr 2012 13:28:56 +0000 (+0000) Subject: Seems I wasn't quite done editing these files after all. X-Git-Tag: 2.5.0-alpha~7035 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=331c0f599c0496ea7eadac9d4441cd0c76bb081c;p=apache Seems I wasn't quite done editing these files after all. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1330277 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/howto/access.html.en b/docs/manual/howto/access.html.en index 154821d0d2..acac364e55 100644 --- a/docs/manual/howto/access.html.en +++ b/docs/manual/howto/access.html.en @@ -69,8 +69,8 @@

The usage of these directives is:

-      Require host address
-      Require ip ip.address
+Require host address
+Require ip ip.address
@@ -91,25 +91,23 @@ board, and you want to keep them out, you could do the following:

-

- Require not ip 10.252.46.165 -

+ 
Require not ip 10.252.46.165
+

Visitors coming from that address will not be able to see the content covered by this directive. If, instead, you have a machine name, rather than an IP address, you can use that.

-

- Require not host host.example.com -

+ 
Require not host host.example.com
+

And, if you'd like to block access from an entire domain, you can specify just part of an address or domain name:

-      Require not ip 192.168.205
-      Require not host phishers.example.com moreidiots.example
-      Require not gov
+Require not ip 192.168.205
+Require not host phishers.example.com moreidiots.example
+Require not gov
@@ -127,9 +125,9 @@ following:

-    <If "%{HTTP_USER_AGENT} = 'BadBot'">
-        Require All Denied
-    </If>
+<If "%{HTTP_USER_AGENT} = 'BadBot'">
+    Require All Denied
+</If>
@@ -155,10 +153,10 @@ and 6am, you can do this using mod_rewrite.

-    RewriteEngine On
-    RewriteCond %{TIME_HOUR} >20 [OR]
-    RewriteCond %{TIME_HOUR} <07
-    RewriteRule ^/fridge - [F]
+RewriteEngine On
+RewriteCond %{TIME_HOUR} >20 [OR]
+RewriteCond %{TIME_HOUR} <07
+RewriteRule ^/fridge - [F]
diff --git a/docs/manual/howto/access.xml b/docs/manual/howto/access.xml index 62ffd60075..a24220af1b 100644 --- a/docs/manual/howto/access.xml +++ b/docs/manual/howto/access.xml @@ -68,8 +68,8 @@

The usage of these directives is:

- Require host address - Require ip ip.address +Require host address +Require ip ip.address

In the first form, address is a fully qualified @@ -89,25 +89,21 @@ board, and you want to keep them out, you could do the following:

- - Require not ip 10.252.46.165 - + Require not ip 10.252.46.165

Visitors coming from that address will not be able to see the content covered by this directive. If, instead, you have a machine name, rather than an IP address, you can use that.

- - Require not host host.example.com - + Require not host host.example.com

And, if you'd like to block access from an entire domain, you can specify just part of an address or domain name:

- Require not ip 192.168.205 - Require not host phishers.example.com moreidiots.example - Require not gov +Require not ip 192.168.205 +Require not host phishers.example.com moreidiots.example +Require not gov

Use of the - <If "%{HTTP_USER_AGENT} = 'BadBot'"> - Require All Denied - </If> +<If "%{HTTP_USER_AGENT} = 'BadBot'"> + Require All Denied +</If> Warning: @@ -155,10 +151,10 @@ and 6am, you can do this using mod_rewrite.

- RewriteEngine On - RewriteCond %{TIME_HOUR} >20 [OR] - RewriteCond %{TIME_HOUR} <07 - RewriteRule ^/fridge - [F] +RewriteEngine On +RewriteCond %{TIME_HOUR} >20 [OR] +RewriteCond %{TIME_HOUR} <07 +RewriteRule ^/fridge - [F]

This will return a 403 Forbidden response for any request after 8pm diff --git a/docs/manual/howto/auth.html.en b/docs/manual/howto/auth.html.en index 21aa5daea4..ea9344a2f5 100644 --- a/docs/manual/howto/auth.html.en +++ b/docs/manual/howto/auth.html.en @@ -142,9 +142,7 @@ module from each group.

an AllowOverride directive like the following:

- 
-      AllowOverride AuthConfig
-
+ 
AllowOverride AuthConfig

Or, if you are just going to put the directives directly in @@ -218,12 +216,12 @@ module from each group.

/usr/local/apache/htdocs/secret> section.

-      AuthType Basic
-      AuthName "Restricted Files"
-      # (Following line optional)
-      AuthBasicProvider file
-      AuthUserFile /usr/local/apache/passwd/passwords
-      Require user rbowen
+AuthType Basic
+AuthName "Restricted Files"
+# (Following line optional)
+AuthBasicProvider file
+AuthUserFile /usr/local/apache/passwd/passwords
+Require user rbowen
@@ -316,13 +314,13 @@ person in look like the following:

-      AuthType Basic
-      AuthName "By Invitation Only"
-      # Optional line:
-      AuthBasicProvider file
-      AuthUserFile /usr/local/apache/passwd/passwords
-      AuthGroupFile /usr/local/apache/passwd/groups
-      Require group GroupName
+AuthType Basic
+AuthName "By Invitation Only"
+# Optional line:
+AuthBasicProvider file
+AuthUserFile /usr/local/apache/passwd/passwords
+AuthGroupFile /usr/local/apache/passwd/groups
+Require group GroupName
@@ -334,9 +332,8 @@ person in specific. Rather than creating a group file, you can just use the following directive:

-

- Require valid-user -

+ 
Require valid-user
+

Using that rather than the Require user rbowen line will allow anyone in that is listed in the password file, @@ -383,13 +380,13 @@ person in

To select a dbd file rather than a text file, for example:

-    <Directory /www/docs/private>
-        AuthName "Private"
-        AuthType Basic
-        AuthBasicProvider dbm
-        AuthDBMUserFile /www/passwords/passwd.dbm
-        Require valid-user
-    </Directory>
+<Directory /www/docs/private>
+    AuthName "Private"
+    AuthType Basic
+    AuthBasicProvider dbm
+    AuthDBMUserFile /www/passwords/passwd.dbm
+    Require valid-user
+</Directory>
@@ -407,14 +404,14 @@ person in file and LDAP based authentication providers are being used.

-    <Directory /www/docs/private>
-        AuthName "Private"
-        AuthType Basic
-        AuthBasicProvider file ldap
-        AuthUserFile /usr/local/apache/passwd/passwords
-        AuthLDAPURL ldap://ldaphost/o=yourorg
-        Require valid-user
-    </Directory>
+<Directory /www/docs/private>
+    AuthName "Private"
+    AuthType Basic
+    AuthBasicProvider file ldap
+    AuthUserFile /usr/local/apache/passwd/passwords
+    AuthLDAPURL ldap://ldaphost/o=yourorg
+    Require valid-user
+</Directory>
@@ -432,16 +429,16 @@ person in authorization as well as LDAP group authorization is being used.

-    <Directory /www/docs/private>
-        AuthName "Private"
-        AuthType Basic
-        AuthBasicProvider file
-        AuthUserFile /usr/local/apache/passwd/passwords
-        AuthLDAPURL ldap://ldaphost/o=yourorg
-        AuthGroupFile /usr/local/apache/passwd/groups
-        Require group GroupName
-        Require ldap-group cn=mygroup,o=yourorg
-    </Directory>
+<Directory /www/docs/private>
+    AuthName "Private"
+    AuthType Basic
+    AuthBasicProvider file
+    AuthUserFile /usr/local/apache/passwd/passwords
+    AuthLDAPURL ldap://ldaphost/o=yourorg
+    AuthGroupFile /usr/local/apache/passwd/groups
+    Require group GroupName
+    Require ldap-group cn=mygroup,o=yourorg
+</Directory>
@@ -521,17 +518,13 @@ person in that will be called during the authorization stage of the request processing. For example:

- 
-          Require ip address
-
+ 
Require ip address

where address is an IP address (or a partial IP address) or:

- 
-          Require host domain_name
-
+ 
Require host domain_name

where domain_name is a fully qualified domain name @@ -543,10 +536,10 @@ person in following:

-          <RequireAll>
-            Require all granted
-            Require not ip 10.252.46.165
-          </RequireAll>
+<RequireAll>
+    Require all granted
+    Require not ip 10.252.46.165
+</RequireAll>
@@ -555,10 +548,10 @@ person in machine name, rather than an IP address, you can use that.

-          <RequireAll>
-            Require all granted
-            Require not host host.example.com
-          </RequireAll>
+<RequireAll>
+    Require all granted
+    Require not host host.example.com
+</RequireAll>
@@ -566,14 +559,14 @@ person in you can specify just part of an address or domain name:

-  <RequireAll>
+<RequireAll>
     Require all granted
     <RequireNone>
-      Require ip 192.168.205
-      Require host phishers.example.com moreidiots.example
-      Require host ke
+        Require ip 192.168.205
+        Require host phishers.example.com moreidiots.example
+        Require host ke
     </RequireNone>
-  </RequireAll>
+</RequireAll>
diff --git a/docs/manual/howto/auth.xml b/docs/manual/howto/auth.xml index 01e139818c..d5c5e1134b 100644 --- a/docs/manual/howto/auth.xml +++ b/docs/manual/howto/auth.xml @@ -127,9 +127,7 @@ module from each group.

an AllowOverride directive like the following:

- - AllowOverride AuthConfig - + AllowOverride AuthConfig

Or, if you are just going to put the directives directly in your main server configuration file, you will of course need to @@ -202,12 +200,12 @@ module from each group.

/usr/local/apache/htdocs/secret> section.

- AuthType Basic - AuthName "Restricted Files" - # (Following line optional) - AuthBasicProvider file - AuthUserFile /usr/local/apache/passwd/passwords - Require user rbowen +AuthType Basic +AuthName "Restricted Files" +# (Following line optional) +AuthBasicProvider file +AuthUserFile /usr/local/apache/passwd/passwords +Require user rbowen

Let's examine each of those directives individually. The look like the following:

- AuthType Basic - AuthName "By Invitation Only" - # Optional line: - AuthBasicProvider file - AuthUserFile /usr/local/apache/passwd/passwords - AuthGroupFile /usr/local/apache/passwd/groups - Require group GroupName +AuthType Basic +AuthName "By Invitation Only" +# Optional line: +AuthBasicProvider file +AuthUserFile /usr/local/apache/passwd/passwords +AuthGroupFile /usr/local/apache/passwd/groups +Require group GroupName

Now, anyone that is listed in the group GroupName, @@ -323,9 +321,7 @@ person in specific. Rather than creating a group file, you can just use the following directive:

- - Require valid-user - + Require valid-user

Using that rather than the Require user rbowen line will allow anyone in that is listed in the password file, @@ -373,13 +369,13 @@ person in

To select a dbd file rather than a text file, for example:

- <Directory /www/docs/private> - AuthName "Private" - AuthType Basic - AuthBasicProvider dbm - AuthDBMUserFile /www/passwords/passwd.dbm - Require valid-user - </Directory> +<Directory /www/docs/private> + AuthName "Private" + AuthType Basic + AuthBasicProvider dbm + AuthDBMUserFile /www/passwords/passwd.dbm + Require valid-user +</Directory>

Other options are available. Consult the @@ -396,14 +392,14 @@ person in file and LDAP based authentication providers are being used.

- <Directory /www/docs/private> - AuthName "Private" - AuthType Basic - AuthBasicProvider file ldap - AuthUserFile /usr/local/apache/passwd/passwords - AuthLDAPURL ldap://ldaphost/o=yourorg - Require valid-user - </Directory> +<Directory /www/docs/private> + AuthName "Private" + AuthType Basic + AuthBasicProvider file ldap + AuthUserFile /usr/local/apache/passwd/passwords + AuthLDAPURL ldap://ldaphost/o=yourorg + Require valid-user +</Directory>

In this example the file provider will attempt to authenticate @@ -420,16 +416,16 @@ person in authorization as well as LDAP group authorization is being used.

- <Directory /www/docs/private> - AuthName "Private" - AuthType Basic - AuthBasicProvider file - AuthUserFile /usr/local/apache/passwd/passwords - AuthLDAPURL ldap://ldaphost/o=yourorg - AuthGroupFile /usr/local/apache/passwd/groups - Require group GroupName - Require ldap-group cn=mygroup,o=yourorg - </Directory> +<Directory /www/docs/private> + AuthName "Private" + AuthType Basic + AuthBasicProvider file + AuthUserFile /usr/local/apache/passwd/passwords + AuthLDAPURL ldap://ldaphost/o=yourorg + AuthGroupFile /usr/local/apache/passwd/groups + Require group GroupName + Require ldap-group cn=mygroup,o=yourorg +</Directory>

To take authorization a little further, authorization container @@ -508,16 +504,12 @@ person in that will be called during the authorization stage of the request processing. For example:

- - Require ip address - + Require ip address

where address is an IP address (or a partial IP address) or:

- - Require host domain_name - + Require host domain_name

where domain_name is a fully qualified domain name (or a partial domain name); you may provide multiple addresses or @@ -528,10 +520,10 @@ person in following:

- <RequireAll> - Require all granted - Require not ip 10.252.46.165 - </RequireAll> +<RequireAll> + Require all granted + Require not ip 10.252.46.165 +</RequireAll>

Visitors coming from that address will not be able to see @@ -539,24 +531,24 @@ person in machine name, rather than an IP address, you can use that.

- <RequireAll> - Require all granted - Require not host host.example.com - </RequireAll> +<RequireAll> + Require all granted + Require not host host.example.com +</RequireAll>

And, if you'd like to block access from an entire domain, you can specify just part of an address or domain name:

- <RequireAll> +<RequireAll> Require all granted <RequireNone> - Require ip 192.168.205 - Require host phishers.example.com moreidiots.example - Require host ke + Require ip 192.168.205 + Require host phishers.example.com moreidiots.example + Require host ke </RequireNone> - </RequireAll> +</RequireAll>

The above example uses the - + diff --git a/docs/manual/howto/auth.xml.ja b/docs/manual/howto/auth.xml.ja index b4c5a9ed0e..3b4083eea9 100644 --- a/docs/manual/howto/auth.xml.ja +++ b/docs/manual/howto/auth.xml.ja @@ -1,7 +1,7 @@ - + + + + diff --git a/docs/manual/howto/htaccess.xml.ja b/docs/manual/howto/htaccess.xml.ja index 0c4238756a..19ad0c61a2 100644 --- a/docs/manual/howto/htaccess.xml.ja +++ b/docs/manual/howto/htaccess.xml.ja @@ -1,7 +1,7 @@ - + + + + diff --git a/docs/manual/howto/public_html.xml.ja b/docs/manual/howto/public_html.xml.ja index fc823a6403..730554c429 100644 --- a/docs/manual/howto/public_html.xml.ja +++ b/docs/manual/howto/public_html.xml.ja @@ -1,7 +1,7 @@ - + + + + diff --git a/docs/manual/howto/ssi.xml.ja b/docs/manual/howto/ssi.xml.ja index c63aa7826c..65e8fdb378 100644 --- a/docs/manual/howto/ssi.xml.ja +++ b/docs/manual/howto/ssi.xml.ja @@ -1,7 +1,7 @@ - + +