summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/manual/location.html6
-rw-r--r--docs/manual/misc/FAQ-G.html10
-rw-r--r--docs/manual/misc/FAQ.html4
-rw-r--r--docs/manual/misc/perf-tuning.html4
-rw-r--r--docs/manual/misc/security_tips.html8
-rw-r--r--docs/manual/mod/core.html39
-rw-r--r--docs/manual/mod/directives.html8
-rw-r--r--docs/manual/mod/mod_access.html104
-rw-r--r--docs/manual/mod/mod_auth.html2
-rw-r--r--docs/manual/mod/mod_auth_anon.html6
-rw-r--r--docs/manual/mod/mod_auth_db.html2
-rw-r--r--docs/manual/mod/mod_auth_dbm.html2
-rw-r--r--docs/manual/mod/mod_auth_digest.html2
-rw-r--r--docs/manual/mod/mod_proxy.html6
-rw-r--r--docs/manual/mod/mod_status.html6
-rw-r--r--docs/manual/platform/readme-tpf.html2
-rw-r--r--docs/manual/vhosts/examples.html6
-rw-r--r--docs/manual/vhosts/host.html2
18 files changed, 111 insertions, 108 deletions
diff --git a/docs/manual/location.html b/docs/manual/location.html
index 2dddd2ee2c..284371267e 100644
--- a/docs/manual/location.html
+++ b/docs/manual/location.html
@@ -56,9 +56,9 @@ from browsers at foo.com, you might use:
<PRE>
&lt;Location /status&gt;
SetHandler server-status
- order deny,allow
- deny from all
- allow from .foo.com
+ Order Deny,Allow
+ Deny from all
+ Allow from .foo.com
&lt;/Location&gt;
</PRE>
diff --git a/docs/manual/misc/FAQ-G.html b/docs/manual/misc/FAQ-G.html
index 0edc6997e9..e65537f51a 100644
--- a/docs/manual/misc/FAQ-G.html
+++ b/docs/manual/misc/FAQ-G.html
@@ -31,7 +31,7 @@
<!--#include virtual="header.html" -->
<H1 ALIGN="CENTER">Apache Server Frequently Asked Questions</H1>
<P>
- $Revision: 1.3 $ ($Date: 2000/04/18 20:54:03 $)
+ $Revision: 1.4 $ ($Date: 2000/09/12 15:16:45 $)
</P>
<P>
The latest version of this FAQ is always available from the main
@@ -192,9 +192,9 @@
</P>
<P>
<DL>
- <DD><CODE>deny from all
+ <DD><CODE>Deny from all
<BR>
- allow from .domain.com
+ Allow from .domain.com
<BR>
AuthType Basic
<BR>
@@ -202,9 +202,9 @@
<BR>
AuthName "special directory"
<BR>
- require valid-user
+ Require valid-user
<BR>
- satisfy any</CODE>
+ Satisfy any</CODE>
</DD>
</DL>
<P></P>
diff --git a/docs/manual/misc/FAQ.html b/docs/manual/misc/FAQ.html
index b9a926f84a..eaf0ac371f 100644
--- a/docs/manual/misc/FAQ.html
+++ b/docs/manual/misc/FAQ.html
@@ -15,7 +15,7 @@
<!--#include virtual="header.html" -->
<H1 ALIGN="CENTER">Apache Server Frequently Asked Questions</H1>
<P>
- $Revision: 1.145 $ ($Date: 1999/06/24 15:02:53 $)
+ $Revision: 1.146 $ ($Date: 2000/09/12 15:16:46 $)
</P>
<P>
The latest version of this FAQ is always available from the main
@@ -77,7 +77,7 @@
<!-- file) don't have the type listed at all. -->
<!-- - RewriteRule /~fraggle/* /cgi-bin/fraggle.pl does not work -->
<!-- - how do I disable authentication for a subdirectory? -->
-<!-- (A: you can't but "satisfy any; allow from all" can be close -->
+<!-- (A: you can't but "Satisfy any; Allow from all" can be close -->
<!-- - '400 malformed request' on Win32 might mean stale proxy; see -->
<!-- PR #2300. -->
<!-- - how do I tell what version of Apache I am running? -->
diff --git a/docs/manual/misc/perf-tuning.html b/docs/manual/misc/perf-tuning.html
index c9c1348c80..85a527afa5 100644
--- a/docs/manual/misc/perf-tuning.html
+++ b/docs/manual/misc/perf-tuning.html
@@ -71,8 +71,8 @@ recent FreeBSD, and Linux.
This adds latency
to every request because it requires a DNS lookup to complete before
the request is finished. In Apache 1.3 this setting defaults to Off.
-However (1.3 or later), if you use any <CODE>allow from domain</CODE> or
-<CODE>deny from domain</CODE> directives then you will pay for a
+However (1.3 or later), if you use any <CODE>Allow from domain</CODE> or
+<CODE>Deny from domain</CODE> directives then you will pay for a
double reverse DNS lookup (a reverse, followed by a forward to make sure
that the reverse is not being spoofed). So for the highest performance
avoid using these directives (it's fine to use IP addresses rather than
diff --git a/docs/manual/misc/security_tips.html b/docs/manual/misc/security_tips.html
index d0961d9cf9..964d7d89bf 100644
--- a/docs/manual/misc/security_tips.html
+++ b/docs/manual/misc/security_tips.html
@@ -131,7 +131,7 @@ In the server configuration file, put
&lt;Directory /&gt; <BR>
AllowOverride None <BR>
Options None <BR>
-allow from all <BR>
+Allow from all <BR>
&lt;/Directory&gt; <BR>
</CODE></BLOCKQUOTE>
@@ -164,7 +164,7 @@ around this, add the following block to your server's configuration:
</P>
<PRE>
&lt;Directory /&gt;
- Order deny,allow
+ Order Deny,Allow
Deny from all
&lt;/Directory&gt;
</PRE>
@@ -179,11 +179,11 @@ in those areas you wish. For example,
</P>
<PRE>
&lt;Directory /usr/users/*/public_html&gt;
- Order deny,allow
+ Order Deny,Allow
Allow from all
&lt;/Directory&gt;
&lt;Directory /usr/local/httpd&gt;
- Order deny,allow
+ Order Deny,Allow
Allow from all
&lt;/Directory&gt;
</PRE>
diff --git a/docs/manual/mod/core.html b/docs/manual/mod/core.html
index 3588077c92..0d96648bc0 100644
--- a/docs/manual/mod/core.html
+++ b/docs/manual/mod/core.html
@@ -70,7 +70,7 @@ always available.
<LI><A HREF="#options">Options</A>
<LI><A HREF="#pidfile">PidFile</A>
<LI><A HREF="#port">Port</A>
-<LI><A HREF="#require">require</A>
+<LI><A HREF="#require">Require</A>
<LI><A HREF="#resourceconfig">ResourceConfig</A>
<LI><A HREF="#rlimitcpu">RLimitCPU</A>
<LI><A HREF="#rlimitmem">RLimitMEM</A>
@@ -253,7 +253,7 @@ Allow use of the authorization directives
<A HREF="mod_auth.html#authgroupfile">AuthGroupFile</A>,
<A HREF="#authname">AuthName</A>, <A HREF="#authtype">AuthType</A>,
<A HREF="mod_auth.html#authuserfile">AuthUserFile</A>,
-<A HREF="#require">require</A>, <EM>etc.</EM>).
+<A HREF="#require">Require</A>, <EM>etc.</EM>).
<DT>FileInfo
<DD>
<!--%plaintext &lt;?INDEX {\tt FileInfo} override&gt; -->
@@ -282,7 +282,7 @@ Allow use of the directives controlling directory indexing
<DT>Limit
<DD>
<!--%plaintext &lt;?INDEX {\tt Limit} override&gt; -->
-Allow use of the directives controlling host access (allow, deny and order).
+Allow use of the directives controlling host access (Allow, Deny and Order).
<DT>Options
<DD>
<!--%plaintext &lt;?INDEX {\tt Options} override&gt; -->
@@ -315,7 +315,7 @@ This realm is given to the client so that the user knows which username and
password to send. <SAMP>AuthName</SAMP> takes a single argument;
if the realm name contains spaces, it must be enclosed in quotation marks.
It must be accompanied by <A HREF="#authtype">AuthType</A> and
-<A HREF="#require">require</A> directives, and directives such as
+<A HREF="#require">Require</A> directives, and directives such as
<A HREF="mod_auth.html#authuserfile">AuthUserFile</A> and
<A HREF="mod_auth.html#authgroupfile">AuthGroupFile</A> to work.<P><HR>
@@ -342,7 +342,7 @@ This directive selects the type of user authentication for a directory.
Only <CODE>Basic</CODE> and <CODE>Digest</CODE> are currently implemented.
<!--%plaintext &lt;?INDEX {\tt Basic} authentication scheme&gt; -->
It must be accompanied by <A HREF="#authname">AuthName</A> and
-<A HREF="#require">require</A> directives, and directives such as
+<A HREF="#require">Require</A> directives, and directives such as
<A HREF="mod_auth.html#authuserfile">AuthUserFile</A> and
<A HREF="mod_auth.html#authgroupfile">AuthGroupFile</A> to work.<P><HR>
@@ -1378,7 +1378,7 @@ PUT, and DELETE, leaving all other methods unprotected:
<BLOCKQUOTE><CODE>
&lt;Limit POST PUT DELETE&gt;<BR>
-require valid-user<BR>
+Require valid-user<BR>
&lt;/Limit&gt;</CODE></BLOCKQUOTE>
The method names listed can be one or more of: GET, POST, PUT, DELETE,
@@ -1780,9 +1780,9 @@ from browsers at foo.com, you might use:
<PRE>
&lt;Location /status&gt;
SetHandler server-status
- order deny,allow
- deny from all
- allow from .foo.com
+ Order Deny,Allow
+ Deny from all
+ Allow from .foo.com
&lt;/Location&gt;
</PRE>
@@ -2418,12 +2418,12 @@ not to set <A HREF="#user">User</A> to root. If you run the server as
root whilst handling connections, your site may be open to a major security
attack.<P><HR>
-<H2><A NAME="require">require directive</A></H2>
-<!--%plaintext &lt;?INDEX {\tt require} directive&gt; -->
+<H2><A NAME="require">Require directive</A></H2>
+<!--%plaintext &lt;?INDEX {\tt Require} directive&gt; -->
<A
HREF="directive-dict.html#Syntax"
REL="Help"
-><STRONG>Syntax:</STRONG></A> require <EM>entity-name entity entity...</EM><BR>
+><STRONG>Syntax:</STRONG></A> Require <EM>entity-name entity entity...</EM><BR>
<A
HREF="directive-dict.html#Context"
REL="Help"
@@ -2440,11 +2440,11 @@ attack.<P><HR>
This directive selects which authenticated users can access a directory.
The allowed syntaxes are:
<UL>
-<LI>require user <EM>userid userid ...</EM><P>
+<LI>Require user <EM>userid userid ...</EM><P>
Only the named users can access the directory.<P>
-<LI>require group <EM>group-name group-name ...</EM><P>
+<LI>Require group <EM>group-name group-name ...</EM><P>
Only users in the named groups can access the directory.<P>
-<LI>require valid-user<P>
+<LI>Require valid-user<P>
All valid users can access the directory.
</UL>
<P>
@@ -2458,14 +2458,14 @@ AuthType Basic<BR>
AuthName "Restricted Directory"<BR>
AuthUserFile /web/users<BR>
AuthGroupFile /web/groups<BR>
-require group admin<BR>
+Require group admin<BR>
</CODE></BLOCKQUOTE>
Access controls which are applied in this way are effective for
<STRONG>all</STRONG> methods. <STRONG>This is what is normally
desired.</STRONG> If you wish to apply access controls only to
specific methods, while leaving other methods unprotected, then place
-the <CODE>require</CODE> statement into a <A
+the <CODE>Require</CODE> statement into a <A
HREF="#limit">&lt;Limit&gt;</A> section<P>
<P>See also <A HREF="#satisfy">Satisfy</A> and <A HREF="mod_access.html">mod_access</A>.
<HR>
@@ -2667,7 +2667,8 @@ See also <A HREF="#rlimitmem">RLimitMEM</A> or
><STRONG>Compatibility:</STRONG></A> Satisfy is only available in Apache 1.2
and later<P>
-Access policy if both allow and require used. The parameter can be
+Access policy if both <CODE>Allow</CODE> and <CODE>Require</CODE>
+used. The parameter can be
either <EM>'all'</EM> or <EM>'any'</EM>. This directive is only useful
if access to a particular area is being restricted by both
username/password <EM>and</EM> client host address. In this case the
@@ -2678,7 +2679,7 @@ they either pass the host restriction or enter a valid username and
password. This can be used to password restrict an area, but to let
clients from particular addresses in without prompting for a password.
<P>
-See also <A HREF="#require">require</A> and
+See also <A HREF="#require">Require</A> and
<A HREF="mod_access.html">mod_access</A>.
<P><HR>
diff --git a/docs/manual/mod/directives.html b/docs/manual/mod/directives.html
index c89cf84b71..bce69bb607 100644
--- a/docs/manual/mod/directives.html
+++ b/docs/manual/mod/directives.html
@@ -45,7 +45,7 @@ of the terms used in their descriptions available.
<LI><A HREF="mod_log_agent.html#agentlog">AgentLog</A>
<LI><A HREF="mod_alias.html#alias">Alias</A>
<LI><A HREF="mod_alias.html#aliasmatch">AliasMatch</A>
-<LI><A HREF="mod_access.html#allow">allow</A>
+<LI><A HREF="mod_access.html#allow">Allow</A>
<LI><A HREF="mod_proxy.html#allowconnect">AllowCONNECT</A>
<LI><A HREF="core.html#allowoverride">AllowOverride</A>
<LI><A HREF="mod_auth_anon.html#anonymous">Anonymous</A>
@@ -100,7 +100,7 @@ of the terms used in their descriptions available.
<LI><A HREF="mod_autoindex.html#defaulticon">DefaultIcon</A>
<LI><A HREF="mod_mime.html#defaultlanguage">DefaultLanguage</A>
<LI><A HREF="core.html#defaulttype">DefaultType</A>
-<LI><A HREF="mod_access.html#deny">deny</A>
+<LI><A HREF="mod_access.html#deny">Deny</A>
<LI><A HREF="core.html#directory">&lt;Directory&gt;</A>
<LI><A HREF="core.html#directorymatch">&lt;DirectoryMatch&gt;</A>
<LI><A HREF="mod_dir.html#directoryindex">DirectoryIndex</A>
@@ -161,7 +161,7 @@ of the terms used in their descriptions available.
<LI><A HREF="core.html#namevirtualhost">NameVirtualHost</A>
<LI><A HREF="mod_proxy.html#nocache">NoCache</A>
<LI><A HREF="core.html#options">Options</A>
-<LI><A HREF="mod_access.html#order">order</A>
+<LI><A HREF="mod_access.html#order">Order</A>
<LI><A HREF="mod_env.html#passenv">PassEnv</A>
<LI><A HREF="core.html#pidfile">PidFile</A>
<LI><A HREF="core.html#port">Port</A>
@@ -181,7 +181,7 @@ of the terms used in their descriptions available.
<LI><A HREF="mod_log_referer.html#refererignore">RefererIgnore</A>
<LI><A HREF="mod_log_referer.html#refererlog">RefererLog</A>
<LI><A HREF="mod_mime#removehandler">RemoveHandler</A>
-<LI><A HREF="core.html#require">require</A>
+<LI><A HREF="core.html#require">Require</A>
<LI><A HREF="core.html#resourceconfig">ResourceConfig</A>
<LI><A HREF="mod_rewrite.html#RewriteBase">RewriteBase</A>
<LI><A HREF="mod_rewrite.html#RewriteCond">RewriteCond</A>
diff --git a/docs/manual/mod/mod_access.html b/docs/manual/mod/mod_access.html
index 81c7e8d3db..28ea89f42a 100644
--- a/docs/manual/mod/mod_access.html
+++ b/docs/manual/mod/mod_access.html
@@ -22,26 +22,26 @@ hostname or IP address.
</P>
<UL>
-<LI><A HREF="#allow">allow</A>
-<LI><A HREF="#allowfromenv">allow from env=</A>
-<LI><A HREF="#deny">deny</A>
-<LI><A HREF="#denyfromenv">deny from env=</A>
-<LI><A HREF="#order">order</A>
+<LI><A HREF="#allow">Allow</A>
+<LI><A HREF="#allowfromenv">Allow from env=</A>
+<LI><A HREF="#deny">Deny</A>
+<LI><A HREF="#denyfromenv">Deny from env=</A>
+<LI><A HREF="#order">Order</A>
</UL>
<DL>
<DD>See also <A HREF="core.html#satisfy">Satisfy</A>
- and <A HREF="core.html#require">require</A>.
+ and <A HREF="core.html#require">Require</A>.
</DL>
<HR>
-<H2><A NAME="allow">allow directive</A></H2>
+<H2><A NAME="allow">Allow directive</A></H2>
<P>
-<!--%plaintext &lt;?INDEX {\tt allow} directive&gt; -->
+<!--%plaintext &lt;?INDEX {\tt Allow} directive&gt; -->
<A
HREF="directive-dict.html#Syntax"
REL="Help"
-><STRONG>Syntax:</STRONG></A> allow from <EM>host host ...</EM><BR>
+><STRONG>Syntax:</STRONG></A> Allow from <EM>host host ...</EM><BR>
<A
HREF="directive-dict.html#Context"
REL="Help"
@@ -60,7 +60,7 @@ hostname or IP address.
><STRONG>Module:</STRONG></A> mod_access
</P>
<P>
-The allow directive affects which hosts can access a given directory.
+The Allow directive affects which hosts can access a given directory.
<EM>Host</EM> is one of the following:
</P>
<DL>
@@ -82,7 +82,7 @@ The allow directive affects which hosts can access a given directory.
<P>
Example:
</P>
-<BLOCKQUOTE><CODE>allow from .ncsa.uiuc.edu</CODE></BLOCKQUOTE>
+<BLOCKQUOTE><CODE>Allow from .ncsa.uiuc.edu</CODE></BLOCKQUOTE>
<P>
All hosts in the specified domain are allowed access.
</P>
@@ -91,12 +91,12 @@ Note that this compares whole components; <CODE>bar.edu</CODE>
would not match <CODE>foobar.edu</CODE>.
</P>
<P>
-See also <A HREF="#deny">deny</A>, <A HREF="#order">order</A>, and
+See also <A HREF="#deny">Deny</A>, <A HREF="#order">Order</A>, and
<A HREF="mod_browser.html#browsermatch">BrowserMatch</A>.
</P>
<P>
-<A NAME="allowfromenv"><STRONG>Syntax:</STRONG> allow from
+<A NAME="allowfromenv"><STRONG>Syntax:</STRONG> Allow from
env=<EM>variablename</EM></A><BR>
<A
HREF="directive-dict.html#Context"
@@ -120,7 +120,7 @@ See also <A HREF="#deny">deny</A>, <A HREF="#order">order</A>, and
><STRONG>Compatibility:</STRONG></A> Apache 1.2 and above
</P>
<P>
-The allow from env directive controls access to a directory by the
+The <CODE>Allow from env</CODE> directive controls access to a directory by the
existence (or non-existence) of an environment variable.
</P>
<P>
@@ -129,26 +129,26 @@ Example:
<BLOCKQUOTE><PRE>
BrowserMatch ^KnockKnock/2.0 let_me_in
&lt;Directory /docroot&gt;
- order deny,allow
- deny from all
- allow from env=let_me_in
+ Order Deny,Allow
+ Deny from all
+ Allow from env=let_me_in
&lt;/Directory&gt;
</PRE></BLOCKQUOTE>
In this case browsers with the user-agent string <TT>KnockKnock/2.0</TT> will
be allowed access, and all others will be denied.
<P>
-See also <A HREF="#denyfromenv">deny from env</A>
-and <A HREF="#order">order</A>.
+See also <A HREF="#denyfromenv">Deny from env</A>
+and <A HREF="#order">Order</A>.
</P>
<HR>
-<H2><A NAME="deny">deny directive</A></H2>
+<H2><A NAME="deny">Deny directive</A></H2>
<P>
-<!--%plaintext &lt;?INDEX {\tt deny} directive&gt; -->
+<!--%plaintext &lt;?INDEX {\tt Deny} directive&gt; -->
<A
HREF="directive-dict.html#Syntax"
REL="Help"
-><STRONG>Syntax:</STRONG></A> deny from <EM>host host ...</EM><BR>
+><STRONG>Syntax:</STRONG></A> Deny from <EM>host host ...</EM><BR>
<A
HREF="directive-dict.html#Context"
REL="Help"
@@ -167,7 +167,7 @@ and <A HREF="#order">order</A>.
><STRONG>Module:</STRONG></A> mod_access
</P>
<P>
-The deny directive affects which hosts can access a given directory.
+The <CODE>Deny</CODE> directive affects which hosts can access a given directory.
<EM>Host</EM> is one of the following:
</P>
<DL>
@@ -189,7 +189,7 @@ The deny directive affects which hosts can access a given directory.
<P>
Example:
</P>
-<BLOCKQUOTE><CODE>deny from 16</CODE></BLOCKQUOTE>
+<BLOCKQUOTE><CODE>Deny from 16</CODE></BLOCKQUOTE>
<P>
All hosts in the specified network are denied access.
</P>
@@ -198,11 +198,11 @@ Note that this compares whole components; <CODE>bar.edu</CODE>
would not match <CODE>foobar.edu</CODE>.
</P>
<P>
-See also <A HREF="#allow">allow</A> and <A HREF="#order">order</A>.
+See also <A HREF="#allow">Allow</A> and <A HREF="#order">Order</A>.
</P>
<P>
-<A NAME="denyfromenv"><STRONG>Syntax:</STRONG> deny from
+<A NAME="denyfromenv"><STRONG>Syntax:</STRONG> Deny from
env=<EM>variablename</EM></A><BR>
<A
HREF="directive-dict.html#Context"
@@ -226,7 +226,7 @@ See also <A HREF="#allow">allow</A> and <A HREF="#order">order</A>.
><STRONG>Compatibility:</STRONG></A> Apache 1.2 and above
</P>
<P>
-The deny from env directive controls access to a directory by the
+The <CODE>Deny from env</CODE> directive controls access to a directory by the
existence (or non-existence) of an environment variable.
</P>
<P>
@@ -235,31 +235,31 @@ Example:
<BLOCKQUOTE><PRE>
BrowserMatch ^BadRobot/0.9 go_away
&lt;Directory /docroot&gt;
- order allow,deny
- allow from all
- deny from env=go_away
+ Order Allow,Deny
+ Allow from all
+ Deny from env=go_away
&lt;/Directory&gt;
</PRE></BLOCKQUOTE>
In this case browsers with the user-agent string <TT>BadRobot/0.9</TT> will
be denied access, and all others will be allowed.
<P>
-See also <A HREF="#allowfromenv">allow from env</A>
-and <A HREF="#order">order</A>.
+See also <A HREF="#allowfromenv">Allow from env</A>
+and <A HREF="#order">Order</A>.
</P>
<HR>
-<H2><A NAME="order">order directive</A></H2>
+<H2><A NAME="order">Order directive</A></H2>
<P>
-<!--%plaintext &lt;?INDEX {\tt order} directive&gt; -->
+<!--%plaintext &lt;?INDEX {\tt Order} directive&gt; -->
<A
HREF="directive-dict.html#Syntax"
REL="Help"
-><STRONG>Syntax:</STRONG></A> order <EM>ordering</EM><BR>
+><STRONG>Syntax:</STRONG></A> Order <EM>ordering</EM><BR>
<A
HREF="directive-dict.html#Default"
REL="Help"
-><STRONG>Default:</STRONG></A> <CODE>order deny,allow</CODE><BR>
+><STRONG>Default:</STRONG></A> <CODE>Order Deny,Allow</CODE><BR>
<A
HREF="directive-dict.html#Context"
REL="Help"
@@ -278,34 +278,36 @@ and <A HREF="#order">order</A>.
><STRONG>Module:</STRONG></A> mod_access
</P>
<P>
-The order directive controls the order in which <A HREF="#allow">allow</A> and
-<A HREF="#deny">deny</A> directives are evaluated. <EM>Ordering</EM> is one
+The <CODE>Order</CODE> directive controls the order in which
+<A HREF="#allow">Allow</A> and <A HREF="#deny">Deny</A> directives are
+evaluated. <EM>Ordering</EM> is one
of
</P>
<DL>
-<DT>deny,allow
-<DD>the deny directives are evaluated before the allow directives. (The
-initial state is OK.)
-<DT>allow,deny
-<DD>the allow directives are evaluated before the deny directives. (The
-initial state is FORBIDDEN.)
-<DT>mutual-failure
-<DD>Only those hosts which appear on the allow list and do not appear
-on the deny list are granted access. (The initial state is irrelevant.)
+<DT>Deny,Allow
+<DD>the <CODE>Deny</CODE> directives are evaluated before the <CODE>Allow</CODE>
+directives. (The initial state is OK.)
+<DT>Allow,Deny
+<DD>the <CODE>Allow</CODE> directives are evaluated before the <CODE>Deny</CODE>
+directives. (The initial state is FORBIDDEN.)
+<DT>Mutual-failure
+<DD>Only those hosts which appear on the <CODE>Allow</CODE> list and do not
+appear on the <CODE>Deny</CODE> list are granted access. (The initial state is
+irrelevant.)
</DL>
<P>
Keywords may only be separated by a comma; no whitespace is allowed between
them.
-<STRONG>Note that in all cases every <CODE>allow</CODE> and <CODE>deny</CODE>
+<STRONG>Note that in all cases every <CODE>Allow</CODE> and <CODE>Deny</CODE>
statement is evaluated, there is no &quot;short-circuiting&quot;.</STRONG>
</P>
<P>
Example:
</P>
<BLOCKQUOTE><CODE>
- order deny,allow<BR>
- deny from all<BR>
- allow from .ncsa.uiuc.edu<BR>
+ Order Deny,Allow<BR>
+ Deny from all<BR>
+ Allow from .ncsa.uiuc.edu<BR>
</CODE></BLOCKQUOTE>
<P>
Hosts in the ncsa.uiuc.edu domain are allowed access; all other hosts are
diff --git a/docs/manual/mod/mod_auth.html b/docs/manual/mod/mod_auth.html
index a3f85d54be..9d408ab1aa 100644
--- a/docs/manual/mod/mod_auth.html
+++ b/docs/manual/mod/mod_auth.html
@@ -165,7 +165,7 @@ and a failure will give an Authorization Required reply.
<P>
So if a userID appears in the database of more than one module; or if
-a valid require directive applies to more than one module; then the
+a valid <CODE>Require</CODE> directive applies to more than one module; then the
first module will verify the credentials; and no access is passed on;
regardless of the AuthAuthoritative setting.
diff --git a/docs/manual/mod/mod_auth_anon.html b/docs/manual/mod/mod_auth_anon.html
index b4708cb95d..a9f9ae1512 100644
--- a/docs/manual/mod/mod_auth_anon.html
+++ b/docs/manual/mod/mod_auth_anon.html
@@ -299,10 +299,10 @@ AuthType basic
# Anonymous_Authoritative for public access.<BR>
# In the .htaccess for the public directory, add:<BR>
&lt;Files *&gt;<BR>
-order deny,allow <BR>
-allow from all <BR>
+Order Deny,Allow <BR>
+Allow from all <BR>
<P>
-require valid-user <BR>
+Require valid-user <BR>
&lt;/Files&gt;<BR>
</CODE></BLOCKQUOTE>
diff --git a/docs/manual/mod/mod_auth_db.html b/docs/manual/mod/mod_auth_db.html
index 2df31ba261..8b6aeeb2ca 100644
--- a/docs/manual/mod/mod_auth_db.html
+++ b/docs/manual/mod/mod_auth_db.html
@@ -185,7 +185,7 @@ and/or rule specified; the usual password and access checks will
be applied and a failure will give an Authorization Required reply.
<P>
So if a userID appears in the database of more than one module; or
-if a valid require directive applies to more than one module; then
+if a valid <CODE>Require</CODE> directive applies to more than one module; then
the first module will verify the credentials; and no access is
passed on; regardless of the AuthAuthoritative setting. <P>
diff --git a/docs/manual/mod/mod_auth_dbm.html b/docs/manual/mod/mod_auth_dbm.html
index 36218ef8ee..260f243caf 100644
--- a/docs/manual/mod/mod_auth_dbm.html
+++ b/docs/manual/mod/mod_auth_dbm.html
@@ -175,7 +175,7 @@ and/or rule specified; the usual password and access checks will
be applied and a failure will give an Authorization Required reply.
<P>
So if a userID appears in the database of more than one module; or
-if a valid require directive applies to more than one module; then
+if a valid <CODE>Require</CODE> directive applies to more than one module; then
the first module will verify the credentials; and no access is
passed on; regardless of the AuthAuthoritative setting. <P>
diff --git a/docs/manual/mod/mod_auth_digest.html b/docs/manual/mod/mod_auth_digest.html
index 97fc96f1b4..447fcfea0e 100644
--- a/docs/manual/mod/mod_auth_digest.html
+++ b/docs/manual/mod/mod_auth_digest.html
@@ -396,7 +396,7 @@ this protection space. Example:
AuthName "private area"
AuthDigestDomain /private/ http://mirror.my.dom/private2/
AuthDigestFile /web/auth/.digest_pw
- require valid-user
+ Require valid-user
&lt;/Location&gt;
</PRE>
diff --git a/docs/manual/mod/mod_proxy.html b/docs/manual/mod/mod_proxy.html
index 6e9db4fdd9..e7ec704d1a 100644
--- a/docs/manual/mod/mod_proxy.html
+++ b/docs/manual/mod/mod_proxy.html
@@ -1081,9 +1081,9 @@ control block using the following example:<P>
<PRE>
&lt;Directory proxy:*&gt;
-order deny,allow
-deny from [machines you'd like *not* to allow by IP address or name]
-allow from [machines you'd like to allow by IP address or name]
+Order Deny,Allow
+Deny from [machines you'd like *not* to allow by IP address or name]
+Allow from [machines you'd like to allow by IP address or name]
&lt;/Directory&gt;
</PRE><P>
diff --git a/docs/manual/mod/mod_status.html b/docs/manual/mod/mod_status.html
index ccfabe1a83..f85943374e 100644
--- a/docs/manual/mod/mod_status.html
+++ b/docs/manual/mod/mod_status.html
@@ -93,9 +93,9 @@ domain add this code to your <CODE>access.conf</CODE> configuration file
&lt;Location /server-status&gt;
SetHandler server-status
- order deny,allow
- deny from all
- allow from .foo.com
+ Order Deny,Allow
+ Deny from all
+ Allow from .foo.com
&lt;/Location&gt;
</PRE>
<P>
diff --git a/docs/manual/platform/readme-tpf.html b/docs/manual/platform/readme-tpf.html
index 9d1a82a279..2b3c0e2cdc 100644
--- a/docs/manual/platform/readme-tpf.html
+++ b/docs/manual/platform/readme-tpf.html
@@ -129,7 +129,7 @@
</UL></MULTICOL>
<A NAME="notes"></A><b>Notes:</b>
<ol>
- <li>Use of mod_access directives &quot;<tt>allow from</tt>&quot; &amp; &quot;<tt>deny from</tt>&quot;
+ <li>Use of mod_access directives &quot;<tt>Allow from</tt>&quot; &amp; &quot;<tt>Deny from</tt>&quot;
with host <i>names</i> (verses ip addresses) requires TPF version 4.1 PUT10
<li>CGI execution requires TPF version 4.1 PUT10
</ol>
diff --git a/docs/manual/vhosts/examples.html b/docs/manual/vhosts/examples.html
index 46697bcec4..a59d15ed53 100644
--- a/docs/manual/vhosts/examples.html
+++ b/docs/manual/vhosts/examples.html
@@ -128,9 +128,9 @@
ServerName www-cache.domain.tld
...
&lt;Directory proxy:&gt;
- order deny,allow
- deny from all
- allow from 111.22.33
+ Order Deny,Allow
+ Deny from all
+ Allow from 111.22.33
&lt;/Directory&gt;
&lt;/VirtualHost&gt;
</PRE>
diff --git a/docs/manual/vhosts/host.html b/docs/manual/vhosts/host.html
index 5788676af8..248092467b 100644
--- a/docs/manual/vhosts/host.html
+++ b/docs/manual/vhosts/host.html
@@ -123,7 +123,7 @@ access to <CODE>www.foo.com</CODE> to get
private.foo.com</CODE> header. It is important to note that this
condition exists only if you only implement this policy at the IP
layer - all security controls used by Apache (<EM>i.e.</EM>, <A
-HREF="../mod/mod_access.html">allow, deny from,</A> <EM>etc.</EM>) are
+HREF="../mod/mod_access.html">Allow, Deny from,</A> <EM>etc.</EM>) are
consistently respected.
<H2>Compatibility with Older Browsers</H2>