Commit e6390d83 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Docs update. Refresh as well as fold in (better??) docs 

about balancer.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@153116 13f79535-47bb-0310-9956-ffa450edef68
parent 3403a45e

docs/manual/mod/allmodules.xml.ja

+2 −2
Changes for docs/manual/mod/allmodules.xml.ja: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 
  <modulefile>mod_authz_default.xml.ja</modulefile>

  <modulefile>mod_authz_groupfile.xml.ja</modulefile>

  <modulefile>mod_authz_host.xml.ja</modulefile>

  <modulefile>mod_authz_owner.xml</modulefile>

  <modulefile>mod_authz_user.xml</modulefile>

  <modulefile>mod_authz_owner.xml.ja</modulefile>

  <modulefile>mod_authz_user.xml.ja</modulefile>

  <modulefile>mod_autoindex.xml.ja</modulefile>

  <modulefile>mod_cache.xml.ja</modulefile>

  <modulefile>mod_cern_meta.xml</modulefile>

docs/manual/mod/index.html.en

+1 −2
Changes for docs/manual/mod/index.html.en: 1 added line, 2 removed lines.
Original line number Diff line number Diff line
@@ -147,8 +147,7 @@ by other LDAP modules</dd> 
<dt><a href="mod_proxy.html" id="P" name="P">mod_proxy</a></dt><dd>HTTP/1.1 proxy/gateway server</dd>

<dt><a href="mod_proxy_ajp.html">mod_proxy_ajp</a></dt><dd>AJP support module for

<code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code></dd>

<dt><a href="mod_proxy_balancer.html">mod_proxy_balancer</a></dt><dd><code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> extension for

load balancing </dd>

<dt><a href="mod_proxy_balancer.html">mod_proxy_balancer</a></dt><dd><code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> extension for load balancing </dd>

<dt><a href="mod_proxy_connect.html">mod_proxy_connect</a></dt><dd><code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> extension for

<code>CONNECT</code> request handling</dd>

<dt><a href="mod_proxy_ftp.html">mod_proxy_ftp</a></dt><dd>FTP support module for

docs/manual/mod/mod_authnz_ldap.html.en

+25 −3
Changes for docs/manual/mod/mod_authnz_ldap.html.en: 25 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -542,12 +542,18 @@ require valid-user 
<div class="section">

<h2><a name="usingtls" id="usingtls">Using TLS</a></h2>



    <p>To use TLS, see the <code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code> directives <code class="directive"><a href="../mod/mod_ldap.html#ldaptrustedca">LDAPTrustedCA</a></code> and <code class="directive"><a href="../mod/mod_ldap.html#ldaptrustedcatype">LDAPTrustedCAType</a></code>.</p>

    <p>To use TLS, see the <code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code> directives <code class="directive"><a href="../mod/mod_ldap.html#ldaptrustedclientcert">LDAPTrustedClientCert</a></code>, <code class="directive"><a href="../mod/mod_ldap.html#ldaptrustedglobalcert">LDAPTrustedGlobalCert</a></code> and <code class="directive"><a href="../mod/mod_ldap.html#ldaptrustedmode">LDAPTrustedMode</a></code>.</p>



    <p>An optional second parameter can be added to the 

    <code class="directive"><a href="#authldapurl">AuthLDAPURL</a></code> to override

    the default connection type set by <code class="directive"><a href="../mod/mod_ldap.html#ldaptrustedmode">LDAPTrustedMode</a></code>.

    This will allow the connection established by an <em>ldap://</em> Url 

    to be upgraded to a secure connection on the same port.</p>

</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>

<div class="section">

