rebuild docs with a version of tidy that doesn't break <pre> formatting

diff --git a/doc/webserver/developer-manual/newrelease.html b/doc/webserver/developer-manual/newrelease.html
index 8aa7015..baf5bbe 100644 (file)
--- a/doc/webserver/developer-manual/newrelease.html
+++ b/doc/webserver/developer-manual/newrelease.html
@@ -160,8 +160,8 @@ for-privoxy-version=3.0.11</pre>
           <table border="0" bgcolor="#E0E0E0" width="90%">
             <tr>
               <td>
           <table border="0" bgcolor="#E0E0E0" width="90%">
             <tr>
               <td>

-                <pre class="PROGRAMLISTING">
-                $ utils/changelog2doc.pl /tmp/change.log &gt;| doc/source/changelog.sgml</pre>
+                <pre class=
+                "PROGRAMLISTING">  $ utils/changelog2doc.pl /tmp/change.log &gt;| doc/source/changelog.sgml</pre>

               </td>
             </tr>
           </table>
               </td>
             </tr>
           </table>


@@ -427,8 +427,8 @@ for-privoxy-version=3.0.11</pre>
         <table border="0" bgcolor="#E0E0E0" width="100%">
           <tr>
             <td>
         <table border="0" bgcolor="#E0E0E0" width="100%">
           <tr>
             <td>

-              <pre class="PROGRAMLISTING">
-              cvs -z3 -d:pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa co os2setup</pre>
+              <pre class=
+              "PROGRAMLISTING">  cvs -z3 -d:pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa co os2setup</pre>

             </td>
           </tr>
         </table>
             </td>
           </tr>
         </table>


@@ -577,8 +577,8 @@ for-privoxy-version=3.0.11</pre>
           <table border="0" bgcolor="#E0E0E0" width="100%">
             <tr>
               <td>
           <table border="0" bgcolor="#E0E0E0" width="100%">
             <tr>
               <td>

-                <pre class="PROGRAMLISTING">
-                cvs -z3 -d:pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa co OSXPackageBuilder</pre>
+                <pre class=
+                "PROGRAMLISTING">  cvs -z3 -d:pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa co OSXPackageBuilder</pre>

               </td>
             </tr>
           </table>
               </td>
             </tr>
           </table>


@@ -599,8 +599,8 @@ for-privoxy-version=3.0.11</pre>
           <table border="0" bgcolor="#E0E0E0" width="100%">
             <tr>
               <td>
           <table border="0" bgcolor="#E0E0E0" width="100%">
             <tr>
               <td>

-                <pre class="PROGRAMLISTING">
-                cvs -z3 -d:pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa co osxsetup</pre>
+                <pre class=
+                "PROGRAMLISTING">  cvs -z3 -d:pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa co osxsetup</pre>

               </td>
             </tr>
           </table>
               </td>
             </tr>
           </table>


@@ -638,8 +638,8 @@ for-privoxy-version=3.0.11</pre>
           <table border="0" bgcolor="#E0E0E0" width="100%">
             <tr>
               <td>
           <table border="0" bgcolor="#E0E0E0" width="100%">
             <tr>
               <td>

-                <pre class="PROGRAMLISTING">
-                cvs -z3 -d:pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa co macsetup</pre>
+                <pre class=
+                "PROGRAMLISTING">  cvs -z3 -d:pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa co macsetup</pre>

               </td>
             </tr>
           </table>
               </td>
             </tr>
           </table>

diff --git a/doc/webserver/faq/configuration.html b/doc/webserver/faq/configuration.html
index 7802ae2..76ce468 100644 (file)
--- a/doc/webserver/faq/configuration.html
+++ b/doc/webserver/faq/configuration.html
@@ -395,8 +395,8 @@
       <table border="0" bgcolor="#E0E0E0" width="100%">
         <tr>
           <td>
       <table border="0" bgcolor="#E0E0E0" width="100%">
         <tr>
           <td>

