httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From k...@apache.org
Subject cvs commit: httpd-2.0/docs/manual/mod core.xml core.html.en quickreference.html.en
Date Sat, 18 Jan 2003 19:39:07 GMT
kess        2003/01/18 11:39:07

  Modified:    docs/manual/mod core.xml core.html.en quickreference.html.en
  Log:
  - specify some mistakables discussed while reviewing the german translation
  - set a link from AccessFileName to AllowOverride
  - <Files> and <Location> sections and .htaccess files may be used for more
    then access control
  - state an example more precisely
  
  Thanks to Michael Schroepl <Michael.Schroepl@telekurs.de> and nd for their suggestions.
  
  Revision  Changes    Path
  1.52      +39 -35    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.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- core.xml	8 Jan 2003 20:58:31 -0000	1.51
  +++ core.xml	18 Jan 2003 19:39:06 -0000	1.52
  @@ -53,7 +53,7 @@
       trailing pathname information is determined by the <a
       href="../handler.html">handler</a> responsible for the request.
       The core handler for normal files defaults to rejecting
  -    <code>PATH_INFO</code>. Handlers that serve scripts, such as <a
  +    <code>PATH_INFO</code> requests. Handlers that serve scripts, such as <a
       href="mod_cgi.html">cgi-script</a> and <a
       href="mod_isapi.html">isapi-isa</a>, generally accept
       <code>PATH_INFO</code> by default.</dd>
  @@ -93,8 +93,8 @@
       <p>While processing a request the server looks for
       the first existing configuration file from this list of names in
       every directory of the path to the document, if distributed
  -    configuration files are enabled for that directory. For
  -    example:</p>
  +    configuration files are <a href="#allowoverride">enabled for that
  +    directory</a>. For example:</p>
   
       <example>
         AccessFileName .acl
  @@ -174,10 +174,10 @@
         AddOutputFilterByType DEFLATE text/html text/plain
       </example>
   
  -    <p>If you want the content to be processed by more than one filter, they
  -    have to be separated by semicolons. It's also possible to use one
  +    <p>If you want the content to be processed by more than one filter, their
  +    names have to be separated by semicolons. It's also possible to use one
       <directive>AddOutputFilterByType</directive> directive for each of
  -    them.</p>
  +    these filters.</p>
   
       <p>The configuration below causes all script output labeled as
       <code>text/html</code> to be processed at first by the
  @@ -196,9 +196,10 @@
       <note type="warning"><title>Note</title>
         <p>Enabling filters with <directive>AddOutputFilterByType</directive>
         may fail partially or completely in some cases. For expample, no
  -      filters are applied if the content type falls back to the <directive
  -      module="core">DefaultType</directive>, even if the <directive
  -      module="core">DefaultType</directive> is the same.</p>
  +      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
  @@ -228,7 +229,7 @@
       <p>When the server finds an <code>.htaccess</code> file (as
       specified by <directive module="core">AccessFileName</directive>)
       it needs to know which directives declared in that file can override
  -    earlier access information.</p>
  +    earlier configuration directives.</p>
   
       <note><title>Only available in &lt;Directory&gt; sections</title>
       <directive>AllowOverride</directive> is valid only in
  @@ -471,11 +472,11 @@
         DefaultType image/gif
       </example>
   
  -    <p>would be appropriate for a directory which contained many gif
  +    <p>would be appropriate for a directory which contained many GIF
       images with filenames missing the <code>.gif</code> extension.</p>
   
       <p>Note that unlike <directive
  -    module="core">ForceType</directive>, this directive is only
  +    module="core">ForceType</directive>, this directive only
       provides the default mime-type. All other mime-type definitions,
       including filename extensions, that might identify the media type
       will override this default.</p>
  @@ -534,9 +535,9 @@
       <p>would match directories in <code>/www/</code> that consisted of
       three numbers.</p>
   
  -    <p>If multiple (non-regular expression)  <directive
  +    <p>If multiple (non-regular expression) <directive
       type="section">Directory</directive> sections
  -    match the directory (or its parents) containing a document,
  +    match the directory (or one of its parents) containing a document,
       then the directives are applied in the order of shortest match
       first, interspersed with the directives from the <a
       href="#accessfilename">.htaccess</a> files. For example,
  @@ -564,10 +565,11 @@
         (disabling <code>.htaccess</code> files).</li>
   
         <li>Apply directive <code>AllowOverride FileInfo</code> (for
  -      directory <code>/home/web</code>).</li>
  +      directory <code>/home</code>).</li>
   
         <li>Apply any <code>FileInfo</code> directives in
  -      <code>/home/web/.htaccess</code></li>
  +      <code>/home/.htaccess</code>, <code>/home/web/.htaccess</code>
