cvs commit: apache/htdocs/manual/mod core.html

[Paul Sutton]

pcs         97/04/18 14:55:12

  Modified:    htdocs/manual/mod  core.html
  Log:
  Explain Satisfy directive.
  
  Revision  Changes    Path
  1.47      +12 -2     apache/htdocs/manual/mod/core.html
  
  Index: core.html
  ===================================================================
  RCS file: /export/home/cvs/apache/htdocs/manual/mod/core.html,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -C3 -r1.46 -r1.47
  *** core.html 1997/04/16 09:09:34     1.46
  --- core.html 1997/04/18 21:55:11     1.47
  ***************
  *** 1060,1071 ****
    <A name="satisfy"><h2>Satisfy</h2></A>
    <!--%plaintext &lt;?INDEX {\tt Satisfy} directive&gt; -->
    <strong>Syntax:</strong> Satisfy <em>'any' or 'all'</em><br>
    <strong>Context:</strong> server config, virtual host, directory, 
.htaccess<br>
    <strong>Status:</strong> core<br>
    <strong>Compatibility:</strong> Satisfy is only available in Apache 1.2 and 
later<p>
    
  ! Access policy if both allow and require used. The parameter can be either
  ! <em>'all'</em> or <em>'any'</em>.
    
    <p><hr>
    
  --- 1060,1081 ----
    <A name="satisfy"><h2>Satisfy</h2></A>
    <!--%plaintext &lt;?INDEX {\tt Satisfy} directive&gt; -->
    <strong>Syntax:</strong> Satisfy <em>'any' or 'all'</em><br>
  + <strong>Default:</strong> Satisy all<br>
    <strong>Context:</strong> server config, virtual host, directory, 
.htaccess<br>
    <strong>Status:</strong> core<br>
    <strong>Compatibility:</strong> Satisfy is only available in Apache 1.2 and 
later<p>
    
  ! Access policy if both allow and require used. The parameter can be
  ! either <em>'all'</em> or <em>'any'</em>. This directive is only useful
  ! if access to a particular area is being restricted by both
  ! username/password <i>and</i> client host address. In this case the
  ! default behavior ("all") is to require that the client passes the
  ! address access restriction <i>and</i> enters a valid username and
  ! password. With the "any" option the client will be granted access if
  ! they either pass the host restriction or enter a valid username and
  ! password. This can be used to password restrict an area, but to let
  ! clients from particular addresses in without prompting for a password.
  ! 
    
    <p><hr>