Fix a perl brain fart with <li> in comments.

diff --git a/templates/blocked b/templates/blocked
index 8944a0d..d6e3d01 100644 (file)
--- a/templates/blocked
+++ b/templates/blocked
@@ -42,8 +42,7 @@
 #  default-cgi:
 #    The URL for the "main menu" builtin CGI of this proxy
 #  menu:
-#    List of 
-         <li> elements linking to the other available CGIs
+#    List of <li> elements linking to the other available CGIs
 #  version:
 #    The version number of the proxy software
 #  code-status:
@@ -196,9 +195,7 @@
     <tr> \
       <td class="box" colspan="2"> \
         <h2>More Privoxy:</h2> \
-        <ul>@menu@
-         <li><a href="@user-manual@">Documentation</a></li>
-        </ul> \
+        <ul>@menu@<li><a href="@user-manual@">Documentation</a></li></ul> \
       </td> \
     </tr> \
  \
@@ -210,28 +207,23 @@
           we ask that you: \
         </p> \
         <ul> \
-          
-         <li> \
+          <li> \
             use the <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=211118">support forum</a> or (better) the \
             <a href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a> to get help. \
           </li> \
-          
-         <li> \
+          <li> \
             submit banners and all problems with the actions file only through the \
             <a href="javascript:void(window.open(\'http://www.privoxy.org/actions\',\'Feedback\',\'width=600,scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no\').focus());">actions \
             file feedback system</a>. \
           </li> \
-          
-         <li> \
+          <li> \
             submit bugs only through our <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=111118">bug tracker</a>. \
             Make sure that the bug has not yet been submitted. \
           </li> \
-          
-         <li> \
+          <li> \
             submit feature requests only through our <a href="http://sourceforge.net/tracker/?atid=361118&amp;group_id=11118&amp;func=browse">feature \
             request tracker</a>. \
           </li> \
-        
         </ul> \
       </td> \
     </tr> \

diff --git a/templates/cgi-error-404 b/templates/cgi-error-404
index 8c8579c..925ff95 100644 (file)
--- a/templates/cgi-error-404
+++ b/templates/cgi-error-404
@@ -37,8 +37,7 @@
 #  default-cgi:
 #    The URL for the "main menu" builtin CGI of this proxy
 #  menu:
-#    List of 
-         <li> elements linking to the other available CGIs
+#    List of <li> elements linking to the other available CGIs
 #  version:
 #    The version number of the proxy software
 #  code-status:
@@ -121,9 +120,7 @@
     <tr>
       <td class="box" colspan="2">
         <h2>More Privoxy:</h2>
-        <ul>@menu@
-         <li><a href="@user-manual@">Documentation</a></li>
-        </ul>
+        <ul>@menu@<li><a href="@user-manual@">Documentation</a></li></ul>
       </td>
     </tr>
 

diff --git a/templates/cgi-error-bad-param b/templates/cgi-error-bad-param
index 9be06dc..32f90fa 100644 (file)
--- a/templates/cgi-error-bad-param
+++ b/templates/cgi-error-bad-param
@@ -37,8 +37,7 @@
 #  default-cgi:
 #    The URL for the "main menu" builtin CGI of this proxy
 #  menu:
-#    List of 
-         <li> elements linking to the other available CGIs
+#    List of <li> elements linking to the other available CGIs
 #  version:
 #    The version number of the proxy software
 #  code-status:
@@ -108,22 +107,17 @@
            "?" mark) are wrong or missing.</p>
         <p>Possible causes:</p>
         <ul>
-          
-         <li>If you just typed a URL pattern into a form, then you got
+          <li>If you just typed a URL pattern into a form, then you got
              something wrong.  Press the "back" button on your browser
              once and correct what you typed.</li>
-          
-         <li>If you tried to type in the URL, then you've found a
+          <li>If you tried to type in the URL, then you've found a
              page where you can't do that.  You can only view this
              page by following links from elsewhere in the configuration
              interface.</li>
