You are viewing a plain text version of this content. The canonical link for it is here.

Posted to cvs@httpd.apache.org by rp...@apache.org on 2008/05/03 10:09:35 UTC

svn commit: r653013 - in /httpd/httpd/branches/2.2.x/docs/manual: content-negotiation.html.en content-negotiation.xml

Author: rpluem
Date: Sat May  3 01:09:34 2008
New Revision: 653013

URL: http://svn.apache.org/viewvc?rev=653013&view=rev
Log:
Merge r550504 from trunk:

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

Modified:
    httpd/httpd/branches/2.2.x/docs/manual/content-negotiation.html.en
    httpd/httpd/branches/2.2.x/docs/manual/content-negotiation.xml

Modified: httpd/httpd/branches/2.2.x/docs/manual/content-negotiation.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/content-negotiation.html.en?rev=653013&r1=653012&r2=653013&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/content-negotiation.html.en (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/content-negotiation.html.en Sat May  3 01:09:34 2008
@@ -504,7 +504,7 @@
     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>
 

Modified: httpd/httpd/branches/2.2.x/docs/manual/content-negotiation.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/content-negotiation.xml?rev=653013&r1=653012&r2=653013&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/content-negotiation.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/content-negotiation.xml Sat May  3 01:09:34 2008
@@ -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>