Return-Path: 
 <cvs-return-12582-apmail-httpd-cvs-archive=httpd.apache.org@httpd.apache.org>
Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org
Received: (qmail 23053 invoked by uid 500); 22 Jul 2002 17:31:01 -0000
Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
list-help: <mailto:cvs-help@httpd.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@httpd.apache.org>
list-post: <mailto:cvs@httpd.apache.org>
Delivered-To: mailing list cvs@httpd.apache.org
Received: (qmail 23041 invoked by uid 500); 22 Jul 2002 17:31:01 -0000
Delivered-To: apmail-httpd-2.0-cvs@apache.org
Date: 22 Jul 2002 17:31:00 -0000
Message-ID: <20020722173100.67439.qmail@icarus.apache.org>
From: slive@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/docs/manual/mod core.xml core.html.en
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

slive       2002/07/22 10:31:00

  Modified:    docs/manual/mod core.xml core.html.en
  Log:
  Remove a paragraph from the UseCanonicalName defition that is not relevant now
  that Port is gone.
  
  PR: 11041
  
  Revision  Changes    Path
  1.20      +2 -10     httpd-2.0/docs/manual/mod/core.xml
  
  Index: core.xml
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/mod/core.xml,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -d -b -u -r1.19 -r1.20
  --- core.xml	9 Jul 2002 15:32:35 -0000	1.19
  +++ core.xml	22 Jul 2002 17:31:00 -0000	1.20
  @@ -2455,22 +2455,14 @@
   <context>directory</context></contextlist>
   
   <usage>
  -    <p>In many situations Apache has to construct a
  -    <em>self-referential</em> URL. That is, a URL which refers back to
  +    <p>In many situations Apache must construct a
  +    <em>self-referential</em> URL -- that is, a URL that refers back to
       the same server. With <code>UseCanonicalName on</code> Apache will
       use the hostname and port specified in the <directive
       module="core">ServerName</directive> directive to construct the canonical
       name for the server. This name is used in all self-referential
       URLs, and for the values of <code>SERVER_NAME</code> and
       <code>SERVER_PORT</code> in CGIs.</p>
  -
  -    <p>For example, if <directive>ServerName</directive> is set to
  -    <code>www.example.com</code> and <directive>Port</directive> is set
  -    to <code>9090</code>, then the <em>canonical name</em> of the server
  -    is <code>www.example.com:9090</code>. In the event that
  -    <directive>Port</directive> has its default value of
  -    <code>80</code>, the <code>:80</code> is ommitted from the
  -    <em>canonical name</em>.</p>
   
       <p>With <code>UseCanonicalName off</code> Apache will form
       self-referential URLs using the hostname and port supplied by
  
  
  
  1.13      +2 -10     httpd-2.0/docs/manual/mod/core.html.en
  
  Index: core.html.en
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/mod/core.html.en,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -d -b -u -r1.12 -r1.13
  --- core.html.en	10 Jul 2002 07:06:30 -0000	1.12
  +++ core.html.en	22 Jul 2002 17:31:00 -0000	1.13
  @@ -1686,21 +1686,13 @@
       the timer is not reset when a packet is sent. </p>
   <hr/><h2><a name="UseCanonicalName">UseCanonicalName</a> <a name="usecanonicalname">Directive</a></h2><table cellpadding="1" cellspacing="0" border="0" bgcolor="#cccccc"><tr><td><table bgcolor="#ffffff"><tr><td nowrap="nowrap"><strong>Description: </strong></td><td>Configures how the server determines its own name and
   port</td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Syntax" class="help">Syntax:</a></td><td>UseCanonicalName on|off|dns</td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Default" class="help">Default:</a></td><td><code>UseCanonicalName on</code></td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Context" class="help">Context:</a></td><td>server config, virtual host, directory</td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Status" class="help">Status:</a></td><td>Core</td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Module" class="help">Module:</a></td><td>core</td></tr></table></td></tr></table>
  -    <p>In many situations Apache has to construct a
  -    <em>self-referential</em> URL. That is, a URL which refers back to
  +    <p>In many situations Apache must construct a
  +    <em>self-referential</em> URL -- that is, a URL that refers back to
       the same server. With <code>UseCanonicalName on</code> Apache will
       use the hostname and port specified in the <a href="#servername" class="directive"><code class="directive">ServerName</code></a> directive to construct the canonical
       name for the server. This name is used in all self-referential
       URLs, and for the values of <code>SERVER_NAME</code> and
       <code>SERVER_PORT</code> in CGIs.</p>
  -
  -    <p>For example, if <code class="directive">ServerName</code> is set to
  -    <code>www.example.com</code> and <code class="directive">Port</code> is set
  -    to <code>9090</code>, then the <em>canonical name</em> of the server
  -    is <code>www.example.com:9090</code>. In the event that
  -    <code class="directive">Port</code> has its default value of
  -    <code>80</code>, the <code>:80</code> is ommitted from the
  -    <em>canonical name</em>.</p>
   
       <p>With <code>UseCanonicalName off</code> Apache will form
       self-referential URLs using the hostname and port supplied by