-          
-         <li>If you got here using your browser's "back" button, then
+          <li>If you got here using your browser's "back" button, then
              that is deliberately disabled for this page.</li>
-          
-         <li>If you got here by clicking a link in the
+          <li>If you got here by clicking a link in the
              configuration interface, please file a bug report!</li>
-        
         </ul>
         <p>You can use the menu below to select from the available
            configuration options</p>
@@ -133,9 +127,7 @@
     <tr>
       <td class="box">
         <h2>Privoxy Menu:</h2>
-        <ul>@menu@
-         <li><a href="@user-manual@">Documentation</a></li>
-        </ul>
+        <ul>@menu@<li><a href="@user-manual@">Documentation</a></li></ul>
       </td>
     </tr>
 

diff --git a/templates/cgi-error-disabled b/templates/cgi-error-disabled
index 6f772a1..9845a64 100644 (file)
--- a/templates/cgi-error-disabled
+++ b/templates/cgi-error-disabled
@@ -37,8 +37,7 @@
 #  default-cgi:
 #    The URL for the "main menu" builtin CGI of this proxy
 #  menu:
-#    List of 
-         <li> elements linking to the other available CGIs
+#    List of <li> elements linking to the other available CGIs
 #  version:
 #    The version number of the proxy software
 #  code-status:
@@ -115,9 +114,7 @@
     <tr>
       <td class="box">
         <h2>More Privoxy:</h2>
-        <ul>@menu@
-         <li><a href="@user-manual@">Documentation</a></li>
-        </ul>
+        <ul>@menu@<li><a href="@user-manual@">Documentation</a></li></ul>
       </td>
     </tr>
 

diff --git a/templates/cgi-error-file b/templates/cgi-error-file
index 794d267..ffe4c9c 100644 (file)
--- a/templates/cgi-error-file
+++ b/templates/cgi-error-file
@@ -37,8 +37,7 @@
 #  default-cgi:
 #    The URL for the "main menu" builtin CGI of this proxy
 #  menu:
-#    List of 
-         <li> elements linking to the other available CGIs
+#    List of <li> elements linking to the other available CGIs
 #  version:
 #    The version number of the proxy software
 #  code-status:
@@ -111,9 +110,7 @@
      <tr>
       <td class="box">
         <h2>Privoxy Menu:</h2>
-        <ul>@menu@
-         <li><a href="@user-manual@">Documentation</a></li>
-        </ul>
+        <ul>@menu@<li><a href="@user-manual@">Documentation</a></li></ul>
       </td>
     </tr>
 

diff --git a/templates/cgi-error-file-read-only b/templates/cgi-error-file-read-only
index a307069..d9b7bae 100644 (file)
--- a/templates/cgi-error-file-read-only
+++ b/templates/cgi-error-file-read-only
@@ -37,8 +37,7 @@
 #  default-cgi:
 #    The URL for the "main menu" builtin CGI of this proxy
 #  menu:
-#    List of 
-         <li> elements linking to the other available CGIs
+#    List of <li> elements linking to the other available CGIs
 #  version:
 #    The version number of the proxy software
 #  code-status:
@@ -118,9 +117,7 @@
      <tr>
       <td class="box">
         <h2>Privoxy Menu:</h2>
-        <ul>@menu@
-         <li><a href="@user-manual@">Documentation</a></li>
-        </ul>
+        <ul>@menu@<li><a href="@user-manual@">Documentation</a></li></ul>
       </td>
     </tr>
 

diff --git a/templates/cgi-error-modified b/templates/cgi-error-modified
index d636c21..5c5cee3 100644 (file)
--- a/templates/cgi-error-modified
+++ b/templates/cgi-error-modified
@@ -37,8 +37,7 @@
 #  default-cgi:
 #    The URL for the "main menu" builtin CGI of this proxy
 #  menu:
