Return-Path: Delivered-To: apmail-apache-cvs-archive@apache.org Received: (qmail 16851 invoked by uid 500); 13 Sep 2000 18:19:52 -0000 Mailing-List: contact apache-cvs-help@apache.org; run by ezmlm Precedence: bulk X-No-Archive: yes Reply-To: new-httpd@apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list apache-cvs@apache.org Received: (qmail 16695 invoked by uid 500); 13 Sep 2000 18:19:29 -0000 Delivered-To: apmail-apache-2.0-cvs@apache.org Date: 13 Sep 2000 18:19:23 -0000 Message-ID: <20000913181923.16575.qmail@locus.apache.org> From: fanf@locus.apache.org To: apache-2.0-cvs@apache.org Subject: cvs commit: apache-2.0/conf httpd.conf-dist httpd.conf-dist-win fanf 00/09/13 11:19:20 Modified: conf httpd.conf-dist httpd.conf-dist-win Log: Encourage people to use the simpler NameVirtualHost * syntax for new setups and use a syntactically valid hostname in the example. Revision Changes Path 1.16 +15 -14 apache-2.0/conf/httpd.conf-dist Index: httpd.conf-dist =================================================================== RCS file: /home/cvs/apache-2.0/conf/httpd.conf-dist,v retrieving revision 1.15 retrieving revision 1.16 diff -u -u -r1.15 -r1.16 --- httpd.conf-dist 2000/08/28 14:39:03 1.15 +++ httpd.conf-dist 2000/09/13 18:19:16 1.16 @@ -909,30 +909,31 @@ ### Section 3: Virtual Hosts # # VirtualHost: If you want to maintain multiple domains/hostnames on your -# machine you can setup VirtualHost containers for them. +# machine you can setup VirtualHost containers for them. Most configurations +# use only name-based virtual hosts so the server doesn't need to worry about +# IP addresses. This is indicated by the asterisks in the directives below. +# # Please see the documentation at # for further details before you try to setup virtual hosts. +# # You may use the command line option '-S' to verify your virtual host # configuration. # -# If you want to use name-based virtual hosts you need to define at -# least one IP address (and port number) for them. +# Use name-based virtual hosting. # -#NameVirtualHost 12.34.56.78:80 -#NameVirtualHost 12.34.56.78 +#NameVirtualHost * # # VirtualHost example: # Almost any Apache directive may go into a VirtualHost container. +# The first VirtualHost section is used for requests without a known +# server name. # -# -# 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@dummy-host.example.com +# DocumentRoot /www/docs/dummy-host.example.com +# ServerName dummy-host.example.com +# ErrorLog logs/dummy-host.example.com-error_log +# CustomLog logs/dummy-host.example.com-access_log common # 1.12 +15 -14 apache-2.0/conf/httpd.conf-dist-win Index: httpd.conf-dist-win =================================================================== RCS file: /home/cvs/apache-2.0/conf/httpd.conf-dist-win,v retrieving revision 1.11 retrieving revision 1.12 diff -u -u -r1.11 -r1.12 --- httpd.conf-dist-win 2000/08/28 14:39:05 1.11 +++ httpd.conf-dist-win 2000/09/13 18:19:17 1.12 @@ -824,30 +824,31 @@ ### Section 3: Virtual Hosts # # VirtualHost: If you want to maintain multiple domains/hostnames on your -# machine you can setup VirtualHost containers for them. +# machine you can setup VirtualHost containers for them. Most configurations +# use only name-based virtual hosts so the server doesn't need to worry about +# IP addresses. This is indicated by the asterisks in the directives below. +# # Please see the documentation at # for further details before you try to setup virtual hosts. +# # You may use the command line option '-S' to verify your virtual host # configuration. # -# If you want to use name-based virtual hosts you need to define at -# least one IP address (and port number) for them. +# Use name-based virtual hosting. # -#NameVirtualHost 12.34.56.78:80 -#NameVirtualHost 12.34.56.78 +#NameVirtualHost * # # VirtualHost example: # Almost any Apache directive may go into a VirtualHost container. +# The first VirtualHost section is used for requests without a known +# server name. # -# -# 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@dummy-host.example.com +# DocumentRoot /www/docs/dummy-host.example.com +# ServerName dummy-host.example.com +# ErrorLog logs/dummy-host.example.com-error_log +# CustomLog logs/dummy-host.example.com-access_log common #