cvs commit: apache-1.3/htdocs/manual/mod core.html

[fanf]

fanf        99/11/16 04:16:21

  Modified:    htdocs/manual/mod core.html
  Log:
  explain how ServerName interacts with NameVirtualHost better
  
  Revision  Changes    Path
  1.156     +13 -3     apache-1.3/htdocs/manual/mod/core.html
  
  Index: core.html
  ===================================================================
  RCS file: /home/cvs/apache-1.3/htdocs/manual/mod/core.html,v
  retrieving revision 1.155
  retrieving revision 1.156
  diff -u -r1.155 -r1.156
  --- core.html 1999/08/15 06:55:48     1.155
  +++ core.html 1999/11/16 12:16:20     1.156
  @@ -2768,16 +2768,26 @@
    REL="Help"
   ><STRONG>Status:</STRONG></A> core<P>
   
  -The ServerName directive sets the hostname of the server; this is only
  +The ServerName directive sets the hostname of the server; this is
   used when creating redirection URLs. If it is not specified, then the
   server attempts to deduce it from its own IP address; however this may
   not work reliably, or may not return the preferred hostname. For example:
  -<BLOCKQUOTE><CODE>ServerName www.wibble.com</CODE></BLOCKQUOTE>
  +<BLOCKQUOTE><CODE>ServerName www.example.com</CODE></BLOCKQUOTE>
   would be used if the canonical (main) name of the actual machine
  -were <CODE>monster.wibble.com</CODE>.<P>
  +were <CODE>simple.example.com</CODE>.<P>
  +
  +If you are using <A HREF="../vhosts/name-based.html">name-based
  +virtual hosts</A>, the <CODE>ServerName</CODE> inside a
  +<A HREF="#virtualhost"><CODE>&lt;VirtualHost&gt;</CODE></A>
  +section specifies what hostname must appear in the request's
  +<CODE>Host:</CODE> header to match this virtual host.<P>
  +
   <P><STRONG>See Also</STRONG>:<BR>
   <A HREF="../dns-caveats.html">DNS Issues</A><BR>
  +<A HREF="../vhosts/index.html">Apache virtual host documentation</A><BR>
   <A HREF="#usecanonicalname">UseCanonicalName</A><BR>
  +<A HREF="#namevirtualhost">NameVirtualHost</A><BR>
  +<A HREF="#serveralias">ServerAlias</A><BR>
   </P>
   <HR>