]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Add some links and improve highlight
authorChristophe Jaillet <jailletc36@apache.org>
Fri, 3 Jun 2016 20:33:14 +0000 (20:33 +0000)
committerChristophe Jaillet <jailletc36@apache.org>
Fri, 3 Jun 2016 20:33:14 +0000 (20:33 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1746754 13f79535-47bb-0310-9956-ffa450edef68

docs/manual/mod/core.xml
docs/manual/vhosts/examples.xml

index cecf5e327607f9597ad6c6e3ee58bfe43f4fec63..aec326ed0ea88d7148642b6b097feecd1d35ccfb 100644 (file)
@@ -4087,7 +4087,8 @@ to name-virtual hosts</description>
     >ServerAlias</directive> is used, with no different precedence for wildcards
     (nor for ServerName vs. ServerAlias).  </p>
 
-    <p>The complete list of names in the <directive>VirtualHost</directive>
+    <p>The complete list of names in the <directive type="section" module="core"
+    >VirtualHost</directive>
     directive are treated just like a (non wildcard)
     <directive>ServerAlias</directive>.</p>
 
@@ -4110,13 +4111,13 @@ itself</description>
     </p>
 
     <p><directive>ServerName</directive> is used (possibly
-    in conjunction with <directive>ServerAlias</directive>) to uniquely
+    in conjunction with <directive module="core">ServerAlias</directive>) to uniquely
     identify a virtual host, when using <a
     href="../vhosts/name-based.html">name-based virtual hosts</a>.</p>
 
     <p>Additionally, this is used when
     creating self-referential redirection URLs when 
-    <directive>UseCanonicalName</directive> is set to a non-default
+    <directive module="core">UseCanonicalName</directive> is set to a non-default
     value.</p>
 
     <p>For example, if the name of the
index dfeb41d3b645e79c57576018ccc3554111b20dd1..4aae8d2fad7a3ff420a0d2409aabb50c0c0c4321 100644 (file)
@@ -76,8 +76,8 @@ Listen 80
     in the configuration file, it has the highest priority and can be seen
     as the <cite>default</cite> or <cite>primary</cite> server. That means
     that if a request is received that does not match one of the specified
-    <code>ServerName</code> directives, it will be served by this first
-    <code>VirtualHost</code>.</p>
+    <directive module="core">ServerName</directive> directives, it will be served by this first
+    <directive type="section" module="core">VirtualHost</directive>.</p>
 
     <p>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"
     (<code>192.168.1.1</code>).</p>
 
     <p>The server can be made to respond to internal and external requests
-    with the same content, with just one <code>VirtualHost</code>
-    section.</p>
+    with the same content, with just one <directive type="section" module="core"
+    >VirtualHost</directive> section.</p>
 
     <highlight language="config">
 &lt;VirtualHost 192.168.1.1 172.20.30.40&gt;
@@ -169,7 +169,7 @@ DocumentRoot "/www/mainserver"
     </highlight>
 
     <p>Now requests from both networks will be served from the same
-    <code>VirtualHost</code>.</p>
+    <directive type="section" module="core">VirtualHost</directive>.</p>
 
     <note>
           <title>Note:</title><p>On the internal