From: André Malo Date: Wed, 8 Sep 2004 10:34:28 +0000 (+0000) Subject: update transformation X-Git-Tag: 2.1.1~331 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7308039ec49c71d861371ab522e53a4db8dca6d;p=thirdparty%2Fapache%2Fhttpd.git update transformation git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105030 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/vhosts/examples.html.en b/docs/manual/vhosts/examples.html.en index d715d073658..7bd139c84e8 100644 --- a/docs/manual/vhosts/examples.html.en +++ b/docs/manual/vhosts/examples.html.en @@ -58,7 +58,7 @@

Your server has a single IP address, and multiple aliases (CNAMES) point to this machine in DNS. You want to run a web server for - www.example1.com and www.example2.org on this + www.example.com and www.example.org on this machine.

Note

Creating virtual @@ -83,7 +83,7 @@ <VirtualHost *:80>
DocumentRoot /www/example1
- ServerName www.example1.com
+ ServerName www.example.com

# Other directives here

@@ -93,7 +93,7 @@ <VirtualHost *:80>
DocumentRoot /www/example2
- ServerName www.example2.org
+ ServerName www.example.org

# Other directives here

@@ -102,7 +102,7 @@

The asterisks match all addresses, so the main server serves no - requests. Due to the fact that www.example1.com is first + requests. Due to the fact that www.example.com is first in the configuration file, it has the highest priority and can be seen as the default or primary server. That means that if a request is received that does not match one of the specified @@ -168,7 +168,7 @@ <VirtualHost 172.20.30.50>
DocumentRoot /www/example1
- ServerName www.example1.com
+ ServerName www.example.com

# Other directives here ...

@@ -178,7 +178,7 @@ <VirtualHost 172.20.30.50>
DocumentRoot /www/example2
- ServerName www.example2.org
+ ServerName www.example.org

# Other directives here ...

@@ -189,7 +189,7 @@

Any request to an address other than 172.20.30.50 will be served from the main server. A request to 172.20.30.50 with an unknown hostname, or no Host: header, will be served from - www.example1.com.

+ www.example.com.

top
@@ -260,28 +260,28 @@
<VirtualHost 172.20.30.40:80>
- ServerName www.example1.com
+ ServerName www.example.com
DocumentRoot /www/domain-80
 </VirtualHost>

<VirtualHost 172.20.30.40:8080>
- ServerName www.example1.com
+ ServerName www.example.com
DocumentRoot /www/domain-8080
 </VirtualHost>

<VirtualHost 172.20.30.40:80>
- ServerName www.example2.org
+ ServerName www.example.org
DocumentRoot /www/otherdomain-80
 </VirtualHost>

<VirtualHost 172.20.30.40:8080>
- ServerName www.example2.org
+ ServerName www.example.org
DocumentRoot /www/otherdomain-8080
 </VirtualHost> @@ -293,7 +293,7 @@

The server has two IP addresses (172.20.30.40 and 172.20.30.50) which resolve to the names - www.example1.com and www.example2.org + www.example.com and www.example.org respectively.

Server configuration

@@ -304,14 +304,14 @@ <VirtualHost 172.20.30.40>
DocumentRoot /www/example1
- ServerName www.example1.com
+ ServerName www.example.com
 </VirtualHost>

<VirtualHost 172.20.30.50>
DocumentRoot /www/example2
- ServerName www.example2.org
+ ServerName www.example.org
 </VirtualHost>

@@ -328,7 +328,7 @@

The server machine has two IP addresses (172.20.30.40 and 172.20.30.50) which resolve to the names - www.example1.com and www.example2.org + www.example.com and www.example.org respectively. In each case, we want to run hosts on ports 80 and 8080.

@@ -343,28 +343,28 @@ <VirtualHost 172.20.30.40:80>
DocumentRoot /www/example1-80
- ServerName www.example1.com
+ ServerName www.example.com
 </VirtualHost>

<VirtualHost 172.20.30.40:8080>
DocumentRoot /www/example1-8080
- ServerName www.example1.com
+ ServerName www.example.com
 </VirtualHost>

<VirtualHost 172.20.30.50:80>
DocumentRoot /www/example2-80
- ServerName www.example1.org
+ ServerName www.example.org
 </VirtualHost>

<VirtualHost 172.20.30.50:8080>
DocumentRoot /www/example2-8080
- ServerName www.example2.org
+ ServerName www.example.org
 </VirtualHost>

@@ -387,14 +387,14 @@ <VirtualHost 172.20.30.40>
DocumentRoot /www/example1
- ServerName www.example1.com
+ ServerName www.example.com
 </VirtualHost>

<VirtualHost 172.20.30.40>
DocumentRoot /www/example2
- ServerName www.example2.org
+ ServerName www.example.org
 </VirtualHost>

@@ -513,7 +513,7 @@ IP-based vhost

The name-based vhost with the hostname - www.example2.org (from our name-based example, setup 2) should get its own IP + www.example.org (from our name-based example, setup 2) should get its own IP address. To avoid problems with name servers or proxies who cached the old IP address for the name-based vhost we want to provide both variants during a migration phase.
@@ -525,7 +525,7 @@ Listen 80
- ServerName www.example1.com
+ ServerName www.example.com
DocumentRoot /www/example1

NameVirtualHost 172.20.30.40
@@ -533,7 +533,7 @@ <VirtualHost 172.20.30.40 172.20.30.50>
DocumentRoot /www/example2
- ServerName www.example2.org
+ ServerName www.example.org
# ...
 </VirtualHost>
@@ -541,8 +541,8 @@ <VirtualHost 172.20.30.40>
DocumentRoot /www/example3
- ServerName www.example3.net
- ServerAlias *.example3.net
+ ServerName www.example.net
+ ServerAlias *.example.net
# ...
 </VirtualHost> diff --git a/docs/manual/vhosts/examples.xml.ko b/docs/manual/vhosts/examples.xml.ko index 1b3868cc69a..dab4f1ba06c 100644 --- a/docs/manual/vhosts/examples.xml.ko +++ b/docs/manual/vhosts/examples.xml.ko @@ -1,7 +1,7 @@ - +