You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ke...@apache.org on 2002/10/04 17:29:17 UTC
cvs commit: httpd-2.0/docs/manual/vhosts ip-based.html.en ip-based.xml name-based.html.en name-based.xml
kess 2002/10/04 08:29:16
Modified: docs/manual/vhosts ip-based.html.en ip-based.xml
name-based.html.en name-based.xml
Log:
Ugh, I forgot some <pre> elements
Revision Changes Path
1.2 +18 -18 httpd-2.0/docs/manual/vhosts/ip-based.html.en
Index: ip-based.html.en
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/vhosts/ip-based.html.en,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ip-based.html.en 4 Oct 2002 15:12:04 -0000 1.1
+++ ip-based.html.en 4 Oct 2002 15:29:16 -0000 1.2
@@ -61,9 +61,9 @@
configuration file to select which IP address (or virtual host)
that daemon services. e.g.</p>
-<div class="example"><pre>
+ <div class="example"><p><code>
Listen www.smallco.com:80
-</pre></div>
+ </code></p></div>
<p>It is recommended that you use an IP address instead of a
hostname (see <a href="../dns-caveats.html">DNS caveats</a>).</p>
@@ -78,23 +78,23 @@
configuration directives to different values for each virtual
host. e.g.</p>
-<div class="example"><pre>
- <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
+ <div class="example"><p><code>
+ <VirtualHost www.smallco.com><br />
+ ServerAdmin webmaster@mail.smallco.com<br />
+ DocumentRoot /groups/smallco/www<br />
+ ServerName www.smallco.com<br />
+ ErrorLog /groups/smallco/logs/error_log<br />
+ TransferLog /groups/smallco/logs/access_log<br />
+ </VirtualHost><br />
+ <br />
+ <VirtualHost www.baygroup.org><br />
+ ServerAdmin webmaster@mail.baygroup.org<br />
+ DocumentRoot /groups/baygroup/www<br />
+ ServerName www.baygroup.org<br />
+ ErrorLog /groups/baygroup/logs/error_log<br />
+ TransferLog /groups/baygroup/logs/access_log<br />
</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>
-</pre></div>
+ </code></p></div>
<p>It is recommended that you use an IP address instead of a
hostname (see <a href="../dns-caveats.html">DNS caveats</a>).</p>
1.2 +18 -22 httpd-2.0/docs/manual/vhosts/ip-based.xml
Index: ip-based.xml
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/vhosts/ip-based.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ip-based.xml 4 Oct 2002 15:12:04 -0000 1.1
+++ ip-based.xml 4 Oct 2002 15:29:16 -0000 1.2
@@ -76,11 +76,9 @@
configuration file to select which IP address (or virtual host)
that daemon services. e.g.</p>
-<example>
-<pre>
+ <example>
Listen www.smallco.com:80
-</pre>
-</example>
+ </example>
<p>It is recommended that you use an IP address instead of a
hostname (see <a href="../dns-caveats.html">DNS caveats</a>).</p>
@@ -103,25 +101,23 @@
configuration directives to different values for each virtual
host. e.g.</p>
-<example>
-<pre>
- <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
+ <example>
+ <VirtualHost www.smallco.com><br />
+ ServerAdmin webmaster@mail.smallco.com<br />
+ DocumentRoot /groups/smallco/www<br />
+ ServerName www.smallco.com<br />
+ ErrorLog /groups/smallco/logs/error_log<br />
+ TransferLog /groups/smallco/logs/access_log<br />
+ </VirtualHost><br />
+ <br />
+ <VirtualHost www.baygroup.org><br />
+ ServerAdmin webmaster@mail.baygroup.org<br />
+ DocumentRoot /groups/baygroup/www<br />
+ ServerName www.baygroup.org<br />
+ ErrorLog /groups/baygroup/logs/error_log<br />
+ TransferLog /groups/baygroup/logs/access_log<br />
</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>
-</pre>
-</example>
+ </example>
<p>It is recommended that you use an IP address instead of a
hostname (see <a href="../dns-caveats.html">DNS caveats</a>).</p>
1.20 +13 -13 httpd-2.0/docs/manual/vhosts/name-based.html.en
Index: name-based.html.en
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/vhosts/name-based.html.en,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- name-based.html.en 4 Oct 2002 15:09:47 -0000 1.19
+++ name-based.html.en 4 Oct 2002 15:29:16 -0000 1.20
@@ -82,19 +82,19 @@
<code>www.otherdomain.tld</code>, which points at the same IP address.
Then you simply add the following to <code>httpd.conf</code>:</p>
- <div class="example"><pre>
- NameVirtualHost *
-
- <VirtualHost *>
- ServerName www.domain.tld
- DocumentRoot /www/domain
- </VirtualHost>
-
- <VirtualHost *>
- ServerName www.otherdomain.tld
- DocumentRoot /www/otherdomain
- </VirtualHost>
-</pre></div>
+ <div class="example"><p><code>
+ NameVirtualHost *<br />
+ <br />
+ <VirtualHost *><br />
+ ServerName www.domain.tld<br />
+ DocumentRoot /www/domain<br />
+ </VirtualHost><br />
+ <br />
+ <VirtualHost *><br />
+ ServerName www.otherdomain.tld<br />
+ DocumentRoot /www/otherdomain<br />
+ </VirtualHost><br />
+ </code></p></div>
<p>You can alternatively specify an explicit IP address in place of
the * in both the <code>NameVirtualHost</code> and
1.2 +11 -13 httpd-2.0/docs/manual/vhosts/name-based.xml
Index: name-based.xml
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/vhosts/name-based.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- name-based.xml 4 Oct 2002 15:12:04 -0000 1.1
+++ name-based.xml 4 Oct 2002 15:29:16 -0000 1.2
@@ -112,19 +112,17 @@
Then you simply add the following to <code>httpd.conf</code>:</p>
<example>
-<pre>
- NameVirtualHost *
-
- <VirtualHost *>
- ServerName www.domain.tld
- DocumentRoot /www/domain
- </VirtualHost>
-
- <VirtualHost *>
- ServerName www.otherdomain.tld
- DocumentRoot /www/otherdomain
- </VirtualHost>
-</pre>
+ NameVirtualHost *<br />
+ <br />
+ <VirtualHost *><br />
+ ServerName www.domain.tld<br />
+ DocumentRoot /www/domain<br />
+ </VirtualHost><br />
+ <br />
+ <VirtualHost *><br />
+ ServerName www.otherdomain.tld<br />
+ DocumentRoot /www/otherdomain<br />
+ </VirtualHost><br />
</example>
<p>You can alternatively specify an explicit IP address in place of