From: Jim Jagielski <jim@apache.org>
Date: Wed, 21 Jun 2017 15:00:46 +0000 (+0000)
Subject: some more nits
X-Git-Tag: 2.5.0-alpha~352
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5f7bb104e4faabbea2242b212ae623e199a2d358;p=apache

some more nits

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

diff --git a/docs/manual/mod/mod_proxy.xml b/docs/manual/mod/mod_proxy.xml
index b5ab86e605..746436f18c 100644
--- a/docs/manual/mod/mod_proxy.xml
+++ b/docs/manual/mod/mod_proxy.xml
@@ -217,7 +217,8 @@ ProxyPass "/example" "http://backend.example.com" connectiontimeout=5 timeout=30
 
       <p>This will create a worker associated with the origin server URL
       <code>http://backend.example.com</code> that will use the given timeout
-      values. When used in a forward proxy, workers are usually defined
+      values. All timeouts use the <a href="directive-dict.html#Syntax">time-interval</a>
+      directive syntax. When used in a forward proxy, workers are usually defined
       via the <directive module="mod_proxy">ProxySet</directive> directive:</p>
 
       <highlight language="config">
@@ -1061,7 +1062,7 @@ ProxyPass "/example" "http://backend.example.com" max=20 ttl=120 retry=300
         <td>Connect timeout in seconds.
         The number of seconds Apache httpd waits for the creation of a connection to
         the backend to complete. By adding a postfix of ms, the timeout can be
-        also set in milliseconds.
+        also set in milliseconds. Uses the <a href="directive-dict.html#Syntax">time-interval</a> directive syntax
     </td></tr>
     <tr><td>disablereuse</td>
         <td>Off</td>
@@ -1093,7 +1094,8 @@ ProxyPass "/example" "http://backend.example.com" max=20 ttl=120 retry=300
     <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'. Uses time-interval directive syntax.
+        flushing the output brigade if 'flushpackets' is 'auto'.
+        Uses <a href="directive-dict.html#Syntax">time-interval</a> directive syntax.
     </td></tr>
     <tr><td>iobuffersize</td>
         <td>8192</td>
@@ -1112,7 +1114,7 @@ ProxyPass "/example" "http://backend.example.com" max=20 ttl=120 retry=300
     <p>The frequency of initial and subsequent TCP keepalive probes
     depends on global OS settings, and may be as high as 2 hours. To be useful,
     the frequency configured in the OS must be smaller than the threshold used
-    by the firewall. Uses time-interval directive syntax.</p>
+    by the firewall. Uses the <a href="directive-dict.html#Syntax">time-interval</a> directive syntax.</p>
     </td></tr>
     <tr><td>lbset</td>
         <td>0</td>
@@ -1139,7 +1141,7 @@ ProxyPass "/example" "http://backend.example.com" max=20 ttl=120 retry=300
         which could be an issue, but it will lower the
         traffic in case some of the cluster nodes are down or busy.
         By adding a postfix of ms, the delay can be also set in
-        milliseconds. Uses time-interval directive syntax.
+        milliseconds. Uses the <a href="directive-dict.html#Syntax">time-interval</a> directive syntax.
     </td></tr>
     <tr><td>receivebuffersize</td>
         <td>0</td>
@@ -1163,7 +1165,8 @@ ProxyPass "/example" "http://backend.example.com" max=20 ttl=120 retry=300
     Apache httpd will not forward any requests to that server until the timeout
     expires. This enables to shut down the backend server for maintenance
     and bring it back online later. A value of 0 means always retry workers
-    in an error state with no timeout. Uses time-interval directive syntax.
+    in an error state with no timeout.
+    Uses the <a href="directive-dict.html#Syntax">time-interval</a> directive syntax.
     </td></tr>
     <tr><td>route</td>
         <td>-</td>
@@ -1195,14 +1198,14 @@ ProxyPass "/example" "http://backend.example.com" max=20 ttl=120 retry=300
         <td><directive module="mod_proxy">ProxyTimeout</directive></td>
         <td>Connection timeout in seconds.
         The number of seconds Apache httpd waits for data sent by / to the backend.
-        Uses time-interval directive syntax.
+        Uses the <a href="directive-dict.html#Syntax">time-interval</a> directive syntax.
     </td></tr>
     <tr><td>ttl</td>
         <td>-</td>
         <td>Time to live for inactive connections and associated connection
         pool entries, in seconds.  Once reaching this limit, a
         connection will not be used again; it will be closed at some
-        later time. Uses time-interval directive syntax.
+        later time. Uses the <a href="directive-dict.html#Syntax">time-interval</a> directive syntax.
     </td></tr>
     <tr><td>flusher</td>
         <td>flush</td>
@@ -1280,7 +1283,8 @@ ProxyPass "/example" "http://backend.example.com" max=20 ttl=120 retry=300
     <tr><td>timeout</td>
         <td>0</td>
         <td>Balancer timeout in seconds. If set, this will be the maximum time
-        to wait for a free worker. The default is to not wait. Uses time-interval directive syntax.
+        to wait for a free worker. The default is to not wait.
+        Uses the <a href="directive-dict.html#Syntax">time-interval</a> directive syntax.
     </td></tr>
     <tr><td>failonstatus</td>
         <td>-</td>
@@ -1865,7 +1869,7 @@ NoProxy         .example.com 192.168.112.0/21
 <directivesynopsis>
 <name>ProxyTimeout</name>
 <description>Network timeout for proxied requests</description>
-<syntax>ProxyTimeout <var>seconds</var></syntax>
+<syntax>ProxyTimeout <var>time-interval</var>[s]</syntax>
 <default>Value of <directive module="core">Timeout</directive></default>
 <contextlist><context>server config</context><context>virtual host</context>
 </contextlist>