httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sl...@apache.org
Subject cvs commit: httpd-2.0/docs/manual/mod core.html.en core.xml
Date Thu, 08 May 2003 18:15:59 GMT
slive       2003/05/08 11:15:59

  Modified:    docs/manual/mod Tag: APACHE_2_0_BRANCH core.html.en core.xml
  Log:
    Add a bunch of links to the Options docs and make a couple
    small textual adjustments.
  
    PR: 19699
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.46.2.20 +33 -25    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.46.2.19
  retrieving revision 1.46.2.20
  diff -u -d -b -u -r1.46.2.19 -r1.46.2.20
  --- core.html.en	21 Apr 2003 15:12:58 -0000	1.46.2.19
  +++ core.html.en	8 May 2003 18:15:57 -0000	1.46.2.20
  @@ -2094,7 +2094,8 @@
         <dt><code>ExecCGI</code></dt>
   
         <dd>
  -      Execution of CGI scripts is permitted.</dd>
  +      Execution of CGI scripts using <code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code>
  +      is permitted.</dd>
   
         <dt><code>FollowSymLinks</code></dt>
   
  @@ -2112,48 +2113,55 @@
         <dt><code>Includes</code></dt>
   
         <dd>
  -      Server-side includes are permitted.</dd>
  +      Server-side includes provided by <code class="module"><a href="../mod/mod_include.html">mod_include</a></code>
  +      are permitted.</dd>
   
         <dt><code>IncludesNOEXEC</code></dt>
   
         <dd>
   
  -      Server-side includes are permitted, but the <code>#exec cmd</code>
  -      and <code>#exec cgi</code> are disabled. It is still possible to
  -      <code>#include virtual</code> CGI scripts from
  -      <code class="directive">ScriptAlias</code>e'd directories.</dd>
  +      Server-side includes are permitted, but the <code>#exec
  +      cmd</code> and <code>#exec cgi</code> are disabled. It is still
  +      possible to <code>#include virtual</code> CGI scripts from
  +      <code class="directive"><a href="../mod/mod_cgi.html#scriptalias">ScriptAlias</a></code>ed
  +      directories.</dd>
   
         <dt><code>Indexes</code></dt>
   
         <dd>
  -      If a URL which maps to a directory is requested, and the
  -      there is no <code class="directive">DirectoryIndex</code> (<em>e.g.</em>,
  -      <code>index.html</code>) in that directory, then the server will
  -      return a formatted listing of the directory.</dd>
  +      If a URL which maps to a directory is requested, and the there
  +      is no <code class="directive"><a href="../mod/mod_dir.html#directoryindex">DirectoryIndex</a></code>
  +      (<em>e.g.</em>, <code>index.html</code>) in that directory,
then
  +      <code class="module"><a href="../mod/mod_autoindex.html">mod_autoindex</a></code>
will return a formatted listing
  +      of the directory.</dd>
   
         <dt><code>MultiViews</code></dt>
   
         <dd>
         <a href="../content-negotiation.html">Content negotiated</a>
  -      "MultiViews" are allowed.</dd>
  +      "MultiViews" are allowed using
  +      <code class="module"><a href="../mod/mod_negotiation.html">mod_negotiation</a></code>.</dd>
   
         <dt><code>SymLinksIfOwnerMatch</code></dt>
   
  -      <dd>
  +      <dd>The server will only follow symbolic links for which the
  +      target file or directory is owned by the same user id as the
  +      link.
   
  -      The server will only follow symbolic links for which the target
  -      file or directory is owned by the same user id as the link.<br /> <strong>Note</strong>:
this option gets ignored if set inside
  -      a <code class="directive"><a href="#location">&lt;Location&gt;</a></code>
  -      section.</dd>
  +      <div class="note"><h3>Note</h3> This option gets ignored if
  +      set inside a <code class="directive"><a href="#location">&lt;Location&gt;</a></code>
section.</div>
  +      </dd>
       </dl>
  -    <p>Normally, if multiple <code class="directive">Options</code> could
apply to a
  -    directory, then the most specific one is taken complete; the
  -    options are not merged. However if <em>all</em> the options on
  -    the <code class="directive">Options</code> directive are preceded by a
  -    <code>+</code> or <code>-</code>
  -    symbol, the options are merged. Any options preceded by a <code>+</code>
  -    are added to the options currently in force, and any options
  -    preceded by a <code>-</code> are removed from the options currently in
  +
  +    <p>Normally, if multiple <code class="directive">Options</code> could
  +    apply to a directory, then the most specific one is used and
  +    others are ignored; the options are not merged. (See <a href="../sections.html#mergin">how
sections are merged</a>.)
  +    However if <em>all</em> the options on the
  +    <code class="directive">Options</code> directive are preceded by a
  +    <code>+</code> or <code>-</code> symbol, the options are
  +    merged. Any options preceded by a <code>+</code> are added to the
  +    options currently in force, and any options preceded by a
  +    <code>-</code> are removed from the options currently in
       force. </p>
   
       <p>For example, without any <code>+</code> and <code>-</code>
