xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1147343 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 34 insertions, 5 deletions

diff --git a/docs/manual/mod/mod_alias.html.en b/docs/manual/mod/mod_alias.html.en
index ba2992181e..64f5218933 100644
--- a/docs/manual/mod/mod_alias.html.en
+++ b/docs/manual/mod/mod_alias.html.en
@@ -128,10 +128,10 @@
       Alias /image /ftp/pub/image
     </code></p></div>
 
-    <p>A request for <code>http://myserver/image/foo.gif</code> would cause
+    <p>A request for <code>http://example.com/image/foo.gif</code> would cause
     the server to return the file <code>/ftp/pub/image/foo.gif</code>.  Only
     complete path segments are matched, so the above alias would not match a
-    request for <code>http://myserver/imagefoo.gif</code>.  For more complex
+    request for <code>http://example.com/imagefoo.gif</code>.  For more complex
     matching using regular expressions, see the <code class="directive"><a href="#aliasmatch">AliasMatch</a></code> directive.</p>
 
     <p>Note that if you include a trailing / on the
@@ -443,7 +443,7 @@ target as a CGI script</td></tr>
       ScriptAlias /cgi-bin/ /web/cgi-bin/
     </code></p></div>
 
-    <p>A request for <code>http://myserver/cgi-bin/foo</code> would cause the
+    <p>A request for <code>http://example.com/cgi-bin/foo</code> would cause the
     server to run the script <code>/web/cgi-bin/foo</code>.  This configuration
     is essentially equivalent to:</p>
     <div class="example"><p><code>
diff --git a/docs/manual/mod/mod_dir.html.en b/docs/manual/mod/mod_dir.html.en
index af4870c204..9dfb8f354d 100644
--- a/docs/manual/mod/mod_dir.html.en
+++ b/docs/manual/mod/mod_dir.html.en
@@ -59,6 +59,7 @@
 <div id="quickview"><h3 class="directives">Directives</h3>
 <ul id="toc">
 <li><img alt="" src="../images/down.gif" /> <a href="#directoryindex">DirectoryIndex</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#directoryindexredirect">DirectoryIndexRedirect</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#directoryslash">DirectorySlash</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#fallbackresource">FallbackResource</a></li>
 </ul>
@@ -92,8 +93,8 @@ a directory</td></tr>
       DirectoryIndex index.html
     </code></p></div>
 
-    <p>then a request for <code>http://myserver/docs/</code> would
-    return <code>http://myserver/docs/index.html</code> if it
+    <p>then a request for <code>http://example.com/docs/</code> would
+    return <code>http://example.com/docs/index.html</code> if it
     exists, or would list the directory if it did not.</p>
 
     <p>Note that the documents do not need to be relative to the
@@ -115,6 +116,34 @@ a directory</td></tr>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="DirectoryIndexRedirect" id="DirectoryIndexRedirect">DirectoryIndexRedirect</a> <a name="directoryindexredirect" id="directoryindexredirect">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Configures an external redirect for directory indexes.
+</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>DirectoryIndexRedirect on | off | permanent | temp | seeother | 
+<var>3xx-code</var>
+</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>DirectoryIndexRedirect off</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>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_dir</td></tr>
+</table>
+    <p>By default, the <code class="directive">DirectoryIndex</code> is selected
+    and returned transparently to the client.  <code class="directive">DirectoryIndexRedirect</code> causes an external redirect
+    to instead be issued.</p>
+
+    <div class="example"><h3>Example</h3><p><code>
+      DirectoryIndexRedirect on
+    </code></p></div>
+
+    <p>A request for <code>http://example.com/docs/</code> would
+    return a temporary redirect to <code>http://example.com/docs/index.html</code> 
+    if it exists.</p>
+
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="directive-section"><h2><a name="DirectorySlash" id="DirectorySlash">DirectorySlash</a> <a name="directoryslash" id="directoryslash">Directive</a></h2>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Toggle trailing slash redirects on or off</td></tr>