You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by sl...@apache.org on 2004/03/23 16:42:45 UTC

cvs commit: httpd-2.0/docs/manual/howto htaccess.html.en htaccess.xml

slive       2004/03/23 07:42:45

  Modified:    docs/manual/howto htaccess.html.en htaccess.xml
  Log:
  Reference the config file syntax in the htaccess tutorial.
  
  PR: 17236
  
  Revision  Changes    Path
  1.19      +9 -6      httpd-2.0/docs/manual/howto/htaccess.html.en
  
  Index: htaccess.html.en
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/howto/htaccess.html.en,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -d -b -u -r1.18 -r1.19
  --- htaccess.html.en	21 Feb 2004 00:31:32 -0000	1.18
  +++ htaccess.html.en	23 Mar 2004 15:42:45 -0000	1.19
  @@ -60,13 +60,16 @@
         </code></p></div>
       </div>
   
  -    <p>What you can put in these files is determined by the <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code>
  -    directive. This directive specifies, in categories, what directives
  -    will be honored if they are found in a <code>.htaccess</code> file. If
  -    a directive is permitted in a <code>.htaccess</code> file, the
  +    <p>In general, <code>.htaccess</code> files use the same syntax as
  +    the <a href="../configuring.html#syntax">main configuration
  +    files</a>.  What you can put in these files is determined by the
  +    <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code> directive. This
  +    directive specifies, in categories, what directives will be
  +    honored if they are found in a <code>.htaccess</code> file. If a
  +    directive is permitted in a <code>.htaccess</code> file, the
       documentation for that directive will contain an Override section,
  -    specifying what value must be in <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code> in order
  -    for that directive to be permitted.</p>
  +    specifying what value must be in <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code> in order for that
  +    directive to be permitted.</p>
   
       <p>For example, if you look at the documentation for the <code class="directive"><a href="../mod/core.html#adddefaultcharset">AddDefaultCharset</a></code>
       directive, you will find that it is permitted in <code>.htaccess</code>
  
  
  
  1.12      +10 -8     httpd-2.0/docs/manual/howto/htaccess.xml
  
  Index: htaccess.xml
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/howto/htaccess.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -d -b -u -r1.11 -r1.12
  --- htaccess.xml	9 Feb 2004 20:22:51 -0000	1.11
  +++ htaccess.xml	23 Mar 2004 15:42:45 -0000	1.12
  @@ -76,15 +76,17 @@
         </example>
       </note>
   
  -    <p>What you can put in these files is determined by the <directive
  -    module="core">AllowOverride</directive>
  -    directive. This directive specifies, in categories, what directives
  -    will be honored if they are found in a <code>.htaccess</code> file. If
  -    a directive is permitted in a <code>.htaccess</code> file, the
  +    <p>In general, <code>.htaccess</code> files use the same syntax as
  +    the <a href="../configuring.html#syntax">main configuration
  +    files</a>.  What you can put in these files is determined by the
  +    <directive module="core">AllowOverride</directive> directive. This
  +    directive specifies, in categories, what directives will be
  +    honored if they are found in a <code>.htaccess</code> file. If a
  +    directive is permitted in a <code>.htaccess</code> file, the
       documentation for that directive will contain an Override section,
       specifying what value must be in <directive 
  -    module="core">AllowOverride</directive> in order
  -    for that directive to be permitted.</p>
  +    module="core">AllowOverride</directive> in order for that
  +    directive to be permitted.</p>
   
       <p>For example, if you look at the documentation for the <directive
       module="core">AddDefaultCharset</directive>