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/trunk@100847 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/conf/httpd-std.conf.in b/docs/conf/httpd-std.conf.in
index ae06c53c701646d0c301b9a0211bdc6d66e73c72..82b25d887f068bdb68a36f5911e7183ebe09a8f4 100644 (file)
--- a/docs/conf/httpd-std.conf.in
+++ b/docs/conf/httpd-std.conf.in
@@ -274,7 +274,7 @@ Group #-1
 # e-mailed.  This address appears on some server-generated pages, such
 # as error documents.  e.g. admin@your-domain.com
 #
-ServerAdmin you@your.address
+ServerAdmin you@example.com
 
 #
 # ServerName gives the name and port that the server uses to identify itself.
@@ -288,7 +288,7 @@ ServerAdmin you@your.address
 # You will have to access it by its address anyway, and this will make 
 # redirections work in a sensible way.
 #
-#ServerName new.host.name:80
+#ServerName www.example.com:80
 
 #
 # UseCanonicalName: Determines how Apache constructs self-referencing 

diff --git a/docs/conf/ssl-std.conf.in b/docs/conf/ssl-std.conf.in
index 33d9a58254af5f21a7378d01af6b11b083092d21..a3056ca1f5a35f7e93a7eb818ef8af24f1393113 100644 (file)
--- a/docs/conf/ssl-std.conf.in
+++ b/docs/conf/ssl-std.conf.in
@@ -86,8 +86,8 @@ SSLRandomSeed connect builtin
 
 #  General setup for the virtual host
 DocumentRoot "@exp_htdocsdir@"
-ServerName new.host.name:443
-ServerAdmin you@your.address
+ServerName www.example.com:443
+ServerAdmin you@example.com
 ErrorLog @exp_logfiledir@/error_log
 TransferLog @exp_logfiledir@/access_log