-            <pre class="SCREEN">
-            { -crunch-incoming-cookies -crunch-outgoing-cookies -session-cookies-only -filter{content-cookies} }
+            <pre class=
+            "SCREEN"> { -crunch-incoming-cookies -crunch-outgoing-cookies -session-cookies-only -filter{content-cookies} }

   .example.com</pre>
           </td>
         </tr>
   .example.com</pre>
           </td>
         </tr>

diff --git a/doc/webserver/user-manual/actions-file.html b/doc/webserver/user-manual/actions-file.html
index d8c6990..c8405fa 100644 (file)
--- a/doc/webserver/user-manual/actions-file.html
+++ b/doc/webserver/user-manual/actions-file.html
@@ -1622,8 +1622,8 @@ problem-host.example.com</pre>
               <table border="0" bgcolor="#E0E0E0" width="90%">
                 <tr>
                   <td>
               <table border="0" bgcolor="#E0E0E0" width="90%">
                 <tr>
                   <td>

-                    <pre class="SCREEN">
-                    +filter{js-annoyances}       # Get rid of particularly annoying JavaScript abuse.</pre>
+                    <pre class=
+                    "SCREEN">+filter{js-annoyances}       # Get rid of particularly annoying JavaScript abuse.</pre>

                   </td>
                 </tr>
               </table>
                   </td>
                 </tr>
               </table>


@@ -1631,8 +1631,8 @@ problem-host.example.com</pre>
               <table border="0" bgcolor="#E0E0E0" width="90%">
                 <tr>
                   <td>
               <table border="0" bgcolor="#E0E0E0" width="90%">
                 <tr>
                   <td>

-                    <pre class="SCREEN">
-                    +filter{js-events}           # Kill JavaScript event bindings and timers (Radically destructive! Only for extra nasty sites).</pre>
+                    <pre class=
+                    "SCREEN">+filter{js-events}           # Kill JavaScript event bindings and timers (Radically destructive! Only for extra nasty sites).</pre>

                   </td>
                 </tr>
               </table>
                   </td>
                 </tr>
               </table>


@@ -1640,8 +1640,8 @@ problem-host.example.com</pre>
               <table border="0" bgcolor="#E0E0E0" width="90%">
                 <tr>
                   <td>
               <table border="0" bgcolor="#E0E0E0" width="90%">
                 <tr>
                   <td>

-                    <pre class="SCREEN">
-                    +filter{html-annoyances}     # Get rid of particularly annoying HTML abuse.</pre>
+                    <pre class=
+                    "SCREEN">+filter{html-annoyances}     # Get rid of particularly annoying HTML abuse.</pre>

                   </td>
                 </tr>
               </table>
                   </td>
                 </tr>
               </table>


@@ -1649,8 +1649,8 @@ problem-host.example.com</pre>
               <table border="0" bgcolor="#E0E0E0" width="90%">
                 <tr>
                   <td>
               <table border="0" bgcolor="#E0E0E0" width="90%">
                 <tr>
                   <td>

-                    <pre class="SCREEN">
-                    +filter{content-cookies}     # Kill cookies that come in the HTML or JS content.</pre>
+                    <pre class=
+                    "SCREEN">+filter{content-cookies}     # Kill cookies that come in the HTML or JS content.</pre>

                   </td>
                 </tr>
               </table>
                   </td>
                 </tr>
               </table>


@@ -1658,8 +1658,8 @@ problem-host.example.com</pre>
               <table border="0" bgcolor="#E0E0E0" width="90%">
                 <tr>
                   <td>
               <table border="0" bgcolor="#E0E0E0" width="90%">
                 <tr>
                   <td>

-                    <pre class="SCREEN">
-                    +filter{refresh-tags}        # Kill automatic refresh tags if refresh time is larger than 9 seconds.</pre>
+                    <pre class=
+                    "SCREEN">+filter{refresh-tags}        # Kill automatic refresh tags if refresh time is larger than 9 seconds.</pre>

                   </td>
                 </tr>
               </table>
                   </td>
                 </tr>
               </table>