-#    List of 
-         <li> elements linking to the other available CGIs
+#    List of <li> elements linking to the other available CGIs
 #  version:
 #    The version number of the proxy software
 #  code-status:
@@ -108,21 +107,17 @@
         </p>
         <p>Possible causes:</p>
         <ul>
-          
-         <li>If you got here using your browser's "back" button, then
+          <li>If you got here using your browser's "back" button, then
              that is deliberately disabled for this page.  Please 
              navigate around the configuration editor using the
              links provided.</li>
-          
-         <li>Perhaps you've got more than one browser window open, and
+          <li>Perhaps you've got more than one browser window open, and
              you're trying to change the same file in both?  You can
              only have one editor window open at a time.  Your other edit
              window should continue to function.</li>
-          
-         <li>You may have modified the file some other way - perhaps by
+          <li>You may have modified the file some other way - perhaps by
              editing it with a text editor.  Simply go back in to the 
              configuration interface using the links below.</li>
-        
         </ul>
         <p>You can go back into the edit interface using the menu below,
            or by clicking <a href="edit-actions-list?f=@f@">here</a>.
@@ -133,9 +128,7 @@
     <tr>
       <td class="box">
         <h2>More Privoxy:</h2>
-        <ul>@menu@
-         <li><a href="@user-manual@">Documentation</a></li>
-        </ul>
+        <ul>@menu@<li><a href="@user-manual@">Documentation</a></li></ul>
       </td>
     </tr>
 

diff --git a/templates/cgi-error-parse b/templates/cgi-error-parse
index 90f3812..0c640a4 100644 (file)
--- a/templates/cgi-error-parse
+++ b/templates/cgi-error-parse
@@ -37,8 +37,7 @@
 #  default-cgi:
 #    The URL for the "main menu" builtin CGI of this proxy
 #  menu:
-#    List of 
-         <li> elements linking to the other available CGIs
+#    List of <li> elements linking to the other available CGIs
 #  version:
 #    The version number of the proxy software
 #  code-status:
@@ -148,9 +147,7 @@
     <tr>
       <td class="box">
         <h2>More Privoxy:</h2>
-        <ul>@menu@
-         <li><a href="@user-manual@">Documentation</a></li>
-        </ul>
+        <ul>@menu@<li><a href="@user-manual@">Documentation</a></li></ul>
       </td>
     </tr>
 

diff --git a/templates/connect-failed b/templates/connect-failed
index d4e6d4a..b332f9d 100644 (file)
--- a/templates/connect-failed
+++ b/templates/connect-failed
@@ -37,8 +37,7 @@
 #  default-cgi:
 #    The URL for the "main menu" builtin CGI of this proxy
 #  menu:
-#    List of 
-         <li> elements linking to the other available CGIs
+#    List of <li> elements linking to the other available CGIs
 #  version:
 #    The version number of the proxy software
 #  code-status:
@@ -126,9 +125,7 @@
     <tr>
       <td class="box" colspan="2">
         <h2>More Privoxy:</h2>
-        <ul>@menu@
-         <li><a href="@user-manual@">Documentation</a></li>
-        </ul>
+        <ul>@menu@<li><a href="@user-manual@">Documentation</a></li></ul>
       </td>
     </tr>
 

diff --git a/templates/default b/templates/default
index b393e3c..ecba16f 100644 (file)
--- a/templates/default
+++ b/templates/default
@@ -37,8 +37,7 @@
 #  default-cgi:
 #    The URL for the "main menu" builtin CGI of this proxy
 #  menu:
-#    List of 
-         <li> elements linking to the other available CGIs
+#    List of <li> elements linking to the other available CGIs
 #  version:
 #    The version number of the proxy software
 #  code-status:
@@ -103,9 +102,7 @@
     <tr>
       <td class="box">
         <h2>Privoxy Menu:</h2>
