Enabled Server-Side Includes by default in the /manual directory so that all

headers and footers will be included correctly in the documentation pages.

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

diff --git a/docs/conf/httpd-nw.conf b/docs/conf/httpd-nw.conf
index b953b92b77a5cbdf3e21cb817f5a478ac378647d..ea0b8e13a9501d7917cad0e325118fac483ad42d 100644 (file)
--- a/docs/conf/httpd-nw.conf
+++ b/docs/conf/httpd-nw.conf
@@ -441,7 +441,8 @@ Alias /icons/ "@@ServerRoot@@/icons/"
 Alias /manual "@@ServerRoot@@/manual"
 
 <Directory "@@ServerRoot@@/manual">
-    Options Indexes FollowSymLinks MultiViews
+    Options Indexes FollowSymLinks MultiViews IncludesNoExec
+    AddOutputFilter Includes html
     AllowOverride None
     Order allow,deny
     Allow from all

diff --git a/docs/conf/httpd-std.conf.in b/docs/conf/httpd-std.conf.in
index 7374ca470cb3303e3df2aad9a8e325af99165f8f..5c145478c43f4bb030cbfb1e8ed0df22ed6e5670 100644 (file)
--- a/docs/conf/httpd-std.conf.in
+++ b/docs/conf/httpd-std.conf.in
@@ -540,7 +540,8 @@ Alias /icons/ "@exp_iconsdir@/"
 Alias /manual "@exp_manualdir@"
 
 <Directory "@exp_manualdir@">
-    Options Indexes FollowSymLinks MultiViews
+    Options Indexes FollowSymLinks MultiViews IncludesNoExec
+    AddOutputFilter Includes html
     AllowOverride None
     Order allow,deny
     Allow from all

diff --git a/docs/conf/httpd-win.conf b/docs/conf/httpd-win.conf
index 4053e67735dc090c807312e9e10d6acea23b6bce..1a535be3954c6adec5e8122bc2822af4fdcbdde3 100644 (file)
--- a/docs/conf/httpd-win.conf
+++ b/docs/conf/httpd-win.conf
@@ -456,7 +456,8 @@ Alias /icons/ "@@ServerRoot@@/icons/"
 Alias /manual "@@ServerRoot@@/manual"
 
 <Directory "@@ServerRoot@@/manual">
-    Options Indexes FollowSymLinks MultiViews
+    Options Indexes FollowSymLinks MultiViews IncludesNoExec
+    AddOutputFilter Includes html
     AllowOverride None
     Order allow,deny
     Allow from all