Commit f9318354 authored by Jeff Trawick's avatar Jeff Trawick
Browse files

backport this from 2.1-dev: 

fix various mispellings and style problems

  PR:            28732
  Submitted by:  Ville Skytt� <ville.skytta iki.fi>
  Reviewed by:   Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@103616 13f79535-47bb-0310-9956-ffa450edef68
parent 75390f07

docs/manual/mod/core.html.en

+9 −8
Changes for docs/manual/mod/core.html.en: 9 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -279,14 +279,14 @@ response without an explicit character set</td></tr> 


    <div class="warning"><h3>Note</h3>

      <p>Enabling filters with <code class="directive">AddOutputFilterByType</code>

      may fail partially or completely in some cases. For expample, no

      may fail partially or completely in some cases. For example, no

      filters are applied if the MIME-type could not be determined  and falls

      back to the <code class="directive"><a href="#defaulttype">DefaultType</a></code> setting,

      even if the <code class="directive"><a href="#defaulttype">DefaultType</a></code> is the

      same.</p>



      <p>However, if you want to make sure, that the filters will be

      applied, assign the content type to a resource explicitely, for

      applied, assign the content type to a resource explicitly, for

      example with <code class="directive"><a href="../mod/mod_mime.html#addtype">AddType</a></code> or

      <code class="directive"><a href="#forcetype">ForceType</a></code>. Setting the

      content type within a (non-nph) CGI script is also safe.</p>
