This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 978963b70fa975122f9dafaafd1bd0905de9fb5d Author: Mark Thomas <ma...@apache.org> AuthorDate: Tue Jul 9 16:00:03 2019 +0100 Align docs with 8.5.x including fixes to a copy/paste error --- webapps/docs/config/filter.xml | 4 ++-- webapps/docs/config/valve.xml | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/webapps/docs/config/filter.xml b/webapps/docs/config/filter.xml index 30c8c9b..6d3334f 100644 --- a/webapps/docs/config/filter.xml +++ b/webapps/docs/config/filter.xml @@ -923,7 +923,7 @@ FINE: Request "/docs/config/manager.html" with response status "200" </attribute> <attribute name="antiClickJackingOption" required="false"> - <p>What value should be used for the ant click-jacking header? Must be + <p>What value should be used for the anticlick-jacking header? Must be one of <code>DENY</code>, <code>SAMEORIGIN</code>, <code>ALLOW-FROM </code> (case-insensitive). If not specified, the default value of <code>DENY</code> will be used.</p> @@ -1537,7 +1537,7 @@ FINE: Request "/docs/config/manager.html" with response status "200" <p> Note : <code>x-forwarded-by</code> holds the trusted proxy <code>proxy1</code>. <code>x-forwarded-by</code> holds <code>140.211.11.130</code> because - <code>untrusted-proxy</code> is not trusted and thus, we can not trust that + <code>untrusted-proxy</code> is not trusted and thus, we cannot trust that <code>untrusted-proxy</code> is the actual remote ip. <code>request.remoteAddr</code> is <code>untrusted-proxy</code> that is an IP verified by <code>proxy1</code>. diff --git a/webapps/docs/config/valve.xml b/webapps/docs/config/valve.xml index 31069d9..702a464 100644 --- a/webapps/docs/config/valve.xml +++ b/webapps/docs/config/valve.xml @@ -325,7 +325,7 @@ <li><b><code>msec</code></b> - number of milliseconds since the epoch</li> <li><b><code>msec_frac</code></b> - millisecond fraction</li> </ul> - <p>These formats can not be mixed with SimpleDateFormat formats in the same format + <p>These formats cannot be mixed with SimpleDateFormat formats in the same format token.</p> <p>Furthermore one can define whether to log the timestamp for the request start @@ -473,15 +473,15 @@ <section name="Access Control"> -<subsection name="Remote Address Filter"> +<subsection name="Remote Address Valve"> <subsection name="Introduction"> - <p>The <strong>Remote Address Filter</strong> allows you to compare the + <p>The <strong>Remote Address Valve</strong> allows you to compare the IP address of the client that submitted this request against one or more <em>regular expressions</em>, and either allow the request to continue or refuse to process the request from this client. A Remote Address - Filter can be associated with any Catalina container + Valve can be associated with any Catalina container (<a href="engine.html">Engine</a>, <a href="host.html">Host</a>, or <a href="context.html">Context</a>), and must accept any request presented to this container for processing before it will be passed on.</p> @@ -507,13 +507,13 @@ will be <code>0:0:0:0:0:0:0:1</code> instead of the more widely used <code>::1</code>. Consult your access logs for the actual value.</p> - <p>See also: <a href="#Remote_Host_Filter">Remote Host Filter</a>, + <p>See also: <a href="#Remote_Host_Valve">Remote Host Valve</a>, <a href="#Remote_IP_Valve">Remote IP Valve</a>.</p> </subsection> <subsection name="Attributes"> - <p>The <strong>Remote Address Filter</strong> supports the following + <p>The <strong>Remote Address Valve</strong> supports the following configuration attributes:</p> <attributes> @@ -602,15 +602,15 @@ </subsection> -<subsection name="Remote Host Filter"> +<subsection name="Remote Host Valve"> <subsection name="Introduction"> - <p>The <strong>Remote Host Filter</strong> allows you to compare the + <p>The <strong>Remote Host Valve</strong> allows you to compare the hostname of the client that submitted this request against one or more <em>regular expressions</em>, and either allow the request to continue or refuse to process the request from this client. A Remote Host - Filter can be associated with any Catalina container + Valve can be associated with any Catalina container (<a href="engine.html">Engine</a>, <a href="host.html">Host</a>, or <a href="context.html">Context</a>), and must accept any request presented to this container for processing before it will be passed on.</p> @@ -633,13 +633,13 @@ to return proper host names, you have to enable "DNS lookups" feature on a <strong>Connector</strong>.</p> - <p>See also: <a href="#Remote_Address_Filter">Remote Address Filter</a>, + <p>See also: <a href="#Remote_Address_Valve">Remote Address Valve</a>, <a href="http.html">HTTP Connector</a> configuration.</p> </subsection> <subsection name="Attributes"> - <p>The <strong>Remote Host Filter</strong> supports the following + <p>The <strong>Remote Host Valve</strong> supports the following configuration attributes:</p> <attributes> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org