From: Rich Bowen <rbowen@apache.org>
Date: Fri, 8 May 2015 15:14:03 +0000 (+0000)
Subject: Rebuild
X-Git-Tag: 2.4.13~117
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b4a13bed211c07908d1b278db4bf170d084555c;p=thirdparty%2Fapache%2Fhttpd.git

Rebuild

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1678375 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/rewrite/avoid.html.en b/docs/manual/rewrite/avoid.html.en
index 91c8108eef5..441a9d6dadf 100644
--- a/docs/manual/rewrite/avoid.html.en
+++ b/docs/manual/rewrite/avoid.html.en
@@ -89,6 +89,11 @@ and <code>/one/three/four.html</code>.</p>
 <pre class="prettyprint lang-config">Redirect /one/ http://one.example.com/</pre>
 
 
+<p>To redirect one hostname to another, for example
+<code>example.com</code> to <code>www.example.com</code>, see the
+<a href="remapping.html#canonicalhost">Canonical Hostnames</a>
+recipe.</p>
+
 <p>To redirect <code>http</code> URLs to <code>https</code>, do the
 following:</p>
 
diff --git a/docs/manual/rewrite/avoid.xml.fr b/docs/manual/rewrite/avoid.xml.fr
index ba80da1b11c..6ebd630b4e9 100644
--- a/docs/manual/rewrite/avoid.xml.fr
+++ b/docs/manual/rewrite/avoid.xml.fr
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1479866:1673563 (outdated) -->
+<!-- English Revision: 1479866:1678373 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->