Right this change to conform to my minimal interpretation of Ken Coar's

  veto over creating /manual/ under ServerRoot.  It's possible he also
  ment to veto the Alias, I'm not clear.  If that's the case, these alias
  sections can be removed entirely.  I personally believe they are goodness.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@91327 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/conf/httpd.conf-dist b/conf/httpd.conf-dist
index 9968db7c6e8367b12777965c098317246a4c965c..9a4fd87a2c41b2a8bd4d42de22047ea574e58553 100644 (file)
--- a/conf/httpd.conf-dist
+++ b/conf/httpd.conf-dist
@@ -545,13 +545,13 @@ ServerSignature On
         Allow from all
     </Directory>
 
-    # This Alias will project the on-line documentation tree into your
-    # logical DocumentRoot. Comment it if you don't want to provide access
-    # to the on-line docu for some reason.
+    # This Alias will project the on-line documentation tree under /manual/
+    # even if you change the DocumentRoot. Comment it if you don't want to 
+    # provide access to the on-line documentation.
     #
-    Alias /manual/ "@@ServerRoot@@/manual/"
+    Alias /manual/ "@@ServerRoot@@/htdocs/manual/"
 
-    <Directory "@@ServerRoot@@/manual">
+    <Directory "@@ServerRoot@@/htdocs/manual">
         Options Indexes FollowSymlinks MultiViews
         AllowOverride None
         Order allow,deny

diff --git a/conf/httpd.conf-dist-nw b/conf/httpd.conf-dist-nw
index 71324c33ebb62732cb039d765f0d23b035065118..6bc42bd3b705029a364e39e25883553f61163abc 100644 (file)
--- a/conf/httpd.conf-dist-nw
+++ b/conf/httpd.conf-dist-nw
@@ -480,13 +480,13 @@ ServerSignature On
         Allow from all
     </Directory>
 
-    # This Alias will project the on-line documentation tree into your
-    # logical DocumentRoot. Comment it if you don't want to provide access
-    # to the on-line docu for some reason.
+    # This Alias will project the on-line documentation tree under /manual/
+    # even if you change the DocumentRoot. Comment it if you don't want to 
+    # provide access to the on-line documentation.
     #
-    Alias /manual/ "sys:/apache/manual/"
+    Alias /manual/ "sys:/apache/htdocs/manual/"
 
-    <Directory "sys:/apache/manual">
+    <Directory "sys:/apache/htdocs/manual">
         Options Indexes FollowSymlinks MultiViews
         AllowOverride None
         Order allow,deny

diff --git a/conf/httpd.conf-dist-win b/conf/httpd.conf-dist-win
index b587681bab43910eb15ec7a29627258f6c490fdd..4f4ad92aa22566ae9ee93df28afc49c789e2b68e 100644 (file)
--- a/conf/httpd.conf-dist-win
+++ b/conf/httpd.conf-dist-win
@@ -586,13 +586,13 @@ ServerSignature On
         Allow from all
     </Directory>
 
-    # This Alias will project the on-line documentation tree into your
-    # logical DocumentRoot. Comment it if you don't want to provide access
-    # to the on-line docu for some reason.
+    # This Alias will project the on-line documentation tree under /manual/
+    # even if you change the DocumentRoot. Comment it if you don't want to 
+    # provide access to the on-line documentation.
     #
-    Alias /manual/ "@@ServerRoot@@/manual/"
+    Alias /manual/ "@@ServerRoot@@/htdocs/manual/"
 
-    <Directory "@@ServerRoot@@/manual">
+    <Directory "@@ServerRoot@@/htdocs/manual">
         Options Indexes FollowSymlinks MultiViews
         AllowOverride None
         Order allow,deny