From: brian Date: Mon, 9 Dec 1996 04:09:19 +0000 (+0000) Subject: Reviewed by: Brian Behlendorf X-Git-Tag: APACHE_1_2b2~3 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a5ca41e81a94ba28f1948aa932e3eb85549e57ce;p=apache Reviewed by: Brian Behlendorf Obtained from: Martin.Kraemer@mch.sni.de Typos, clarifications, and overall improvements. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@77227 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/core.html b/docs/manual/mod/core.html index e6d39f18fe..af92315739 100644 --- a/docs/manual/mod/core.html +++ b/docs/manual/mod/core.html @@ -861,7 +861,7 @@ AuthType Basic
AuthName somedomain
AuthUserFile /web/users
AuthGroupFile /web/groups
-Limit <GET POST>
+<Limit GET POST>
require group admin
</Limit> @@ -958,11 +958,14 @@ See also RLimitMEM or RLimitCPU

Satisfy

-Syntax:
+Syntax: Satisfy 'any' or 'all'
Context: server config, virtual host, directory, .htaccess
Status: core
Compatibility: Satisfy is only available in Apache 1.2 and later

+Access policy if both allow and require used. The parameter can be either +'all' or 'any'. +

SendBufferSize

 @@ -1026,7 +1029,7 @@ were monster.wibble.com.

Compatibility: ServerPath is only available in Apache 1.1 and later.

-The ServerAlias directive sets the legacy URL pathname for a host, for +The ServerPath directive sets the legacy URL pathname for a host, for use with Host-header based virtual hosts.

@@ -1040,7 +1043,8 @@ use with Host-header based virtual hosts. The ServerRoot directive sets the directory in which the server lives. Typically it will contain the subdirectories conf/ and logs/. Relative paths for other configuration files are taken -as relative to this directory.

+as relative to this directory.
+See also the -d option to httpd.

ServerType directive

 @@ -1146,7 +1150,9 @@ dangers are.

Syntax: <VirtualHost addr[:port]> ... </VirtualHost>
Context: server config
-Status: Core.

+Status: Core.
+Compatibility: Non-IP address-based Virtual Hosting is +only available in Apache 1.2 and later.

<VirtualHost> and </VirtualHost> are used to enclose a group of directives which will apply only to a particular virtual host. @@ -1169,13 +1175,13 @@ TransferLog logs/host.foo.com-access_log
</VirtualHost> -Currently, each VirtualHost must correspond to a different IP address for -the server, so the server machine must be configured to accept IP packets for -multiple addresses. If the machine does not have multiple network interfaces, -then this can be accomplished with the ifconfig alias command -(if your OS supports it), or with kernel patches like -VIF (for SunOS(TM) 4.1.x).

- +Each VirtualHost must correspond to a different IP address or a +different host name for the server, in the latter case the server +machine must be configured to accept IP packets for multiple +addresses. (If the machine does not have multiple network interfaces, +then this can be accomplished with the ifconfig alias +command (if your OS supports it), or with kernel patches like VIF (for SunOS(TM) 4.1.x)).

See also: Information on Virtual Hosts. diff --git a/docs/manual/mod/mod_include.html b/docs/manual/mod/mod_include.html index 4052baca61..58ff88079f 100644 --- a/docs/manual/mod/mod_include.html +++ b/docs/manual/mod/mod_include.html @@ -224,13 +224,14 @@ elements are: Regular expressions have the same syntax as those found in the Unix egrep command. -

( test_condition )
true if test_condition is true -
! test_condition
true if test_condition is false - test_condition1 and test_condition2 are true -
test_condition1 && test_condition2
true if both - test_condition1 and test_condition2 are true -
test_condition1 || test_condition2
true if either - test_condition1 or test_condition2 is true +
( test_condition ) +
true if test_condition is true +
! test_condition +
true if test_condition is false +
test_condition1 && test_condition2 +
true if both test_condition1 and test_condition2 are true +
test_condition1 || test_condition2 +
true if either test_condition1 or test_condition2 is true

"=" and "!=" bind more tightly than "&&" and "||". diff --git a/docs/manual/mod/mod_proxy.html b/docs/manual/mod/mod_proxy.html index 9bb11a146e..b07975723e 100644 --- a/docs/manual/mod/mod_proxy.html +++ b/docs/manual/mod/mod_proxy.html @@ -71,9 +71,9 @@ partial URL for the remote server. Syntax: 

   <remote-server> = <protocol>://<hostname>[:port]
-<protocol> is the protocol that should be used to communicate with the -remote -server; only "http" is supported by this module. + +<protocol> is the protocol that should be used to communicate +with the remote server; only "http" is supported by this module. Example: 
@@ -186,7 +186,7 @@ then the latter takes precedence.
 Apache 1.1 and later.

 
 If the document is fetched via a protocol that does not support expirytimes,
-then use <time> as the expiry time.
+then use <time> hours as the expiry time.
 CacheMaxExpire does not
 override.