@@ -1683,8 +1683,8 @@ problem-host.example.com</pre>
               <table border="0" bgcolor="#E0E0E0" width="90%">
                 <tr>
                   <td>
               <table border="0" bgcolor="#E0E0E0" width="90%">
                 <tr>
                   <td>

-                    <pre class="SCREEN">
-                    +filter{img-reorder}         # Reorder attributes in &lt;img&gt; tags to make the banners-by-* filters more effective.</pre>
+                    <pre class=
+                    "SCREEN">+filter{img-reorder}         # Reorder attributes in &lt;img&gt; tags to make the banners-by-* filters more effective.</pre>

                   </td>
                 </tr>
               </table>
                   </td>
                 </tr>
               </table>


@@ -1700,8 +1700,8 @@ problem-host.example.com</pre>
               <table border="0" bgcolor="#E0E0E0" width="90%">
                 <tr>
                   <td>
               <table border="0" bgcolor="#E0E0E0" width="90%">
                 <tr>
                   <td>

-                    <pre class="SCREEN">
-                    +filter{banners-by-link}     # Kill banners by their links to known clicktrackers.</pre>
+                    <pre class=
+                    "SCREEN">+filter{banners-by-link}     # Kill banners by their links to known clicktrackers.</pre>

                   </td>
                 </tr>
               </table>
                   </td>
                 </tr>
               </table>


@@ -1709,8 +1709,8 @@ problem-host.example.com</pre>
               <table border="0" bgcolor="#E0E0E0" width="90%">
                 <tr>
                   <td>
               <table border="0" bgcolor="#E0E0E0" width="90%">
                 <tr>
                   <td>

-                    <pre class="SCREEN">
-                    +filter{webbugs}             # Squish WebBugs (1x1 invisible GIFs used for user tracking).</pre>
+                    <pre class=
+                    "SCREEN">+filter{webbugs}             # Squish WebBugs (1x1 invisible GIFs used for user tracking).</pre>

                   </td>
                 </tr>
               </table>
                   </td>
                 </tr>
               </table>


@@ -1718,8 +1718,8 @@ problem-host.example.com</pre>
               <table border="0" bgcolor="#E0E0E0" width="90%">
                 <tr>
                   <td>
               <table border="0" bgcolor="#E0E0E0" width="90%">
                 <tr>
                   <td>

-                    <pre class="SCREEN">
-                    +filter{tiny-textforms}      # Extend those tiny textareas up to 40x80 and kill the hard wrap.</pre>
+                    <pre class=
+                    "SCREEN">+filter{tiny-textforms}      # Extend those tiny textareas up to 40x80 and kill the hard wrap.</pre>

                   </td>
                 </tr>
               </table>
                   </td>
                 </tr>
               </table>


@@ -1727,8 +1727,8 @@ problem-host.example.com</pre>
               <table border="0" bgcolor="#E0E0E0" width="90%">
                 <tr>
                   <td>
               <table border="0" bgcolor="#E0E0E0" width="90%">
                 <tr>
                   <td>

-                    <pre class="SCREEN">
-                    +filter{jumping-windows}     # Prevent windows from resizing and moving themselves.</pre>
+                    <pre class=
+                    "SCREEN">+filter{jumping-windows}     # Prevent windows from resizing and moving themselves.</pre>

                   </td>
                 </tr>
               </table>
                   </td>
                 </tr>
               </table>


@@ -1736,8 +1736,8 @@ problem-host.example.com</pre>
               <table border="0" bgcolor="#E0E0E0" width="90%">
                 <tr>
                   <td>
               <table border="0" bgcolor="#E0E0E0" width="90%">
                 <tr>
                   <td>

-                    <pre class="SCREEN">
-                    +filter{frameset-borders}    # Give frames a border and make them resizable.</pre>
+                    <pre class=
+                    "SCREEN">+filter{frameset-borders}    # Give frames a border and make them resizable.</pre>

                   </td>
                 </tr>
               </table>
                   </td>
                 </tr>
               </table>


@@ -1745,8 +1745,8 @@ problem-host.example.com</pre>
               <table border="0" bgcolor="#E0E0E0" width="90%">
                 <tr>
                   <td>
               <table border="0" bgcolor="#E0E0E0" width="90%">
                 <tr>
                   <td>

