From: William A. Rowe Jr Date: Sat, 22 Dec 2001 18:25:57 +0000 (+0000) Subject: Already patched in the 2.0 tree - make all .conf's reflect the applicable X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85e4c4a809ae01ec312c828c42682671f54629d1;p=thirdparty%2Fapache%2Fhttpd.git 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 9a4fd87a2c4..94acd6207d4 100644 --- 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. # # # SetHandler server-status # Order deny,allow # Deny from all -# Allow from .your_domain.com +# Allow from .your-domain.com # # # 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. # # # SetHandler server-info # Order deny,allow # Deny from all -# Allow from .your_domain.com +# Allow from .your-domain.com # # @@ -928,7 +928,7 @@ ServerSignature On # # Order deny,allow # Deny from all -# Allow from .your_domain.com +# Allow from .your-domain.com # # @@ -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 # # End of proxy directives. diff --git a/conf/httpd.conf-dist-nw b/conf/httpd.conf-dist-nw index 609274e1c8a..27cb1f9c7cf 100644 --- 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. # SetHandler server-status Order deny,allow Deny from all - Allow from .your_domain.com + Allow from .your-domain.com # # 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. # SetHandler server-info Order deny,allow Deny from all - Allow from .your_domain.com + Allow from .your-domain.com @@ -866,7 +866,7 @@ ServerSignature On # # Order deny,allow # Deny from all -# Allow from .your_domain.com +# Allow from .your-domain.com # # @@ -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 # # End of proxy directives. @@ -911,12 +911,12 @@ ServerSignature On # VirtualHost example: # Almost any Apache directive may go into a VirtualHost container. # -# -# 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 +# +# 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 # # diff --git a/conf/httpd.conf-dist-win b/conf/httpd.conf-dist-win index 4f4ad92aa22..d505b81ef96 100644 --- 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 # # End of proxy directives.