Remove useless <br \> in highlight blocks.

(r1741841 in 2.4.x + small tweak for logs.xml because quoting is different. This will be fixed later on)

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

10 files changed, 69 insertions, 70 deletions

diff --git a/docs/manual/custom-error.xml b/docs/manual/custom-error.xml
index 1698b89768..0f3c41ba3e 100644
--- a/docs/manual/custom-error.xml
+++ b/docs/manual/custom-error.xml
@@ -56,10 +56,10 @@
     FileInfo.</p>
 
     <highlight language="config">
-ErrorDocument 500 "Sorry, our script crashed. Oh dear"<br />
-ErrorDocument 500 /cgi-bin/crash-recover<br />
-ErrorDocument 500 http://error.example.com/server_error.html<br />
-ErrorDocument 404 /errors/not_found.html <br />
+ErrorDocument 500 "Sorry, our script crashed. Oh dear"
+ErrorDocument 500 /cgi-bin/crash-recover
+ErrorDocument 500 http://error.example.com/server_error.html
+ErrorDocument 404 /errors/not_found.html
 ErrorDocument 401 /subscription/how_to_subscribe.html
     </highlight>
 
@@ -147,8 +147,8 @@ ErrorDocument 401 /subscription/how_to_subscribe.html
 
        <highlight language="perl">
 ...
-print  "Content-type: text/html\n"; <br />
-printf "Status: %s Condition Intercepted\n", $ENV{"REDIRECT_STATUS"}; <br />
+print  "Content-type: text/html\n";
+printf "Status: %s Condition Intercepted\n", $ENV{"REDIRECT_STATUS"};
 ...
       </highlight>
 
@@ -175,8 +175,8 @@ printf "Status: %s Condition Intercepted\n", $ENV{"REDIRECT_STATUS"}; <br />
     <p>In your server configuration file, you'll see a line such as:</p>
 
     <highlight language="config">
-    # Multi-language error messages<br />
-    #Include conf/extra/httpd-multilang-errordoc.conf
+# Multi-language error messages
+#Include conf/extra/httpd-multilang-errordoc.conf
     </highlight>
 
     <p>Uncommenting this <code>Include</code> line will enable this
diff --git a/docs/manual/developer/hooks.xml b/docs/manual/developer/hooks.xml
index bba2d184f2..8dc15ca95e 100644
--- a/docs/manual/developer/hooks.xml
+++ b/docs/manual/developer/hooks.xml
@@ -65,7 +65,7 @@
       takes a <code>request_rec *</code> and an <code>int</code> and is
       called <code>do_something</code>, then declare it like this:</p>
       <highlight language="c">
-        AP_DECLARE_HOOK(int, do_something, (request_rec *r, int n))
+AP_DECLARE_HOOK(int, do_something, (request_rec *r, int n))
       </highlight>
 
       <p>This should go in a header which modules will include if