-        <ul>@menu@
-         <li><a href="@user-manual@">Documentation</a></li>
-        </ul>
+        <ul>@menu@<li><a href="@user-manual@">Documentation</a></li></ul>
       </td>
     </tr>
 

diff --git a/templates/edit-actions-add-url-form b/templates/edit-actions-add-url-form
index 546fe6f..d298969 100644 (file)
--- a/templates/edit-actions-add-url-form
+++ b/templates/edit-actions-add-url-form
@@ -171,9 +171,7 @@
     <tr>
       <td class="box">
         <h2>More Privoxy:</h2>
-        <ul>@menu@
-         <li><a href="@user-manual@">Documentation</a></li>
-        </ul>
+        <ul>@menu@<li><a href="@user-manual@">Documentation</a></li></ul>
       </td>
     </tr>
 

diff --git a/templates/edit-actions-for-url b/templates/edit-actions-for-url
index 14ad7e1..f599a77 100644 (file)
--- a/templates/edit-actions-for-url
+++ b/templates/edit-actions-for-url
@@ -816,9 +816,7 @@ function show_send_wafer_opts(tf)
     <tr>
       <td class="box">
         <h2>More Privoxy:</h2>
-        <ul>@menu@
-         <li><a href="@user-manual@">Documentation</a></li>
-        </ul>
+        <ul>@menu@<li><a href="@user-manual@">Documentation</a></li></ul>
       </td>
     </tr>
 

diff --git a/templates/edit-actions-for-url-filter b/templates/edit-actions-for-url-filter
index 952ed14..67fdff7 100644 (file)
--- a/templates/edit-actions-for-url-filter
+++ b/templates/edit-actions-for-url-filter
@@ -1,7 +1,7 @@
-<tr class="bg1" align="left" valign="top">\r
-  <td class="en1" align="center" valign="middle"><input type="radio" name="filter_r@index@" value="Y" @this-filter-y@></td>\r
-  <td class="dis1" align="center" valign="middle"><input type="radio" name="filter_r@index@" value="N" @this-filter-n@></td>\r
-  <td class="noc1" align="center" valign="middle"><input type="radio" name="filter_r@index@" value="X" @this-filter-x@></td>\r
-  <td class="action"><a href="@user-manual@@actions-help-prefix@FILTER">filter</a> @name@<input type="hidden" name="filter_n@index@" value="@name@"></td>\r
-  <td>@description@</td>\r
-</tr>\r
+<tr class="bg1" align="left" valign="top">
+  <td class="en1" align="center" valign="middle"><input type="radio" name="filter_r@index@" value="Y" @this-filter-y@></td>
+  <td class="dis1" align="center" valign="middle"><input type="radio" name="filter_r@index@" value="N" @this-filter-n@></td>
+  <td class="noc1" align="center" valign="middle"><input type="radio" name="filter_r@index@" value="X" @this-filter-x@></td>
+  <td class="action"><a href="@user-manual@@actions-help-prefix@FILTER">filter</a> @name@<input type="hidden" name="filter_n@index@" value="@name@"></td>
+  <td>@description@</td>
+</tr>

diff --git a/templates/edit-actions-list b/templates/edit-actions-list
index 2d56917..44b0330 100644 (file)
--- a/templates/edit-actions-list
+++ b/templates/edit-actions-list
@@ -332,9 +332,7 @@ function a_p(section)
     <tr>
       <td class="box">
         <h2>More Privoxy:</h2>
-        <ul>@menu@
-         <li><a href="@user-manual@">Documentation</a></li>
-        </ul>
+        <ul>@menu@<li><a href="@user-manual@">Documentation</a></li></ul>
       </td>
     </tr>
 

diff --git a/templates/edit-actions-remove-url-form b/templates/edit-actions-remove-url-form
index c148333..0cf5c87 100644 (file)
--- a/templates/edit-actions-remove-url-form
+++ b/templates/edit-actions-remove-url-form
@@ -156,9 +156,7 @@
     <tr>
       <td class="box">
         <h2>More Privoxy:</h2>
