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 01df00fe64bee9a842044624f1fd356108f7f835
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Dec 2 20:28:31 2019 +0000

    Alternative wording
---
 webapps/docs/config/valve.xml | 48 +++++++++++++++++++++----------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/webapps/docs/config/valve.xml b/webapps/docs/config/valve.xml
index 05d1b6b..fbb19fe 100644
--- a/webapps/docs/config/valve.xml
+++ b/webapps/docs/config/valve.xml
@@ -1109,12 +1109,12 @@
         <code>always</code>. <code>never</code> means that a request will never
         bypass authentication even if it appears to be a CORS preflight 
request.
         <code>filter</code> means that a request will bypass authentication if
-        it appears to be a CORS preflight request and the web application the
-        request maps to has the <a href="filter.html#CORS_Filter">CORS
-        Filter</a> enabled and mapped to <code>/*</code>. <code>always</code>
-        means that all requests that appear to be CORS preflight requests will
-        bypass authentication. If not set, the default value is
-        <code>never</code>.</p>
+        it appears to be a CORS preflight request; it is mapped to a web
+        application that has the <a href="filter.html#CORS_Filter">CORS
+        Filter</a> enabled; and the CORS Filter is mapped to <code>/*</code>.
+        <code>always</code> means that all requests that appear to be CORS
+        preflight requests will bypass authentication. If not set, the default
+        value is <code>never</code>.</p>
       </attribute>
 
       <attribute name="alwaysUseSession" required="false">
@@ -1252,12 +1252,12 @@
         <code>always</code>. <code>never</code> means that a request will never
         bypass authentication even if it appears to be a CORS preflight 
request.
         <code>filter</code> means that a request will bypass authentication if
-        it appears to be a CORS preflight request and the web application the
-        request maps to has the <a href="filter.html#CORS_Filter">CORS
-        Filter</a> enabled and mapped to <code>/*</code>. <code>always</code>
-        means that all requests that appear to be CORS preflight requests will
-        bypass authentication. If not set, the default value is
-        <code>never</code>.</p>
+        it appears to be a CORS preflight request; it is mapped to a web
+        application that has the <a href="filter.html#CORS_Filter">CORS
+        Filter</a> enabled; and the CORS Filter is mapped to <code>/*</code>.
+        <code>always</code> means that all requests that appear to be CORS
+        preflight requests will bypass authentication. If not set, the default
+        value is <code>never</code>.</p>
       </attribute>
 
       <attribute name="alwaysUseSession" required="false">
@@ -1425,12 +1425,12 @@
         <code>always</code>. <code>never</code> means that a request will never
         bypass authentication even if it appears to be a CORS preflight 
request.
         <code>filter</code> means that a request will bypass authentication if
-        it appears to be a CORS preflight request and the web application the
-        request maps to has the <a href="filter.html#CORS_Filter">CORS
-        Filter</a> enabled and mapped to <code>/*</code>. <code>always</code>
-        means that all requests that appear to be CORS preflight requests will
-        bypass authentication. If not set, the default value is
-        <code>never</code>.</p>
+        it appears to be a CORS preflight request; it is mapped to a web
+        application that has the <a href="filter.html#CORS_Filter">CORS
+        Filter</a> enabled; and the CORS Filter is mapped to <code>/*</code>.
+        <code>always</code> means that all requests that appear to be CORS
+        preflight requests will bypass authentication. If not set, the default
+        value is <code>never</code>.</p>
       </attribute>
 
       <attribute name="changeSessionIdOnAuthentication" required="false">
@@ -1557,12 +1557,12 @@
         <code>always</code>. <code>never</code> means that a request will never
         bypass authentication even if it appears to be a CORS preflight 
request.
         <code>filter</code> means that a request will bypass authentication if
-        it appears to be a CORS preflight request and the web application the
-        request maps to has the <a href="filter.html#CORS_Filter">CORS
-        Filter</a> enabled and mapped to <code>/*</code>. <code>always</code>
-        means that all requests that appear to be CORS preflight requests will
-        bypass authentication. If not set, the default value is
-        <code>never</code>.</p>
+        it appears to be a CORS preflight request; it is mapped to a web
+        application that has the <a href="filter.html#CORS_Filter">CORS
+        Filter</a> enabled; and the CORS Filter is mapped to <code>/*</code>.
+        <code>always</code> means that all requests that appear to be CORS
+        preflight requests will bypass authentication. If not set, the default
+        value is <code>never</code>.</p>
       </attribute>
 
       <attribute name="cache" required="false">


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to