@@ -96,7 +96,7 @@ APR_HOOK_STRUCT(
         hooks are called, and the caller is implemented like this:</p>
 
         <highlight language="c">
-          AP_IMPLEMENT_HOOK_VOID(do_something, (request_rec *r, int n), (r, n))
+AP_IMPLEMENT_HOOK_VOID(do_something, (request_rec *r, int n), (r, n))
         </highlight>
 
         <p>The second and third arguments are the dummy argument
@@ -118,7 +118,7 @@ void ap_run_do_something(request_rec *r, int n)
         the first hook that does something interesting, like so:</p>
 
         <highlight language="c">
-          AP_IMPLEMENT_HOOK_RUN_FIRST(int, do_something, (request_rec *r, int n), (r, n), DECLINED)
+AP_IMPLEMENT_HOOK_RUN_FIRST(int, do_something, (request_rec *r, int n), (r, n), DECLINED)
         </highlight>
 
         <p>The first hook that does <em>not</em> return <code>DECLINED</code>
@@ -135,7 +135,7 @@ void ap_run_do_something(request_rec *r, int n)
         return is the return value. Declare these like so:</p>
 
         <highlight language="c">
-          AP_IMPLEMENT_HOOK_RUN_ALL(int, do_something, (request_rec *r, int n), (r, n), OK, DECLINED)
+AP_IMPLEMENT_HOOK_RUN_ALL(int, do_something, (request_rec *r, int n), (r, n), OK, DECLINED)
         </highlight>
 
         <p>Again, <code>OK</code> and <code>DECLINED</code> are the traditional
@@ -165,7 +165,7 @@ ret=ap_run_do_something(r, n);
       of the correct type:</p>
 
       <highlight language="c">
-static int my_something_doer(request_rec *r, int n)<br />
+static int my_something_doer(request_rec *r, int n)
 {
     ...
     return OK;
diff --git a/docs/manual/developer/output-filters.xml b/docs/manual/developer/output-filters.xml
index 5ae281f60d..9b8c1e78fb 100644
--- a/docs/manual/developer/output-filters.xml
+++ b/docs/manual/developer/output-filters.xml
@@ -122,12 +122,12 @@
 
     <example><title>How to handle an empty brigade</title>
     <highlight language="c">
-    apr_status_t dummy_filter(ap_filter_t *f, apr_bucket_brigade *bb)<br />
-    {
-        if (APR_BRIGADE_EMPTY(bb)) {
-            return APR_SUCCESS;
-        }
-        ....
+apr_status_t dummy_filter(ap_filter_t *f, apr_bucket_brigade *bb)
+{
+    if (APR_BRIGADE_EMPTY(bb)) {
+        return APR_SUCCESS;
+    }
+    ...
     </highlight>
     </example>
 
@@ -281,16 +281,16 @@ const char *data;
 apr_size_t length;
 
 while ((e = APR_BRIGADE_FIRST(bb)) != APR_BRIGADE_SENTINEL(bb)) {
-   rv = apr_bucket_read(e, &amp;data, &amp;length, APR_BLOCK_READ);
-   if (rv) ...;
-   /* Remove bucket e from bb. */
-   APR_BUCKET_REMOVE(e);
-   /* Insert it into  temporary brigade. */
-   APR_BRIGADE_INSERT_HEAD(tmpbb, e);
-   /* Pass brigade downstream. */
-   rv = ap_pass_brigade(f->next, tmpbb);
-   if (rv) ...;
-   apr_brigade_cleanup(tmpbb);
+    rv = apr_bucket_read(e, &amp;data, &amp;length, APR_BLOCK_READ);
+    if (rv) ...;
+    /* Remove bucket e from bb. */
+    APR_BUCKET_REMOVE(e);
+    /* Insert it into  temporary brigade. */
+    APR_BRIGADE_INSERT_HEAD(tmpbb, e);
+    /* Pass brigade downstream. */
+    rv = ap_pass_brigade(f->next, tmpbb);
+    if (rv) ...;
+    apr_brigade_cleanup(tmpbb);
 }
 </highlight>
     </example>
@@ -311,26 +311,24 @@ while ((e = APR_BRIGADE_FIRST(bb)) != APR_BRIGADE_SENTINEL(bb)) {
     <example><title>Example code to maintain filter state</title>
 <highlight language="c">
 struct dummy_state {
-   apr_bucket_brigade *tmpbb;
-   int filter_state;
-   ...
+    apr_bucket_brigade *tmpbb;
+    int filter_state;
+    ...
 };
 
 apr_status_t dummy_filter(ap_filter_t *f, apr_bucket_brigade *bb)
 {
-
     struct dummy_state *state;
 
     state = f->ctx;
     if (state == NULL) {
 
-       /* First invocation for this response: initialise state structure.
-        */
-       f->ctx = state = apr_palloc(f->r->pool, sizeof *state);
-
-       state->tmpbb = apr_brigade_create(f->r->pool, f->c->bucket_alloc);
-       state->filter_state = ...;
+        /* First invocation for this response: initialise state structure.
+         */
+        f->ctx = state = apr_palloc(f->r->pool, sizeof *state);
 
+        state->tmpbb = apr_brigade_create(f->r->pool, f->c->bucket_alloc);
+        state->filter_state = ...;
     }
     ...
 </highlight>
@@ -430,7 +428,8 @@ while ((e = APR_BRIGADE_FIRST(bb)) != APR_BRIGADE_SENTINEL(bb)) {
         /* Retry, using a blocking read. */
         mode = APR_BLOCK_READ;
         continue;
-    } else if (rv != APR_SUCCESS) {
+    }
+    else if (rv != APR_SUCCESS) {
         /* handle errors */
     }
 
diff --git a/docs/manual/howto/htaccess.xml b/docs/manual/howto/htaccess.xml
index 08e27eec63..fcdcea98bb 100644
--- a/docs/manual/howto/htaccess.xml
+++ b/docs/manual/howto/htaccess.xml
@@ -307,7 +307,7 @@ Options Includes
 &lt;/Directory&gt;
 
 &lt;Location "/"&gt;
-    Options +IncludesNoExec -ExecCGI<br />
+    Options +IncludesNoExec -ExecCGI
 &lt;/Location&gt;
     </highlight>
 
diff --git a/docs/manual/howto/public_html.xml b/docs/manual/howto/public_html.xml
index e523ccc630..15ef8604bb 100644
--- a/docs/manual/howto/public_html.xml
+++ b/docs/manual/howto/public_html.xml
@@ -148,8 +148,8 @@ UserDir disabled root jro fish
     using a configuration like the following:</p>
 
     <highlight language="config">
-      UserDir disabled<br />
-      UserDir enabled rbowen krietz
+UserDir disabled
+UserDir enabled rbowen krietz
     </highlight>
 
     <p>See <directive module="mod_userdir">UserDir</directive>
diff --git a/docs/manual/howto/ssi.xml b/docs/manual/howto/ssi.xml
index 0671563a0d..f487b00556 100644
--- a/docs/manual/howto/ssi.xml
+++ b/docs/manual/howto/ssi.xml
@@ -95,7 +95,7 @@ existing HTML documents.</p>
     directive either in your <code>httpd.conf</code> file, or in a
     <code>.htaccess</code> file:</p>
 <highlight language="config">
-        Options +Includes
+Options +Includes
 </highlight>
 
     <p>This tells Apache that you want to permit files to be parsed
@@ -111,8 +111,8 @@ existing HTML documents.</p>
     particular file extension, such as <code>.shtml</code>, with
     the following directives:</p>
 <highlight language="config">
-        AddType text/html .shtml<br />
-        AddOutputFilter INCLUDES .shtml
+AddType text/html .shtml
+AddOutputFilter INCLUDES .shtml
 </highlight>
 
     <p>One disadvantage to this approach is that if you wanted to
@@ -124,7 +124,7 @@ existing HTML documents.</p>
     <p>The other method is to use the <directive
     module="mod_include">XBitHack</directive> directive:</p>
 <highlight language="config">
-        XBitHack on
+XBitHack on
 </highlight>
 
     <p><directive module="mod_include">XBitHack</directive>
diff --git a/docs/manual/logs.xml b/docs/manual/logs.xml
index 15e29ac6da..fcfbc7526f 100644
--- a/docs/manual/logs.xml
+++ b/docs/manual/logs.xml
@@ -476,8 +476,8 @@ CustomLog "logs/access_log" common env=!dontlog
       different log file.</p>
 
       <highlight language="config">
-SetEnvIf Accept-Language "en" english<br />
-CustomLog "logs/english_log" common env=english<br />
+SetEnvIf Accept-Language "en" english
+CustomLog "logs/english_log" common env=english
 CustomLog "logs/non_english_log" common env=!english
       </highlight>
 
diff --git a/docs/manual/mod/mod_include.xml b/docs/manual/mod/mod_include.xml
index 5ede805f95..a3a7bd3908 100644
--- a/docs/manual/mod/mod_include.xml
+++ b/docs/manual/mod/mod_include.xml
@@ -64,7 +64,7 @@ AddOutputFilter INCLUDES .shtml
     is set):</p>
 
     <highlight language="config">
-      Options +Includes
+Options +Includes
     </highlight>
 
     <p>For backwards compatibility, the <code>server-parsed</code>
@@ -835,7 +835,7 @@ AddOutputFilter INCLUDES .shtml
     looks for to mark the end of an include element.</p>
 
     <highlight language="config">
-      SSIEndTag "%&gt;"
+SSIEndTag "%&gt;"
     </highlight>
 
 </usage>
@@ -856,7 +856,7 @@ AddOutputFilter INCLUDES .shtml
     displays when a variable is not set and &quot;echoed&quot;.</p>
 
     <highlight language="config">
-      SSIUndefinedEcho "&lt;!-- undef --&gt;"
+SSIUndefinedEcho "&lt;!-- undef --&gt;"
     </highlight>
 </usage>
 </directivesynopsis>
@@ -883,7 +883,7 @@ directive]&quot;</default>
     errmsg=<var>message</var> --&gt;</code> element.</p>
 
     <highlight language="config">
-      SSIErrorMsg "&lt;!-- Error --&gt;"
+SSIErrorMsg "&lt;!-- Error --&gt;"
     </highlight>
 </usage>
 </directivesynopsis>
@@ -905,8 +905,8 @@ directive]&quot;</default>
     different times).</p>
 
     <highlight language="config">
-      SSIStartTag "&lt;%"<br />
-      SSIEndTag   "%&gt;"
+SSIStartTag "&lt;%"
+SSIEndTag   "%&gt;"
     </highlight>
 
     <p>The example given above, which also specifies a matching
@@ -942,7 +942,7 @@ displayed</description>
     timefmt=<var>formatstring</var> --&gt;</code> element.</p>
 
     <highlight language="config">
-      SSITimeFormat "%R, %B %d, %Y"
+SSITimeFormat "%R, %B %d, %Y"
     </highlight>
 
     <p>The above directive would cause times to be displayed in the
diff --git a/docs/manual/mod/mod_lua.xml b/docs/manual/mod/mod_lua.xml
index d6451f9c08..470a11fef6 100644
--- a/docs/manual/mod/mod_lua.xml
+++ b/docs/manual/mod/mod_lua.xml
@@ -1054,16 +1054,16 @@ r:activeconfig() -- Get a walkable tree of the active (virtualhost-specific) htt
 <section id="logging"><title>Logging Functions</title>
 
 <highlight language="lua">
-        -- examples of logging messages<br />
-        r:trace1("This is a trace log message") -- trace1 through trace8 can be used <br />
-        r:debug("This is a debug log message")<br />
-        r:info("This is an info log message")<br />
-        r:notice("This is a notice log message")<br />
-        r:warn("This is a warn log message")<br />
-        r:err("This is an err log message")<br />
-        r:alert("This is an alert log message")<br />
-        r:crit("This is a crit log message")<br />
-        r:emerg("This is an emerg log message")<br />
+-- examples of logging messages
+r:trace1("This is a trace log message") -- trace1 through trace8 can be used
+r:debug("This is a debug log message")
+r:info("This is an info log message")
+r:notice("This is a notice log message")
+r:warn("This is a warn log message")
+r:err("This is an err log message")
+r:alert("This is an alert log message")
+r:crit("This is a crit log message")
+r:emerg("This is an emerg log message")
 </highlight>
 
 </section>
diff --git a/docs/manual/mod/mod_rewrite.xml b/docs/manual/mod/mod_rewrite.xml
index 3c73246f9a..187472c9ba 100644
--- a/docs/manual/mod/mod_rewrite.xml
+++ b/docs/manual/mod/mod_rewrite.xml
@@ -70,8 +70,8 @@ URLs on the fly</description>
 
     <example><title>Example</title>
     <highlight language="config">
-      LogLevel alert rewrite:trace3
-      </highlight>
+LogLevel alert rewrite:trace3
+    </highlight>
     </example>
 
     <note><title>RewriteLog</title>
@@ -941,7 +941,7 @@ RewriteRule ^(.+) /other/archive/$1 [R]
 
         </li>
 
-	<li>
+        <li>
            <p>If the <em>TestString</em> has the special value <code>expr</code>, the
            <em>CondPattern</em> will be treated as an
            <a href="../expr.html">ap_expr</a>.</p>
@@ -953,7 +953,7 @@ RewriteRule ^(.+) /other/archive/$1 [R]
            </p>
 
            <highlight language="config">
-RewriteCond expr "! %{HTTP_REFERER} -strmatch '*://%{HTTP_HOST}/*'"<br />
+RewriteCond expr "! %{HTTP_REFERER} -strmatch '*://%{HTTP_HOST}/*'"
 RewriteRule "^/images" "-" [F]
            </highlight>
         </li>