4 files changed, 105 insertions, 50 deletions
diff --git a/docs/conf/httpd-nw.conf b/docs/conf/httpd-nw.conf
index d9f0c75da6..c5724fafcb 100644
--- a/docs/conf/httpd-nw.conf
+++ b/docs/conf/httpd-nw.conf
@@ -858,15 +858,47 @@ BrowserMatch "JDK/1\.0" force-response-1.0
 #</Location>
 
 #
+# Proxy Server directives. Uncomment the following lines to
+# enable the proxy server:
+#
+#<IfModule mod_proxy.c>
+#ProxyRequests On
+#
+#<Proxy *>
+#    Order deny,allow
+#    Deny from all
+#    Allow from .your_domain.com
+#</Proxy>
+
+#
+# Enable/disable the handling of HTTP/1.1 "Via:" headers.
+# ("Full" adds the server version; "Block" removes all outgoing Via: headers)
+# Set to one of: Off | On | Full | Block
+#
+#ProxyVia On
+
+#
+# To enable the cache as well, edit and uncomment the following lines:
+# (no cacheing without CacheRoot)
+#
+#CacheRoot "@@ServerRoot@@/proxy"
+#CacheSize 5
+#CacheGcInterval 4
+#CacheMaxExpire 24
+#CacheLastModifiedFactor 0.1
+#CacheDefaultExpire 1
+#NoCache a_domain.com another_domain.edu joes.garage_sale.com
+
+#</IfModule>
+# End of proxy directives.
+
+#
 # Bring in additional module-specific configurations
 #
 <IfModule mod_ssl.c>
     Include conf/ssl.conf
 </IfModule>
 
-<IfModule mod_proxy.c>
-    Include conf/proxy.conf
-</IfModule>
 
 ### Section 3: Virtual Hosts
 #
diff --git a/docs/conf/httpd-std.conf b/docs/conf/httpd-std.conf
index 4fbe1981ab..93d7449816 100644
--- a/docs/conf/httpd-std.conf
+++ b/docs/conf/httpd-std.conf
@@ -926,20 +926,47 @@ BrowserMatch "JDK/1\.0" force-response-1.0
 #</Location>
 
 #
+# Proxy Server directives. Uncomment the following lines to
+# enable the proxy server:
+#
+#<IfModule mod_proxy.c>
+#ProxyRequests On
+#
+#<Proxy *>
+#    Order deny,allow
+#    Deny from all
+#    Allow from .your_domain.com
+#</Proxy>
+
+#
+# Enable/disable the handling of HTTP/1.1 "Via:" headers.
+# ("Full" adds the server version; "Block" removes all outgoing Via: headers)
+# Set to one of: Off | On | Full | Block
+#
+#ProxyVia On
+
+#
+# To enable the cache as well, edit and uncomment the following lines:
+# (no cacheing without CacheRoot)
+#
+#CacheRoot "@@ServerRoot@@/proxy"
+#CacheSize 5
+#CacheGcInterval 4
+#CacheMaxExpire 24
+#CacheLastModifiedFactor 0.1
+#CacheDefaultExpire 1
+#NoCache a_domain.com another_domain.edu joes.garage_sale.com
+
+#</IfModule>
+# End of proxy directives.
+
+#
 # Bring in additional module-specific configurations
 #
 <IfModule mod_ssl.c>
     Include conf/ssl.conf
 </IfModule>
 
-<IfModule mod_proxy.c>
-    Include conf/proxy.conf
-</IfModule>
-
-<IfModule mod_ldap.c>
-    Include conf/ldap.conf
-</IfModule>
-
 
 ### Section 3: Virtual Hosts
 #
diff --git a/docs/conf/httpd-win.conf b/docs/conf/httpd-win.conf
index 28ba934923..49bfe76632 100644
--- a/docs/conf/httpd-win.conf
+++ b/docs/conf/httpd-win.conf
@@ -849,16 +849,47 @@ BrowserMatch "JDK/1\.0" force-response-1.0
 #</Location>
 
 #
+# Proxy Server directives. Uncomment the following lines to
+# enable the proxy server:
+#
+#<IfModule mod_proxy.c>
+#ProxyRequests On
+#
+#<Proxy *>
+#    Order deny,allow
+#    Deny from all
+#    Allow from .your_domain.com
+#</Proxy>
+
+#
+# Enable/disable the handling of HTTP/1.1 "Via:" headers.
+# ("Full" adds the server version; "Block" removes all outgoing Via: headers)
+# Set to one of: Off | On | Full | Block
+#
+#ProxyVia On
+
+#
+# To enable the cache as well, edit and uncomment the following lines:
+# (no cacheing without CacheRoot)
+#
+#CacheRoot "@@ServerRoot@@/proxy"
+#CacheSize 5
+#CacheGcInterval 4
+#CacheMaxExpire 24
+#CacheLastModifiedFactor 0.1
+#CacheDefaultExpire 1
+#NoCache a_domain.com another_domain.edu joes.garage_sale.com
+
+#</IfModule>
+# End of proxy directives.
+
+#
 # Bring in additional module-specific configurations
 #
 <IfModule mod_ssl.c>
     Include conf/ssl.conf
 </IfModule>
 
-<IfModule mod_proxy.c>
-    Include conf/proxy.conf
-</IfModule>
-
 
 ### Section 3: Virtual Hosts
 #
diff --git a/docs/conf/proxy-std.conf b/docs/conf/proxy-std.conf
deleted file mode 100644
index 62b56ceb0c..0000000000
--- a/docs/conf/proxy-std.conf
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Proxy Server directives. Uncomment the following lines to
-# enable the proxy server:
-#
-#<IfModule mod_proxy.c>
-#ProxyRequests On
-#
-#<Proxy *>
-#    Order deny,allow
-#    Deny from all
-#    Allow from .your_domain.com
-#</Proxy>
-
-#
-# Enable/disable the handling of HTTP/1.1 "Via:" headers.
-# ("Full" adds the server version; "Block" removes all outgoing Via: headers)
-# Set to one of: Off | On | Full | Block
-#
-#ProxyVia On
-
-#
-# To enable the cache as well, edit and uncomment the following lines:
-# (no cacheing without CacheRoot)
-#
-#CacheRoot "@@ServerRoot@@/proxy"
-#CacheSize 5
-#CacheGcInterval 4
-#CacheMaxExpire 24
-#CacheLastModifiedFactor 0.1
-#CacheDefaultExpire 1
-#NoCache a_domain.com another_domain.edu joes.garage_sale.com
-
-#</IfModule>
-# End of proxy directives.
-