-        <ul>@menu@
-         <li><a href="@user-manual@">Documentation</a></li>
-        </ul>
+        <ul>@menu@<li><a href="@user-manual@">Documentation</a></li></ul>
       </td>
     </tr>
 

diff --git a/templates/edit-actions-url-form b/templates/edit-actions-url-form
index 0c7261d..b9696a2 100644 (file)
--- a/templates/edit-actions-url-form
+++ b/templates/edit-actions-url-form
@@ -174,9 +174,7 @@ function validate(text)
     <tr>
       <td class="box">
         <h2>More Privoxy:</h2>
-        <ul>@menu@
-         <li><a href="@user-manual@">Documentation</a></li>
-        </ul>
+        <ul>@menu@<li><a href="@user-manual@">Documentation</a></li></ul>
       </td>
     </tr>
 

diff --git a/templates/mod-support-and-service b/templates/mod-support-and-service
index 44eb2c0..d937e16 100644 (file)
--- a/templates/mod-support-and-service
+++ b/templates/mod-support-and-service
@@ -4,24 +4,19 @@
           we ask that you:
         </p>
         <ul>
-          
-         <li>
+          <li>
             use the <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=211118">support forum</a> to get help.
           </li>
-          
-         <li>
+          <li>
             submit banners and all problems with the actions file only through the
             <a href="javascript:w=Math.floor(screen.width/2);h=Math.floor(screen.height*0.9);void(window.open('http://www.privoxy.org/actions','Feedback','screenx='+w+',width='+w+',height='+h+',scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">actions file feedback system.</a>
           </li>
-          
-         <li>
+          <li>
             submit bugs only through our <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=111118">bug tracker</a>.
             Make sure that the bug has not yet been submitted.
           </li>
-          
-         <li>
+          <li>
             submit feature requests only through our <a href="http://sourceforge.net/tracker/?atid=361118&amp;group_id=11118&amp;func=browse">feature
             request tracker</a>.
           </li>
-        
         </ul>

diff --git a/templates/no-such-domain b/templates/no-such-domain
index 01795a2..34403e5 100644 (file)
--- a/templates/no-such-domain
+++ b/templates/no-such-domain
@@ -37,8 +37,7 @@
 #  default-cgi:
 #    The URL for the "main menu" builtin CGI of this proxy
 #  menu:
-#    List of 
-         <li> elements linking to the other available CGIs
+#    List of <li> elements linking to the other available CGIs
 #  version:
 #    The version number of the proxy software
 #  code-status:
@@ -128,9 +127,7 @@
     <tr>
       <td class="box" colspan="2">
         <h2>More Privoxy:</h2>
-        <ul>@menu@
-         <li><a href="@user-manual@">Documentation</a></li>
-        </ul>
+        <ul>@menu@<li><a href="@user-manual@">Documentation</a></li></ul>
       </td>
     </tr>
 

diff --git a/templates/show-request b/templates/show-request
index d7c3b25..9b6cb80 100644 (file)
--- a/templates/show-request
+++ b/templates/show-request
@@ -37,8 +37,7 @@
 #  default-cgi:
 #    The URL for the "main menu" builtin CGI of this proxy
 #  menu:
-#    List of 
-         <li> elements linking to the other available CGIs
+#    List of <li> elements linking to the other available CGIs
 #  version:
 #    The version number of the proxy software
 #  code-status:
@@ -126,9 +125,7 @@
      <tr>
       <td class="box">
         <h2>More Privoxy:</h2>
-        <ul>@menu@
-         <li><a href="@user-manual@">Documentation</a></li>
-        </ul>
+        <ul>@menu@<li><a href="@user-manual@">Documentation</a></li></ul>
       </td>
     </tr>
 