and
  +      <code>/home/web/dir/.htaccess</code> in that order.</li>
       </ul>
   
       <p>Regular expressions are not considered until after all of the
  @@ -584,9 +586,11 @@
       </example>
   
       <p>the regular expression section won't be considered until after
  -    all normal <code>&lt;Directory&gt;</code>s and <code>.htaccess</code>
  -    files have been applied. Then the regular expression will match on
  -    <code>/home/abc/public_html/abc</code> and be applied.</p>
  +    all normal <directive type="section">Directory</directive>s and
  +    <code>.htaccess</code> files have been applied. Then the regular
  +    expression will match on <code>/home/abc/public_html/abc</code> and
  +    the corresponding <directive type="section">Directory</directive> will
  +    be applied.</p>
   
      <p><strong>Note that the default Apache access for
       <code>&lt;Directory /&gt;</code> is <code>Allow from All</code>.
  @@ -756,7 +760,7 @@
       without ever reading the file if the OS supports it.</p>
   
       <p>This sendfile mechanism avoids seperate read and send operations,
  -    and buffer allocations.  But on some platforms or within some
  +    and buffer allocations. But on some platforms or within some
       filesystems, it is better to disable this feature to avoid
       operational problems:</p>
   
  @@ -985,13 +989,12 @@
   
   <usage>
       <p>The <directive type="section">Files</directive> directive
  -    provides for access control by filename. It is comparable to the
  -    <directive module="core" type="section">Directory</directive>
  -    directive and <directive module="core"
  -    type="section">Location</directive> directives. It should be
  -    matched with a <directive type="section">Files</directive> directive. The
  -    directives given within this section will be applied to any object
  -    with a basename (last component of filename) matching the
  +    limits the scope of the enclosed directives by filename. It is comparable
  +    to the <directive module="core" type="section">Directory</directive>
  +    and <directive module="core" type="section">Location</directive>
  +    directives. It should be matched with a <code>&lt;/Files&gt;</code>
  +    directive. The directives given within this section will be applied to
  +    any object with a basename (last component of filename) matching the
       specified filename. <directive type="section">Files</directive>
       sections are processed in the order they appear in the
       configuration file, after the <directive module="core"
  @@ -1042,8 +1045,8 @@
   
   <usage>
       <p>The <directive type="section">FilesMatch</directive> directive
  -    provides for access control by filename, just as the <directive
  -    module="core" type="section">Files</directive> directive
  +    limits the scope of the enclosed directives by filename, just as the
  +    <directive module="core" type="section">Files</directive> directive
       does. However, it accepts a regular expression. For example:</p>
   
       <example>
  @@ -1052,6 +1055,7 @@
   
       <p>would match most common Internet graphics formats.</p>
   </usage>
  +
   <seealso><a href="../sections.html">How &lt;Directory&gt;, &lt;Location&gt;
       and &lt;Files&gt; sections work</a> for an explanation of how these
       different sections are combined when a request is received</seealso>
  @@ -1307,7 +1311,7 @@
       files in a directory that can cause <code>httpd</code> to
       fail.</p>
   
  -    <p>The file path specified may be a fully qualified path (i.e.
  +    <p>The file path specified may be an absolute path (i.e.
       starting with a slash), or may be relative to the
       <directive module="core">ServerRoot</directive> directory.</p>
   
  @@ -1680,7 +1684,7 @@
   
   <usage>
       <p>The <directive type="section">Location</directive> directive
  -    provides for access control by URL. It is similar to the
  +    limits the scope of the enclosed directives by URL. It is similar to the
       <directive type="section" module="core">Directory</directive>
       directive, and starts a subsection which is terminated with a
       <code>&lt;/Location&gt;</code> directive. <directive
  @@ -1775,8 +1779,8 @@
   
   <usage>
       <p>The <directive type="section">LocationMatch</directive> directive
  -    provides for access control by URL, in an identical manner to
  -    <directive module="core" type="section">Location</directive>. However,
  +    limits the scope of the enclosed directives by URL, in an identical manner
  +    to <directive module="core" type="section">Location</directive>. However,
       it takes a regular expression as an argument instead of a simple
       string. For example:</p>
   
  @@ -2170,7 +2174,7 @@
   
         <dt><code>Require group <var>group-name</var> [<var>group-name</var>]
         ...</code></dt>
  -      <dd>Only users in the named groups can access the  resource.</dd>
  +      <dd>Only users in the named groups can access the resource.</dd>
   
         <dt><code>Require valid-user</code></dt>
         <dd>All valid users can access the resource.</dd>
  @@ -2726,7 +2730,7 @@
   <name>TimeOut</name>
   <description>Amount of time the server will wait for
   certain events before failing a request</description>
  -<syntax>TimeOut <var>second</var></syntax>
  +<syntax>TimeOut <var>seconds</var></syntax>
   <default>TimeOut 300</default>
   <contextlist><context>server config</context></contextlist>
   
  
  
  
  1.57      +38 -31    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.56
  retrieving revision 1.57
  diff -u -r1.56 -r1.57
  --- core.html.en	9 Jan 2003 03:22:26 -0000	1.56
  +++ core.html.en	18 Jan 2003 19:39:06 -0000	1.57
  @@ -133,7 +133,7 @@
       <dt><code>Default</code></dt><dd>The treatment of requests
with
       trailing pathname information is determined by the <a href="../handler.html">handler</a>
responsible for the request.
       The core handler for normal files defaults to rejecting
  -    <code>PATH_INFO</code>. Handlers that serve scripts, such as <a href="mod_cgi.html">cgi-script</a>
and <a href="mod_isapi.html">isapi-isa</a>, generally accept
  +    <code>PATH_INFO</code> requests. Handlers that serve scripts, such as <a
href="mod_cgi.html">cgi-script</a> and <a href="mod_isapi.html">isapi-isa</a>,
generally accept
       <code>PATH_INFO</code> by default.</dd>
       </dl>
   
  @@ -171,8 +171,8 @@
       <p>While processing a request the server looks for
       the first existing configuration file from this list of names in
       every directory of the path to the document, if distributed
  -    configuration files are enabled for that directory. For
  -    example:</p>
  +    configuration files are <a href="#allowoverride">enabled for that
  +    directory</a>. For example:</p>
   
       <div class="example"><p><code>
         AccessFileName .acl
  @@ -252,10 +252,10 @@
         AddOutputFilterByType DEFLATE text/html text/plain
       </code></p></div>
   
  -    <p>If you want the content to be processed by more than one filter, they
  -    have to be separated by semicolons. It's also possible to use one
  +    <p>If you want the content to be processed by more than one filter, their
  +    names have to be separated by semicolons. It's also possible to use one
       <code class="directive">AddOutputFilterByType</code> directive for each
of
  -    them.</p>
  +    these filters.</p>
   
       <p>The configuration below causes all script output labeled as
       <code>text/html</code> to be processed at first by the
  @@ -274,7 +274,10 @@
       <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
  -      filters are applied if the content type falls back to the <code class="directive"><a
href="#defaulttype">DefaultType</a></code>, even if the <code class="directive"><a
href="#defaulttype">DefaultType</a></code> is the same.</p>
  +      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
  @@ -307,7 +310,7 @@
       <p>When the server finds an <code>.htaccess</code> file (as
       specified by <code class="directive"><a href="#accessfilename">AccessFileName</a></code>)
       it needs to know which directives declared in that file can override
  -    earlier access information.</p>
  +    earlier configuration directives.</p>
   
       <div class="note"><h3>Only available in &lt;Directory&gt; sections</h3>
       <code class="directive">AllowOverride</code> is valid only in
  @@ -527,10 +530,10 @@
         DefaultType image/gif
       </code></p></div>
   
  -    <p>would be appropriate for a directory which contained many gif
  +    <p>would be appropriate for a directory which contained many GIF
       images with filenames missing the <code>.gif</code> extension.</p>
   
  -    <p>Note that unlike <code class="directive"><a href="#forcetype">ForceType</a></code>,
this directive is only
  +    <p>Note that unlike <code class="directive"><a href="#forcetype">ForceType</a></code>,
this directive only
       provides the default mime-type. All other mime-type definitions,
       including filename extensions, that might identify the media type
       will override this default.</p>
  @@ -589,8 +592,8 @@
       <p>would match directories in <code>/www/</code> that consisted of
       three numbers.</p>
   
  -    <p>If multiple (non-regular expression)  <code class="directive">&lt;Directory&gt;</code>
sections
  -    match the directory (or its parents) containing a document,
  +    <p>If multiple (non-regular expression) <code class="directive">&lt;Directory&gt;</code>
sections
  +    match the directory (or one of its parents) containing a document,
       then the directives are applied in the order of shortest match
       first, interspersed with the directives from the <a href="#accessfilename">.htaccess</a>
files. For example,
       with</p>
  @@ -617,10 +620,11 @@
         (disabling <code>.htaccess</code> files).</li>
   
         <li>Apply directive <code>AllowOverride FileInfo</code> (for
  -      directory <code>/home/web</code>).</li>
  +      directory <code>/home</code>).</li>
   
         <li>Apply any <code>FileInfo</code> directives in
  -      <code>/home/web/.htaccess</code></li>
  +      <code>/home/.htaccess</code>, <code>/home/web/.htaccess</code>
