From: Ruediger Pluem <rpluem@apache.org>
Date: Sat, 3 May 2008 08:09:34 +0000 (+0000)
Subject: Merge r550504 from trunk:
X-Git-Tag: 2.2.9~228
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e47a28ecdfd8ab3f62a8f3c9411120747687f5a5;p=thirdparty%2Fapache%2Fhttpd.git

Merge r550504 from trunk:

Missing <br /> to wrap text correctly
Submitted by:  Takashi Sato <serai lans-tv.com>
Reviewed by: rpluem, pctony


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

diff --git a/docs/manual/content-negotiation.html.en b/docs/manual/content-negotiation.html.en
index 535a9dffddd..90412aa4c22 100644
--- a/docs/manual/content-negotiation.html.en
+++ b/docs/manual/content-negotiation.html.en
@@ -504,7 +504,7 @@ Negotiation</a></li>
     the normal negotiation process applies.</p>
 
     <div class="example"><h3>Example</h3><p><code>
-      SetEnvIf Cookie "language=(.+)" prefer-language=$1
+      SetEnvIf Cookie "language=(.+)" prefer-language=$1<br />
       Header append Vary cookie
     </code></p></div>
 
diff --git a/docs/manual/content-negotiation.xml b/docs/manual/content-negotiation.xml
index 9a05d3a0e5d..733e32c37e6 100644
--- a/docs/manual/content-negotiation.xml
+++ b/docs/manual/content-negotiation.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8' ?>
+<?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.en.xsl"?>
 <!-- $LastChangedRevision$ -->
@@ -502,7 +502,7 @@
     the normal negotiation process applies.</p>
 
     <example><title>Example</title>
-      SetEnvIf Cookie "language=(.+)" prefer-language=$1
+      SetEnvIf Cookie "language=(.+)" prefer-language=$1<br />
       Header append Vary cookie
     </example>
 </section>