-                    <pre class="SCREEN">
-                    +filter{iframes}             # Removes all detected iframes. Should only be enabled for individual sites.</pre>
+                    <pre class=
+                    "SCREEN">+filter{iframes}             # Removes all detected iframes. Should only be enabled for individual sites.</pre>

                   </td>
                 </tr>
               </table>
                   </td>
                 </tr>
               </table>


@@ -1754,8 +1754,8 @@ problem-host.example.com</pre>
               <table border="0" bgcolor="#E0E0E0" width="90%">
                 <tr>
                   <td>
               <table border="0" bgcolor="#E0E0E0" width="90%">
                 <tr>
                   <td>

-                    <pre class="SCREEN">
-                    +filter{demoronizer}         # Fix MS's non-standard use of standard charsets.</pre>
+                    <pre class=
+                    "SCREEN">+filter{demoronizer}         # Fix MS's non-standard use of standard charsets.</pre>

                   </td>
                 </tr>
               </table>
                   </td>
                 </tr>
               </table>


@@ -1779,8 +1779,8 @@ problem-host.example.com</pre>
               <table border="0" bgcolor="#E0E0E0" width="90%">
                 <tr>
                   <td>
               <table border="0" bgcolor="#E0E0E0" width="90%">
                 <tr>
                   <td>

-                    <pre class="SCREEN">
-                    +filter{fun}                 # Text replacements for subversive browsing fun!</pre>
+                    <pre class=
+                    "SCREEN">+filter{fun}                 # Text replacements for subversive browsing fun!</pre>

                   </td>
                 </tr>
               </table>
                   </td>
                 </tr>
               </table>


@@ -1788,8 +1788,8 @@ problem-host.example.com</pre>
               <table border="0" bgcolor="#E0E0E0" width="90%">
                 <tr>
                   <td>
               <table border="0" bgcolor="#E0E0E0" width="90%">
                 <tr>
                   <td>

-                    <pre class="SCREEN">
-                    +filter{crude-parental}      # Crude parental filtering. Note that this filter doesn't work reliably.</pre>
+                    <pre class=
+                    "SCREEN">+filter{crude-parental}      # Crude parental filtering. Note that this filter doesn't work reliably.</pre>

                   </td>
                 </tr>
               </table>
                   </td>
                 </tr>
               </table>


@@ -1797,8 +1797,8 @@ problem-host.example.com</pre>
               <table border="0" bgcolor="#E0E0E0" width="90%">
                 <tr>
                   <td>
               <table border="0" bgcolor="#E0E0E0" width="90%">
                 <tr>
                   <td>

-                    <pre class="SCREEN">
-                    +filter{ie-exploits}         # Disable some known Internet Explorer bug exploits.</pre>
+                    <pre class=
+                    "SCREEN">+filter{ie-exploits}         # Disable some known Internet Explorer bug exploits.</pre>

                   </td>
                 </tr>
               </table>
                   </td>
                 </tr>
               </table>


@@ -1806,8 +1806,8 @@ problem-host.example.com</pre>
               <table border="0" bgcolor="#E0E0E0" width="90%">
                 <tr>
                   <td>
               <table border="0" bgcolor="#E0E0E0" width="90%">
                 <tr>
                   <td>

-                    <pre class="SCREEN">
-                    +filter{site-specifics}      # Cure for site-specific problems. Don't apply generally!</pre>
+                    <pre class=
+                    "SCREEN">+filter{site-specifics}      # Cure for site-specific problems. Don't apply generally!</pre>

                   </td>
                 </tr>
               </table>
                   </td>
                 </tr>
               </table>


@@ -1815,8 +1815,8 @@ problem-host.example.com</pre>
               <table border="0" bgcolor="#E0E0E0" width="90%">
                 <tr>
                   <td>
               <table border="0" bgcolor="#E0E0E0" width="90%">
                 <tr>
                   <td>

