From f3b4fbe65f2ed5604853da1118c6bf49f58b6ab3 Mon Sep 17 00:00:00 2001
From: Eric Covener
Date: Thu, 31 May 2012 12:25:23 +0000
Subject: [PATCH] Merge r1344675 from trunk:
PR5334, leave a hint about VirtualHost args acting like serveralias for people who don't read details.html
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1344676 13f79535-47bb-0310-9956-ffa450edef68
---
docs/manual/mod/core.xml | 5 +++++
docs/manual/vhosts/name-based.xml | 5 +++++
2 files changed, 10 insertions(+)
diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index ed73eeb717..4f9a9238b7 100644
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -3699,6 +3699,11 @@ to name-virtual hosts
module="core">ServerName or ServerAlias is used, with no different precedence for wildcards
(nor for ServerName vs. ServerAlias).
+
+ The complete list of names in the VirtualHost
+ directive are treated just like a (non wildcard)
+ ServerAlias.
+
UseCanonicalName
Apache HTTP Server Virtual Host documentation
diff --git a/docs/manual/vhosts/name-based.xml b/docs/manual/vhosts/name-based.xml
index e5a52d9a85..9fbf2ad44e 100644
--- a/docs/manual/vhosts/name-based.xml
+++ b/docs/manual/vhosts/name-based.xml
@@ -175,6 +175,11 @@
>ServerAlias is used, with no different precedence for wildcards
(nor for ServerName vs. ServerAlias).
+ The complete list of names in the VirtualHost
+ directive are treated just like a (non wildcard)
+ ServerAlias.
+
Finally, you can fine-tune the configuration of the virtual hosts
by placing other directives inside the VirtualHost containers. Most directives can be
--
2.40.0