From: Christophe Jaillet <jailletc36@apache.org>
Date: Sun, 1 May 2016 17:47:37 +0000 (+0000)
Subject: Remove useless <br \> in highlight blocks.
X-Git-Tag: 2.5.0-alpha~1664
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=86ab4211a9db661daf125be6cd8ee8bcd3ba6297;p=thirdparty%2Fapache%2Fhttpd.git

Remove useless <br \> in highlight blocks.

(r1741864 in 2.4.x + small tweak because quoting is different. This will be fixed later on)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1741874 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/mod/mod_autoindex.xml b/docs/manual/mod/mod_autoindex.xml
index 55e2c9fdd07..e7fa5d7b748 100644
--- a/docs/manual/mod/mod_autoindex.xml
+++ b/docs/manual/mod/mod_autoindex.xml
@@ -980,7 +980,7 @@ indexing</description>
      so far. Consider the following example:</p>
 
      <highlight language="config">
-IndexOptions +ScanHTMLTitles -IconsAreLinks FancyIndexing<br />
+IndexOptions +ScanHTMLTitles -IconsAreLinks FancyIndexing
 IndexOptions +SuppressSize
      </highlight>
 
diff --git a/docs/manual/mod/mod_proxy.xml b/docs/manual/mod/mod_proxy.xml
index c58669ad5ec..d56c491e860 100644
--- a/docs/manual/mod/mod_proxy.xml
+++ b/docs/manual/mod/mod_proxy.xml
@@ -1862,9 +1862,9 @@ NoProxy         .example.com 192.168.112.0/21
 
     <example><title>Example</title>
     <highlight language="config">
-      ProxyRemote  *  http://firewall.example.com:81<br />
-      NoProxy         .example.com 192.168.112.0/21<br />
-      ProxyDomain     .example.com
+ProxyRemote  "*"  "http://firewall.example.com:81"
+NoProxy           ".example.com" "192.168.112.0/21"
+ProxyDomain       ".example.com"
       </highlight>
     </example>
 </usage>
diff --git a/docs/manual/mod/mod_ssl.xml b/docs/manual/mod/mod_ssl.xml
index e673dbf8c3c..2b4dfc91fd5 100644
--- a/docs/manual/mod/mod_ssl.xml
+++ b/docs/manual/mod/mod_ssl.xml
@@ -268,8 +268,8 @@ directive.</p>
        either with a client certificate or by username and password.</p>
 
     <highlight language="config">
-      Require ssl-verify-client<br/>
-      Require valid-user
+Require ssl-verify-client
+Require valid-user
     </highlight>
 
   </section>
diff --git a/docs/manual/rewrite/access.xml b/docs/manual/rewrite/access.xml
index 67aa57a0d33..647f20c81dc 100644
--- a/docs/manual/rewrite/access.xml
+++ b/docs/manual/rewrite/access.xml
@@ -291,12 +291,12 @@ RewriteRule "^"                            "${deflector:%{HTTP_REFERER}}" [R,L]
       placed in the map:</p>
 
 <highlight language="config">
-##<br />
-##  deflector.map<br />
-##<br />
-<br />
-http://badguys.example.com/bad/index.html    -<br />
-http://badguys.example.com/bad/index2.html   -<br />
+##
+##  deflector.map
+##
+
+http://badguys.example.com/bad/index.html    -
+http://badguys.example.com/bad/index2.html   -
 http://badguys.example.com/bad/index3.html   http://somewhere.example.com/
 </highlight>
 
diff --git a/docs/manual/rewrite/rewritemap.xml b/docs/manual/rewrite/rewritemap.xml
index 0386394e7c9..a08ee368696 100644
--- a/docs/manual/rewrite/rewritemap.xml
+++ b/docs/manual/rewrite/rewritemap.xml
@@ -381,7 +381,7 @@ by many requests.
 
     <p><strong>Rewrite configuration</strong></p>
     <highlight language="config">
-RewriteMap d2u "prg:/www/bin/dash2under.programlisting" apache:apache<br />
+RewriteMap d2u "prg:/www/bin/dash2under.programlisting" apache:apache
 RewriteRule "-" "${d2u:%{REQUEST_URI}}"
     </highlight>
 
diff --git a/docs/manual/urlmapping.xml b/docs/manual/urlmapping.xml
index 627c90d56f0..8b36dc55783 100644
--- a/docs/manual/urlmapping.xml
+++ b/docs/manual/urlmapping.xml
@@ -269,9 +269,9 @@ and returns them to the client as if they were from the local
 server.</p>
 
 <highlight language="config">
-ProxyPass        "/foo/" "http://internal.example.com/bar/"<br />
-ProxyPassReverse "/foo/" "http://internal.example.com/bar/"<br />
-ProxyPassReverseCookieDomain internal.example.com public.example.com<br />
+ProxyPass        "/foo/" "http://internal.example.com/bar/"
+ProxyPassReverse "/foo/" "http://internal.example.com/bar/"
+ProxyPassReverseCookieDomain internal.example.com public.example.com
 ProxyPassReverseCookiePath "/foo/" "/bar/"
 </highlight>