symbols:</p>
  
  
  
  1.46.2.15 +35 -26    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.46.2.14
  retrieving revision 1.46.2.15
  diff -u -d -b -u -r1.46.2.14 -r1.46.2.15
  --- core.xml	21 Apr 2003 00:29:44 -0000	1.46.2.14
  +++ core.xml	8 May 2003 18:15:57 -0000	1.46.2.15
  @@ -2060,7 +2060,8 @@
         <dt><code>ExecCGI</code></dt>
   
         <dd>
  -      Execution of CGI scripts is permitted.</dd>
  +      Execution of CGI scripts using <module>mod_cgi</module>
  +      is permitted.</dd>
   
         <dt><code>FollowSymLinks</code></dt>
   
  @@ -2079,49 +2080,57 @@
         <dt><code>Includes</code></dt>
   
         <dd>
  -      Server-side includes are permitted.</dd>
  +      Server-side includes provided by <module>mod_include</module>
  +      are permitted.</dd>
   
         <dt><code>IncludesNOEXEC</code></dt>
   
         <dd>
   
  -      Server-side includes are permitted, but the <code>#exec cmd</code>
  -      and <code>#exec cgi</code> are disabled. It is still possible to
  -      <code>#include virtual</code> CGI scripts from
  -      <directive>ScriptAlias</directive>e'd directories.</dd>
  +      Server-side includes are permitted, but the <code>#exec
  +      cmd</code> and <code>#exec cgi</code> are disabled. It is still
  +      possible to <code>#include virtual</code> CGI scripts from
  +      <directive module="mod_cgi">ScriptAlias</directive>ed
  +      directories.</dd>
   
         <dt><code>Indexes</code></dt>
   
         <dd>
  -      If a URL which maps to a directory is requested, and the
  -      there is no <directive>DirectoryIndex</directive> (<em>e.g.</em>,
  -      <code>index.html</code>) in that directory, then the server will
  -      return a formatted listing of the directory.</dd>
  +      If a URL which maps to a directory is requested, and the there
  +      is no <directive module="mod_dir">DirectoryIndex</directive>
  +      (<em>e.g.</em>, <code>index.html</code>) in that directory,
then
  +      <module>mod_autoindex</module> will return a formatted listing
  +      of the directory.</dd>
   
         <dt><code>MultiViews</code></dt>
   
         <dd>
         <a href="../content-negotiation.html">Content negotiated</a>
  -      "MultiViews" are allowed.</dd>
  +      "MultiViews" are allowed using
  +      <module>mod_negotiation</module>.</dd>
   
         <dt><code>SymLinksIfOwnerMatch</code></dt>
   
  -      <dd>
  +      <dd>The server will only follow symbolic links for which the
  +      target file or directory is owned by the same user id as the
  +      link.
   
  -      The server will only follow symbolic links for which the target
  -      file or directory is owned by the same user id as the link.<br
  -      /> <strong>Note</strong>: this option gets ignored if set inside
  -      a <directive module="core" type="section">Location</directive>
  -      section.</dd>
  +      <note><title>Note</title> This option gets ignored if
  +      set inside a <directive module="core"
  +      type="section">Location</directive> section.</note>
  +      </dd>
       </dl>
  -    <p>Normally, if multiple <directive>Options</directive> could apply
to a
  -    directory, then the most specific one is taken complete; the
  -    options are not merged. However if <em>all</em> the options on
  -    the <directive>Options</directive> directive are preceded by a
  -    <code>+</code> or <code>-</code>
  -    symbol, the options are merged. Any options preceded by a <code>+</code>
  -    are added to the options currently in force, and any options
  -    preceded by a <code>-</code> are removed from the options currently in
  +
  +    <p>Normally, if multiple <directive>Options</directive> could
  +    apply to a directory, then the most specific one is used and
  +    others are ignored; the options are not merged. (See <a
  +    href="../sections.html#mergin">how sections are merged</a>.)
  +    However if <em>all</em> the options on the
  +    <directive>Options</directive> directive are preceded by a
  +    <code>+</code> or <code>-</code> symbol, the options are
  +    merged. Any options preceded by a <code>+</code> are added to the
  +    options currently in force, and any options preceded by a
  +    <code>-</code> are removed from the options currently in
       force. </p>
   
       <p>For example, without any <code>+</code> and <code>-</code>
symbols:</p>
  
  
  

Mime
View raw message