[tomcat] 02/02: Clarify where wildcards are allowed in Host and Alias directives

[mg...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

mgrigorov pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit a1f53c366ded63bb1d57adc8000b082a4b70d767
Author: Tom Chiverton <to...@users.noreply.github.com>
AuthorDate: Wed Aug 26 16:41:52 2020 +0100

    Clarify where wildcards are allowed in Host and Alias directives
    
    (cherry picked from commit ae88ac2ee9a69b075696769c6b7ec61b7ba1d8a6)
---
 webapps/docs/config/host.xml | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/webapps/docs/config/host.xml b/webapps/docs/config/host.xml
index d2e8f14..3d97fd9 100644
--- a/webapps/docs/config/host.xml
+++ b/webapps/docs/config/host.xml
@@ -192,10 +192,8 @@
         have a name that matches the <code>defaultHost</code> setting for that
         Engine.  See <a href="#Host_Name_Aliases">Host Name Aliases</a> for
         information on how to assign more than one network name to the same
-        virtual host. If the name takes the form of <code>*.domainname</code>
-        (e.g. <code>*.apache.org</code>) then it will be treated as a match for
-        any host in that domain unless a host that has an exactly matching name
-        is found.</p>
+        virtual host. The name can not contain a wildcard, this is only
+        valid in an Alias.</p>
       </attribute>
 
       <attribute name="startStopThreads" required="false">
@@ -491,10 +489,9 @@
     involved must be registered in your DNS server to resolve to the
     same computer that is running this instance of Catalina.</p>
 
-    <p>Aliases may also use the wildcard form (<code>*.domainname</code>)
-       permitted for the <strong>name</strong> attribute of a
-       <strong>Host</strong>.</p>
-
+    <p>Aliases may also use the wildcard form (<code>*.domainname</code>), 
+    unlike for the <strong>name</strong> attribute of a <strong>Host</strong>.
+    </p>
   </subsection>
 
 


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