Standardize on example.com names, never bogus your-server.name style

  entries.  Roy attacked this recently, but apparently there are some
  holdovers or reversions to this policy.

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

diff --git a/conf/httpd.conf-dist b/conf/httpd.conf-dist
index f517ca56a5cdc9eb497e998d1b0375edc05398e8..30ff2750a44cdfa3969ff5c4e734b201570c85f3 100644 (file)
--- a/conf/httpd.conf-dist
+++ b/conf/httpd.conf-dist
@@ -269,7 +269,7 @@ ServerAdmin you@your.address
 # machine always knows itself by this address. If you use Apache strictly for 
 # local testing and development, you may use 127.0.0.1 as the server name.
 #
-#ServerName new.host.name
+#ServerName www.example.com
 
 #
 # DocumentRoot: The directory out of which you will serve your
@@ -840,7 +840,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://www.example.com/subscription_info.html
 #  N.B.: Many of the environment variables associated with the original
 #  request will *not* be available to such a script.
 
@@ -874,25 +874,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 ".example.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 .example.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 ".example.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 .example.com
 #</Location>
 
 #

diff --git a/conf/httpd.conf-dist-nw b/conf/httpd.conf-dist-nw
index b0a89e716a6f627097e8c03e6c391b6d13c2a3e5..94d3d01a09110d8dc4f1823a157a88d2098d68bf 100644 (file)
--- a/conf/httpd.conf-dist-nw
+++ b/conf/httpd.conf-dist-nw
@@ -215,7 +215,7 @@ Port 80
 # e-mailed.  This address appears on some server-generated pages, such
 # as error documents.
 #
-ServerAdmin someone@somewhere.com
+ServerAdmin you@example.com
 
 #
 # ServerName allows you to set a host name which is sent back to clients for
@@ -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://www.example.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 ".example.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 .example.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 ".example.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 .example.com
     </Location>
 </IfModule>
 
@@ -876,12 +876,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.example.com>
+#    ServerAdmin webmaster@host.example.com
+#    DocumentRoot /www/docs/host.example.com
+#    ServerName host.example.com
+#    ErrorLog logs/host.example.com-error_log
+#    CustomLog logs/host.example.com-access_log common
 #</VirtualHost>
 
 #<VirtualHost _default_:*>

diff --git a/conf/httpd.conf-dist-win b/conf/httpd.conf-dist-win
index 264c5da7fcf87f2c6125ef72f8029a6804881fe7..e3dd1b4006461a5efe23591b05c15514c9e8c463 100644 (file)
--- a/conf/httpd.conf-dist-win
+++ b/conf/httpd.conf-dist-win
@@ -886,7 +886,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://www.example.com/subscription_info.html
 #  N.B.: Many of the environment variables associated with the original
 #  request will *not* be available to such a script.