From: Rich Bowen <rbowen@apache.org>
Date: Thu, 10 Mar 2011 17:22:42 +0000 (+0000)
Subject: Moves the DocumentRoot declaration down to immediately above the
X-Git-Tag: 2.3.12~257
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15c52ebab6c28085e7452e85d3727c5325384a10;p=thirdparty%2Fapache%2Fhttpd.git

Moves the DocumentRoot declaration down to immediately above the
<Directory $document_root> block, so that they are clearly related to
one another, rather than having to have the comment referring back up 20
lines.


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

diff --git a/docs/conf/httpd.conf.in b/docs/conf/httpd.conf.in
index e7628a660e0..0c168fd7fcd 100644
--- a/docs/conf/httpd.conf.in
+++ b/docs/conf/httpd.conf.in
@@ -106,13 +106,6 @@ ServerAdmin you@example.com
 #
 #ServerName www.example.com:@@Port@@
 
-#
-# DocumentRoot: The directory out of which you will serve your
-# documents. By default, all requests are taken from this directory, but
-# symbolic links and aliases may be used to point to other locations.
-#
-DocumentRoot "@exp_htdocsdir@"
-
 #
 # Deny access to the entirety of your server's filesystem. You must
 # explicitly permit access to web content directories in other 
@@ -130,8 +123,11 @@ DocumentRoot "@exp_htdocsdir@"
 #
 
 #
-# This should be changed to whatever you set DocumentRoot to.
+# DocumentRoot: The directory out of which you will serve your
+# documents. By default, all requests are taken from this directory, but
+# symbolic links and aliases may be used to point to other locations.
 #
+DocumentRoot "@exp_htdocsdir@"
 <Directory "@exp_htdocsdir@">
     #
     # Possible values for the Options directive are "None", "All",