-                    <pre class="SCREEN">
-                    +filter{no-ping}             # Removes non-standard ping attributes in &lt;a&gt; and &lt;area&gt; tags.</pre>
+                    <pre class=
+                    "SCREEN">+filter{no-ping}             # Removes non-standard ping attributes in &lt;a&gt; and &lt;area&gt; tags.</pre>

                   </td>
                 </tr>
               </table>
                   </td>
                 </tr>
               </table>


@@ -1824,8 +1824,8 @@ problem-host.example.com</pre>
               <table border="0" bgcolor="#E0E0E0" width="90%">
                 <tr>
                   <td>
               <table border="0" bgcolor="#E0E0E0" width="90%">
                 <tr>
                   <td>

-                    <pre class="SCREEN">
-                    +filter{google}              # CSS-based block for Google text ads. Also removes a width limitation and the toolbar advertisement.</pre>
+                    <pre class=
+                    "SCREEN">+filter{google}              # CSS-based block for Google text ads. Also removes a width limitation and the toolbar advertisement.</pre>

                   </td>
                 </tr>
               </table>
                   </td>
                 </tr>
               </table>


@@ -1833,8 +1833,8 @@ problem-host.example.com</pre>
               <table border="0" bgcolor="#E0E0E0" width="90%">
                 <tr>
                   <td>
               <table border="0" bgcolor="#E0E0E0" width="90%">
                 <tr>
                   <td>

-                    <pre class="SCREEN">
-                    +filter{yahoo}               # CSS-based block for Yahoo text ads. Also removes a width limitation.</pre>
+                    <pre class=
+                    "SCREEN">+filter{yahoo}               # CSS-based block for Yahoo text ads. Also removes a width limitation.</pre>

                   </td>
                 </tr>
               </table>
                   </td>
                 </tr>
               </table>


@@ -1842,8 +1842,8 @@ problem-host.example.com</pre>
               <table border="0" bgcolor="#E0E0E0" width="90%">
                 <tr>
                   <td>
               <table border="0" bgcolor="#E0E0E0" width="90%">
                 <tr>
                   <td>

-                    <pre class="SCREEN">
-                    +filter{msn}                 # CSS-based block for MSN text ads. Also removes tracking URLs and a width limitation.</pre>
+                    <pre class=
+                    "SCREEN">+filter{msn}                 # CSS-based block for MSN text ads. Also removes tracking URLs and a width limitation.</pre>

                   </td>
                 </tr>
               </table>
                   </td>
                 </tr>
               </table>


@@ -1851,8 +1851,8 @@ problem-host.example.com</pre>
               <table border="0" bgcolor="#E0E0E0" width="90%">
                 <tr>
                   <td>
               <table border="0" bgcolor="#E0E0E0" width="90%">
                 <tr>
                   <td>

-                    <pre class="SCREEN">
-                    +filter{blogspot}            # Cleans up some Blogspot blogs. Read the fine print before using this.</pre>
+                    <pre class=
+                    "SCREEN">+filter{blogspot}            # Cleans up some Blogspot blogs. Read the fine print before using this.</pre>

                   </td>
                 </tr>
               </table>
                   </td>
                 </tr>
               </table>

diff --git a/doc/webserver/user-manual/config.html b/doc/webserver/user-manual/config.html
index a266655..0b94a9e 100644 (file)
--- a/doc/webserver/user-manual/config.html
+++ b/doc/webserver/user-manual/config.html
@@ -1329,8 +1329,8 @@
               <table border="0" bgcolor="#E0E0E0" width="90%">
                 <tr>
                   <td>
               <table border="0" bgcolor="#E0E0E0" width="90%">
                 <tr>
                   <td>

-                    <pre class="SCREEN">
-                    forward-socks4a   /              socks-gw.example.com:1080  www-cache.isp.example.net:8080
+                    <pre class=
+                    "SCREEN">  forward-socks4a   /              socks-gw.example.com:1080  www-cache.isp.example.net:8080

   forward           .example.com   .</pre>
                   </td>
                 </tr>
   forward           .example.com   .</pre>
                   </td>
                 </tr>