Never compare docs and code:

- enableLookups for connector was
  "false" by default at least the last 5 years.

- resolveHosts for normal and extended
  access log valve wasn't functional in
  the last 4 years (see e.g. r494191) and
  IMHO since noone complaint switching
  enableLookups to "true" instead is an
  appropriate alternative. So document
  that "resolveHosts" is no longer supported.

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

diff --git a/webapps/docs/config/ajp.xml b/webapps/docs/config/ajp.xml
index a25e7f9..2094c18 100644 (file)
--- a/webapps/docs/config/ajp.xml
+++ b/webapps/docs/config/ajp.xml
@@ -92,7 +92,7 @@
       order to return the actual host name of the remote client.  Set
       to <code>false</code> to skip the DNS lookup and return the IP
       address in String form instead (thereby improving performance).
-      By default, DNS lookups are enabled.</p>
+      By default, DNS lookups are disabled.</p>
     </attribute>
 
     <attribute name="maxPostSize" required="false">

diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml
index b241d56..7219c4f 100644 (file)
--- a/webapps/docs/config/http.xml
+++ b/webapps/docs/config/http.xml
@@ -90,7 +90,7 @@
       order to return the actual host name of the remote client.  Set
       to <code>false</code> to skip the DNS lookup and return the IP
       address in String form instead (thereby improving performance).
-      By default, DNS lookups are enabled.</p>
+      By default, DNS lookups are disabled.</p>
     </attribute>
 
     <attribute name="maxPostSize" required="false">

diff --git a/webapps/docs/config/valve.xml b/webapps/docs/config/valve.xml
index 8eb9d73..0c55d8f 100644 (file)
--- a/webapps/docs/config/valve.xml
+++ b/webapps/docs/config/valve.xml
@@ -148,10 +148,8 @@
       </attribute>
 
       <attribute name="resolveHosts" required="false">
-        <p>Set to <code>true</code> to convert the IP address of the remote
-        host into the corresponding host name via a DNS lookup.  Set to
-        <code>false</code> to skip this lookup, and report the remote IP
-        address instead.</p>
+        <p>This attribute is no longer supported. Use the connector
+        attribute <code>enableLookups</code> instead.</p>
       </attribute>
 
       <attribute name="suffix" required="false">
@@ -209,7 +207,7 @@
     <li><b>%b</b> - Bytes sent, excluding HTTP headers, or '-' if zero</li>
     <li><b>%B</b> - Bytes sent, excluding HTTP headers</li>
     <li><b>%h</b> - Remote host name (or IP address if
-        <code>resolveHosts</code> is false)</li>
+        <code>enableLookups</code> for the connector is false)</li>
     <li><b>%H</b> - Request protocol</li>
     <li><b>%l</b> - Remote logical username from identd (always returns
         '-')</li>
@@ -341,10 +339,8 @@
       </attribute>
 
       <attribute name="resolveHosts" required="false">
-        <p>Set to <code>true</code> to convert the IP address of the remote
-        host into the corresponding host name via a DNS lookup.  Set to
-        <code>false</code> to skip this lookup, and report the remote IP
-        address instead.</p>
+        <p>This attribute is no longer supported. Use the connector
+        attribute <code>enableLookups</code> instead.</p>
       </attribute>
 
       <attribute name="suffix" required="false">

diff --git a/webapps/docs/funcspecs/fs-admin-objects.xml b/webapps/docs/funcspecs/fs-admin-objects.xml
index 8846033..8a39e93 100644 (file)
--- a/webapps/docs/funcspecs/fs-admin-objects.xml
+++ b/webapps/docs/funcspecs/fs-admin-objects.xml
@@ -118,7 +118,7 @@ Operations</a> that can be performed when the administrative application is
   <li><code>debug</code> - Debugging detail level.  [0]</li>
   <li><code>enableLookups</code> - Should we perform DNS lookups on remote
       IP addresses when <code>request.getRemoteHost()</code> is called?
-      [true]</li>
+      [false]</li>
   <li><code>maxProcessors</code> - The maximum number of processor threads
       supported by this connector.  [20]</li>
   <li><code>minProcessors</code> - The minimum number of processor threads