and
  +      <code>/home/web/dir/.htaccess</code> in that order.</li>
       </ul>
   
       <p>Regular expressions are not considered until after all of the
  @@ -637,9 +641,11 @@
       </code></p></div>
   
       <p>the regular expression section won't be considered until after
  -    all normal <code>&lt;Directory&gt;</code>s and <code>.htaccess</code>
  -    files have been applied. Then the regular expression will match on
  -    <code>/home/abc/public_html/abc</code> and be applied.</p>
  +    all normal <code class="directive">&lt;Directory&gt;</code>s and
  +    <code>.htaccess</code> files have been applied. Then the regular
  +    expression will match on <code>/home/abc/public_html/abc</code> and
  +    the corresponding <code class="directive">&lt;Directory&gt;</code>
will
  +    be applied.</p>
   
      <p><strong>Note that the default Apache access for
       <code>&lt;Directory /&gt;</code> is <code>Allow from All</code>.
  @@ -810,7 +816,7 @@
       without ever reading the file if the OS supports it.</p>
   
       <p>This sendfile mechanism avoids seperate read and send operations,
  -    and buffer allocations.  But on some platforms or within some
  +    and buffer allocations. But on some platforms or within some
       filesystems, it is better to disable this feature to avoid
       operational problems:</p>
   
  @@ -1036,12 +1042,12 @@
   <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
   </table>
       <p>The <code class="directive">&lt;Files&gt;</code> directive
  -    provides for access control by filename. It is comparable to the
  -    <code class="directive"><a href="#directory">&lt;Directory&gt;</a></code>
  -    directive and <code class="directive"><a href="#location">&lt;Location&gt;</a></code>
