From: Lars Eilebrecht <lars@apache.org>
Date: Sun, 14 Feb 1999 14:26:49 +0000 (+0000)
Subject: fix/enhancement
X-Git-Tag: 1.3.5~21
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=a415f220d45a3261cbf0557a5ea7d6341aa3949e;p=thirdparty%2Fapache%2Fhttpd.git

fix/enhancement

PR: 3745
Submitted by: Roger Pack <roger.pack@juno.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@82804 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/vhosts/details.html b/docs/manual/vhosts/details.html
index 8a69668b7a9..f14bd088a5b 100644
--- a/docs/manual/vhosts/details.html
+++ b/docs/manual/vhosts/details.html
@@ -126,7 +126,7 @@ set.  Note that subsequent <CODE>Port</CODE> statements for this vhost will not
 affect the ports assigned in the address set.
 
 <P>During initialization a list for each IP address
-is generated an inserted into an hash table. If the IP address is
+is generated and inserted into an hash table. If the IP address is
 used in a <CODE>NameVirtualHost</CODE> directive the list contains
 all name-based vhosts for the given IP address. If there are no
 vhosts defined for that address the <CODE>NameVirtualHost</CODE> directive
diff --git a/docs/manual/vhosts/name-based.html b/docs/manual/vhosts/name-based.html
index 879e1ed73d1..238cf5c7211 100644
--- a/docs/manual/vhosts/name-based.html
+++ b/docs/manual/vhosts/name-based.html
@@ -107,15 +107,18 @@ For example, if local users are
 familiar with typing "www" or "www.foobar" then you will need to add
 <CODE>ServerAlias www www.foobar</CODE>.  It isn't possible for the
 server to know what domain the client uses for their name resolution
-because the client doesn't provide that information in the request.</P>
+because the client doesn't provide that information in the request.
+The <CODE>ServerAlias</CODE> directive is generally a way to have different
+hostnames pointing to the same virtual host.
+</P>
 
 <H2>Compatibility with Older Browsers</H2>
 
 <P>As mentioned earlier, there are still some clients in use who
 do not send the required data for the name-based virtual hosts to work
 properly. These clients will always be sent the pages from the
-<CITE>primary</CITE> name-based virtual host (the first virtual host
-appearing in the configuration file for a specific IP address).</P>
+first virtual host listed for that IP address (the
+<CITE>primary</CITE> name-based virtual host).</P>
 
 <P>There is a possible workaround with the
 <A HREF="../mod/core.html#serverpath"><CODE>ServerPath</CODE></A>
diff --git a/docs/manual/vhosts/name-based.html.en b/docs/manual/vhosts/name-based.html.en
index 879e1ed73d1..238cf5c7211 100644
--- a/docs/manual/vhosts/name-based.html.en
+++ b/docs/manual/vhosts/name-based.html.en
@@ -107,15 +107,18 @@ For example, if local users are
 familiar with typing "www" or "www.foobar" then you will need to add
 <CODE>ServerAlias www www.foobar</CODE>.  It isn't possible for the
 server to know what domain the client uses for their name resolution
-because the client doesn't provide that information in the request.</P>
+because the client doesn't provide that information in the request.
+The <CODE>ServerAlias</CODE> directive is generally a way to have different
+hostnames pointing to the same virtual host.
+</P>
 
 <H2>Compatibility with Older Browsers</H2>
 
 <P>As mentioned earlier, there are still some clients in use who
 do not send the required data for the name-based virtual hosts to work
 properly. These clients will always be sent the pages from the
-<CITE>primary</CITE> name-based virtual host (the first virtual host
-appearing in the configuration file for a specific IP address).</P>
+first virtual host listed for that IP address (the
+<CITE>primary</CITE> name-based virtual host).</P>
 
 <P>There is a possible workaround with the
 <A HREF="../mod/core.html#serverpath"><CODE>ServerPath</CODE></A>