From: Christophe Jaillet Date: Fri, 3 Jun 2016 20:33:14 +0000 (+0000) Subject: Add some links and improve highlight X-Git-Tag: 2.5.0-alpha~1544 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0cb0bc70ac3f5f054237f11c99a60188221e8ed;p=thirdparty%2Fapache%2Fhttpd.git Add some links and improve highlight git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1746754 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml index cecf5e32760..aec326ed0ea 100644 --- a/docs/manual/mod/core.xml +++ b/docs/manual/mod/core.xml @@ -4087,7 +4087,8 @@ to name-virtual hosts >ServerAlias is used, with no different precedence for wildcards (nor for ServerName vs. ServerAlias).

-

The complete list of names in the VirtualHost +

The complete list of names in the VirtualHost directive are treated just like a (non wildcard) ServerAlias.

@@ -4110,13 +4111,13 @@ itself

ServerName is used (possibly - in conjunction with ServerAlias) to uniquely + in conjunction with ServerAlias) to uniquely identify a virtual host, when using name-based virtual hosts.

Additionally, this is used when creating self-referential redirection URLs when - UseCanonicalName is set to a non-default + UseCanonicalName is set to a non-default value.

For example, if the name of the diff --git a/docs/manual/vhosts/examples.xml b/docs/manual/vhosts/examples.xml index dfeb41d3b64..4aae8d2fad7 100644 --- a/docs/manual/vhosts/examples.xml +++ b/docs/manual/vhosts/examples.xml @@ -76,8 +76,8 @@ Listen 80 in the configuration file, it has the highest priority and can be seen as the default or primary server. That means that if a request is received that does not match one of the specified - ServerName directives, it will be served by this first - VirtualHost.

+ ServerName directives, it will be served by this first + VirtualHost.

The above configuration is what you will want to use in almost all name-based virtual hosting situations. The only thing that this @@ -157,8 +157,8 @@ DocumentRoot "/www/mainserver" (192.168.1.1).

The server can be made to respond to internal and external requests - with the same content, with just one VirtualHost - section.

+ with the same content, with just one VirtualHost section.

<VirtualHost 192.168.1.1 172.20.30.40> @@ -169,7 +169,7 @@ DocumentRoot "/www/mainserver"

Now requests from both networks will be served from the same - VirtualHost.

+ VirtualHost.

Note:

On the internal