From: William A. Rowe Jr <wrowe@apache.org>
Date: Fri, 18 May 2001 04:29:17 +0000 (+0000)
Subject:   Time to loose a second copy of this from the installer directory, these
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2fcabfd11fb9f3e0e2d13950761e7a8ed28c304c;p=thirdparty%2Fapache%2Fhttpd.git

  Time to loose a second copy of this from the installer directory, these
  variables seem here to stay.


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

diff --git a/conf/httpd.conf-dist-win b/conf/httpd.conf-dist-win
index 5934a08f93e..436fd610ec5 100644
--- a/conf/httpd.conf-dist-win
+++ b/conf/httpd.conf-dist-win
@@ -234,7 +234,7 @@ Port 80
 # e-mailed.  This address appears on some server-generated pages, such
 # as error documents.
 #
-ServerAdmin you@your.address
+ServerAdmin @@ServerAdmin@@
 
 #
 # ServerName allows you to set a host name which is sent back to clients for
@@ -252,7 +252,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 @@ServerName@@
 
 
 #
@@ -877,25 +877,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 "@@Domain@@" 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 @@Domain@@
 #</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 "@@Domain@@" 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 @@Domain@@
 #</Location>
 
 #
@@ -920,7 +920,7 @@ ServerSignature On
 #    <Directory proxy:*>
 #        Order deny,allow
 #        Deny from all
-#        Allow from .your_domain.com
+#        Allow from @@Domain@@
 #    </Directory>
 
     #