@@ -323,7 +323,7 @@ be passed through</td></tr> 


    <div class="note"><h3>Note</h3>

      <p>Allowing encoded slashes does <em>not</em> imply <em>decoding</em>.

      Occurences of <code>%2F</code> or <code>%5C</code> (<em>only</em> on

      Occurrences of <code>%2F</code> or <code>%5C</code> (<em>only</em> on

      according systems) will be left as such in the otherwise decoded URL

      string.</p>

    </div>
@@ -857,7 +857,7 @@ Location</a></li> 
    static file -- Apache uses sendfile to deliver the file contents

    without ever reading the file if the OS supports it.</p>



    <p>This sendfile mechanism avoids seperate read and send operations,

    <p>This sendfile mechanism avoids separate read and send operations,

    and buffer allocations. But on some platforms or within some

    filesystems, it is better to disable this feature to avoid

    operational problems:</p>
@@ -960,7 +960,7 @@ in case of an error</td></tr> 
    the type of error, but in general, if you make your error document

    greater than 512 bytes, then MSIE will show the server-generated

    error rather than masking it.  More information is available in

    Microsoft Knowledgebase article <a href="http://support.microsoft.com/default.aspx?scid=kb;en-us;Q294807">Q294807</a>.</p>

    Microsoft Knowledge Base article <a href="http://support.microsoft.com/default.aspx?scid=kb;en-us;Q294807">Q294807</a>.</p>



    <p>Prior to version 2.0, messages were indicated by prefixing

    them with a single unmatched double quote character.</p>
@@ -1223,7 +1223,7 @@ MIME content-type</td></tr> 
    logged (and passed to CGIs/SSIs in <code>REMOTE_HOST</code>).

    The value <code>Double</code> refers to doing double-reverse

    DNS lookup. That is, after a reverse lookup is performed, a forward

    lookup is then performed on that result. At least one of the ip

    lookup is then performed on that result. At least one of the IP

    addresses in the forward lookup must match the original

    address. (In "tcpwrappers" terminology this is called

    <code>PARANOID</code>.)</p>
@@ -2109,7 +2109,7 @@ hosting</td></tr> 
    <div class="note"><h3>Note</h3>

      <p>Note, that the "main server" and any <code>_default_</code> servers

      will <strong>never</strong> be served for a request to a

      <code class="directive">NameVirtualHost</code> IP Address (unless for some

      <code class="directive">NameVirtualHost</code> IP address (unless for some

      reason you specify <code class="directive">NameVirtualHost</code> but then

      don't define any <code class="directive">VirtualHost</code>s for that

      address).</p>
@@ -2656,7 +2656,8 @@ itself</td></tr> 
    <p>If no <code class="directive">ServerName</code> is specified, then the

    server attempts to deduce the hostname by performing a reverse

    lookup on the IP address. If no port is specified in the

    servername, then the server will use the port from the incoming

    <code class="directive">ServerName</code>, then the server will use the port

    from the incoming

    request. For optimal reliability and predictability, you should

    specify an explicit hostname and port using the

    <code class="directive">ServerName</code> directive.</p>

docs/manual/mod/core.xml

+10 −9
Changes for docs/manual/mod/core.xml: 10 added lines, 9 removed lines.
Original line number Diff line number Diff line 
<?xml version="1.0"?>

<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">

<?xml-stylesheet type="text/xsl" href="../style/manual.en.xsl"?>

<!-- $Revision: 1.46.2.35 $ -->

<!-- $Revision: 1.46.2.36 $ -->



<!--

 Copyright 2002-2004 The Apache Software Foundation
@@ -213,14 +213,14 @@ response without an explicit character set</description> 


    <note type="warning"><title>Note</title>

      <p>Enabling filters with <directive>AddOutputFilterByType</directive>

      may fail partially or completely in some cases. For expample, no

      may fail partially or completely in some cases. For example, no

      filters are applied if the MIME-type could not be determined  and falls

      back to the <directive module="core">DefaultType</directive> setting,

      even if the <directive module="core">DefaultType</directive> is the

      same.</p>



      <p>However, if you want to make sure, that the filters will be

      applied, assign the content type to a resource explicitely, for

      applied, assign the content type to a resource explicitly, for

      example with <directive module="mod_mime">AddType</directive> or

      <directive module="core">ForceType</directive>. Setting the

      content type within a (non-nph) CGI script is also safe.</p>
@@ -255,7 +255,7 @@ be passed through</description> 


    <note><title>Note</title>

      <p>Allowing encoded slashes does <em>not</em> imply <em>decoding</em>.

      Occurences of <code>%2F</code> or <code>%5C</code> (<em>only</em> on

      Occurrences of <code>%2F</code> or <code>%5C</code> (<em>only</em> on

      according systems) will be left as such in the otherwise decoded URL

      string.</p>

    </note>
@@ -810,7 +810,7 @@ Location</a></seealso> 
    static file -- Apache uses sendfile to deliver the file contents

    without ever reading the file if the OS supports it.</p>



    <p>This sendfile mechanism avoids seperate read and send operations,

    <p>This sendfile mechanism avoids separate read and send operations,

    and buffer allocations. But on some platforms or within some

    filesystems, it is better to disable this feature to avoid

    operational problems:</p>
@@ -915,7 +915,7 @@ in case of an error</description> 
    the type of error, but in general, if you make your error document

    greater than 512 bytes, then MSIE will show the server-generated

    error rather than masking it.  More information is available in

    Microsoft Knowledgebase article <a

    Microsoft Knowledge Base article <a

    href="http://support.microsoft.com/default.aspx?scid=kb;en-us;Q294807"

    >Q294807</a>.</p>
@@ -1182,7 +1182,7 @@ MIME content-type</description> 
    logged (and passed to CGIs/SSIs in <code>REMOTE_HOST</code>).

    The value <code>Double</code> refers to doing double-reverse

    DNS lookup. That is, after a reverse lookup is performed, a forward

    lookup is then performed on that result. At least one of the ip

    lookup is then performed on that result. At least one of the IP

    addresses in the forward lookup must match the original

    address. (In "tcpwrappers" terminology this is called

    <code>PARANOID</code>.)</p>
@@ -2087,7 +2087,7 @@ hosting</description> 
    <note><title>Note</title>

      <p>Note, that the "main server" and any <code>_default_</code> servers

      will <strong>never</strong> be served for a request to a

      <directive>NameVirtualHost</directive> IP Address (unless for some

      <directive>NameVirtualHost</directive> IP address (unless for some

      reason you specify <directive>NameVirtualHost</directive> but then

      don't define any <directive>VirtualHost</directive>s for that

      address).</p>
@@ -2625,7 +2625,8 @@ itself</description> 
    <p>If no <directive>ServerName</directive> is specified, then the

    server attempts to deduce the hostname by performing a reverse

    lookup on the IP address. If no port is specified in the

    servername, then the server will use the port from the incoming

    <directive>ServerName</directive>, then the server will use the port

    from the incoming

    request. For optimal reliability and predictability, you should

    specify an explicit hostname and port using the

    <directive>ServerName</directive> directive.</p>