Return-Path: 
 <cvs-return-47050-apmail-httpd-cvs-archive=httpd.apache.org@httpd.apache.org>
X-Original-To: apmail-httpd-cvs-archive@www.apache.org
Delivered-To: apmail-httpd-cvs-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 1C12CF043
	for <apmail-httpd-cvs-archive@www.apache.org>;
 Fri, 26 Apr 2013 01:35:52 +0000 (UTC)
Received: (qmail 38341 invoked by uid 500); 26 Apr 2013 01:35:51 -0000
Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org
Received: (qmail 38283 invoked by uid 500); 26 Apr 2013 01:35:51 -0000
Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
list-help: <mailto:cvs-help@httpd.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@httpd.apache.org>
List-Post: <mailto:cvs@httpd.apache.org>
List-Id: <cvs.httpd.apache.org>
Delivered-To: mailing list cvs@httpd.apache.org
Received: (qmail 38275 invoked by uid 99); 26 Apr 2013 01:35:51 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 26 Apr 2013 01:35:51 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 26 Apr 2013 01:35:49 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id ADD8A2388A67;
	Fri, 26 Apr 2013 01:35:28 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1476015 -
 /httpd/httpd/branches/2.4.x/docs/manual/urlmapping.xml
Date: Fri, 26 Apr 2013 01:35:28 -0000
To: cvs@httpd.apache.org
From: rbowen@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20130426013528.ADD8A2388A67@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: rbowen
Date: Fri Apr 26 01:35:28 2013
New Revision: 1476015

URL: http://svn.apache.org/r1476015
Log:
DirectoryIndex and mod_autoindex

Modified:
    httpd/httpd/branches/2.4.x/docs/manual/urlmapping.xml

Modified: httpd/httpd/branches/2.4.x/docs/manual/urlmapping.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/urlmapping.xml?rev=1476015&r1=1476014&r2=1476015&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/urlmapping.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/urlmapping.xml Fri Apr 26 01:35:28 2013
@@ -36,6 +36,7 @@
 <modulelist>
 <module>mod_actions</module>
 <module>mod_alias</module>
+<module>mod_autoindex</module>
 <module>mod_dir</module>
 <module>mod_imagemap</module>
 <module>mod_negotiation</module>
@@ -49,6 +50,7 @@
 <directive module="mod_alias">Alias</directive>
 <directive module="mod_alias">AliasMatch</directive>
 <directive module="mod_speling">CheckSpelling</directive>
+<directive module="core">DirectoryIndex</directive>
 <directive module="core">DocumentRoot</directive>
 <directive module="core">ErrorDocument</directive>
 <directive module="core">Options</directive>
@@ -84,6 +86,25 @@
     in the file <code>/var/www/html/fish/guppies.html</code> being
     served to the requesting client.</p>
 
+    <p>If a directory is requested (i.e. a path ending with
+    <code>/</code>), the file served from that directory is defined by
+    the <directive module="core">DirectoryIndex</directive> directive.
+    For example, if <code>DocumentRoot</code> were set as above, and 
+    you were to set:</p>
+
+    <example>DirectoryIndex index.html index.php</example>
+
+    <p>Then a request for <code>http://www.example.com/fish/</code> will
+    cause httpd to attempt to serve the file
+    <code>/var/www/html/fish/index.html</code>. In the event that
+    that file didn't exist, it will next attempt to serve file file
+    <code>/var/www/html/fish/index.php</code>.</p>
+
+    <p>If neither of these files existed, the next step would be to
+    attempt to provide a directory index, if
+    <module>mod_autoindex<module> were loaded and configured to permit
+    that.</p>
+
     <p>httpd is also capable of <a href="vhosts/">Virtual
     Hosting</a>, where the server receives requests for more than one
     host. In this case, a different <directive