summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/manual/logs.html.en21
-rw-r--r--docs/manual/mod/core.html.en5
-rw-r--r--docs/manual/mod/mod_ext_filter.html.en23
-rw-r--r--docs/manual/mod/mod_mime.html.en3
-rw-r--r--docs/manual/mod/quickreference.html.en2
-rw-r--r--docs/manual/mpm.html.en1
-rw-r--r--docs/manual/upgrading.html.en6
7 files changed, 26 insertions, 35 deletions
diff --git a/docs/manual/logs.html.en b/docs/manual/logs.html.en
index 26dce4e910..3381baf906 100644
--- a/docs/manual/logs.html.en
+++ b/docs/manual/logs.html.en
@@ -429,22 +429,6 @@
that piped log programs usually run as root. It is therefore
very important to keep the programs simple and secure.</p>
- <p>Some simple examples using piped logs:</p>
-
- <div class="example"><p><code>
- # compressed logs<br />
- CustomLog "|/usr/bin/gzip -c &gt;&gt;
- /var/log/access_log.gz" common<br />
- # almost-real-time name resolution<br />
- CustomLog "|/usr/local/apache/bin/logresolve &gt;&gt;
- /var/log/access_log" common
- </code></p></div>
-
- <p>Notice that quotes are used to enclose the entire command
- that will be called for the pipe. Although these examples are
- for the access log, the same technique can be used for the
- error log.</p>
-
<p>One important use of piped logs is to allow log rotation
without having to restart the server. The Apache HTTP Server
includes a simple program called <a href="programs/rotatelogs.html">rotatelogs</a> for this
@@ -456,6 +440,11 @@
/var/log/access_log 86400" common
</code></p></div>
+ <p>Notice that quotes are used to enclose the entire command
+ that will be called for the pipe. Although these examples are
+ for the access log, the same technique can be used for the
+ error log.</p>
+
<p>A similar, but much more flexible log rotation program
called <a href="http://www.cronolog.org/">cronolog</a>
is available at an external site.</p>
diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index 7c9984594e..927db2b995 100644
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -238,11 +238,10 @@ response without an explicit character set</td></tr><tr><th><a href="directive-d
which directives declared in that file can override earlier
access information.</p>
- <div class="note"><h3>Only available in Location sections</h3>
+ <div class="note"><h3>Only available in Directory sections</h3>
<code class="directive">AllowOverride</code> is valid only in
<code class="directive"><a href="#directory">&lt;Directory&gt;</a></code>
- sections, not in <code class="directive"><a href="#location">&lt;Location&gt;</a></code> or <code class="directive"><a href="#files">&lt;Files&gt;</a></code> sections, as implied by the
- <strong>Context</strong> section above.
+ sections, not in <code class="directive"><a href="#location">&lt;Location&gt;</a></code> or <code class="directive"><a href="#files">&lt;Files&gt;</a></code> sections.
</div>
<p>When this directive is set to <code>None</code>, then
diff --git a/docs/manual/mod/mod_ext_filter.html.en b/docs/manual/mod/mod_ext_filter.html.en
index a7f2eaedc7..27ebb01ed9 100644
--- a/docs/manual/mod/mod_ext_filter.html.en
+++ b/docs/manual/mod/mod_ext_filter.html.en
@@ -10,20 +10,14 @@ delivery to the client</td></tr><tr><th><a href="module-dict.html#Status">Status
</a></th><td>Extension</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
</a></th><td>ext_filter_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
</a></th><td>mod_ext_filter.c</td></tr></table><h3>Summary</h3>
- <p>This is an <strong>experimental</strong> module and should
- be used with care. Test your <code class="module"><a href="../mod/mod_ext_filter.html">mod_ext_filter</a></code>
- configuration carefully to ensure that it performs the desired
- function. You may wish to review <a href="../filter.html">
- this information</a> for background on the Apache filtering
- model.</p>
-
<p><code class="module"><a href="../mod/mod_ext_filter.html">mod_ext_filter</a></code> presents a simple and familiar
- programming model for filters. With this module, a program
- which reads from stdin and writes to stdout (i.e., a Unix-style
- filter command) can be a filter for Apache. This filtering
- mechanism is much slower than using a filter which is specially
- written for the Apache API and runs inside of the Apache server
- process, but it does have the following benefits:</p>
+ programming model for <a href="../filter.html">filters</a>. With
+ this module, a program which reads from stdin and writes to stdout
+ (i.e., a Unix-style filter command) can be a filter for
+ Apache. This filtering mechanism is much slower than using a
+ filter which is specially written for the Apache API and runs
+ inside of the Apache server process, but it does have the
+ following benefits:</p>
<ul>
<li>the programming model is much simpler</li>
@@ -39,9 +33,10 @@ delivery to the client</td></tr><tr><th><a href="module-dict.html#Status">Status
<p>Even when the performance characteristics are not suitable
for production use, <code class="module"><a href="../mod/mod_ext_filter.html">mod_ext_filter</a></code> can be used as
a prototype environment for filters.</p>
+
</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#extfilterdefine">ExtFilterDefine</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#extfilteroptions">ExtFilterOptions</a></li>
-</ul><h3>Topics</h3><ul id="topics"><li><img alt="" src="../images/down.gif" /> <a href="#examples">Examples</a></li></ul><h3>See also</h3><ul class="seealso"><li><a href="../filter.html">The filter documentation</a></li></ul></div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="examples" id="examples">Examples</a></h2>
+</ul><h3>Topics</h3><ul id="topics"><li><img alt="" src="../images/down.gif" /> <a href="#examples">Examples</a></li></ul><h3>See also</h3><ul class="seealso"><li><a href="../filter.html">Filters</a></li></ul></div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="examples" id="examples">Examples</a></h2>
<h3>Generating HTML from some other type of response</h3>
<div class="example"><p><code>
diff --git a/docs/manual/mod/mod_mime.html.en b/docs/manual/mod/mod_mime.html.en
index f63d7c8b89..e24f35ca9c 100644
--- a/docs/manual/mod/mod_mime.html.en
+++ b/docs/manual/mod/mod_mime.html.en
@@ -497,7 +497,8 @@ DefaultLanguage en
</a></th><td>The types of files that will be included when
searching for a matching file with MultiViews</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
</a></th><td><code>MultiviewsMatch
- <em>[NegotiatedOnly] [Handlers] [Filters] [Any]</em></code></td></tr><tr><th><a href="directive-dict.html#Context">Context:
+ <em>[NegotiatedOnly] [Handlers] [Filters] [Any]</em></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
+ </a></th><td><code>MultiviewsMatch NegotiatedOnly</code></td></tr><tr><th><a href="directive-dict.html#Context">Context:
</a></th><td>server config, virtual host, directory, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">Override:
</a></th><td>FileInfo</td></tr><tr><th><a href="directive-dict.html#Status">Status:
</a></th><td>Base</td></tr><tr><th><a href="directive-dict.html#Module">Module:
diff --git a/docs/manual/mod/quickreference.html.en b/docs/manual/mod/quickreference.html.en
index 8111776e07..d2574e3d3f 100644
--- a/docs/manual/mod/quickreference.html.en
+++ b/docs/manual/mod/quickreference.html.en
@@ -405,7 +405,7 @@ spikes</td></tr>
<tr><td><a href="mod_file_cache.html#mmapfile">MMapFile <var>file-path</var> [<var>file-path</var>] ...</a></td><td /><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">Map a list of files into memory at startup time</td></tr>
<tr class="odd"><td><a href="mod_mime.html#modmimeusepathinfo">ModMimeUsePathInfo On|Off</a></td><td /><td>d</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Tells mod_mime to treat path_info components as part of the filename</td></tr>
<tr><td><a href="mod_mime.html#multiviewsmatch">MultiviewsMatch
- <em>[NegotiatedOnly] [Handlers] [Filters] [Any]</em></a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">The types of files that will be included when
+ <em>[NegotiatedOnly] [Handlers] [Filters] [Any]</em></a></td><td> NegotiatedOnly </td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">The types of files that will be included when
searching for a matching file with MultiViews</td></tr>
<tr class="odd"><td><a href="core.html#namevirtualhost" id="N" name="N">NameVirtualHost <var>addr</var>[:<var>port</var>]</a></td><td /><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Designates an IP address for name-virtual
hosting</td></tr>
diff --git a/docs/manual/mpm.html.en b/docs/manual/mpm.html.en
index 468a3f1930..9a8513bf7d 100644
--- a/docs/manual/mpm.html.en
+++ b/docs/manual/mpm.html.en
@@ -79,6 +79,7 @@ choice at compile-time.</p>
<table>
<tr><td>BeOS</td><td><code class="module"><a href="./mod/beos.html">beos</a></code></td></tr>
+<tr><td>Netware</td><td><code class="module"><a href="./mod/mpm_netware.html">mpm_netware</a></code></td></tr>
<tr><td>OS/2</td><td><code class="module"><a href="./mod/mpmt_os2.html">mpmt_os2</a></code></td></tr>
<tr><td>Unix</td><td><code class="module"><a href="./mod/prefork.html">prefork</a></code></td></tr>
<tr><td>Windows</td><td><code class="module"><a href="./mod/mpm_winnt.html">mpm_winnt</a></code></td></tr>
diff --git a/docs/manual/upgrading.html.en b/docs/manual/upgrading.html.en
index da6938dc39..8f261bb1f4 100644
--- a/docs/manual/upgrading.html.en
+++ b/docs/manual/upgrading.html.en
@@ -127,6 +127,12 @@
The same functionality is available through the
<code>FancyIndexing</code> option to the <code class="directive"><a href="./mod/mod_autoindex.html#indexoptions">IndexOptions</a></code>
directive.</li>
+
+ <li>The MultiViews content-negotiation technique provided by
+ <code class="module"><a href="./mod/mod_negotiation.html">mod_negotiation</a></code> has become more strict in its
+ default file matching. It will select only from <em>negotiable</em>
+ files. The old behavior can be restored using the <code class="directive"><a href="./mod/mod_mime.html#multiviewsmatch">MultiviewsMatch</a></code> directive.</li>
+
</ul>
</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="misc" id="misc">Misc Changes</a></h2>