diff --git a/templates/show-status b/templates/show-status
index 4cbb86d..9769781 100644 (file)
--- a/templates/show-status
+++ b/templates/show-status
@@ -36,8 +36,7 @@
 #  default-cgi:
 #    The URL for the "main menu" builtin CGI of this proxy
 #  menu:
-#    List of 
-         <li> elements linking to the other available CGIs
+#    List of <li> elements linking to the other available CGIs
 #  version:
 #    The version number of the proxy software
 #  code-status:
@@ -308,9 +307,7 @@
     <tr>
       <td class="box">
         <h2>More Privoxy:</h2>
-        <ul>@menu@
-         <li><a href="@user-manual@">Documentation</a></li>
-        </ul>
+        <ul>@menu@<li><a href="@user-manual@">Documentation</a></li></ul>
       </td>
     </tr>
 

diff --git a/templates/show-status-file b/templates/show-status-file
index 4373504..2a8f138 100644 (file)
--- a/templates/show-status-file
+++ b/templates/show-status-file
@@ -37,8 +37,7 @@
 #  default-cgi:
 #    The URL for the "main menu" builtin CGI of this proxy
 #  menu:
-#    List of 
-         <li> elements linking to the other available CGIs
+#    List of <li> elements linking to the other available CGIs
 #  version:
 #    The version number of the proxy software
 #  code-status:
@@ -118,9 +117,7 @@
     <tr>
       <td class="box">
         <h2>More Privoxy:</h2>
-        <ul>@menu@
-         <li><a href="@user-manual@">Documentation</a></li>
-        </ul>
+        <ul>@menu@<li><a href="@user-manual@">Documentation</a></li></ul>
       </td>
     </tr>
 

diff --git a/templates/show-url-info b/templates/show-url-info
index 150d056..913a45a 100644 (file)
--- a/templates/show-url-info
+++ b/templates/show-url-info
@@ -37,8 +37,7 @@
 #  default-cgi:
 #    The URL for the "main menu" builtin CGI of this proxy
 #  menu:
-#    List of 
-         <li> elements linking to the other available CGIs
+#    List of <li> elements linking to the other available CGIs
 #  version:
 #    The version number of the proxy software
 #  code-status:
@@ -155,9 +154,7 @@
     <tr>
       <td class="box">
         <h2>More Privoxy:</h2>
-        <ul>@menu@
-         <li><a href="@user-manual@">Documentation</a></li>
-        </ul>
+        <ul>@menu@<li><a href="@user-manual@">Documentation</a></li></ul>
       </td>
     </tr>
 

diff --git a/templates/show-version b/templates/show-version
index 028916f..2ccc273 100644 (file)
--- a/templates/show-version
+++ b/templates/show-version
@@ -36,8 +36,7 @@
 #  default-cgi:
 #    The URL for the "main menu" builtin CGI of this proxy
 #  menu:
-#    List of 
-         <li> elements linking to the other available CGIs
+#    List of <li> elements linking to the other available CGIs
 #  version:
 #    The version number of the proxy software
 #  code-status:
@@ -131,9 +130,7 @@
     <tr>
       <td class="box">
         <h2>More Privoxy:</h2>
-        <ul>@menu@
-         <li><a href="@user-manual@">Documentation</a></li>
-        </ul>
+        <ul>@menu@<li><a href="@user-manual@">Documentation</a></li></ul>
       </td>
     </tr>
 

diff --git a/templates/toggle b/templates/toggle
index c8171ec..c60e0c1 100644 (file)
--- a/templates/toggle
+++ b/templates/toggle
@@ -37,8 +37,7 @@
 #  default-cgi:
 #    The URL for the "main menu" builtin CGI of this proxy
 #  menu:
-#    List of 
-         <li> elements linking to the other available CGIs
+#    List of <li> elements linking to the other available CGIs
 #  version:
 #    The version number of the proxy software
 #  code-status:
@@ -133,17 +132,12 @@
           </p>
 
           <ul>
