generated files only

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

diff --git a/docs/manual/developer/new_api_2_4.html.en b/docs/manual/developer/new_api_2_4.html.en
index 778078630f7127449abd9df0f09fd90972a036a6..24974fe24f9d22bf16390f89d80fb7b6942e2c21 100644 (file)
--- a/docs/manual/developer/new_api_2_4.html.en
+++ b/docs/manual/developer/new_api_2_4.html.en
@@ -43,6 +43,7 @@
 <div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#ap_expr">ap_expr (NEW!)</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#ap_listen">ap_listen (changed; back-compatible)</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#ap_mpm">ap_mpm (changed)</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#ap_regex">ap_regex (changed)</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#ap_slotmem">ap_slotmem (NEW!)</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#ap_socache">ap_socache (NEW!)</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#heartbeat">heartbeat (NEW!)</a></li>
@@ -83,6 +84,14 @@
   <code>ap_mpm_register_timed_callback</code> is new.</p>
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
+<h2><a name="ap_regex" id="ap_regex">ap_regex (changed)</a></h2>
+    
+  <p>In addition to the existing regexp wrapper, a new higher-level API
+  <code>ap_rxplus</code> is now provided.  This provides the capability to
+  compile Perl-style expressions like <code>s/regexp/replacement/flags</code>
+  and to execute them against arbitrary strings.  Also regexp memory.</p>
+  </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
 <h2><a name="ap_slotmem" id="ap_slotmem">ap_slotmem (NEW!)</a></h2>
     
     <p>Introduces an API for modules to allocate and manage memory slots

diff --git a/docs/manual/mod/mod_cache.html.en b/docs/manual/mod/mod_cache.html.en
index e99cfe74d6a08506abda7de0d1c0e18c1aaa6228..ca11b434aa2464496aa859ceaff4d3a1360caf48 100644 (file)
--- a/docs/manual/mod/mod_cache.html.en
+++ b/docs/manual/mod/mod_cache.html.en
@@ -730,7 +730,7 @@ LastModified date.</td></tr>
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_cache</td></tr>
 </table>
-    <p>Since httpd 2.2.4, responses which are already-expired are not 
+    <p>Since httpd 2.2.4, responses which have already expired are not
        stored in the cache.  The <code class="directive">CacheStoreExpired</code>
        directive allows this behavior to be overridden.
        <code class="directive">CacheStoreExpired</code> On

diff --git a/docs/manual/mod/mod_cache.xml.ja b/docs/manual/mod/mod_cache.xml.ja
index 18ca59cd6e5ec1b7099e17de62d41fb4a6494776..e8f43cb55d9bd62e76e82aed4d83364c4e6d0a74 100644 (file)
--- a/docs/manual/mod/mod_cache.xml.ja
+++ b/docs/manual/mod/mod_cache.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 504183:1000106 (outdated) -->
+<!-- English Revision: 504183:1000128 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/mod/mod_cache.xml.ko b/docs/manual/mod/mod_cache.xml.ko
index 794495ae2024d65d15c5abbd7382d68045440ad0..4abb21e3140f36ab6ac66573769bc361016f0b17 100644 (file)
--- a/docs/manual/mod/mod_cache.xml.ko
+++ b/docs/manual/mod/mod_cache.xml.ko
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="EUC-KR" ?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 105569:1000106 (outdated) -->
+<!-- English Revision: 105569:1000128 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/mod/mod_proxy.html.en b/docs/manual/mod/mod_proxy.html.en
index 31ab0dc921ae57306f35394dac117de33467ab04..400240f1353591ccb95df87266526315e46104aa 100644 (file)
--- a/docs/manual/mod/mod_proxy.html.en
+++ b/docs/manual/mod/mod_proxy.html.en
@@ -893,13 +893,12 @@ through</td></tr>
     using  <code>key=value</code> parameters, described in the table
     below.</p>
 
-    <p>Setting <code>min</code> will determine how many connections to
-    the backend server will be retained after use.  Up to the
-    Soft Maximum, or <code>smax</code>, number of connections will be
-    created on demand.  Any connections above <code>smax</code> are
-    subject to a time to live, or <code>ttl</code>.  Apache httpd will
-    never create more than the Hard Maximum or, <code>max</code>,
-    connections to the backend server.</p>
+    <p>Setting <code>min</code> to non-zero allows connections to the
+    backend server to be retained after use; at least <code>min</code>
+    connections will be retained.  Any idle connections above
+    <code>smax</code> are subject to a time to live, or <code>ttl</code>.
+    Up to the hard maximum, or <code>max</code>, number of connections
+    may be created.</p>
 
     <p>The pool of connections is maintained per web server child
     process, and the <code>min</code>, <code>max</code>, and
@@ -930,9 +929,8 @@ through</td></tr>
     to the backend server.</td></tr>
     <tr><td>smax</td>
         <td>max</td>
-        <td>Up to the Soft Maximum
-    number of connections will be created on demand. Any connections above 
-    <code>smax</code> are subject to a time to live or <code>ttl</code>.
+        <td>Retained connections above the soft maximum, or <code>smax</code>,
+    are subject to a time to live, controlled by the <code>ttl</code> parameter.
     </td></tr>
     <tr><td>acquire</td>
         <td>-</td>
@@ -1060,9 +1058,9 @@ through</td></tr>
     </td></tr>
     <tr><td>ttl</td>
         <td>-</td>
-        <td>Time To Live for the inactive connections above the
-        <code>smax</code> connections in seconds. Apache httpd will close all
-        connections that has not been used inside that time period.
+        <td>Time to live for the inactive connections above <code>smax</code>,
+        in seconds.  Connections above <code>smax</code> will be closed
+        if they have not been used inside that time period.
     </td></tr>
 
     </table>

diff --git a/docs/manual/mod/mod_proxy.xml.ja b/docs/manual/mod/mod_proxy.xml.ja
index 13bc98b0a05560fffe5ffeb98892468761b592c6..ec8dab0c20c97806809440cac7ec580f21fd764f 100644 (file)
--- a/docs/manual/mod/mod_proxy.xml.ja
+++ b/docs/manual/mod/mod_proxy.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 344971:987858 (outdated) -->
+<!-- English Revision: 344971:1000130 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more