directives. It should be
  -    matched with a <code class="directive">&lt;Files&gt;</code> directive.
The
  -    directives given within this section will be applied to any object
  -    with a basename (last component of filename) matching the
  +    limits the scope of the enclosed directives by filename. It is comparable
  +    to the <code class="directive"><a href="#directory">&lt;Directory&gt;</a></code>
  +    and <code class="directive"><a href="#location">&lt;Location&gt;</a></code>
  +    directives. It should be matched with a <code>&lt;/Files&gt;</code>
  +    directive. The directives given within this section will be applied to
  +    any object with a basename (last component of filename) matching the
       specified filename. <code class="directive">&lt;Files&gt;</code>
       sections are processed in the order they appear in the
       configuration file, after the <code class="directive"><a href="#directory">&lt;Directory&gt;</a></code>
sections and
  @@ -1087,7 +1093,8 @@
   <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
   </table>
       <p>The <code class="directive">&lt;FilesMatch&gt;</code>
directive
  -    provides for access control by filename, just as the <code class="directive"><a
href="#files">&lt;Files&gt;</a></code> directive
  +    limits the scope of the enclosed directives by filename, just as the
  +    <code class="directive"><a href="#files">&lt;Files&gt;</a></code>
directive
       does. However, it accepts a regular expression. For example:</p>
   
       <div class="example"><p><code>
  @@ -1347,7 +1354,7 @@
       files in a directory that can cause <code>httpd</code> to
       fail.</p>
   
  -    <p>The file path specified may be a fully qualified path (i.e.
  +    <p>The file path specified may be an absolute path (i.e.
       starting with a slash), or may be relative to the
       <code class="directive"><a href="#serverroot">ServerRoot</a></code>
directory.</p>
   
  @@ -1720,7 +1727,7 @@
   <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
   </table>
       <p>The <code class="directive">&lt;Location&gt;</code> directive
  -    provides for access control by URL. It is similar to the
  +    limits the scope of the enclosed directives by URL. It is similar to the
       <code class="directive"><a href="#directory">&lt;Directory&gt;</a></code>
       directive, and starts a subsection which is terminated with a
       <code>&lt;/Location&gt;</code> directive. <code class="directive">&lt;Location&gt;</code>
sections are processed in the
  @@ -1809,8 +1816,8 @@
   <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
   </table>
       <p>The <code class="directive">&lt;LocationMatch&gt;</code>
directive
  -    provides for access control by URL, in an identical manner to
  -    <code class="directive"><a href="#location">&lt;Location&gt;</a></code>.
However,
  +    limits the scope of the enclosed directives by URL, in an identical manner
  +    to <code class="directive"><a href="#location">&lt;Location&gt;</a></code>.
However,
       it takes a regular expression as an argument instead of a simple
       string. For example:</p>
   
  @@ -2201,7 +2208,7 @@
   
         <dt><code>Require group <var>group-name</var> [<var>group-name</var>]
         ...</code></dt>
  -      <dd>Only users in the named groups can access the  resource.</dd>
  +      <dd>Only users in the named groups can access the resource.</dd>
   
         <dt><code>Require valid-user</code></dt>
         <dd>All valid users can access the resource.</dd>
  @@ -2786,7 +2793,7 @@
   <table class="directive">
   <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Amount
of time the server will wait for
   certain events before failing a request</td></tr>
  -<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>TimeOut
<var>second</var></code></td></tr>
  +<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>TimeOut
<var>seconds</var></code></td></tr>
   <tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>TimeOut
300</code></td></tr>
   <tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server
config</td></tr>
   <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Core</td></tr>
  
  
  
  1.67      +1 -1      httpd-2.0/docs/manual/mod/quickreference.html.en
  
  Index: quickreference.html.en
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/mod/quickreference.html.en,v
  retrieving revision 1.66
  retrieving revision 1.67
  diff -u -r1.66 -r1.67
  --- quickreference.html.en	17 Jan 2003 01:58:22 -0000	1.66
  +++ quickreference.html.en	18 Jan 2003 19:39:06 -0000	1.67
  @@ -655,7 +655,7 @@
   per child process</td></tr>
   <tr><td><a href="mpm_common.html#threadsperchild">ThreadsPerChild <var>number</var></a></td><td
/><td>s</td><td>M</td></tr><tr><td class="descr"
colspan="4">Number of threads created by each child process</td></tr>
   <tr class="odd"><td><a href="mpm_netware.html#threadstacksize">ThreadStackSize
<var>number</var></a></td><td> 65536 </td><td>s</td><td>M</td></tr><tr
class="odd"><td class="descr" colspan="4">Determine the stack size for each thread</td></tr>
  -<tr><td><a href="core.html#timeout">TimeOut <var>second</var></a></td><td>
300 </td><td>s</td><td>C</td></tr><tr><td class="descr"
colspan="4">Amount of time the server will wait for
  +<tr><td><a href="core.html#timeout">TimeOut <var>seconds</var></a></td><td>
300 </td><td>s</td><td>C</td></tr><tr><td class="descr"
colspan="4">Amount of time the server will wait for
   certain events before failing a request</td></tr>
   <tr class="odd"><td><a href="mod_log_config.html#transferlog">TransferLog
<var>file</var>|<var>pipe</var></a></td><td /><td>sv</td><td>B</td></tr><tr
class="odd"><td class="descr" colspan="4">Specifly location of a log file</td></tr>
   <tr><td><a href="mod_mime.html#typesconfig">TypesConfig <var>file-path</var></a></td><td>
conf/mime.types </td><td>s</td><td>B</td></tr><tr><td
class="descr" colspan="4">The location of the <code>mime.types</code> file</td></tr>
  
  
  

Mime
View raw message