Already patched in the 2.0 tree - make all .conf's reflect the applicable

  DNS rfc's that underbars aren't permitted - why should our examples show
  administrators otherwise?!?

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

diff --git a/conf/httpd.conf-dist b/conf/httpd.conf-dist
index 9a4fd87a2c41b2a8bd4d42de22047ea574e58553..94acd6207d4aee5f6d9b49a0793e2ff88f2a546f 100644 (file)
--- a/conf/httpd.conf-dist
+++ b/conf/httpd.conf-dist
@@ -851,7 +851,7 @@ ServerSignature On
 #  N.B.: You can redirect to a script or a document using server-side-includes.
 #
 #    3) external redirects
-#ErrorDocument 402 http://some.other_server.com/subscription_info.html
+#ErrorDocument 402 http://some.other-server.com/subscription_info.html
 #  N.B.: Many of the environment variables associated with the original
 #  request will *not* be available to such a script.
 
@@ -885,25 +885,25 @@ ServerSignature On
 
 #
 # Allow server status reports, with the URL of http://servername/server-status
-# Change the ".your_domain.com" to match your domain to enable.
+# Change the ".your-domain.com" to match your domain to enable.
 #
 #<Location /server-status>
 #    SetHandler server-status
 #    Order deny,allow
 #    Deny from all
-#    Allow from .your_domain.com
+#    Allow from .your-domain.com
 #</Location>
 
 #
 # Allow remote server configuration reports, with the URL of
 # http://servername/server-info (requires that mod_info.c be loaded).
-# Change the ".your_domain.com" to match your domain to enable.
+# Change the ".your-domain.com" to match your domain to enable.
 #
 #<Location /server-info>
 #    SetHandler server-info
 #    Order deny,allow
 #    Deny from all
-#    Allow from .your_domain.com
+#    Allow from .your-domain.com
 #</Location>
 
 #
@@ -928,7 +928,7 @@ ServerSignature On
 #    <Directory proxy:*>
 #        Order deny,allow
 #        Deny from all
-#        Allow from .your_domain.com
+#        Allow from .your-domain.com
 #    </Directory>
 
     #
@@ -948,7 +948,7 @@ ServerSignature On
 #    CacheMaxExpire 24
 #    CacheLastModifiedFactor 0.1
 #    CacheDefaultExpire 1
-#    NoCache a_domain.com another_domain.edu joes.garage_sale.com
+#    NoCache a-domain.com another-domain.edu joes.garage-sale.com
 
 #</IfModule>
 # End of proxy directives.

diff --git a/conf/httpd.conf-dist-nw b/conf/httpd.conf-dist-nw
index 609274e1c8a88df9869c25864a4500093b5631b1..27cb1f9c7cfc4a8365324da2d832b0ffcb2e739b 100644 (file)
--- a/conf/httpd.conf-dist-nw
+++ b/conf/httpd.conf-dist-nw
@@ -786,7 +786,7 @@ ServerSignature On
 #  N.B.: You can redirect to a script or a document using server-side-includes.
 #
 #    3) external redirects
-#ErrorDocument 402 http://some.other_server.com/subscription_info.html
+#ErrorDocument 402 http://some.other-server.com/subscription_info.html
 #  N.B.: Many of the environment variables associated with the original
 #  request will *not* be available to such a script.
 
@@ -819,28 +819,28 @@ ServerSignature On
 
 #
 # Allow server status reports, with the URL of http://servername/server-status
-# Change the ".your_domain.com" to match your domain to enable.
+# Change the ".your-domain.com" to match your domain to enable.
 #
 <IfModule mod_status.c>
     <Location /server-status>
         SetHandler server-status
         Order deny,allow
         Deny from all
-        Allow from .your_domain.com
+        Allow from .your-domain.com
     </Location>
 </IfModule>
 
 #
 # Allow remote server configuration reports, with the URL of
 #  http://servername/server-info (requires that mod_info.c be loaded).
-# Change the ".your_domain.com" to match your domain to enable.
+# Change the ".your-domain.com" to match your domain to enable.
 #
 <IfModule mod_info.c>
     <Location /server-info>
         SetHandler server-info
         Order deny,allow
         Deny from all
-        Allow from .your_domain.com
+        Allow from .your-domain.com
     </Location>
 </IfModule>
 
@@ -866,7 +866,7 @@ ServerSignature On
 #<Directory proxy:*>
 #    Order deny,allow
 #    Deny from all
-#    Allow from .your_domain.com
+#    Allow from .your-domain.com
 #</Directory>
 
 #
@@ -886,7 +886,7 @@ ServerSignature On
 #CacheMaxExpire 24
 #CacheLastModifiedFactor 0.1
 #CacheDefaultExpire 1
-#NoCache a_domain.com another_domain.edu joes.garage_sale.com
+#NoCache a-domain.com another-domain.edu joes.garage-sale.com
 
 #</IfModule>
 # End of proxy directives.
@@ -911,12 +911,12 @@ ServerSignature On
 # VirtualHost example:
 # Almost any Apache directive may go into a VirtualHost container.
 #
-#<VirtualHost ip.address.of.host.some_domain.com>
-#    ServerAdmin webmaster@host.some_domain.com
-#    DocumentRoot /www/docs/host.some_domain.com
-#    ServerName host.some_domain.com
-#    ErrorLog logs/host.some_domain.com-error_log
-#    CustomLog logs/host.some_domain.com-access_log common
+#<VirtualHost ip.address.of.host.some-domain.com>
+#    ServerAdmin webmaster@host.some-domain.com
+#    DocumentRoot /www/docs/host.some-domain.com
+#    ServerName host.some-domain.com
+#    ErrorLog logs/host.some-domain.com-error_log
+#    CustomLog logs/host.some-domain.com-access_log common
 #</VirtualHost>
 
 #<VirtualHost _default_:*>

diff --git a/conf/httpd.conf-dist-win b/conf/httpd.conf-dist-win
index 4f4ad92aa22566ae9ee93df28afc49c789e2b68e..d505b81ef9686137ea917ef0a45e1d9dc57a75a1 100644 (file)
--- a/conf/httpd.conf-dist-win
+++ b/conf/httpd.conf-dist-win
@@ -896,7 +896,7 @@ ServerSignature On
 #  N.B.: You can redirect to a script or a document using server-side-includes.
 #
 #    3) external redirects
-#ErrorDocument 402 http://some.other_server.com/subscription_info.html
+#ErrorDocument 402 http://some.other-server.com/subscription_info.html
 #  N.B.: Many of the environment variables associated with the original
 #  request will *not* be available to such a script.
 
@@ -993,7 +993,7 @@ ServerSignature On
 #    CacheMaxExpire 24
 #    CacheLastModifiedFactor 0.1
 #    CacheDefaultExpire 1
-#    NoCache a_domain.com another_domain.edu joes.garage_sale.com
+#    NoCache a-domain.com another-domain.edu joes.garage-sale.com
 
 #</IfModule>
 # End of proxy directives.