From 40bed3a8328c419716df734e7be629881ef05d47 Mon Sep 17 00:00:00 2001
From: Astrid Malo elements
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97102 13f79535-47bb-0310-9956-ffa450edef68
---
docs/manual/vhosts/ip-based.html.en | 36 ++++++++++++------------
docs/manual/vhosts/ip-based.xml | 40 ++++++++++++---------------
docs/manual/vhosts/name-based.html.en | 26 ++++++++---------
docs/manual/vhosts/name-based.xml | 24 ++++++++--------
4 files changed, 60 insertions(+), 66 deletions(-)
diff --git a/docs/manual/vhosts/ip-based.html.en b/docs/manual/vhosts/ip-based.html.en
index c743967ed2..40a844d578 100644
--- a/docs/manual/vhosts/ip-based.html.en
+++ b/docs/manual/vhosts/ip-based.html.en
@@ -61,9 +61,9 @@
configuration file to select which IP address (or virtual host)
that daemon services. e.g.
++
Listen www.smallco.com:80 -
It is recommended that you use an IP address instead of a hostname (see DNS caveats).
@@ -78,23 +78,23 @@ configuration directives to different values for each virtual host. e.g. -- <VirtualHost www.smallco.com> - ServerAdmin webmaster@mail.smallco.com - DocumentRoot /groups/smallco/www - ServerName www.smallco.com - ErrorLog /groups/smallco/logs/error_log - TransferLog /groups/smallco/logs/access_log ++
+ <VirtualHost www.smallco.com>
+ ServerAdmin webmaster@mail.smallco.com
+ DocumentRoot /groups/smallco/www
+ ServerName www.smallco.com
+ ErrorLog /groups/smallco/logs/error_log
+ TransferLog /groups/smallco/logs/access_log
+ </VirtualHost>
+
+ <VirtualHost www.baygroup.org>
+ ServerAdmin webmaster@mail.baygroup.org
+ DocumentRoot /groups/baygroup/www
+ ServerName www.baygroup.org
+ ErrorLog /groups/baygroup/logs/error_log
+ TransferLog /groups/baygroup/logs/access_log
</VirtualHost> - - <VirtualHost www.baygroup.org> - ServerAdmin webmaster@mail.baygroup.org - DocumentRoot /groups/baygroup/www - ServerName www.baygroup.org - ErrorLog /groups/baygroup/logs/error_log - TransferLog /groups/baygroup/logs/access_log - </VirtualHost> -
It is recommended that you use an IP address instead of a hostname (see DNS caveats).
diff --git a/docs/manual/vhosts/ip-based.xml b/docs/manual/vhosts/ip-based.xml index a74ceead63..ea2958c313 100644 --- a/docs/manual/vhosts/ip-based.xml +++ b/docs/manual/vhosts/ip-based.xml @@ -76,11 +76,9 @@ configuration file to select which IP address (or virtual host) that daemon services. e.g. -+-Listen www.smallco.com:80 -
It is recommended that you use an IP address instead of a hostname (see DNS caveats).
@@ -103,25 +101,23 @@ configuration directives to different values for each virtual host. e.g. -- <VirtualHost www.smallco.com> - ServerAdmin webmaster@mail.smallco.com - DocumentRoot /groups/smallco/www - ServerName www.smallco.com - ErrorLog /groups/smallco/logs/error_log - TransferLog /groups/smallco/logs/access_log +-+ <VirtualHost www.smallco.com>
+ ServerAdmin webmaster@mail.smallco.com
+ DocumentRoot /groups/smallco/www
+ ServerName www.smallco.com
+ ErrorLog /groups/smallco/logs/error_log
+ TransferLog /groups/smallco/logs/access_log
+ </VirtualHost>
+
+ <VirtualHost www.baygroup.org>
+ ServerAdmin webmaster@mail.baygroup.org
+ DocumentRoot /groups/baygroup/www
+ ServerName www.baygroup.org
+ ErrorLog /groups/baygroup/logs/error_log
+ TransferLog /groups/baygroup/logs/access_log
</VirtualHost> - - <VirtualHost www.baygroup.org> - ServerAdmin webmaster@mail.baygroup.org - DocumentRoot /groups/baygroup/www - ServerName www.baygroup.org - ErrorLog /groups/baygroup/logs/error_log - TransferLog /groups/baygroup/logs/access_log - </VirtualHost> -
It is recommended that you use an IP address instead of a hostname (see DNS caveats).
diff --git a/docs/manual/vhosts/name-based.html.en b/docs/manual/vhosts/name-based.html.en index bd622d0cba..32004767dd 100644 --- a/docs/manual/vhosts/name-based.html.en +++ b/docs/manual/vhosts/name-based.html.en @@ -82,19 +82,19 @@www.otherdomain.tld
, which points at the same IP address.
Then you simply add the following to httpd.conf
:
- - NameVirtualHost * - - <VirtualHost *> - ServerName www.domain.tld - DocumentRoot /www/domain - </VirtualHost> - - <VirtualHost *> - ServerName www.otherdomain.tld - DocumentRoot /www/otherdomain - </VirtualHost> -
+ NameVirtualHost *
+
+ <VirtualHost *>
+ ServerName www.domain.tld
+ DocumentRoot /www/domain
+ </VirtualHost>
+
+ <VirtualHost *>
+ ServerName www.otherdomain.tld
+ DocumentRoot /www/otherdomain
+ </VirtualHost>
+
You can alternatively specify an explicit IP address in place of
the * in both the NameVirtualHost
and
diff --git a/docs/manual/vhosts/name-based.xml b/docs/manual/vhosts/name-based.xml
index 6cc9a1f7e5..41e1b1f24a 100644
--- a/docs/manual/vhosts/name-based.xml
+++ b/docs/manual/vhosts/name-based.xml
@@ -112,19 +112,17 @@
Then you simply add the following to httpd.conf
:
- NameVirtualHost * - - <VirtualHost *> - ServerName www.domain.tld - DocumentRoot /www/domain - </VirtualHost> - - <VirtualHost *> - ServerName www.otherdomain.tld - DocumentRoot /www/otherdomain - </VirtualHost> -+ NameVirtualHost *
You can alternatively specify an explicit IP address in place of -- 2.40.0