pcs 96/11/30 08:53:30
Modified: htdocs/manual new_features_1_2.html
htdocs/manual/mod core.html
Log:
Document Options +/- stuff. Remove duplicate what's new section about
mod_headers
Revision Changes Path
1.8 +8 -7 apache/htdocs/manual/new_features_1_2.html
Index: new_features_1_2.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/new_features_1_2.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -C3 -r1.7 -r1.8
*** new_features_1_2.html 1996/11/28 08:08:17 1.7
--- new_features_1_2.html 1996/11/30 16:53:28 1.8
***************
*** 82,92 ****
a new process and doing application initialization (e.g. connecting to a
database) each time somebody requests
a document. The processes start up with the Web server and keep on running.
- <li><b><a href="mod/mod_headers.html">Optional Headers Module to Set or
Remove HTTP Headers</a></b><br>
- The optional <code>mod_headers</code> header can be used to set custom
- headers in the HTTP response. It can append to existing headers,
- replace them, or remove headers from the response.
-
<li><b><a href="mod/mod_log_config.html">Enhanced, Configurable
Logging</a></b><br>
The optional <code>mod_log_config</code> included with earlier
--- 82,87 ----
***************
*** 135,146 ****
The process of configuring Apache for compilation has been
simplified.
<li><b><a href="help.html">Command-line Help</a></b><br>
The <code>-h</code> command-line option now lists all the available
directives.
! <li><b><a href="mod/mod_headers.html">Optional headers module</a></b><br>
! An optional module is included which can set arbitrary headers in responses.
<li><b><a href="mod/core.html#ifmodule">Conditional Config
Directives</a></b><br>
A new <code><IfModule></code> section allows directives to be
--- 130,147 ----
The process of configuring Apache for compilation has been
simplified.
+ <li><b><a href="mod/core.html#options">Add or Remove Options</a></b><br>
+ The <code>Options</code>directive can now add or remove options from
+ those currently in force, rather than always replacing them.
+
<li><b><a href="help.html">Command-line Help</a></b><br>
The <code>-h</code> command-line option now lists all the available
directives.
! <li><b><a href="mod/mod_headers.html">Optional Headers Module to Set or
Remove HTTP Headers</a></b><br>
! The optional <code>mod_headers</code> module can be used to set custom
! headers in the HTTP response. It can append to existing headers,
! replace them, or remove headers from the response.
<li><b><a href="mod/core.html#ifmodule">Conditional Config
Directives</a></b><br>
A new <code><IfModule></code> section allows directives to be
1.8 +26 -5 apache/htdocs/manual/mod/core.html
Index: core.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/mod/core.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -C3 -r1.7 -r1.8
*** core.html 1996/11/28 08:08:19 1.7
--- core.html 1996/11/30 16:53:29 1.8
***************
*** 694,706 ****
<A name="options"><h2>Options directive</h2></A>
<!--%plaintext <?INDEX {\tt Options} directive> -->
! <strong>Syntax:</strong> Options <em>option option ...</em><br>
<strong>Context:</strong> server config, virtual host, directory,
.htaccess<br>
<strong>Override:</strong> Options<br>
<strong>Status:</strong> core<p>
The Options directive controls which server features are available in
! a particular directory.<p>
<em>option</em> can be set to <code>None</code>, in which case none of
the extra features are enabled, or one or more of the following:
<dl>
--- 694,707 ----
<A name="options"><h2>Options directive</h2></A>
<!--%plaintext <?INDEX {\tt Options} directive> -->
! <strong>Syntax:</strong> Options <em>[+|-]option [+|-]option ...</em><br>
<strong>Context:</strong> server config, virtual host, directory,
.htaccess<br>
<strong>Override:</strong> Options<br>
<strong>Status:</strong> core<p>
The Options directive controls which server features are available in
! a particular directory.
! <p>
<em>option</em> can be set to <code>None</code>, in which case none of
the extra features are enabled, or one or more of the following:
<dl>
***************
*** 741,748 ****
file or directory is owned by the same user id as the link.
</dl>
! If multiple Options could apply to a directory, then the most specific one
is
! taken complete; the options are not merged. For example:
<blockquote><code>
<Directory /web/docs> <br>
Options Indexes FollowSymLinks<br>
--- 742,757 ----
file or directory is owned by the same user id as the link.
</dl>
! Normally, if multiple <code>Options</code> could apply to a directory,
! then the most specific one is taken complete; the options are not
! merged. However if <i>all</i> the options on the <code>Options</code>
directive are
! preceeded by a + or - symbol, the options are merged. Any options
! preceeded by a + are added to the options currently in force, and any
! options preceeded by a - are removed from the options currently in
! force. <P>
!
! For example, without any + and - symbols:
!
<blockquote><code>
<Directory /web/docs> <br>
Options Indexes FollowSymLinks<br>
***************
*** 752,758 ****
</Directory>
</code></blockquote>
then only <code>Includes</code> will be set for the /web/docs/spec
! directory.<p><hr>
<A name="pidfile"><h2>PidFile directive</h2></A>
<!--%plaintext <?INDEX {\tt PidFile} directive> -->
--- 761,779 ----
</Directory>
</code></blockquote>
then only <code>Includes</code> will be set for the /web/docs/spec
! directory. However if the second <code>Options</code> directive uses the +
! and - symbols:<p>
!
! <blockquote><code>
! <Directory /web/docs> <br>
! Options Indexes FollowSymLinks<br>
! </Directory><br>
! <Directory /web/docs/spec> <br>
! Options +Includes -Indexes<br>
! </Directory>
! </code></blockquote>
! then the options <code>FollowSymLinks</code> and <code>Includes</code>
! are set for the /web/docs/spec directory.
<A name="pidfile"><h2>PidFile directive</h2></A>
<!--%plaintext <?INDEX {\tt PidFile} directive> -->
