From: William A. Rowe Jr <wrowe@apache.org>
Date: Tue, 29 Jul 2003 20:17:07 +0000 (+0000)
Subject:   Standardize on example.com names, never bogus your-server.name style
X-Git-Tag: pre_ajp_proxy~1326
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ad23e61d7371bc8a49de66b952ef064eb6fd74dd;p=apache

  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 ae06c53c70..82b25d887f 100644
--- 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 33d9a58254..a3056ca1f5 100644
--- 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