brian 96/12/08 20:09:22
Modified: htdocs/manual host.html
htdocs/manual/mod core.html mod_include.html mod_proxy.html
Log:
Reviewed by: Brian Behlendorf
Obtained from: [EMAIL PROTECTED]
Typos, clarifications, and overall improvements.
Revision Changes Path
1.4 +4 -0 apache/htdocs/manual/host.html
Index: host.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/host.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -C3 -r1.3 -r1.4
*** host.html 1996/12/02 18:13:40 1.3
--- host.html 1996/12/09 04:08:50 1.4
***************
*** 1,9 ****
--- 1,13 ----
+ <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
<html><head>
<title>Apache non-IP Virtual Hosts</title>
</head><body>
<!--#include virtual="header.html" -->
<h1>Apache non-IP Virtual Hosts</h1>
+
+ <strong>See Also:</strong>
+ <a href="virtual-host.html">Virtual Host Support</a>
<hr>
1.19 +18 -12 apache/htdocs/manual/mod/core.html
Index: core.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/mod/core.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -C3 -r1.18 -r1.19
*** core.html 1996/12/05 19:17:39 1.18
--- core.html 1996/12/09 04:09:18 1.19
***************
*** 861,867 ****
AuthName somedomain<br>
AuthUserFile /web/users<br>
AuthGroupFile /web/groups<br>
! Limit <GET POST><br>
require group admin<br>
</Limit>
</code></blockquote>
--- 861,867 ----
AuthName somedomain<br>
AuthUserFile /web/users<br>
AuthGroupFile /web/groups<br>
! <Limit GET POST><br>
require group admin<br>
</Limit>
</code></blockquote>
***************
*** 958,968 ****
<A name="satisfy"><h2>Satisfy</h2></A>
<!--%plaintext <?INDEX {\tt Satisfy} directive> -->
! <strong>Syntax:</strong><br>
<strong>Context:</strong> server config, virtual host, directory,
.htaccess<br>
<strong>Status:</strong> core<br>
<strong>Compatibility:</strong> Satisfy is only available in Apache 1.2 and
later<p>
<p><hr>
<A name="sendbuffersize"><h2>SendBufferSize</h2></A>
--- 958,971 ----
<A name="satisfy"><h2>Satisfy</h2></A>
<!--%plaintext <?INDEX {\tt Satisfy} directive> -->
! <strong>Syntax:</strong> Satisfy <em>'any' or 'all'</em><br>
<strong>Context:</strong> server config, virtual host, directory,
.htaccess<br>
<strong>Status:</strong> core<br>
<strong>Compatibility:</strong> Satisfy is only available in Apache 1.2 and
later<p>
+ Access policy if both allow and require used. The parameter can be either
+ <em>'all'</em> or <em>'any'</em>.
+
<p><hr>
<A name="sendbuffersize"><h2>SendBufferSize</h2></A>
***************
*** 1026,1032 ****
<strong>Compatibility:</strong> ServerPath is only available in Apache
1.1 and later.<p>
! The ServerAlias directive sets the legacy URL pathname for a host, for
use with <a href="../host.html">Host-header based virtual hosts</a>.
<hr>
--- 1029,1035 ----
<strong>Compatibility:</strong> ServerPath is only available in Apache
1.1 and later.<p>
! The ServerPath directive sets the legacy URL pathname for a host, for
use with <a href="../host.html">Host-header based virtual hosts</a>.
<hr>
***************
*** 1040,1046 ****
The ServerRoot directive sets the directory in which the server lives.
Typically it will contain the subdirectories <code>conf/</code> and
<code>logs/</code>. Relative paths for other configuration files are taken
! as relative to this directory.<p><hr>
<A name="servertype"><h2>ServerType directive</h2></A>
<!--%plaintext <?INDEX {\tt ServerType} directive> -->
--- 1043,1050 ----
The ServerRoot directive sets the directory in which the server lives.
Typically it will contain the subdirectories <code>conf/</code> and
<code>logs/</code>. Relative paths for other configuration files are taken
! as relative to this directory.<br>
! See also <a href="../invoking.html">the <code>-d</code> option to
httpd</a>.<p><hr>
<A name="servertype"><h2>ServerType directive</h2></A>
<!--%plaintext <?INDEX {\tt ServerType} directive> -->
***************
*** 1146,1152 ****
<strong>Syntax:</strong> <VirtualHost <em>addr</em>[:<em>port</em>]>
...
</VirtualHost> <br>
<strong>Context:</strong> server config<br>
! <strong>Status:</strong> Core. <p>
<VirtualHost> and </VirtualHost> are used to enclose a group of
directives which will apply only to a particular virtual host.
--- 1150,1158 ----
<strong>Syntax:</strong> <VirtualHost <em>addr</em>[:<em>port</em>]>
...
</VirtualHost> <br>
<strong>Context:</strong> server config<br>
! <strong>Status:</strong> Core.<br>
! <strong>Compatibility:</strong> Non-IP address-based Virtual Hosting is
! only available in Apache 1.2 and later.<p>
<VirtualHost> and </VirtualHost> are used to enclose a group of
directives which will apply only to a particular virtual host.
***************
*** 1169,1181 ****
</VirtualHost>
</code></blockquote>
! 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 <code>ifconfig alias</code> command
! (if your OS supports it), or with kernel patches like
! <A HREF="../misc/vif-info.html">VIF</A> (for SunOS(TM) 4.1.x).<p>
!
<p><strong>See also:</strong>
<A HREF="../virtual-host.html">Information on Virtual Hosts.
--- 1175,1187 ----
</VirtualHost>
</code></blockquote>
! 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 <code>ifconfig alias</code>
! command (if your OS supports it), or with kernel patches like <A
! HREF="../misc/vif-info.html">VIF</A> (for SunOS(TM) 4.1.x)).<p>
<p><strong>See also:</strong>
<A HREF="../virtual-host.html">Information on Virtual Hosts.
1.5 +8 -7 apache/htdocs/manual/mod/mod_include.html
Index: mod_include.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/mod/mod_include.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -C3 -r1.4 -r1.5
*** mod_include.html 1996/12/02 18:14:08 1.4
--- mod_include.html 1996/12/09 04:09:19 1.5
***************
*** 224,236 ****
Regular expressions have the same syntax as those found in the
Unix egrep command.
! <DT>( <I>test_condition</I> )<DD>true if <I>test_condition</I> is true
! <DT>! <I>test_condition</I><DD>true if <I>test_condition</I> is false
! <I>test_condition1</I> and <I>test_condition2</I> are true
! <DT><I>test_condition1</I> && <I>test_condition2</I><DD>true if both
! <I>test_condition1</I> and <I>test_condition2</I> are true
! <DT><I>test_condition1</I> || <I>test_condition2</I><DD>true if either
! <I>test_condition1</I> or <I>test_condition2</I> is true
</DL>
<P> "<I>=</I>" and "</I>!=</I>" bind more tightly than "<I>&&</I>" and
"<I>||</I>".
--- 224,237 ----
Regular expressions have the same syntax as those found in the
Unix egrep command.
! <DT>( <I>test_condition</I> )
! <DD>true if <I>test_condition</I> is true
! <DT>! <I>test_condition</I>
! <DD>true if <I>test_condition</I> is false
! <DT><I>test_condition1</I> && <I>test_condition2</I>
! <DD>true if both <I>test_condition1</I> and <I>test_condition2</I> are
true
! <DT><I>test_condition1</I> || <I>test_condition2</I>
! <DD>true if either <I>test_condition1</I> or <I>test_condition2</I> is
true
</DL>
<P> "<I>=</I>" and "</I>!=</I>" bind more tightly than "<I>&&</I>" and
"<I>||</I>".
1.5 +4 -4 apache/htdocs/manual/mod/mod_proxy.html
Index: mod_proxy.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/mod/mod_proxy.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -C3 -r1.4 -r1.5
*** mod_proxy.html 1996/12/09 03:34:49 1.4
--- mod_proxy.html 1996/12/09 04:09:19 1.5
***************
*** 71,79 ****
<pre>
<remote-server> = <protocol>://<hostname>[:port]
</pre>
! <protocol> is the protocol that should be used to communicate with the
! remote
! server; only "http" is supported by this module.
Example:
<pre>
--- 71,79 ----
<pre>
<remote-server> = <protocol>://<hostname>[:port]
</pre>
!
! <protocol> is the protocol that should be used to communicate
! with the remote server; only "http" is supported by this module.
Example:
<pre>
***************
*** 186,192 ****
Apache 1.1 and later.<p>
If the document is fetched via a protocol that does not support expirytimes,
! then use <time> as the expiry time.
<a href="#cachemaxexpire">CacheMaxExpire</a> does <strong>not</strong>
override.
--- 186,192 ----
Apache 1.1 and later.<p>
If the document is fetched via a protocol that does not support expirytimes,
! then use <time> hours as the expiry time.
<a href="#cachemaxexpire">CacheMaxExpire</a> does <strong>not</strong>
override.
