Docs update...

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

diff --git a/docs/manual/developer/index.html.en b/docs/manual/developer/index.html.en
index 634cbd381192d4e98f3adaa08e01afb0312ccde9..3b94d480098dd14ceac835cea990e155c9dca056 100644 (file)
--- a/docs/manual/developer/index.html.en
+++ b/docs/manual/developer/index.html.en
@@ -78,4 +78,4 @@
 </div><div id="footer">
 <p class="apache">Copyright 1995-2006 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>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
-</body></html>
+</body></html>
\ No newline at end of file

diff --git a/docs/manual/howto/auth.html.en b/docs/manual/howto/auth.html.en
index bc45ebab7d0604af4970c8cf6810e560c80ee1f6..02ec485a38acaef3a201a0c16ebe84e0554f7ca6 100644 (file)
--- a/docs/manual/howto/auth.html.en
+++ b/docs/manual/howto/auth.html.en
@@ -553,7 +553,7 @@ person in</a></h2>
         following:</p>
     
         <div class="example"><p><code>
-          Reject ip 205.252.46.165
+          Reject ip 10.252.46.165
         </code></p></div>
     
         <p>Visitors coming from that address will not be able to see
@@ -570,8 +570,8 @@ person in</a></h2>
         <div class="example"><p><code>
           &lt;SatisfyAll&gt;<br />
           <span class="indent">
-            Reject ip <var>192.101.205</var><br />
-            Reject host <var>cyberthugs.com</var> <var>moreidiots.com</var><br />           Reject host ke<br />
+            Reject ip <var>192.168.205</var><br />
+            Reject host <var>phishers.example.com</var> <var>moreidiots.example</var><br />           Reject host ke<br />
           </span>
           &lt;/SatisfyAll&gt;
         </code></p></div>

diff --git a/docs/manual/howto/auth.xml.ja b/docs/manual/howto/auth.xml.ja
index caca8d9a5bb6dc7ebb85a24bfd797c7d1559600f..78c486711cf8032eb6198cdb5dd7ae3656adeed6 100644 (file)
--- a/docs/manual/howto/auth.xml.ja
+++ b/docs/manual/howto/auth.xml.ja
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='iso-2022-jp' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 219484:378577 (outdated) -->
+<!-- English Revision: 219484:389591 (outdated) -->
 
 <!--
  Copyright 2003-2005 The Apache Software Foundation or its licensors,

diff --git a/docs/manual/howto/auth.xml.ko b/docs/manual/howto/auth.xml.ko
index 00a1dc3a62874b5b042808435988f5799a4cfe3a..6b55ed52741235cc3c92654ba680edde456db921 100644 (file)
--- a/docs/manual/howto/auth.xml.ko
+++ b/docs/manual/howto/auth.xml.ko
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='EUC-KR' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 105989:378577 (outdated) -->
+<!-- English Revision: 105989:389591 (outdated) -->
 
 <!--
  Copyright 2004-2005 The Apache Software Foundation or its licensors,

diff --git a/docs/manual/mod/mod_dbd.html.en b/docs/manual/mod/mod_dbd.html.en
index 36ff654c3902ef5a033a6e72b3db59a4cdd67722..9b98ea567c4e5a7b4da6be8684def77fc634243f 100644 (file)
--- a/docs/manual/mod/mod_dbd.html.en
+++ b/docs/manual/mod/mod_dbd.html.en
@@ -190,6 +190,19 @@ APR_DECLARE_OPTIONAL_FN(void, ap_dbd_prepare, (server_rec*, const char*, const c
     <p>As required by the underlying driver.  Typically this will be
     used to pass whatever cannot be defaulted amongst username,
     password, database name, hostname and port number for connection.</p>
+    <p>Connection string parameters for current drivers include:</p>
+    <dl>
+    <dt>MySQL</dt>
+    <dd>host, port, user, pass, dbname, sock</dd> 
+    <dt>Oracle</dt>
+    <dd>user, pass, dbname, server</dd> 
+    <dt>PostgreSQL</dt>
+    <dd>The connection string is passed straight through to <code>PQconnectdb</code></dd>
+    <dt>SQLite2</dt>
+    <dd>The connection string is split on a colon, and <code>part1:part2</code> is used as <code>sqlite_open(part1, atoi(part2), NULL)</code></dd>
+    <dt>SQLite3</dt>
+    <dd>The connection string is passed straight through to <code>sqlite3_open</code></dd>
+    </dl>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>

diff --git a/docs/manual/mod/mod_proxy.html.en b/docs/manual/mod/mod_proxy.html.en
index 4496a987985006cc40e707fff8ec087c57298c5d..4968faeb6cbcf567cbfd11530b010091b93d9581 100644 (file)
--- a/docs/manual/mod/mod_proxy.html.en
+++ b/docs/manual/mod/mod_proxy.html.en
@@ -790,6 +790,29 @@ through</td></tr>
         redirected to the BalancerMember that has route parametar
         equal as this value.
     </td></tr>
+    <tr><td>status</td>
+        <td>-</td>
+        <td>Single letter value defining the initial status of
+        this worker: 'D' is disabled, 'S' is stopped and 'E' is
+        in an error state. Status can be set (which is the default)
+        by prepending with '+' or cleared by prepending with '-'.
+        Thus, a setting of 'S-E' sets this worker to Stopped and
+        clears the in-error flag.
+    </td></tr>
+    <tr><td>flushpackets</td>
+        <td>off</td>
+        <td>Determines whether the proxy module will auto-flush the output
+        brigade after each "chunk" of data. 'off' means that it will flush
+        only when needed, 'on' means after each chunk is sent and
+        'auto' means poll/wait for a period of time and flush if
+        no input has been received for 'flushwait' milliseconds.
+        Currently this is in effect only for AJP.
+    </td></tr>
+    <tr><td>flushwait</td>
+        <td>10</td>
+        <td>The time to wait for additional input, in milliseconds, before
+        flushing the output brigade if 'flushpackets' is 'auto'.
+    </td></tr>
 
     </table>
 

diff --git a/docs/manual/mod/mod_proxy.xml b/docs/manual/mod/mod_proxy.xml
index 23873166019d09506cac945dd9697ae17de7727c..a1e546f4be1356e163ef3842a13a1b3febcf4125 100644 (file)
--- a/docs/manual/mod/mod_proxy.xml
+++ b/docs/manual/mod/mod_proxy.xml
@@ -605,6 +605,29 @@ expressions</description>
         redirected to the BalancerMember that has route parametar
         equal as this value.
     </td></tr>
+    <tr><td>status</td>
+        <td>-</td>
+        <td>Single letter value defining the initial status of
+        this worker: 'D' is disabled, 'S' is stopped and 'E' is
+        in an error state. Status can be set (which is the default)
+        by prepending with '+' or cleared by prepending with '-'.
+        Thus, a setting of 'S-E' sets this worker to Stopped and
+        clears the in-error flag.
+    </td></tr>
+    <tr><td>flushpackets</td>
+        <td>off</td>
+        <td>Determines whether the proxy module will auto-flush the output
+        brigade after each "chunk" of data. 'off' means that it will flush
+        only when needed, 'on' means after each chunk is sent and
+        'auto' means poll/wait for a period of time and flush if
+        no input has been received for 'flushwait' milliseconds.
+        Currently this is in effect only for AJP.
+    </td></tr>
+    <tr><td>flushwait</td>
+        <td>10</td>
+        <td>The time to wait for additional input, in milliseconds, before
+        flushing the output brigade if 'flushpackets' is 'auto'.
+    </td></tr>
 
     </table>