<h2><a name="usingssl" id="usingssl">Using SSL</a></h2>



    <p>To use SSL, see the <code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code> directives <code class="directive"><a href="../mod/mod_ldap.html#ldaptrustedca">LDAPTrustedCA</a></code> and <code class="directive"><a href="../mod/mod_ldap.html#ldaptrustedcatype">LDAPTrustedCAType</a></code>.</p>

    <p>To use SSL, see the <code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code> directives <code class="directive"><a href="../mod/mod_ldap.html#ldaptrustedclientcert">LDAPTrustedClientCert</a></code>, <code class="directive"><a href="../mod/mod_ldap.html#ldaptrustedglobalcert">LDAPTrustedGlobalCert</a></code> and <code class="directive"><a href="../mod/mod_ldap.html#ldaptrustedmode">LDAPTrustedMode</a></code>.</p>



    <p>To specify a secure LDAP server, use <em>ldaps://</em> in the

    <code class="directive"><a href="#authldapurl">AuthLDAPURL</a></code>
@@ -799,7 +805,7 @@ environment variable</td></tr> 
<div class="directive-section"><h2><a name="AuthLDAPUrl" id="AuthLDAPUrl">AuthLDAPUrl</a> <a name="authldapurl" id="authldapurl">Directive</a></h2>

<table class="directive">

<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>URL specifying the LDAP search parameters</td></tr>

<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthLDAPUrl <em>url</em></code></td></tr>

<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthLDAPUrl <em>url [NONE|SSL|TLS|STARTTLS]</em></code></td></tr>

<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory, .htaccess</td></tr>

<tr><th><a href="directive-dict.html#Override">Override:</a></th><td>AuthConfig</td></tr>

<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
@@ -887,6 +893,22 @@ environment variable</td></tr> 
    Jenson</code>, the resulting search filter will be

    <code>(&amp;(posixid=*)(cn=Babs Jenson))</code>.</p>



    <p>An optional parameter can be added to allow the LDAP Url to override 

    the connection type.  This parameter can be one of the following:</p>



<dl>

    <dt>NONE</dt>

        <dd>Establish an unsecure connection on the default LDAP port. This

        is the same as <code>ldap://</code> on port 389.</dd>

    <dt>SSL</dt>

        <dd>Establish a secure connection on the default secure LDAP port.

        This is the same as <code>ldaps://</code></dd>

    <dt>TLS | STARTTLS</dt>

        <dd>Establish an upgraded secure connection on the default LDAP port.

        This connection will be initiated on port 389 by default and then 

        upgraded to a secure connection on the same port.</dd>

</dl>



    <p>See above for examples of <code class="directive"><a href="#authldapurl">AuthLDAPURL</a></code> URLs.</p>



</div>

docs/manual/mod/mod_authz_owner.html

+4 −0
Changes for docs/manual/mod/mod_authz_owner.html: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -2,6 +2,10 @@ URI: mod_authz_owner.html.en 
Content-Language: en

Content-type: text/html; charset=ISO-8859-1



URI: mod_authz_owner.html.ja.euc-jp

Content-Language: ja

Content-type: text/html; charset=EUC-JP



URI: mod_authz_owner.html.ko.euc-kr

Content-Language: ko

Content-type: text/html; charset=EUC-KR

docs/manual/mod/mod_authz_owner.html.en

+2 −0
Changes for docs/manual/mod/mod_authz_owner.html.en: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
<div id="preamble"><h1>Apache Module mod_authz_owner</h1>

<div class="toplang">

<p><span>Available Languages: </span><a href="../en/mod/mod_authz_owner.html" title="English">&nbsp;en&nbsp;</a> |

<a href="../ja/mod/mod_authz_owner.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |

<a href="../ko/mod/mod_authz_owner.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>

</div>

<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Authorization based on file ownership</td></tr>
@@ -176,6 +177,7 @@ modules</td></tr> 
</div>

<div class="bottomlang">

<p><span>Available Languages: </span><a href="../en/mod/mod_authz_owner.html" title="English">&nbsp;en&nbsp;</a> |

<a href="../ja/mod/mod_authz_owner.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |

<a href="../ko/mod/mod_authz_owner.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>

</div><div id="footer">

<p class="apache">Copyright 1995-2005 The Apache Software Foundation or its licensors, as applicable.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>