You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ja...@apache.org on 2016/06/03 20:33:15 UTC
svn commit: r1746754 - in /httpd/httpd/trunk/docs/manual: mod/core.xml
vhosts/examples.xml
Author: jailletc36
Date: Fri Jun 3 20:33:14 2016
New Revision: 1746754
URL: http://svn.apache.org/viewvc?rev=1746754&view=rev
Log:
Add some links and improve highlight
Modified:
httpd/httpd/trunk/docs/manual/mod/core.xml
httpd/httpd/trunk/docs/manual/vhosts/examples.xml
Modified: httpd/httpd/trunk/docs/manual/mod/core.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/core.xml?rev=1746754&r1=1746753&r2=1746754&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.xml Fri Jun 3 20:33:14 2016
@@ -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
Modified: httpd/httpd/trunk/docs/manual/vhosts/examples.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/vhosts/examples.xml?rev=1746754&r1=1746753&r2=1746754&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/vhosts/examples.xml (original)
+++ httpd/httpd/trunk/docs/manual/vhosts/examples.xml Fri Jun 3 20:33:14 2016
@@ -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">
<VirtualHost 192.168.1.1 172.20.30.40>
@@ -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