-            
-         <li><a href="javascript:void(window.open('@default-cgi@toggle?mini=y&amp;set=enabled','ijbstatus','width=250,height=100,resizable=yes,scrollbars=no,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">Privoxy - Enable</a></li>
-            
-         <li><a href="javascript:void(window.open('@default-cgi@toggle?mini=y&amp;set=disabled','ijbstatus','width=250,height=100,resizable=yes,scrollbars=no,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">Privoxy - Disable</a></li>
-            
-         <li><a href="javascript:void(window.open('@default-cgi@toggle?mini=y&amp;set=toggle','ijbstatus','width=250,height=100,resizable=yes,scrollbars=no,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">Privoxy - Toggle Privoxy</a>
+            <li><a href="javascript:void(window.open('@default-cgi@toggle?mini=y&amp;set=enabled','ijbstatus','width=250,height=100,resizable=yes,scrollbars=no,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">Privoxy - Enable</a></li>
+            <li><a href="javascript:void(window.open('@default-cgi@toggle?mini=y&amp;set=disabled','ijbstatus','width=250,height=100,resizable=yes,scrollbars=no,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">Privoxy - Disable</a></li>
+            <li><a href="javascript:void(window.open('@default-cgi@toggle?mini=y&amp;set=toggle','ijbstatus','width=250,height=100,resizable=yes,scrollbars=no,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">Privoxy - Toggle Privoxy</a>
                   (Toggles between enabled and disabled)</li>
-            
-         <li><a href="javascript:void(window.open('@default-cgi@toggle?mini=y','ijbstatus','width=250,height=100,resizable=yes,scrollbars=no,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">Privoxy - View Status</a></li>
-          
-        </ul>
+            <li><a href="javascript:void(window.open('@default-cgi@toggle?mini=y','ijbstatus','width=250,height=100,resizable=yes,scrollbars=no,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">Privoxy - View Status</a></li>
+          </ul>
 
           <p>
             <b>Credit:</b> The site which gave us the general idea for these
@@ -156,9 +150,7 @@
     <tr>
       <td class="box">
         <h2>More Privoxy:</h2>
-        <ul>@menu@
-         <li><a href="@user-manual@">Documentation</a></li>
-        </ul>
+        <ul>@menu@<li><a href="@user-manual@">Documentation</a></li></ul>
       </td>
     </tr>
 

diff --git a/templates/toggle-mini b/templates/toggle-mini
index 3b2b8d6..bf06fba 100644 (file)
--- a/templates/toggle-mini
+++ b/templates/toggle-mini
@@ -37,8 +37,7 @@
 #  default-cgi:
 #    The URL for the "main menu" builtin CGI of this proxy
 #  menu:
-#    List of 
-         <li> elements linking to the other available CGIs
+#    List of <li> elements linking to the other available CGIs
 #  version:
 #    The version number of the proxy software
 #  code-status:

diff --git a/templates/untrusted b/templates/untrusted
index 207b43b..bc09524 100644 (file)
--- a/templates/untrusted
+++ b/templates/untrusted
@@ -37,8 +37,7 @@
 #  default-cgi:
 #    The URL for the "main menu" builtin CGI of this proxy
 #  menu:
-#    List of 
-         <li> elements linking to the other available CGIs
+#    List of <li> elements linking to the other available CGIs
 #  version:
 #    The version number of the proxy software
 #  code-status:
@@ -140,7 +139,6 @@
         <h2>The following referrers are trusted:</h2>
         <ul>
           @trusted-referrers@
-        
         </ul>
       </td>
     </tr>
@@ -162,9 +160,7 @@
     <tr>
       <td class="box" colspan="2">
         <h2>More Privoxy:</h2>
-        <ul>@menu@
-         <li><a href="@user-manual@">Documentation</a></li>
-        </ul>
+        <ul>@menu@<li><a href="@user-manual@">Documentation</a></li></ul>
       </td>
     </tr>