# HG changeset patch
# User Vladimir Homutov <vl@nginx.com>
# Date 1344846139 0
# Node ID 779a47d0acb073d6b8f823f768f84888f11f107f
# Parent  af23cb587b000b86c504f4104bc6f009891bfb21
Unified terminology used in the "server_name" directive and server_names.xml.

diff -r af23cb587b00 -r 779a47d0acb0 xml/en/docs/http/ngx_http_core_module.xml
--- a/xml/en/docs/http/ngx_http_core_module.xml	Mon Aug 13 08:19:06 2012 +0000
+++ b/xml/en/docs/http/ngx_http_core_module.xml	Mon Aug 13 08:22:19 2012 +0000
@@ -10,7 +10,7 @@
 <module name="Module ngx_http_core_module"
         link="/en/docs/http/ngx_http_core_module.html"
         lang="en"
-        rev="1">
+        rev="2">
 
 <section id="directives" name="Directives">
 
@@ -2115,6 +2115,9 @@
 
 <para>
 The first name becomes the primary server name.
+</para>
+
+<para>
 Server names can include an asterisk (“<literal>*</literal>”)
 to replace the first or last part of a name:
 <example>
@@ -2122,6 +2125,7 @@
     server_name example.com *.example.com www.example.*;
 }
 </example>
+Such names are called wildcard names.
 </para>
 
 <para>
@@ -2134,11 +2138,6 @@
 </para>
 
 <para>
-If the parameter equals “<var>$hostname</var>” (0.9.4), the
-machine’s hostname is substituted.
-</para>
-
-<para>
 It is also possible to use regular expressions in server names,
 prepending the name with a tilde (“<literal>~</literal>”):
 <example>
@@ -2193,6 +2192,11 @@
 </para>
 
 <para>
+If the parameter equals “<var>$hostname</var>” (0.9.4), the
+machine’s hostname is substituted.
+</para>
+
+<para>
 It is also possible to specify an empty server name (0.7.11):
 <example>
 server {
@@ -2210,21 +2214,21 @@
 <para>
 When searching for a virtual server by name,
 if name matches more than one of the specified variants,
-e.g. both mask and regular expression match, the first matching
+e.g. both wildcard name and regular expression match, the first matching
 variant will be chosen, in the following order of precedence:
 <list type="enum">
 
 <listitem>
-full name
+exact name
 </listitem>
 
 <listitem>
-longest name with a prefix mask,
+longest wildcard name starting with an asterisk,
 e.g. “<literal>*.example.com</literal>”
 </listitem>
 
 <listitem>
-longest name with a suffix mask,
+longest wildcard name ending with an asterisk,
 e.g. “<literal>mail.*</literal>”
 </listitem>
 
@@ -2236,6 +2240,11 @@
 </list>
 </para>
 
+<para>
+For more information, please refer to the
+<link doc="server_names.xml"/> document.
+</para>
+
 </directive>