You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by gr...@apache.org on 2012/10/14 14:32:21 UTC
svn commit: r1398068 - in /httpd/httpd/trunk/docs/manual/mod:
mod_dir.html.en mod_dir.xml
Author: gryzor
Date: Sun Oct 14 12:32:20 2012
New Revision: 1398068
URL: http://svn.apache.org/viewvc?rev=1398068&view=rev
Log:
Documenting the 'disabled' argument to FallbackResource
Modified:
httpd/httpd/trunk/docs/manual/mod/mod_dir.html.en
httpd/httpd/trunk/docs/manual/mod/mod_dir.xml
Modified: httpd/httpd/trunk/docs/manual/mod/mod_dir.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_dir.html.en?rev=1398068&r1=1398067&r2=1398068&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_dir.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_dir.html.en Sun Oct 14 12:32:20 2012
@@ -118,8 +118,8 @@ a directory</td></tr>
literally if it has any arguments before or after it, even if they are "disabled"
as well.</p>
- <p><strong>Note:</strong> Multiple <code class="directive">DirectoryIndex</code>
- directives within the <a href="../sections.html"><em>same context</em></a> will add
+ <p><strong>Note:</strong> Multiple <code class="directive">DirectoryIndex</code>
+ directives within the <a href="../sections.html"><em>same context</em></a> will add
to the list of resources to look for rather than replace:
</p>
<pre class="prettyprint lang-config">
@@ -228,7 +228,7 @@ a directory</td></tr>
<code>index.html</code> file. <strong>But a request without trailing slash
would list the directory contents</strong>.</p>
</div>
- <p>Also note that some browsers may erroneously change POST requests into GET
+ <p>Also note that some browsers may erroneously change POST requests into GET
(thus discarding POST data) when a redirect is issued.</p>
</div>
@@ -236,8 +236,8 @@ a directory</td></tr>
<div class="directive-section"><h2><a name="FallbackResource" id="FallbackResource">FallbackResource</a> <a name="fallbackresource" id="fallbackresource">Directive</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Define a default URL for requests that don't map to a file</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>FallbackResource <var>local-url</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>None - httpd will return 404 (Not Found)</code></td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>FallbackResource disabled | <var>local-url</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>disabled - httpd will return 404 (Not Found)</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>Indexes</td></tr>
<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Base</td></tr>
@@ -267,12 +267,17 @@ a directory</td></tr>
<p>Existing files, such as images, css files, and so on, will be
served normally.</p>
+ <p>Use the <code>disabled</code> argument to disable that feature
+ if inheritance from a parent directory is not desired.</p>
<p>In a sub-URI, such as <em>http://example.com/blog/</em> this
<em>sub-URI</em> has to be supplied as <var>local-url</var>:</p>
<pre class="prettyprint lang-config">
<Directory /web/example.com/htdocs/blog>
FallbackResource /blog/index.php
</Directory>
+<Directory /web/example.com/htdocs/blog/images>
+ FallbackResource disabled
+</Directory>
</pre>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_dir.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_dir.xml?rev=1398068&r1=1398067&r2=1398068&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_dir.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_dir.xml Sun Oct 14 12:32:20 2012
@@ -102,8 +102,8 @@ a directory</description>
literally if it has any arguments before or after it, even if they are "disabled"
as well.</p>
- <p><strong>Note:</strong> Multiple <directive>DirectoryIndex</directive>
- directives within the <a href="../sections.html"><em>same context</em></a> will add
+ <p><strong>Note:</strong> Multiple <directive>DirectoryIndex</directive>
+ directives within the <a href="../sections.html"><em>same context</em></a> will add
to the list of resources to look for rather than replace:
</p>
<highlight language="config">
@@ -215,15 +215,15 @@ a directory</description>
<code>index.html</code> file. <strong>But a request without trailing slash
would list the directory contents</strong>.</p>
</note>
- <p>Also note that some browsers may erroneously change POST requests into GET
+ <p>Also note that some browsers may erroneously change POST requests into GET
(thus discarding POST data) when a redirect is issued.</p>
</usage>
</directivesynopsis>
<directivesynopsis>
<name>FallbackResource</name>
<description>Define a default URL for requests that don't map to a file</description>
-<syntax>FallbackResource <var>local-url</var></syntax>
-<default>None - httpd will return 404 (Not Found)</default>
+<syntax>FallbackResource disabled | <var>local-url</var></syntax>
+<default>disabled - httpd will return 404 (Not Found)</default>
<contextlist><context>server config</context><context>virtual host</context>
<context>directory</context><context>.htaccess</context></contextlist>
<override>Indexes</override>
@@ -250,12 +250,17 @@ a directory</description>
</highlight>
<p>Existing files, such as images, css files, and so on, will be
served normally.</p>
+ <p>Use the <code>disabled</code> argument to disable that feature
+ if inheritance from a parent directory is not desired.</p>
<p>In a sub-URI, such as <em>http://example.com/blog/</em> this
<em>sub-URI</em> has to be supplied as <var>local-url</var>:</p>
<highlight language="config">
<Directory /web/example.com/htdocs/blog>
FallbackResource /blog/index.php
</Directory>
+<Directory /web/example.com/htdocs/blog/images>
+ FallbackResource disabled
+</Directory>
</highlight>
</usage>
</directivesynopsis>