From: Lee <ler762@users.sourceforge.net>
Date: Mon, 19 Mar 2018 15:46:58 +0000 (-0400)
Subject: have docbook generate valid html
X-Git-Tag: v_3_0_27~59
X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=352696e3ebdddaaf4d370ee35f2bab3ed3b18134

have docbook generate valid html

http://validator.w3.org/check
fusses about 'end tag for element "P" which is not open'
if a table is inside a paragraph - eg
  <p><table> ... </table></p>

docbook 3.1 turns <screen> and <programlisting> into
html <table>s, so get rid of all the enclosing <para>s

problematic constructs:
<para><figure> ... </figure></para>
<para><itemizedlist> ... </itemizedlist></para>
<para><literal> ... </literal></para>
<para><orderedlist> ... </orderedlist></para>
<para><programlisting> ... </programlisting></para>
<para><screen> ... </screen></para>
<para><simplelist> ... </simplelist></para>
---

diff --git a/doc/source/buildsource.sgml b/doc/source/buildsource.sgml
index 5a4f6229..c97fb260 100644
--- a/doc/source/buildsource.sgml
+++ b/doc/source/buildsource.sgml
@@ -40,12 +40,10 @@
 --> first unpack the source:
 </para>
 
-<para>
  <screen>
  tar xzvf privoxy-&p-version;<![%p-not-stable;[-beta]]><![%p-stable;[-stable]]>-src.tar.gz
  cd privoxy-&p-version;<![%p-not-stable;[-beta]]><![%p-stable;[-stable]]>
 </screen>
-</para>
 
 <para>
  For retrieving the current CVS sources, you'll need a CVS client installed.
@@ -54,13 +52,11 @@
  documentation, which might give commands like:
 </para>
 
-<para>
  <screen>
   cvs -d:pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa login
   cvs -z3 -d:pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa co current
   cd current
 </screen>
-</para>
 
 <para>
  This will create a directory named <filename>current/</filename>, which will
@@ -88,17 +84,13 @@
  <filename>/etc/passwd</filename> might then look like:
 </para>
 
-<para>
  <screen>  privoxy:*:7777:7777:privoxy proxy:/no/home:/no/shell</screen>
-</para>
 
 <para>
  And then <filename>/etc/group</filename>, like:
 </para>
 
-<para>
  <screen>  privoxy:*:7777:</screen>
-</para>
 
 <para>
  Some binary packages may do this for you.
@@ -108,7 +100,6 @@
  Then, to build from either unpacked tarball or CVS source:
 </para>
 
-<para>
  <screen>
  autoheader
  autoconf
@@ -117,18 +108,15 @@
  su               # Possibly required
  make -n install  # (to see where all the files will go)
  make -s install  # (to really install, -s to silence output)</screen>
-</para>
 
 <para>
   Using GNU <command>make</command>, you can have the first four steps
   automatically done for you by just typing:
 </para>
 
-<para>
  <screen>
   make
 </screen>
-</para>
 
 <para>
   in the freshly downloaded or unpacked source directory.
@@ -139,10 +127,8 @@
  users cannot easily bypass the proxy (e.g. <quote>Go There Anyway</quote>), or
  alter their own configurations, <command>configure</command> like this:
 </para>
-<para>
  <screen>
  ./configure  --disable-toggle  --disable-editor  --disable-force</screen>
-</para>
 <para>
  Note that all of these options can also be disabled through the configuration file.
 </para>
@@ -170,10 +156,8 @@
  on the <command>make</command> command line, but be sure both already exist:
 </para>
 
-<para>
  <screen>
  make -s install  USER=privoxy GROUP=privoxy</screen>
-</para>
 
 <para>
  The default installation path for <command>make install</command> is
diff --git a/doc/source/changelog.sgml b/doc/source/changelog.sgml
index dffdefcb..3d6094e5 100644
--- a/doc/source/changelog.sgml
+++ b/doc/source/changelog.sgml
@@ -30,11 +30,12 @@
   for the previously released 3.0.25 beta which introduced client-specific
   tags and included a couple of minor improvements.
 </para>
-<para>
+
  <itemizedlist>
   <listitem>
    <para>
     Bug fixes:
+   </para>
     <itemizedlist>
     <listitem>
      <para>
@@ -44,11 +45,11 @@
     </para>
     </listitem>
     </itemizedlist>
-   </para>
   </listitem>
   <listitem>
    <para>
     General improvements:
+   </para>
     <itemizedlist>
     <listitem>
      <para>
@@ -74,11 +75,11 @@
      </para>
      </listitem>
     </itemizedlist>
-   </para>
   </listitem>
   <listitem>
    <para>
     Documentation improvements:
+   </para>
     <itemizedlist>
     <listitem>
      <para>
@@ -102,11 +103,11 @@
      </para>
      </listitem>
     </itemizedlist>
-   </para>
   </listitem>
   <listitem>
    <para>
     Infrastructure improvements:
+   </para>
     <itemizedlist>
     <listitem>
      <para>
@@ -115,11 +116,11 @@
      </para>
      </listitem>
     </itemizedlist>
-   </para>
   </listitem>
   <listitem>
    <para>
     Build system improvements:
+   </para>
     <itemizedlist>
     <listitem>
      <para>
@@ -137,20 +138,19 @@
      </para>
      </listitem>
     </itemizedlist>
-   </para>
   </listitem>
  </itemizedlist>
-</para>
 
 <para>
  Changes between <application>Privoxy 3.0.25 beta</application>
  and the previous release:
 </para>
-<para>
+
  <itemizedlist>
   <listitem>
    <para>
     Bug fixes:
+   </para>
     <itemizedlist>
     <listitem>
      <para>
@@ -170,11 +170,11 @@
      </para>
      </listitem>
     </itemizedlist>
-   </para>
   </listitem>
   <listitem>
    <para>
     General improvements:
+   </para>
     <itemizedlist>
     <listitem>
      <para>
@@ -243,11 +243,11 @@
      </para>
      </listitem>
     </itemizedlist>
-   </para>
   </listitem>
   <listitem>
    <para>
     Action file improvements:
+   </para>
     <itemizedlist>
     <listitem>
      <para>
@@ -262,11 +262,11 @@
      </para>
      </listitem>
     </itemizedlist>
-   </para>
   </listitem>
   <listitem>
    <para>
     Documentation improvements:
+   </para>
     <itemizedlist>
     <listitem>
      <para>
@@ -398,11 +398,11 @@
      </para>
      </listitem>
     </itemizedlist>
-   </para>
   </listitem>
   <listitem>
    <para>
     Infrastructure improvements:
+   </para>
     <itemizedlist>
     <listitem>
      <para>
@@ -423,11 +423,11 @@
      </para>
      </listitem>
     </itemizedlist>
-   </para>
   </listitem>
   <listitem>
    <para>
     Build system improvements:
+   </para>
     <itemizedlist>
     <listitem>
      <para>
@@ -509,11 +509,11 @@
      </para>
      </listitem>
     </itemizedlist>
-   </para>
   </listitem>
   <listitem>
    <para>
     Privoxy-Regression-Test:
+   </para>
     <itemizedlist>
     <listitem>
      <para>
@@ -555,7 +555,6 @@
      </para>
      </listitem>
     </itemizedlist>
-   </para>
   </listitem>
  </itemizedlist>
-</para>
+
diff --git a/doc/source/contacting.sgml b/doc/source/contacting.sgml
index a75197d0..4451e9d2 100644
--- a/doc/source/contacting.sgml
+++ b/doc/source/contacting.sgml
@@ -65,7 +65,6 @@
   Please be sure to provide the following information when reporting problems
   or requesting support:
 </para>
-<para>
  <itemizedlist>
 
   <listitem>
@@ -128,6 +127,7 @@
     is being used and the following <ulink
     url="../user-manual/config.html#DEBUG">debug options</ulink> are enabled
     (all of them):
+   </para>
     <literallayout>debug     1 # Log the destination for each request Privoxy let through.
             #   See also debug 1024.
 debug     2 # show each connection status
@@ -141,14 +141,15 @@ debug  1024 # Log the destination for requests Privoxy didn't let through,
 debug  4096 # Startup banner and warnings.
 debug  8192 # Non-fatal errors
 debug 65536 # Log applying actions</literallayout>
-   </para>
    <para>
     If you are having trouble with a filter, please additionally enable
+   </para>
     <literallayout>debug    64 # debug regular expression filters</literallayout>
+   <para>
     If you suspect that Privoxy interprets the request or the response
     incorrectly, please enable
-    <literallayout>debug 32768 # log all data read from the network</literallayout>
    </para>
+    <literallayout>debug 32768 # log all data read from the network</literallayout>
    <para>
     It's easy for us to ignore log messages that aren't relevant but missing
     log messages may make it impossible to investigate a problem. If you aren't
@@ -163,7 +164,6 @@ debug 65536 # Log applying actions</literallayout>
   </listitem>
 
 </itemizedlist>
-</para>
 
 <para>
  You don't have to tell us your actual name when filing a problem
diff --git a/doc/source/developer-manual.sgml b/doc/source/developer-manual.sgml
index 1d82805c..89d0b004 100644
--- a/doc/source/developer-manual.sgml
+++ b/doc/source/developer-manual.sgml
@@ -231,7 +231,6 @@ Hal.
       <para>
        Basic Guidelines, for all branches:
       </para>
-      <para>
         <itemizedlist>
           <listitem><para>
             Please don't commit even
@@ -267,7 +266,6 @@ Hal.
           </para>
          </listitem>
         </itemizedlist>
-      </para>
 
 <!--
       <para>
@@ -375,6 +373,7 @@ Hal.
     </para>
     <para>
      How do you update the webserver (i.e. the pages on privoxy.org)?
+    </para>
 
      <orderedlist numeration="arabic">
       <listitem><para>
@@ -387,7 +386,6 @@ Hal.
         sourceforge webserver via scp.
       </para></listitem>
      </orderedlist>
-  </para>
 
   <para>
    Finished docs should be occasionally submitted to CVS
@@ -443,7 +441,6 @@ Hal.
  Some common elements that you likely will use:
 </para>
 
-<para>
   <simplelist>
     <member>
       <emphasis>&lt;para&gt;&lt;/para&gt;</emphasis>, paragraph delimiter. Most
@@ -481,7 +478,6 @@ Hal.
       <emphasis>&lt;quote&gt;&lt;/quote&gt;</emphasis>, for, doh, quoting text.
     </member>
   </simplelist>
-</para>
 
 <para>
  Look at any of the existing docs for examples of all these and more.
@@ -507,7 +503,6 @@ Hal.
    <para>
     Here it is:
    </para>
-   <para>
     <itemizedlist>
      <listitem>
       <para>
@@ -518,21 +513,24 @@ Hal.
      <para>
        Tags delimiting a <emphasis>block</emphasis> of text (even small
        blocks) should be on their own line. Like:
+     </para>
        <literallayout>
  &lt;para&gt;
   Some text goes here.
  &lt;/para&gt;
        </literallayout>
+     <para>
        Tags marking individual words, or few words, should be in-line:
+     </para>
        <literallayout>
   Just to &lt;emphasis&gt;emphasize&lt;/emphasis&gt;, some text goes here.
        </literallayout>
-     </para>
    </listitem>
    <listitem>
     <para>
       Tags should be nested and step indented for block text like: (except
       in-line tags)
+    </para>
      <literallayout>
  &lt;para&gt;
   &lt;itemizedlist&gt;
@@ -544,6 +542,7 @@ Hal.
   &lt;/itemizedlist&gt;
  &lt;/para&gt;
        </literallayout>
+    <para>
       This makes it easier to find the text amongst the tags ;-)
     </para>
    </listitem>
@@ -604,7 +603,6 @@ Hal.
   </listitem>
 
   </itemizedlist>
- </para>
 
   </sect2>
 
@@ -636,7 +634,6 @@ Hal.
   custom entities are listed below. See any of the main docs for examples.
  </para>
 
- <para>
   <itemizedlist>
   <listitem>
    <para>
@@ -680,7 +677,6 @@ Hal.
   </simplelist>
  </listitem>
  </itemizedlist>
- </para>
  <para>
   There are others in various places that are defined for a specific
   purpose. Read the source!
@@ -948,11 +944,9 @@ int ms_iis5_hack = 0;</programlisting>
 
     <para><emphasis>Instead of:</emphasis></para>
 
-    <para>
 <programlisting>
 int msiis5hack = 0; int msIis5Hack = 0;
 </programlisting>
-</para>
 
 
 
@@ -975,12 +969,10 @@ int load_some_file(struct client_state *csp)</programlisting>
 
     <para><emphasis>Instead of:</emphasis></para>
 
-    <para>
 <programlisting>
 int loadsomefile(struct client_state *csp)
 int loadSomeFile(struct client_state *csp)
 </programlisting>
-</para>
 
 
   </sect3>
@@ -999,13 +991,12 @@ int loadSomeFile(struct client_state *csp)
 (.h) extern int load_aclfile(struct client_state *csp);
 (.c) int load_aclfile(struct client_state *csp)</programlisting>
 
-    <para><emphasis>Instead of:</emphasis>
+    <para><emphasis>Instead of:</emphasis></para>
 <programlisting>
 (.h) extern int load_aclfile(struct client_state *); or
 (.h) extern int load_aclfile();
 (.c) int load_aclfile(struct client_state *csp)
 </programlisting>
-</para>
 
 
   </sect3>
@@ -1057,7 +1048,6 @@ int loadSomeFile(struct client_state *csp)
 
     <para><emphasis>Instead of:</emphasis></para>
 
-    <para>
 <programlisting>
 #define USE_IMG_LST 1 or
 #define _USE_IMAGE_LIST 1 or
@@ -1065,7 +1055,6 @@ int loadSomeFile(struct client_state *csp)
 #define use_image_list 1 or
 #define UseImageList 1
 </programlisting>
-</para>
 
 
   </sect3>
@@ -1466,12 +1455,10 @@ for (size_t cnt = 0; cnt &lt; len; cnt++)
 
     <para><emphasis>Exception:</emphasis></para>
 
-    <para>
 <programlisting>
 /* This is not a local include, but requires a path element. */
 #include &lt;sys/fileName.h&gt;
 </programlisting>
-</para>
 
     <para><emphasis>Note:</emphasis> Please! do not add "-I." to the Makefile
     without a _very_ good reason. This duplicates the #include
@@ -1950,13 +1937,14 @@ int FUNCTION_NAME(void *param1, const char *x)
     <sect2 id="testing-plan"><title>Testplan for releases</title>
       <para>
        Explain release numbers. major, minor. developer releases. etc.
-
+      </para>
 <orderedlist numeration="arabic">
           <listitem><para>
 Remove any existing rpm with rpm -e
 </para></listitem>
           <listitem><para>
 Remove any file that was left over. This includes (but is not limited to)
+          </para>
       <itemizedlist>
                 <listitem><para>/var/log/privoxy</para></listitem>
                 <listitem><para>/etc/privoxy</para></listitem>
@@ -1964,7 +1952,7 @@ Remove any file that was left over. This includes (but is not limited to)
                 <listitem><para>/etc/init.d/privoxy</para></listitem>
                 <listitem><para>/usr/doc/privoxy*</para></listitem>
               </itemizedlist>
-</para></listitem>
+          </listitem>
           <listitem><para>
 Install the rpm. Any error messages?
 </para></listitem>
@@ -1974,7 +1962,6 @@ Install the rpm. Any error messages?
           <listitem><para>Start browsing. Does <application>Privoxy</application> work? Logfile written?</para></listitem>
           <listitem><para>Remove the rpm. Any error messages? All files removed?</para></listitem>
         </orderedlist>
-</para>
     </sect2>
     <!-- XXX: Document how to write test reports and where to send them -->
 
@@ -2071,6 +2058,7 @@ $ afl-fuzz -i input/ -o output/ -f bla.filter -m none privoxy --fuzz filter bla.
       First you need to determine which version number the release will have.
       <application>Privoxy</application> version numbers consist of three numbers,
       separated by dots, like in X.Y.Z (e.g. 3.0.0), where:
+    </para>
         <itemizedlist>
           <listitem>
             <para>
@@ -2122,7 +2110,6 @@ $ afl-fuzz -i input/ -o output/ -f bla.filter -m none privoxy --fuzz filter bla.
             </para>
           </listitem>
         </itemizedlist>
-    </para>
     <para>
      In summary, the main CVS trunk is the development branch where new
      features are being worked on for the next stable series. This should
@@ -2155,7 +2142,6 @@ $ afl-fuzz -i input/ -o output/ -f bla.filter -m none privoxy --fuzz filter bla.
        The following <emphasis>must be done by one of the
        developers</emphasis> prior to each new release.
      </para>
-     <para>
       <itemizedlist>
        <listitem>
         <para>
@@ -2184,13 +2170,13 @@ $ afl-fuzz -i input/ -o output/ -f bla.filter -m none privoxy --fuzz filter bla.
         If action file processing has changed and is not backward-compatible,
         make sure the "for-privoxy-version=x.y.z" minimum version number in
         default.action.master has been updated:
+       </para>
         <programlisting>
 {{settings}}
 #############################################################################
 #MASTER# COMMENT: The minimum Privoxy version:
 for-privoxy-version=3.0.11
 </programlisting>
-       </para>
       </listitem>
       <listitem>
        <para>
@@ -2255,7 +2241,6 @@ for-privoxy-version=3.0.11
        </para>
       </listitem>
       </itemizedlist>
-     </para>
     </sect2>
 
     <sect2 id="therelease">
@@ -2272,14 +2257,12 @@ for-privoxy-version=3.0.11
       asked for a password):
      </para>
 
-     <para>
       <programlisting>
   mkdir dist # delete or choose different name if it already exists
   cd dist
   cvs -d:pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa login
   cvs -z3 -d:pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa export -r v_X_Y_Z current
 </programlisting>
-    </para>
 
     <para>
      <emphasis>Do NOT change</emphasis> a single bit, including, but not limited to
@@ -2311,7 +2294,6 @@ for-privoxy-version=3.0.11
       Please keep these general guidelines in mind when putting together
       your package. These apply to <emphasis>all</emphasis> platforms!
      </para>
-     <para>
       <itemizedlist>
        <listitem>
         <para>
@@ -2420,7 +2402,6 @@ for-privoxy-version=3.0.11
     </listitem>
 
       </itemizedlist>
-     </para>
 
     </sect3>
 
@@ -2430,28 +2411,22 @@ for-privoxy-version=3.0.11
         version into an empty directory</emphasis>. (See "Building and releasing
         packages" above). Then run:
       </para>
-      <para>
         <programlisting>
   cd current
   autoheader && autoconf && ./configure
 </programlisting>
-      </para>
       <para>
         Then do:
       </para>
-      <para>
         <programlisting>
   make tarball-dist
 </programlisting>
-      </para>
       <para>
         To upload the package to Sourceforge, simply issue
       </para>
-      <para>
         <programlisting>
   make tarball-upload
 </programlisting>
-      </para>
       <para>
         Go to the displayed URL and release the file publicly on Sourceforge.
         For the change log field, use the relevant section of the
@@ -2484,28 +2459,22 @@ for-privoxy-version=3.0.11
       <para>
         Then run:
       </para>
-      <para>
         <programlisting>
   cd current
   autoheader && autoconf && ./configure
 </programlisting>
-      </para>
       <para>
         Then do
       </para>
-      <para>
         <programlisting>
   make <replaceable class="parameter">dist</replaceable>-dist
 </programlisting>
-      </para>
       <para>
         To upload the package to Sourceforge, simply issue
       </para>
-      <para>
         <programlisting>
   make <replaceable class="parameter">dist</replaceable>-upload <replaceable class="parameter">rpm_packagerev</replaceable>
 </programlisting>
-      </para>
       <para>
         where <replaceable class="parameter">rpm_packagerev</replaceable> is the
         RPM release number as determined above.
@@ -2520,11 +2489,9 @@ for-privoxy-version=3.0.11
         version into an empty directory</emphasis>. (See "Building and releasing
         packages" above). Then get the OS/2 Setup module:
       </para>
-      <para>
         <programlisting>
   cvs -z3 -d:pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa co os2setup
 </programlisting>
-      </para>
       <para>
         You will need a mix of development tools.
         The main compilation takes place with IBM Visual Age C++.
@@ -2540,28 +2507,22 @@ for-privoxy-version=3.0.11
         Edit the os2build.cmd file to set the final executable filename.
         For example,
       </para>
-      <para>
         <programlisting>
   installExeName='privoxyos2_setup_X.Y.Z.exe'
 </programlisting>
-      </para>
       <para>
         Next, edit the <filename>IJB.wis</filename> file so the release number matches
         in the <filename>PACKAGEID</filename> section:
       </para>
-      <para>
         <programlisting>
   PACKAGEID="Privoxy Team\Privoxy\Privoxy Package\X\Y\Z"
 </programlisting>
-      </para>
       <para>
         You're now ready to build.  Run:
       </para>
-      <para>
         <programlisting>
   os2build
 </programlisting>
-      </para>
       <para>
          You will find the  WarpIN-installable executable in the
         <filename>./files</filename> directory. Upload this anonymously to
@@ -2575,31 +2536,25 @@ for-privoxy-version=3.0.11
       <para>
         Login to Sourceforge's compilefarm via ssh:
       </para>
-      <para>
         <programlisting>
   ssh cf.sourceforge.net
 </programlisting>
-      </para>
       <para>
         Choose the right operating system (not the Debian one).
         When logged in, <emphasis>make sure that you have freshly exported the right
         version into an empty directory</emphasis>. (See "Building and releasing
         packages" above). Then run:
       </para>
-      <para>
         <programlisting>
   cd current
   autoheader && autoconf && ./configure
 </programlisting>
-      </para>
       <para>
         Then run
       </para>
-      <para>
         <programlisting>
   gmake solaris-dist
 </programlisting>
-      </para>
       <para>
         which creates a gzip'ed tar archive. Sadly, you cannot use <command>make
         solaris-upload</command> on the Sourceforge machine (no ncftpput). You now have
@@ -2620,22 +2575,18 @@ for-privoxy-version=3.0.11
         version into an empty directory</emphasis>. (See "Building and releasing
         packages" above). Then get the Windows setup module:
       </para>
-      <para>
       <programlisting>
   cvs -z3  -d:pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa co winsetup
 </programlisting>
-      </para>
       <para>
         Then you can build the package.  This is fully automated, and is
         controlled by <filename>winsetup/GNUmakefile</filename>.
         All you need to do is:
       </para>
-      <para>
       <programlisting>
   cd winsetup
   make
 </programlisting>
-      </para>
       <para>
         Now you can manually rename <filename>privoxy_setup.exe</filename> to
         <filename>privoxy_setup_X_Y_Z.exe</filename>, and upload it to
@@ -2652,30 +2603,24 @@ for-privoxy-version=3.0.11
         entry to <filename>debian/changelog</filename>, if it is not
         already there, for example by running:
       </para>
-      <para>
         <programlisting>
   debchange -v &p-version;-&p-status;-1 "New upstream version"
 </programlisting>
-      </para>
       <para>
         Then, run:
       </para>
-      <para>
         <programlisting>
   dpkg-buildpackage -rfakeroot -us -uc -b
 </programlisting>
-      </para>
       <para>
         This will create
         <filename>../privoxy_&p-version;-&p-status;-1_i386.deb</filename>
         which can be uploaded.  To upload the package to Sourceforge, simply
         issue
       </para>
-      <para>
         <programlisting>
   make debian-upload
 </programlisting>
-      </para>
     </sect3>
 
     <sect3 id="newrelease-macosx"><title>Mac OS X</title>
@@ -2695,10 +2640,10 @@ for-privoxy-version=3.0.11
           The OSXPackageBuilder module generates OS X installer packages
           supporting all Macs running OS X 10.4 and above. Obtain it from CVS as
           follows into a folder parallel to the exported privoxy source:
+        </para>
           <programlisting>
   cvs -z3 -d:pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa co OSXPackageBuilder
 </programlisting>
-        </para>
         <para>
           The module contains complete instructions on its usage in the file
           <filename>OS X Package Builder HOWTO.txt</filename>.
@@ -2722,19 +2667,17 @@ for-privoxy-version=3.0.11
         <para>
           Check out the module from CVS as follows into a folder parallel to the
           exported privoxy source:
+        </para>
           <programlisting>
   cvs -z3 -d:pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa co osxsetup
 </programlisting>
-        </para>
         <para>
           Then run:
         </para>
-        <para>
           <programlisting>
   cd osxsetup
   build
 </programlisting>
-        </para>
         <para>
           This will run <filename>autoheader</filename>, <filename>autoconf</filename>
           and <filename>configure</filename> as well as <filename>make</filename>.
@@ -2747,11 +2690,9 @@ for-privoxy-version=3.0.11
         package" button. If you specify ./Privoxy.pkg as the output package
         name, you can then create the distributable zip file with the command:
         </para>
-        <para>
           <programlisting>
   zip -r privoxyosx_setup_x.y.z.zip Privoxy.pkg
 </programlisting>
-        </para>
         <para>
           You can then upload this file directly to the Files section of the
           Sourceforge project in the Macintosh (OS X) folder. Each new version
@@ -2770,10 +2711,10 @@ for-privoxy-version=3.0.11
         <para>
           Check out the module from CVS as follows into a folder parallel to the
           exported privoxy source:
+        </para>
           <programlisting>
   cvs -z3 -d:pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa co macsetup
 </programlisting>
-        </para>
         <para>
           The module contains complete instructions on its usage in its
           <filename>README</filename> file. The end result will be the
@@ -2797,7 +2738,6 @@ for-privoxy-version=3.0.11
       to SourceForge, and go through the release steps. The upload
       is done via FTP:
     </para>
-     <para>
       <itemizedlist>
        <listitem>
         <para>
@@ -2815,7 +2755,6 @@ for-privoxy-version=3.0.11
        </para>
       </listitem>
      </itemizedlist>
-    </para>
     <para>
      Or use the <command>make</command> targets as described above.
     </para>
@@ -2877,11 +2816,9 @@ for-privoxy-version=3.0.11
     If you have changed anything in the stable-branch documentation source
     SGML files, do:
    </para>
-   <para>
     <programlisting>
   make dok
 </programlisting>
-   </para>
    <para>
     That will generate <filename>doc/webserver/user-manual</filename>,
     <filename>doc/webserver/developer-manual</filename>,
@@ -2904,11 +2841,9 @@ for-privoxy-version=3.0.11
     Next, commit any changes from the above steps to CVS. All set?
     If these are docs in the stable branch, then do:
    </para>
-   <para>
     <programlisting>
   make webserver
 </programlisting>
-   </para>
    <para>
     This will do the upload to <ulink url="https://www.privoxy.org/">the
     webserver</ulink> (www.privoxy.org) and ensure all files and directories
diff --git a/doc/source/faq.sgml b/doc/source/faq.sgml
index afe66dab..a9ee01f8 100644
--- a/doc/source/faq.sgml
+++ b/doc/source/faq.sgml
@@ -935,12 +935,10 @@ the differences?</title>
   for them in the <filename>user.action</filename> file. An example for yahoo might
   look like:
  </para>
- <para>
   <screen># Allow all cookies for Yahoo login:
 #
 { -<ulink url="../user-manual/actions-file.html#CRUNCH-INCOMING-COOKIES">crunch-incoming-cookies</ulink> -<ulink url="../user-manual/actions-file.html#CRUNCH-OUTGOING-COOKIES">crunch-outgoing-cookies</ulink> -<ulink url="../user-manual/actions-file.html#SESSION-COOKIES-ONLY">session-cookies-only</ulink> }
 .login.yahoo.com</screen>
- </para>
  <para>
   These kinds of sites are often quite complex and heavy with
   <ulink url="http://en.wikipedia.org/wiki/Javascript">Javascript</ulink> and
@@ -949,13 +947,11 @@ the differences?</title>
   url="../user-manual/actions-file.html#ALIASES">alias</ulink> just for such
   sticky situations:
  </para>
- <para>
   <screen># Gmail is a _fragile_ site:
 #
 { <literal>fragile</literal> }
  # Gmail is ...
  mail.google.com</screen>
- </para>
  <para>
   Be sure to flush your browser's caches whenever making these kinds of
   changes, just to make sure the changes <quote>take</quote>.
@@ -1106,10 +1102,8 @@ with a browser? Does that not raise security issues?</title>
  should look like:
 </para>
 
-<para>
  <screen>
   listen-address  192.168.1.1:8118</screen>
-</para>
 
 <para>
  Save the file, and restart <application>Privoxy</application>. Configure
@@ -1121,10 +1115,8 @@ with a browser? Does that not raise security issues?</title>
  all available interfaces:
 </para>
 
-<para>
  <screen>
   listen-address    :8118</screen>
-</para>
 
 <para>
  And then use <application>Privoxy's</application>
@@ -1397,11 +1389,9 @@ and thus avoid individual browser configuration?</title>
   To disable all cookie actions, so that cookies are allowed unrestricted,
   both in and out, for <literal>example.com</literal>:
 </para>
-<para>
  <screen>
  { -crunch-incoming-cookies -crunch-outgoing-cookies -session-cookies-only -filter{content-cookies} }
   .example.com</screen>
-</para>
 <para>
  Place the above in <filename>user.action</filename>. Note that some of these may
  be off by default anyway, so this might be redundant, but there is no harm
@@ -1492,16 +1482,13 @@ and thus avoid individual browser configuration?</title>
  can very easily over-ride <emphasis>all</emphasis> blocking with the
  following very simple rule in your <filename>user.action</filename>:
  </para>
- <para>
  <screen>
  # Unblock everybody, everywhere
  { <ulink url="../user-manual/actions-file.html#BLOCK">-block</ulink> }
  / # UN-Block *all* URLs</screen>
-</para>
 <para>
  Or even a more comprehensive reversing of various ad related actions:
 </para>
-<para>
  <screen>
  # Unblock everybody, everywhere, and turn off appropriate filtering, etc
  { <ulink url="../user-manual/actions-file.html#BLOCK">-block</ulink> \
@@ -1510,7 +1497,6 @@ and thus avoid individual browser configuration?</title>
   <literal>allow-popups</literal> \
  }
  / # UN-Block *all* URLs and allow ads</screen>
-</para>
 <para>
  This last <quote>action</quote> in this compound statement,
  <literal>allow-popups</literal>, is an <ulink
@@ -1551,10 +1537,8 @@ the <emphasis>BLOCKED</emphasis> page?</title>
  available as compile-time options. You should
  <command>configure</command> the sources as follows:
 </para>
-<para>
  <screen>
  ./configure  --disable-toggle  --disable-editor  --disable-force</screen>
-</para>
 <para>
  This will create an executable with hard-coded security features so that
  &my-app; does not allow easy bypassing of blocked sites, or changing the
@@ -1855,11 +1839,9 @@ us help you. Your efforts are not wasted, and we do appreciate them.
  <ulink url="../user-manual/config.html#FORWARDING">forwarding section</ulink>
  and uncomment the line:
 </para>
-<para>
  <screen>
 #        forward-socks5t             /     127.0.0.1:9050 .
  </screen>
-</para>
 <para>
  Note that if you got Tor through one of the bundles, you may
  have to change the port from 9050 to 9150 (or even another one).
@@ -1872,13 +1854,11 @@ us help you. Your efforts are not wasted, and we do appreciate them.
  uncomment the following forward rules, to make sure your local network is still
  reachable through Privoxy:
 </para>
-<para>
  <screen>
 #        forward         192.168.*.*/     .
 #        forward            10.*.*.*/     .
 #        forward           127.*.*.*/     .
  </screen>
-</para>
 <para>
  Unencrypted connections to systems in these address ranges will
  be as (un)secure as the local network is, but the alternative is
@@ -1892,11 +1872,9 @@ us help you. Your efforts are not wasted, and we do appreciate them.
  network by using their names, you will need additional exceptions
  that look like this:
 </para>
-<para>
  <screen>
 #        forward           localhost/     .
  </screen>
-</para>
 <para>
  Save the modified configuration file and open
  <ulink url="http://config.privoxy.org/show-status">http://config.privoxy.org/show-status</ulink>
@@ -2241,14 +2219,12 @@ altered it! Yikes, what is wrong!</title>
  your hosts list is neglected by <application>Privoxy's </application>
  configuration, consider adding your list to your <filename>user.action</filename> file:
 </para>
-<para>
  <screen>
   { +block }
    www.ad.example1.com
    ad.example2.com
    ads.galore.example.com
    etc.example.com</screen>
-</para>
 </sect2>
 
 <sect2 renderas="sect3" id="seealso">
@@ -2344,7 +2320,6 @@ and related issues?</title>
 <para>
  There are several possibilities:
 </para>
-<para>
 <itemizedlist>
 <listitem><para>
 <application>Privoxy</application> is not running. Solution: verify
@@ -2364,7 +2339,6 @@ and related issues?</title>
   try disabling or removing the firewall as a simple test.
  </para></listitem>
 </itemizedlist>
-</para>
 
 </sect2>
 
@@ -2417,7 +2391,6 @@ still getting through. How?</title>
  our job a little easier. &my-app; has <quote>crunched</quote> (meaning caught
  and BLOCKED) quite a few items in this example, but perhaps missed a few as well.
 </para>
-<para>
 <screen>
 <![CDATA[
 Request: www.example.com/
@@ -2455,7 +2428,6 @@ Request: www.adtrak.net/adlog.php?bannerid=1309&clientid=439&zoneid=58&source=Ua
 Request: 66.70.21.80/scripts/click.php?hid=a71b9f6504b0c5681fa5&si=Ua
 ]]>
 </screen>
-</para>
 <para>
  Despite 12 out of 32 requests being blocked, the page looked, and seemed to
  behave perfectly <quote>normal</quote> (minus some ads, of course).
@@ -2915,14 +2887,12 @@ browsing has slowed to a crawl. What gives? </title>
  To do that, enable logging to figure out which requests get blocked by
  &my-app; and add the hosts (no path patterns) to a section like this:
 </para>
-<para>
 <screen>
 <![CDATA[
 {+redirect{http://127.0.0.1:0/} -block -limit-connect}
 .ivwbox.de:443/
 ]]>
 </screen>
-</para>
 <para>
  Additionally you have to configure your browser to contact
  <quote>127.0.0.1:0</quote> directly (instead of through &my-app;).
@@ -3047,11 +3017,12 @@ browsing has slowed to a crawl. What gives? </title>
  Your userid probably isn't allowed to edit the file.
  <!--  show how to check permissions? -->
  On Windows you can use the windows equivalent of sudo:
- <screen>runas /user:administrator "notepad \privoxy\config.txt"</screen>
 </para>
+ <screen>runas /user:administrator "notepad \privoxy\config.txt"</screen>
 
 <para>
  or fix the file permissions:
+</para>
 <screen>C:\Privoxy>icacls config.txt
 config.txt BUILTIN\Administrators:(I)(F)
            NT AUTHORITY\SYSTEM:(I)(F)
@@ -3074,7 +3045,6 @@ config.txt I3668\Lee:(F)
 Successfully processed 1 files; Failed processing 0 files
 
 C:\Privoxy></screen>
-</para>
 
 <para>
  or try to point-n-click your way through adjusting the file
diff --git a/doc/source/newfeatures.sgml b/doc/source/newfeatures.sgml
index f83de65b..44f73c06 100644
--- a/doc/source/newfeatures.sgml
+++ b/doc/source/newfeatures.sgml
@@ -21,7 +21,7 @@
   faq
 
 -->
-<para>
+
  <itemizedlist>
 
 <!--
@@ -32,6 +32,7 @@
   </para>
  </listitem>
 -->
+
  <listitem>
   <para>
      Supports "Connection: keep-alive". Outgoing connections can
@@ -141,4 +142,4 @@
 </listitem>
 
  </itemizedlist>
-</para>
+
diff --git a/doc/source/p-config.sgml b/doc/source/p-config.sgml
index d509c42f..788dc7b6 100644
--- a/doc/source/p-config.sgml
+++ b/doc/source/p-config.sgml
@@ -251,30 +251,22 @@ II. FORMAT OF THE CONFIGURATION FILE
   <para>
    Unix, in local filesystem (may not work with all browsers):
   </para>
-  <para>
    <screen>&nbsp;&nbsp;user-manual&nbsp;&nbsp;file:///usr/share/doc/privoxy-&p-version;/user-manual/</screen>
-  </para>
   <para>
    Windows, in local filesystem, <emphasis>must</emphasis> use forward slash notation:
   </para>
-  <para>
    <screen>&nbsp;&nbsp;user-manual&nbsp;&nbsp;file:/c:/some-dir/privoxy-&p-version;/user-manual/</screen>
-  </para>
   <para>
    Windows, UNC notation (with forward slashes):
   </para>
-  <para>
    <screen>&nbsp;&nbsp;user-manual&nbsp;&nbsp;file://///some-server/some-path/privoxy-&p-version;/user-manual/</screen>
-  </para>
  -->
   <para>
    The best all purpose solution is simply to put the full local
    <literal>PATH</literal> to where the <citetitle>User Manual</citetitle> is
    located:
   </para>
-  <para>
    <screen>&nbsp;&nbsp;user-manual&nbsp;&nbsp;/usr/share/doc/privoxy/user-manual</screen>
-  </para>
   <para>
    The User Manual is then available to anyone with access to
    <application>Privoxy</application>, by following the built-in URL:
@@ -285,9 +277,7 @@ II. FORMAT OF THE CONFIGURATION FILE
    If the documentation is not on the local system, it can be accessed
    from a remote server, as:
   </para>
-  <para>
    <screen>&nbsp;&nbsp;user-manual&nbsp;&nbsp;http://example.com/privoxy/user-manual/</screen>
-  </para>
   <![%user-man;[
    <!-- this gets hammered in conversion to config. Text repeated below. -->
   <warning>
@@ -1035,7 +1025,6 @@ actionsfile
    <para>
     The available debug levels are:
    </para>
-   <para>
     <programlisting>
   debug     1 # Log the destination for each request &my-app; let through. See also debug 1024.
   debug     2 # show each connection status
@@ -1054,7 +1043,6 @@ actionsfile
   debug 32768 # log all data read from the network
   debug 65536 # Log the applying actions
 </programlisting>
-   </para>
    <para>
     To select multiple debug levels, you can either add them or use
     multiple <literal>debug</literal> lines.
@@ -1329,21 +1317,17 @@ actionsfile
      (192.168.0.0) and has another outside connection with a different address.
      You want it to serve requests from inside only:
    </para>
-   <para>
     <programlisting>
   listen-address  192.168.0.1:8118
 </programlisting>
-   </para>
    <para>
     Suppose you are running <application>Privoxy</application> on an
     IPv6-capable machine and you want it to listen on the IPv6 address
     of the loopback device:
    </para>
-   <para>
     <programlisting>
   listen-address [::1]:8118
 </programlisting>
-   </para>
   </listitem>
  </varlistentry>
 </variablelist>
@@ -1790,49 +1774,39 @@ ACLs: permit-access and deny-access</title>
     is OK. The absence of a <replaceable class="parameter">dst_addr</replaceable> implies that
     <emphasis>all</emphasis> destination addresses are OK:
    </para>
-   <para>
     <screen>
   permit-access  localhost
 </screen>
-   </para>
    <para>
     Allow any host on the same class C subnet as www.privoxy.org access to
     nothing but www.example.com (or other domains hosted on the same system):
    </para>
-   <para>
     <screen>
   permit-access  www.privoxy.org/24 www.example.com/32
 </screen>
-   </para>
    <para>
     Allow access from any host on the 26-bit subnet 192.168.45.64 to anywhere,
     with the exception that 192.168.45.73 may not access the IP address behind
     www.dirty-stuff.example.com:
    </para>
-   <para>
     <screen>
   permit-access  192.168.45.64/26
   deny-access    192.168.45.73    www.dirty-stuff.example.com
 </screen>
-   </para>
    <para>
      Allow access from the IPv4 network 192.0.2.0/24 even if listening on
      an IPv6 wild card address (not supported on all platforms):
    </para>
-   <para>
     <programlisting>
   permit-access  192.0.2.0/24
 </programlisting>
-   </para>
    <para>
      This is equivalent to the following line even if listening on an
      IPv4 address (not supported on all platforms):
    </para>
-   <para>
     <programlisting>
   permit-access  [::ffff:192.0.2.0]/120
 </programlisting>
-   </para>
   </listitem>
  </varlistentry>
 </variablelist>
@@ -2138,40 +2112,32 @@ ACLs: permit-access and deny-access</title>
    <para>
     Everything goes to an example parent proxy, except SSL on port 443 (which it doesn't handle):
    </para>
-   <para>
     <screen>
   forward   /      parent-proxy.example.org:8080
   forward   :443   .
 </screen>
-   </para>
    <para>
     Everything goes to our example ISP's caching proxy, except for requests
     to that ISP's sites:
    </para>
-   <para>
     <screen>
   forward   /                  caching-proxy.isp.example.net:8000
   forward   .isp.example.net   .
 </screen>
-   </para>
    <para>
     Parent proxy specified by an IPv6 address:
    </para>
-   <para>
     <programlisting>
   forward   /                   [2001:DB8::1]:8000
 </programlisting>
-   </para>
    <para>
     Suppose your parent proxy doesn't support IPv6:
    </para>
-   <para>
     <programlisting>
   forward  /                        parent-proxy.example.org:8000
   forward  ipv6-server.example.org  .
   forward  &lt;[2-3][0-9a-f][0-9a-f][0-9a-f]:*&gt;   .
 </programlisting>
-   </para>
   </listitem>
  </varlistentry>
 </variablelist>
@@ -2276,30 +2242,24 @@ forward-socks4, forward-socks4a, forward-socks5 and forward-socks5t</title>
      their ISP's proxy by way of example.com's corporate SOCKS 4A gateway to
      the Internet.
    </para>
-   <para>
     <screen>
   forward-socks4a   /              socks-gw.example.com:1080  www-cache.isp.example.net:8080
   forward           .example.com   .
 </screen>
-   </para>
    <para>
     A rule that uses a SOCKS 4 gateway for all destinations but no HTTP parent looks like this:
    </para>
-   <para>
     <screen>
   forward-socks4   /               socks-gw.example.com:1080  .
 </screen>
-   </para>
 
     <para>
     To chain Privoxy and Tor, both running on the same system, you would use
     something like:
    </para>
-   <para>
     <screen>
   forward-socks5t   /               127.0.0.1:9050 .
 </screen>
-   </para>
    <para>
     Note that if you got Tor through one of the bundles, you may
     have to change the port from 9050 to 9150 (or even another one).
@@ -2311,13 +2271,11 @@ forward-socks4, forward-socks4a, forward-socks5 and forward-socks5t</title>
     reach your local network, if you need to access local servers you
     therefore might want to make some exceptions:
    </para>
-   <para>
     <screen>
   forward         192.168.*.*/     .
   forward            10.*.*.*/     .
   forward           127.*.*.*/     .
 </screen>
-   </para>
    <para>
     Unencrypted connections to systems in these address ranges will
     be as (un)secure as the local network is, but the alternative is that you
@@ -2330,11 +2288,9 @@ forward-socks4, forward-socks4a, forward-socks5 and forward-socks5t</title>
     using their names, you will need additional exceptions that look like
     this:
    </para>
-   <para>
     <screen>
  forward           localhost/     .
 </screen>
-   </para>
 
   </listitem>
  </varlistentry>
@@ -2362,23 +2318,19 @@ forward-socks4, forward-socks4a, forward-socks5 and forward-socks5t</title>
  host-a:
 </para>
 
-<para>
  <screen>
   forward    /           .
   forward    .isp-b.example.net  host-b:8118
 </screen>
-</para>
 
 <para>
  host-b:
 </para>
 
-<para>
  <screen>
   forward    /           .
   forward    .isp-a.example.org  host-a:8118
 </screen>
-</para>
 
 <para>
  Now, your users can set their browser's proxy to use either
@@ -2397,7 +2349,6 @@ forward-socks4, forward-socks4a, forward-socks5 and forward-socks5t</title>
  run on the same box, your <application>squid</application> configuration could then look like this:
 </para>
 
-<para>
  <screen>
   # Define Privoxy as parent proxy (without ICP)
   cache_peer 127.0.0.1 parent 8118 7 no-query
@@ -2410,7 +2361,6 @@ forward-socks4, forward-socks4a, forward-socks5 and forward-socks5t</title>
 
   # Forward all the rest to Privoxy
   never_direct allow all</screen>
-</para>
 
 <para>
  You would then need to change your browser's proxy settings to <application>squid</application>'s address and port.
@@ -2423,11 +2373,9 @@ forward-socks4, forward-socks4a, forward-socks5 and forward-socks5t</title>
  say, on <literal>antivir.example.com</literal>, port 8010:
 </para>
 
-<para>
  <screen>
   forward   /                          .
   forward   /.*\.(exe|com|dll|zip)$    antivir.example.com:8010</screen>
-</para>
 
 </sect3>
 ]]>
@@ -3495,7 +3443,6 @@ forward-socks4, forward-socks4a, forward-socks5 and forward-socks5t</title>
  <varlistentry>
   <term>Examples:</term>
   <listitem>
-   <para>
     <screen>
     # Best speed (compared to the other levels)
     compression-level 1
@@ -3508,7 +3455,6 @@ forward-socks4, forward-socks4a, forward-socks5 and forward-socks5t</title>
     # is likely to be flawed.
     compression-level 0
     </screen>
-   </para>
   </listitem>
  </varlistentry>
 </variablelist>
@@ -3656,14 +3602,12 @@ forward-socks4, forward-socks4a, forward-socks5 and forward-socks5t</title>
  <varlistentry>
   <term>Examples:</term>
   <listitem>
-   <para>
     <screen>
     # Define a couple of tags, the described effect requires action sections
     # that are enabled based on CLIENT-TAG patterns.
     client-specific-tag circumvent-blocks Overrule blocks but do not affect other actions
     disable-content-filters Disable content-filters but do not affect other actions
     </screen>
-   </para>
   </listitem>
  </varlistentry>
 </variablelist>
@@ -3721,12 +3665,10 @@ forward-socks4, forward-socks4a, forward-socks5 and forward-socks5t</title>
  <varlistentry>
   <term>Examples:</term>
   <listitem>
-   <para>
     <screen>
       # Increase the time to life for temporarily enabled tags to 3 minutes
       client-tag-lifetime 180
     </screen>
-   </para>
   </listitem>
  </varlistentry>
 </variablelist>
@@ -3795,13 +3737,11 @@ forward-socks4, forward-socks4a, forward-socks5 and forward-socks5t</title>
  <varlistentry>
   <term>Examples:</term>
   <listitem>
-   <para>
     <screen>
       # Allow systems that can reach Privoxy to provide the client
       # IP address with a X-Forwarded-For header.
       trust-x-forwarded-for 1
     </screen>
-   </para>
   </listitem>
  </varlistentry>
 </variablelist>
@@ -3870,12 +3810,10 @@ forward-socks4, forward-socks4a, forward-socks5 and forward-socks5t</title>
  <varlistentry>
   <term>Examples:</term>
   <listitem>
-   <para>
     <screen>
       # Increase the receive buffer size
       receive-buffer-size 32768
     </screen>
-   </para>
   </listitem>
  </varlistentry>
 </variablelist>
diff --git a/doc/source/seealso.sgml b/doc/source/seealso.sgml
index 04b06510..b86189d8 100644
--- a/doc/source/seealso.sgml
+++ b/doc/source/seealso.sgml
@@ -32,7 +32,6 @@
  users:
 </para>
 
-<para>
  <simplelist>
   <member>
    <ulink
@@ -98,4 +97,4 @@
   </member>
  </simplelist>
  ]]>
-</para>
+
diff --git a/doc/source/user-manual.sgml b/doc/source/user-manual.sgml
index e512472a..68a53abf 100644
--- a/doc/source/user-manual.sgml
+++ b/doc/source/user-manual.sgml
@@ -409,7 +409,6 @@ How to install the binary packages depends on your operating system:
  versions of <application>Privoxy</application>:
 </para>
 
-<para>
  <itemizedlist>
 
  <listitem>
@@ -494,11 +493,9 @@ How to install the binary packages depends on your operating system:
     that filtering does not work on compressed pages, so if you use, or want to
     use, filtering, you will need to force compression off. Example:
    </para>
-   <para>
  <screen>
   { +<link linkend="filter">filter</link>{google}  +<link linkend="prevent-compression">prevent-compression</link> }
    .google.</screen>
-   </para>
    <para>
     Or if you use a number of filters, or filter many sites, you may just want
     to turn off compression for all sites in
@@ -526,14 +523,13 @@ How to install the binary packages depends on your operating system:
 -->
 
  </itemizedlist>
-</para>
 
 </sect2>
 </sect1>
 
 <!--   ~~~~~       New section      ~~~~~     -->
 <sect1 id="quickstart"><title>Quickstart to Using Privoxy</title>
-<para>
+
  <itemizedlist>
 
  <listitem>
@@ -633,7 +629,6 @@ How to install the binary packages depends on your operating system:
  </listitem>
 
  </itemizedlist>
-</para>
 
 
 <!--   ~~~~~       New section      ~~~~~     -->
@@ -710,7 +705,6 @@ How to install the binary packages depends on your operating system:
  <literal><link linkend="set-image-blocker">set-image-blocker</link></literal>:
 </para>
 
-<para>
  <itemizedlist>
 
  <listitem>
@@ -785,7 +779,6 @@ How to install the binary packages depends on your operating system:
   </listitem>
 
 </itemizedlist>
-</para>
 
 <para>
  Advanced users will eventually want to explore &my-app;
@@ -831,7 +824,6 @@ How to install the binary packages depends on your operating system:
  A quick and simple step by step example:
 </para>
 
-<para>
  <itemizedlist>
 
   <listitem>
@@ -855,7 +847,6 @@ How to install the binary packages depends on your operating system:
    </para>
 
  <!-- image of editor and actions files selections -->
- <para>
   <figure pgwide="0" float="0"><title>Actions Files in Use</title>
    <mediaobject>
      <imageobject>
@@ -866,7 +857,6 @@ How to install the binary packages depends on your operating system:
       </textobject>
    </mediaobject>
   </figure>
- </para>
  </listitem>
 
  <listitem>
@@ -901,7 +891,6 @@ How to install the binary packages depends on your operating system:
  </listitem>
 
  </itemizedlist>
-</para>
 
 <para>
  This is a very crude and simple example. There might be good reasons to use a
@@ -949,7 +938,6 @@ How to install the binary packages depends on your operating system:
 </para>
 
  <!-- image of Mozilla Proxy configuration -->
- <para>
   <figure pgwide="0" float="0"><title>Proxy Configuration Showing
   Mozilla/Netscape HTTP and HTTPS (SSL) Settings</title>
    <mediaobject>
@@ -961,7 +949,6 @@ How to install the binary packages depends on your operating system:
       </textobject>
    </mediaobject>
   </figure>
- </para>
 
 
 <para>
@@ -1010,7 +997,6 @@ How to install the binary packages depends on your operating system:
 </para>
 
  <!-- image of IE Proxy configuration -->
- <para>
   <figure pgwide="0" float="0"><title>Proxy Configuration Showing
   Internet Explorer HTTP and HTTPS (Secure) Settings</title>
    <mediaobject>
@@ -1022,7 +1008,6 @@ How to install the binary packages depends on your operating system:
       </textobject>
    </mediaobject>
   </figure>
- </para>
 
 
 <para>
@@ -1050,11 +1035,9 @@ How to install the binary packages depends on your operating system:
  <filename>/etc/privoxy/config</filename> as its main configuration
  file.
 </para>
-<para>
  <screen>
  # /etc/init.d/privoxy start
 </screen>
-</para>
 </sect2>
 
 <sect2 id="start-freebsd">
@@ -1073,11 +1056,9 @@ How to install the binary packages depends on your operating system:
 <para>
  To start <application>Privoxy</application> manually, run:
 </para>
-<para>
  <screen>
  # service privoxy onestart
 </screen>
-</para>
 </sect2>
 
 <sect2 id="start-windows">
@@ -1103,11 +1084,9 @@ Click on the &my-app; Icon to start <application>Privoxy</application>. If no co
 <para>
 Example Unix startup command:
 </para>
-<para>
  <screen>
  # /usr/sbin/privoxy --user privoxy /etc/privoxy/config
 </screen>
-</para>
 <para>
  Note that if you installed <application>Privoxy</application> through
  a package manager, the package will probably contain a platform-specific
@@ -1254,7 +1233,6 @@ must find a better place for this paragraph
  command-line options:
 </para>
 
-<para>
  <itemizedlist>
 
  <listitem>
@@ -1370,7 +1348,6 @@ must find a better place for this paragraph
  </listitem>
 
  </itemizedlist>
-</para>
 
 <para>
  On <application>MS Windows</application> only there are two additional
@@ -1491,7 +1468,6 @@ for details.
  principle configuration files are:
 </para>
 
-<para>
  <itemizedlist>
 
   <listitem>
@@ -1549,7 +1525,6 @@ for details.
   </listitem>
 
  </itemizedlist>
-</para>
 
 <para>
  The syntax of the configuration and filter files may change between different
@@ -1635,7 +1610,6 @@ for details.
  are three action files included with <application>Privoxy</application> with
  differing purposes:
 </para>
-<para>
  <itemizedlist>
   <listitem>
    <para>
@@ -1698,7 +1672,6 @@ for details.
     The default profiles, and their associated actions, as pre-defined in
     <filename>default.action</filename> are:
    </para>
-   <para>
     <table frame=all><title>Default Configurations</title>
     <tgroup cols=4 align=left colsep=1 rowsep=1>
     <colspec colname=c1>
@@ -1816,11 +1789,9 @@ for details.
     </tbody>
     </tgroup>
     </table>
-    </para>
 
   </listitem>
  </itemizedlist>
-</para>
 
 <para>
  The list of actions files to be used are defined in the main configuration
@@ -1944,14 +1915,12 @@ for details.
  might look like:
 </para>
 
- <para>
  <screen>
   { +<literal>handle-as-image</literal>  +<literal>block{Banner ads.}</literal> }
   # Block these as if they were images. Send no block page.
    banners.example.com
    media.example.com/.*banners
    .example.com/images/ads/</screen>
- </para>
 
 <para>
  You can trace this process for URL patterns and any given URL by visiting <ulink
@@ -2428,7 +2397,6 @@ for details.
  Example:
 </para>
 
-<para>
  <screen>
 # If the admin defined the client-specific-tag circumvent-blocks,
 # and the request comes from a client that previously requested
@@ -2441,7 +2409,6 @@ CLIENT-TAG:^circumvent-blocks$
 # the previous one.
 {+block{Nobody is supposed to request this.}}
 example.org/blocked-example-page</screen>
-</para>
 
 </sect3>
 
@@ -2478,18 +2445,15 @@ example.org/blocked-example-page</screen>
  Actions fall into three categories:
 </para>
 
-<para>
  <itemizedlist>
  <listitem>
   <para>
    Boolean, i.e the action can only be <quote>enabled</quote> or
    <quote>disabled</quote>. Syntax:
   </para>
-  <para>
    <screen>
   +<replaceable class="function">name</replaceable>        # enable action <replaceable class="parameter">name</replaceable>
   -<replaceable class="function">name</replaceable>        # disable action <replaceable class="parameter">name</replaceable></screen>
-  </para>
   <para>
    Example: <literal>+handle-as-image</literal>
   </para>
@@ -2501,12 +2465,10 @@ example.org/blocked-example-page</screen>
    Parameterized, where some value is required in order to enable this type of action.
    Syntax:
   </para>
-  <para>
    <screen>
   +<replaceable class="function">name</replaceable>{<replaceable class="parameter">param</replaceable>}  # enable action and set parameter to <replaceable class="parameter">param</replaceable>,
                # overwriting parameter from previous match if necessary
   -<replaceable class="function">name</replaceable>         # disable action. The parameter can be omitted</screen>
-  </para>
   <para>
    Note that if the URL matches multiple positive forms of a parameterized action,
    the last match wins, i.e. the params from earlier matches are simply ignored.
@@ -2525,13 +2487,11 @@ example.org/blocked-example-page</screen>
    that can be executed for the same request repeatedly, like adding multiple
    headers, or filtering through multiple filters. Syntax:
   </para>
-  <para>
    <screen>
   +<replaceable class="function">name</replaceable>{<replaceable class="parameter">param</replaceable>}   # enable action and add <replaceable class="parameter">param</replaceable> to the list of parameters
   -<replaceable class="function">name</replaceable>{<replaceable class="parameter">param</replaceable>}   # remove the parameter <replaceable class="parameter">param</replaceable> from the list of parameters
                 # If it was the last one left, disable the action.
   <replaceable class="parameter">-name</replaceable>          # disable this action completely and remove all parameters from the list</screen>
-  </para>
   <para>
    Examples: <literal>+add-header{X-Fun-Header: Some text}</literal> and
    <literal>+filter{html-annoyances}</literal>
@@ -2539,7 +2499,6 @@ example.org/blocked-example-page</screen>
  </listitem>
 
  </itemizedlist>
-</para>
 
 <para>
  If nothing is specified in any actions file, no <quote>actions</quote> are
@@ -2634,7 +2593,6 @@ example.org/blocked-example-page</screen>
  <varlistentry>
   <term>Example usage:</term>
   <listitem>
-    <para>
      <screen># Add a DNT ("Do not track") header to all requests,
 # event to those that already have one.
 #
@@ -2645,7 +2603,6 @@ example.org/blocked-example-page</screen>
 # header may make user-tracking easier.
 {+add-header{DNT: 1}}
 /</screen>
-   </para>
   </listitem>
  </varlistentry>
 </variablelist>
@@ -2734,7 +2691,6 @@ example.org/blocked-example-page</screen>
  <varlistentry>
   <term>Example usage (section):</term>
   <listitem>
-    <para>
      <screen>{+block{No nasty stuff for you.}}
 # Block and replace with "blocked" page
  .nasty-stuff.example.com
@@ -2747,7 +2703,6 @@ example.org/blocked-example-page</screen>
 {+block{Layered ads.} +handle-as-empty-document}
 # Block and then ignore
  adserver.example.net/.*\.js$</screen>
-    </para>
   </listitem>
  </varlistentry>
 
@@ -2818,9 +2773,7 @@ example.org/blocked-example-page</screen>
  <varlistentry>
   <term>Example usage:</term>
   <listitem>
-    <para>
      <screen>+change-x-forwarded-for{block}</screen>
-   </para>
   </listitem>
  </varlistentry>
 </variablelist>
@@ -2898,13 +2851,11 @@ example.org/blocked-example-page</screen>
  <varlistentry>
   <term>Example usage (section):</term>
   <listitem>
-    <para>
      <screen>
 # Hide Tor exit notation in Host and Referer Headers
 {+client-header-filter{hide-tor-exit-notation}}
 /
-    </screen>
-   </para>
+</screen>
   </listitem>
  </varlistentry>
 
@@ -2973,7 +2924,6 @@ example.org/blocked-example-page</screen>
  <varlistentry>
   <term>Example usage (section):</term>
   <listitem>
-    <para>
      <screen>
 # Tag every request with the User-Agent header
 {+client-header-tagger{user-agent}}
@@ -2998,8 +2948,7 @@ TAG:^User-Agent: fetch libfetch/
 TAG:^User-Agent: Ubuntu APT-HTTP/
 TAG:^User-Agent: MPlayer/
     </screen>
-   </para>
-   <para>
+
      <screen>
 # Tag all requests with the Range header set
 {+client-header-tagger{range-requests}}
@@ -3014,8 +2963,7 @@ TAG:^User-Agent: MPlayer/
 {-filter -deanimate-gifs}
 TAG:^RANGE-REQUEST$
     </screen>
-    </para>
-    <para>
+
      <screen>
 # Tag all requests with the client IP address
 #
@@ -3029,7 +2977,6 @@ TAG:^RANGE-REQUEST$
 {+forward-override{forward-socks5 127.0.1.2:2222 .}}
 TAG:^IP-ADDRESS: 10\.0\.0\.1$
      </screen>
-    </para>
   </listitem>
  </varlistentry>
 
@@ -3129,7 +3076,6 @@ TAG:^IP-ADDRESS: 10\.0\.0\.1$
  <varlistentry>
   <term>Example usage (sections):</term>
   <listitem>
-    <para>
      <screen># Check if www.example.net/ really uses valid XHTML
 { +content-type-overwrite{application/xml} }
 www.example.net/
@@ -3139,7 +3085,6 @@ www.example.net/
 www.example.net/.*\.css$
 www.example.net/.*style
 </screen>
-   </para>
   </listitem>
  </varlistentry>
 </variablelist>
@@ -3218,12 +3163,10 @@ new action
  <varlistentry>
   <term>Example usage (section):</term>
   <listitem>
-    <para>
      <screen># Block the non-existent "Privacy-Violation:" client header
 { +crunch-client-header{Privacy-Violation:} }
 /
     </screen>
-   </para>
   </listitem>
  </varlistentry>
 </variablelist>
@@ -3300,14 +3243,12 @@ new action
  <varlistentry>
   <term>Example usage (section):</term>
   <listitem>
-    <para>
      <screen># Let the browser revalidate cached documents but don't
 # allow the server to use the revalidation headers for user tracking.
 {+hide-if-modified-since{-60} \
  +overwrite-last-modified{randomize} \
  +crunch-if-none-match}
 /   </screen>
-   </para>
   </listitem>
  </varlistentry>
 </variablelist>
@@ -3375,9 +3316,7 @@ new action
  <varlistentry>
   <term>Example usage:</term>
   <listitem>
-   <para>
     <screen>+crunch-incoming-cookies</screen>
-   </para>
   </listitem>
  </varlistentry>
 </variablelist>
@@ -3454,11 +3393,9 @@ new action
  <varlistentry>
   <term>Example usage (section):</term>
   <listitem>
-    <para>
      <screen># Crunch server headers that try to prevent caching
 { +crunch-server-header{no-cache} }
 /   </screen>
-   </para>
   </listitem>
  </varlistentry>
 </variablelist>
@@ -3525,9 +3462,7 @@ new action
  <varlistentry>
   <term>Example usage:</term>
   <listitem>
-   <para>
     <screen>+crunch-outgoing-cookies</screen>
-   </para>
   </listitem>
  </varlistentry>
 
@@ -3595,9 +3530,7 @@ new action
  <varlistentry>
   <term>Example usage:</term>
   <listitem>
-    <para>
       <screen>+deanimate-gifs{last}</screen>
-    </para>
   </listitem>
  </varlistentry>
 </variablelist>
@@ -3667,10 +3600,8 @@ new action
  <varlistentry>
   <term>Example usage (section):</term>
   <listitem>
-    <para>
      <screen>{+downgrade-http-version}
 problem-host.example.com</screen>
-    </para>
   </listitem>
  </varlistentry>
 
@@ -3757,9 +3688,7 @@ problem-host.example.com</screen>
  <varlistentry>
   <term>Example usage:</term>
   <listitem>
-   <para>
     <screen>+external-filter{fancy-filter}</screen>
-   </para>
   </listitem>
  </varlistentry>
 </variablelist>
@@ -3874,14 +3803,12 @@ problem-host.example.com</screen>
  <varlistentry>
   <term>Example usage:</term>
   <listitem>
-    <para>
      <screen>
  { +fast-redirects{simple-check} }
    one.example.com
 
  { +fast-redirects{check-decoded-url} }
    another.example.com/testing</screen>
-    </para>
   </listitem>
  </varlistentry>
 
@@ -4023,112 +3950,112 @@ problem-host.example.com</screen>
   <listitem>
    <para>
     <anchor id="filter-js-annoyances">
-    <screen>+filter{js-annoyances}       # Get rid of particularly annoying JavaScript abuse.</screen>
    </para>
+    <screen>+filter{js-annoyances}       # Get rid of particularly annoying JavaScript abuse.</screen>
    <para>
     <anchor id="filter-js-events">
-    <screen>+filter{js-events}           # Kill JavaScript event bindings and timers (Radically destructive! Only for extra nasty sites).</screen>
    </para>
+    <screen>+filter{js-events}           # Kill JavaScript event bindings and timers (Radically destructive! Only for extra nasty sites).</screen>
    <para>
     <anchor id="filter-html-annoyances">
-    <screen>+filter{html-annoyances}     # Get rid of particularly annoying HTML abuse.</screen>
    </para>
+    <screen>+filter{html-annoyances}     # Get rid of particularly annoying HTML abuse.</screen>
    <para>
     <anchor id="filter-content-cookies">
-    <screen>+filter{content-cookies}     # Kill cookies that come in the HTML or JS content.</screen>
    </para>
+    <screen>+filter{content-cookies}     # Kill cookies that come in the HTML or JS content.</screen>
    <para>
     <anchor id="filter-refresh-tags">
-    <screen>+filter{refresh-tags}        # Kill automatic refresh tags if refresh time is larger than 9 seconds.</screen>
    </para>
+    <screen>+filter{refresh-tags}        # Kill automatic refresh tags if refresh time is larger than 9 seconds.</screen>
    <para>
     <anchor id="filter-unsolicited-popups">
-    <screen>+filter{unsolicited-popups}  # Disable only unsolicited pop-up windows.</screen>
    </para>
+    <screen>+filter{unsolicited-popups}  # Disable only unsolicited pop-up windows.</screen>
    <para>
     <anchor id="filter-all-popups">
-    <screen>+filter{all-popups}          # Kill all popups in JavaScript and HTML.</screen>
    </para>
+    <screen>+filter{all-popups}          # Kill all popups in JavaScript and HTML.</screen>
    <para>
     <anchor id="filter-img-reorder">
-    <screen>+filter{img-reorder}         # Reorder attributes in &lt;img&gt; tags to make the banners-by-* filters more effective.</screen>
    </para>
+    <screen>+filter{img-reorder}         # Reorder attributes in &lt;img&gt; tags to make the banners-by-* filters more effective.</screen>
    <para>
     <anchor id="filter-banners-by-size">
-    <screen>+filter{banners-by-size}     # Kill banners by size.</screen>
    </para>
+    <screen>+filter{banners-by-size}     # Kill banners by size.</screen>
    <para>
     <anchor id="filter-banners-by-link">
-    <screen>+filter{banners-by-link}     # Kill banners by their links to known clicktrackers.</screen>
    </para>
+    <screen>+filter{banners-by-link}     # Kill banners by their links to known clicktrackers.</screen>
    <para>
     <anchor id="filter-webbugs">
-    <screen>+filter{webbugs}             # Squish WebBugs (1x1 invisible GIFs used for user tracking).</screen>
    </para>
+    <screen>+filter{webbugs}             # Squish WebBugs (1x1 invisible GIFs used for user tracking).</screen>
    <para>
     <anchor id="filter-tiny-textforms">
-    <screen>+filter{tiny-textforms}      # Extend those tiny textareas up to 40x80 and kill the hard wrap.</screen>
    </para>
+    <screen>+filter{tiny-textforms}      # Extend those tiny textareas up to 40x80 and kill the hard wrap.</screen>
    <para>
     <anchor id="filter-jumping-windows">
-    <screen>+filter{jumping-windows}     # Prevent windows from resizing and moving themselves.</screen>
    </para>
+    <screen>+filter{jumping-windows}     # Prevent windows from resizing and moving themselves.</screen>
    <para>
     <anchor id="filter-frameset-borders">
-    <screen>+filter{frameset-borders}    # Give frames a border and make them resizable.</screen>
    </para>
+    <screen>+filter{frameset-borders}    # Give frames a border and make them resizable.</screen>
    <para>
     <anchor id="filter-iframes">
-    <screen>+filter{iframes}             # Removes all detected iframes. Should only be enabled for individual sites.</screen>
    </para>
+    <screen>+filter{iframes}             # Removes all detected iframes. Should only be enabled for individual sites.</screen>
    <para>
     <anchor id="filter-demoronizer">
-    <screen>+filter{demoronizer}         # Fix MS's non-standard use of standard charsets.</screen>
    </para>
+    <screen>+filter{demoronizer}         # Fix MS's non-standard use of standard charsets.</screen>
    <para>
     <anchor id="filter-shockwave-flash">
-    <screen>+filter{shockwave-flash}     # Kill embedded Shockwave Flash objects.</screen>
    </para>
+    <screen>+filter{shockwave-flash}     # Kill embedded Shockwave Flash objects.</screen>
    <para>
     <anchor id="filter-quicktime-kioskmode">
-    <screen>+filter{quicktime-kioskmode} # Make Quicktime movies saveable.</screen>
    </para>
+    <screen>+filter{quicktime-kioskmode} # Make Quicktime movies saveable.</screen>
    <para>
     <anchor id="filter-fun">
-    <screen>+filter{fun}                 # Text replacements for subversive browsing fun!</screen>
    </para>
+    <screen>+filter{fun}                 # Text replacements for subversive browsing fun!</screen>
    <para>
     <anchor id="filter-crude-parental">
-    <screen>+filter{crude-parental}      # Crude parental filtering. Note that this filter doesn't work reliably.</screen>
    </para>
+    <screen>+filter{crude-parental}      # Crude parental filtering. Note that this filter doesn't work reliably.</screen>
    <para>
     <anchor id="filter-ie-exploits">
-    <screen>+filter{ie-exploits}         # Disable some known Internet Explorer bug exploits.</screen>
    </para>
+    <screen>+filter{ie-exploits}         # Disable some known Internet Explorer bug exploits.</screen>
    <para>
     <anchor id="filter-site-specifics">
-    <screen>+filter{site-specifics}      # Cure for site-specific problems. Don't apply generally!</screen>
    </para>
+    <screen>+filter{site-specifics}      # Cure for site-specific problems. Don't apply generally!</screen>
    <para>
     <anchor id="filter-no-ping">
-    <screen>+filter{no-ping}             # Removes non-standard ping attributes in &lt;a&gt; and &lt;area&gt; tags.</screen>
    </para>
+    <screen>+filter{no-ping}             # Removes non-standard ping attributes in &lt;a&gt; and &lt;area&gt; tags.</screen>
    <para>
     <anchor id="filter-google">
-    <screen>+filter{google}              # CSS-based block for Google text ads. Also removes a width limitation and the toolbar advertisement.</screen>
    </para>
+    <screen>+filter{google}              # CSS-based block for Google text ads. Also removes a width limitation and the toolbar advertisement.</screen>
    <para>
     <anchor id="filter-yahoo">
-    <screen>+filter{yahoo}               # CSS-based block for Yahoo text ads. Also removes a width limitation.</screen>
    </para>
+    <screen>+filter{yahoo}               # CSS-based block for Yahoo text ads. Also removes a width limitation.</screen>
    <para>
     <anchor id="filter-msn">
-    <screen>+filter{msn}                 # CSS-based block for MSN text ads. Also removes tracking URLs and a width limitation.</screen>
    </para>
+    <screen>+filter{msn}                 # CSS-based block for MSN text ads. Also removes tracking URLs and a width limitation.</screen>
    <para>
     <anchor id="filter-blogspot">
-    <screen>+filter{blogspot}            # Cleans up some Blogspot blogs. Read the fine print before using this.</screen>
    </para>
+    <screen>+filter{blogspot}            # Cleans up some Blogspot blogs. Read the fine print before using this.</screen>
   </listitem>
  </varlistentry>
 </variablelist>
@@ -4198,11 +4125,9 @@ new action
  <varlistentry>
   <term>Example usage:</term>
   <listitem>
-   <para>
      <screen>
 +force-text-mode
      </screen>
-   </para>
   </listitem>
  </varlistentry>
 </variablelist>
@@ -4331,7 +4256,6 @@ new action
  <varlistentry>
   <term>Example usage:</term>
   <listitem>
-   <para>
      <screen>
 # Use an ssh tunnel for requests previously tagged as
 # <quote>User-Agent: fetch libfetch/2.0</quote> and make sure
@@ -4349,7 +4273,6 @@ new action
 }
 TAG:^User-Agent: fetch libfetch/2\.0$
      </screen>
-   </para>
   </listitem>
  </varlistentry>
 </variablelist>
@@ -4421,13 +4344,11 @@ new action
  <varlistentry>
   <term>Example usage:</term>
   <listitem>
-   <para>
      <screen># Block all documents on example.org that end with ".js",
 # but send an empty document instead of the usual HTML message.
 {+block{Blocked JavaScript} +handle-as-empty-document}
 example.org/.*\.js$
      </screen>
-   </para>
   </listitem>
  </varlistentry>
 </variablelist>
@@ -4502,7 +4423,6 @@ example.org/.*\.js$
  <varlistentry>
   <term>Example usage (sections):</term>
   <listitem>
-   <para>
      <screen># Generic image extensions:
 #
 {+handle-as-image}
@@ -4514,7 +4434,6 @@ example.org/.*\.js$
 {+block{Nasty banners.} +handle-as-image}
 nasty-banner-server.example.com/junk.cgi\?output=trash
 </screen>
-   </para>
   </listitem>
  </varlistentry>
 </variablelist>
@@ -4594,13 +4513,11 @@ new action
  <varlistentry>
   <term>Example usage (section):</term>
   <listitem>
-    <para>
      <screen># Pretend to use Canadian language settings.
 {+hide-accept-language{en-ca} \
 +hide-user-agent{Mozilla/5.0 (X11; U; OpenBSD i386; en-CA; rv:1.8.0.4) Gecko/20060628 Firefox/1.5.0.4} \
 }
 /   </screen>
-   </para>
   </listitem>
  </varlistentry>
 </variablelist>
@@ -4684,13 +4601,11 @@ new action
  <varlistentry>
   <term>Example usage:</term>
   <listitem>
-    <para>
      <screen># Disarm the download link in Sourceforge's patch tracker
 { -filter \
  +content-type-overwrite{text/plain}\
  +hide-content-disposition{block} }
  .sourceforge.net/tracker/download\.php</screen>
-   </para>
   </listitem>
  </varlistentry>
 </variablelist>
@@ -4773,13 +4688,11 @@ new action
  <varlistentry>
   <term>Example usage (section):</term>
   <listitem>
-    <para>
      <screen># Let the browser revalidate but make tracking based on the time less likely.
 {+hide-if-modified-since{-60} \
  +overwrite-last-modified{randomize} \
  +crunch-if-none-match}
 /</screen>
-   </para>
   </listitem>
  </varlistentry>
 </variablelist>
@@ -4848,10 +4761,9 @@ new action
  <varlistentry>
   <term>Example usage:</term>
   <listitem>
-   <para>
-    <screen>+hide-from-header{block}</screen> or
+    <screen>+hide-from-header{block}</screen>
+    <para>or</para>
     <screen>+hide-from-header{spam-me-senseless@sittingduck.example.com}</screen>
-   </para>
   </listitem>
  </varlistentry>
 </variablelist>
@@ -4952,10 +4864,9 @@ new action
  <varlistentry>
   <term>Example usage:</term>
   <listitem>
-   <para>
-     <screen>+hide-referrer{forge}</screen> or
+     <screen>+hide-referrer{forge}</screen>
+     <para>or</para>
      <screen>+hide-referrer{http://www.yahoo.com/}</screen>
-   </para>
   </listitem>
  </varlistentry>
 </variablelist>
@@ -5034,9 +4945,7 @@ new action
  <varlistentry>
   <term>Example usage:</term>
   <listitem>
-   <para>
      <screen>+hide-user-agent{Netscape 6.1 (X11; I; Linux 2.4.18 i686)}</screen>
-   </para>
   </listitem>
  </varlistentry>
 </variablelist>
@@ -5112,13 +5021,11 @@ new action
    <!-- I had trouble getting the spacing to look right in my browser -->
    <!-- I probably have the wrong font setup, bollocks. -->
    <!-- Apparently the emphasis tag uses a proportional font no matter what -->
-    <para>
      <screen>+limit-connect{443}                   # Port 443 is OK.
 +limit-connect{80,443}                # Ports 80 and 443 are OK.
 +limit-connect{-3, 7, 20-100, 500-}   # Ports less than 3, 7, 20 to 100 and above 500 are OK.
 +limit-connect{-}                     # All ports are OK
 +limit-connect{,}                     # No HTTPS/SSL traffic is allowed</screen>
-   </para>
   </listitem>
  </varlistentry>
 </variablelist>
@@ -5203,10 +5110,7 @@ new action
  <varlistentry>
   <term>Example usages:</term>
   <listitem>
-    <para>
-     <screen>+limit-cookie-lifetime{60}
-       </screen>
-   </para>
+     <screen>+limit-cookie-lifetime{60}</screen>
   </listitem>
  </varlistentry>
 </variablelist>
@@ -5292,7 +5196,6 @@ new action
  <varlistentry>
   <term>Example usage (sections):</term>
   <listitem>
-   <para>
     <screen>
 # Selectively turn off compression, and enable a filter
 #
@@ -5311,7 +5214,6 @@ new action
 #
 { -prevent-compression }
 .compusa.com/</screen>
-   </para>
   </listitem>
  </varlistentry>
 
@@ -5403,13 +5305,11 @@ new action
  <varlistentry>
   <term>Example usage:</term>
   <listitem>
-    <para>
      <screen># Let the browser revalidate without being tracked across sessions
 { +hide-if-modified-since{-60} \
  +overwrite-last-modified{randomize} \
  +crunch-if-none-match}
 /</screen>
-   </para>
   </listitem>
  </varlistentry>
 </variablelist>
@@ -5500,7 +5400,6 @@ new action
  <varlistentry>
   <term>Example usages:</term>
   <listitem>
-   <para>
     <screen># Replace example.com's style sheet with another one
 { +redirect{http://localhost/css-replacements/example.com.css} }
  example.com/stylesheet\.css
@@ -5541,7 +5440,6 @@ i[0-9][0-9][0-9][0-9]*/
 # to the local version delivered by Privoxy
 {+redirect{s@^http://www@http://config@}}
 www.privoxy.org/user-manual/</screen>
-   </para>
   </listitem>
  </varlistentry>
 
@@ -5615,7 +5513,6 @@ www.privoxy.org/user-manual/</screen>
  <varlistentry>
   <term>Example usage (section):</term>
   <listitem>
-    <para>
      <screen>
 {+server-header-filter{html-to-xml}}
 example.org/xml-instance-that-is-delivered-as-html
@@ -5623,7 +5520,6 @@ example.org/xml-instance-that-is-delivered-as-html
 {+server-header-filter{xml-to-html}}
 example.org/instance-that-is-delivered-as-xml-but-is-not
     </screen>
-    </para>
   </listitem>
  </varlistentry>
 
@@ -5700,7 +5596,6 @@ example.org/instance-that-is-delivered-as-xml-but-is-not
  <varlistentry>
   <term>Example usage (section):</term>
   <listitem>
-    <para>
      <screen>
 # Tag every request with the content type declared by the server
 {+server-header-tagger{content-type}}
@@ -5713,8 +5608,7 @@ example.org/instance-that-is-delivered-as-xml-but-is-not
 # <literal><link linkend="external-filter-syntax">silly example</link></literal>.
 {+external-filter{rotate-image} +force-text-mode}
 TAG:^image/
-    </screen>
-    </para>
+</screen>
   </listitem>
  </varlistentry>
 
@@ -5807,9 +5701,7 @@ TAG:^image/
  <varlistentry>
   <term>Example usage:</term>
   <listitem>
-   <para>
      <screen>+session-cookies-only</screen>
-   </para>
   </listitem>
  </varlistentry>
 </variablelist>
@@ -5909,21 +5801,15 @@ TAG:^image/
    <para>
     Built-in pattern:
    </para>
-   <para>
     <screen>+set-image-blocker{pattern}</screen>
-   </para>
    <para>
     Redirect to the BSD daemon:
    </para>
-   <para>
     <screen>+set-image-blocker{http://www.freebsd.org/gifs/dae_up3.gif}</screen>
-   </para>
    <para>
     Redirect to the built-in pattern for better caching:
    </para>
-   <para>
     <screen>+set-image-blocker{http://config.privoxy.org/send-banner?type=pattern}</screen>
-   </para>
   </listitem>
  </varlistentry>
 </variablelist>
@@ -5990,7 +5876,6 @@ TAG:^image/
  Now let's define some aliases...
 </para>
 
-<para>
  <screen>
  # Useful custom aliases we can use later.
  #
@@ -6018,7 +5903,6 @@ TAG:^image/
  #
  c0 = +crunch-all-cookies
  c1 = -crunch-all-cookies</screen>
-</para>
 
 <para>
  ...and put them to use. These sections would appear in the lower part of an
@@ -6026,7 +5910,6 @@ TAG:^image/
  up for the <quote>/</quote> pattern):
 </para>
 
-<para>
  <screen>
  # These sites are either very complex or very keen on
  # user data and require minimal interference to work:
@@ -6050,7 +5933,6 @@ TAG:^image/
  {-filter{all-popups} -filter{unsolicited-popups}}
   .dabs.com
   .overclockers.co.uk</screen>
-</para>
 
 <para>
  Aliases like <quote>shop</quote> and <quote>fragile</quote> are typically used for
@@ -6101,7 +5983,6 @@ hal stop here
  multiple lines with line continuation.
 </para>
 
-<para>
  <screen>
 { \
  +<link linkend="CHANGE-X-FORWARDED-FOR">change-x-forwarded-for{block}</link> \
@@ -6110,7 +5991,6 @@ hal stop here
 }
 / # Match all URLs
  </screen>
-</para>
 
 <para>
  The default behavior is now set.
@@ -6137,14 +6017,12 @@ hal stop here
  that prevents older &my-app; versions from reading the file:
 </para>
 
-<para>
  <screen>
 ##########################################################################
 # Settings -- Don't change! For internal Privoxy use ONLY.
 ##########################################################################
 {{settings}}
 for-privoxy-version=3.0.11</screen>
-</para>
 
 <para>
  After that comes the (optional) alias section. We'll use the example
@@ -6152,7 +6030,6 @@ for-privoxy-version=3.0.11</screen>
  that also explains why and how aliases are used:
 </para>
 
-<para>
  <screen>
 ##########################################################################
 # Aliases
@@ -6172,7 +6049,6 @@ for-privoxy-version=3.0.11</screen>
  #
  fragile     = -<link linkend="BLOCK">block</link> -<link linkend="FILTER">filter</link> -crunch-all-cookies -<link linkend="FAST-REDIRECTS">fast-redirects</link> -<link linkend="HIDE-REFERER">hide-referrer</link>
  shop        = -crunch-all-cookies -<link linkend="FILTER-ALL-POPUPS">filter{all-popups}</link></screen>
-</para>
 
 <para>
  The first of our specialized sections is concerned with <quote>fragile</quote>
@@ -6183,7 +6059,6 @@ for-privoxy-version=3.0.11</screen>
  of actions explicitly:
 </para>
 
-<para>
  <screen>
 ##########################################################################
 # Exceptions for sites that'll break under the default action set:
@@ -6195,7 +6070,6 @@ for-privoxy-version=3.0.11</screen>
 .office.microsoft.com           # surprise, surprise!
 .windowsupdate.microsoft.com
 mail.google.com</screen>
-</para>
 
 <para>
  Shopping sites are not as fragile, but they typically
@@ -6203,7 +6077,6 @@ mail.google.com</screen>
  carts or item details. Again, we'll use a pre-defined alias:
 </para>
 
-<para>
  <screen>
 # Shopping sites:
 #
@@ -6212,7 +6085,6 @@ mail.google.com</screen>
 .worldpay.com   # for quietpc.com
 .jungle.com
 .scan.co.uk</screen>
-</para>
 
 <para>
  The <literal><link linkend="FAST-REDIRECTS">fast-redirects</link></literal>
@@ -6220,7 +6092,6 @@ mail.google.com</screen>
  breaks some sites. So disable it for popular sites where we know it misbehaves:
 </para>
 
-<para>
  <screen>
 { -<link linkend="FAST-REDIRECTS">fast-redirects</link> }
 login.yahoo.com
@@ -6229,7 +6100,6 @@ edit.*.yahoo.com
 .altavista.com/.*(like|url|link):http
 .altavista.com/trans.*urltext=http
 .nytimes.com</screen>
-</para>
 
 <para>
  It is important that <application>Privoxy</application> knows which
@@ -6244,7 +6114,6 @@ edit.*.yahoo.com
  good start:
 </para>
 
-<para>
  <screen>
 ##########################################################################
 # Images:
@@ -6255,7 +6124,6 @@ edit.*.yahoo.com
 #
 { +<link linkend="HANDLE-AS-IMAGE">handle-as-image</link> }
 /.*\.(gif|jpe?g|png|bmp|ico)$</screen>
-</para>
 
 <para>
  And then there are known banner sources. They often use scripts to
@@ -6272,7 +6140,6 @@ edit.*.yahoo.com
  action before, it still applies and needn't be repeated:
 </para>
 
-<para>
  <screen>
 # Known ad generators:
 #
@@ -6284,7 +6151,6 @@ ar.atwola.com
 .a[0-9].yimg.com/(?:(?!/i/).)*$
 bs*.gsanet.com
 .qkimg.net</screen>
-</para>
 
 <para>
  One of the most important jobs of <application>Privoxy</application>
@@ -6304,7 +6170,6 @@ bs*.gsanet.com
  to keep the example short:
 </para>
 
-<para>
  <screen>
 ##########################################################################
 # Block these fine banners:
@@ -6323,7 +6188,6 @@ count*.
 # Site-specific patterns (abbreviated):
 #
 .hitbox.com</screen>
-</para>
 
 <para>
  It's quite remarkable how many advertisers actually call their banner
@@ -6353,7 +6217,6 @@ count*.
  with no <literal><link linkend="BLOCK">block</link></literal> action applying.
 </para>
 
-<para>
  <screen>
 ##########################################################################
 # Save some innocent victims of the above generic block patterns:
@@ -6377,7 +6240,6 @@ ad[ud]*.   # (adult.* and add.*)
 #
 www.globalintersec.com/adv # (adv = advanced)
 www.ugu.com/sui/ugu/adv</screen>
-</para>
 
 <para>
  Filtering source code can have nasty side effects,
@@ -6387,7 +6249,6 @@ www.ugu.com/sui/ugu/adv</screen>
  disables <emphasis>all</emphasis> filters in one fell swoop!
 </para>
 
-<para>
  <screen>
 # Don't filter code!
 #
@@ -6397,7 +6258,6 @@ bugzilla.
 developer.
 wiki.
 .sourceforge.net</screen>
-</para>
 
 <para>
  The actual <filename>default.action</filename> is of course much more
@@ -6431,10 +6291,8 @@ wiki.
 
 <!-- brief sample user.action here -->
 
-<para>
  <screen>
 # My user.action file. &lt;fred@example.com&gt;</screen>
-</para>
 
 <para>
  As <link linkend="aliases">aliases</link> are local to the actions
@@ -6442,7 +6300,6 @@ wiki.
  <filename>default.action</filename>, unless you repeat them here:
 </para>
 
-<para>
  <screen>
 # Aliases are local to the file they are defined in.
 # (Re-)define aliases for this file:
@@ -6472,7 +6329,6 @@ allow-ads   = -block -filter{banners-by-size} -filter{banners-by-link}
 # Alias for specific file types that are text, but might have conflicting
 # MIME types. We want the browser to force these to be text documents.
 handle-as-text = -<link linkend="FILTER">filter</link> +-<link linkend="content-type-overwrite">content-type-overwrite{text/plain}</link> +-<link linkend="FORCE-TEXT-MODE">force-text-mode</link> -<link linkend="HIDE-CONTENT-DISPOSITION">hide-content-disposition</link></screen>
-</para>
 
 <para>
  Say you have accounts on some sites that you visit regularly, and
@@ -6483,30 +6339,25 @@ handle-as-text = -<link linkend="FILTER">filter</link> +-<link linkend="content-
  processing of cookies to make them only temporary.
 </para>
 
-<para>
  <screen>
 { allow-all-cookies }
  sourceforge.net
  .yahoo.com
  .msdn.microsoft.com
  .redhat.com</screen>
-</para>
 
 <para>
  Your bank is allergic to some filter, but you don't know which, so you disable them all:
 </para>
 
-<para>
  <screen>
 { -<link linkend="FILTER">filter</link> }
  .your-home-banking-site.com</screen>
-</para>
 
 <para>
  Some file types you may not want to filter for various reasons:
 </para>
 
-<para>
  <screen>
 # Technical documentation is likely to contain strings that might
 # erroneously get altered by the JavaScript-oriented filters:
@@ -6518,7 +6369,6 @@ handle-as-text = -<link linkend="FILTER">filter</link> +-<link linkend="content-
 # so that Privoxy thinks it is getting HTML and starts filtering:
 #
 stupid-server.example.com/</screen>
-</para>
 
 <para>
  Example of a simple <link linkend="BLOCK">block</link> action. Say you've
@@ -6531,12 +6381,10 @@ stupid-server.example.com/</screen>
  in default.action anyway:
 </para>
 
-<para>
  <screen>
 { +<link linkend="BLOCK">block</link>{Nasty ads.} }
  www.example.com/nasty-ads/sponsor\.gif
  another.example.net/more/junk/here/</screen>
-</para>
 
 <para>
  The URLs of dynamically generated banners, especially from large banner
@@ -6550,14 +6398,12 @@ stupid-server.example.com/</screen>
  browser. Use cautiously.
 </para>
 
-<para>
  <screen>
 { +block-as-image }
  .doubleclick.net
  .fastclick.net
  /Realmedia/ads/
  ar.atwola.com/</screen>
-</para>
 
 <para>
  Now you noticed that the default configuration breaks Forbes Magazine,
@@ -6571,13 +6417,11 @@ stupid-server.example.com/</screen>
  that misbehave, and add those to our personalized list of troublemakers:
 </para>
 
-<para>
 <screen>
 { fragile }
  .forbes.com
  webmail.example.com
  .mybank.com</screen>
-</para>
 
 <para>
  You like the <quote>fun</quote> text replacements in <filename>default.filter</filename>,
@@ -6586,11 +6430,9 @@ stupid-server.example.com/</screen>
  update-safe config, once and for all:
 </para>
 
-<para>
 <screen>
 { +<link linkend="filter-fun">filter{fun}</link> }
  / # For ALL sites!</screen>
-</para>
 
 <para>
  Note that the above is not really a good idea: There are exceptions
@@ -6607,13 +6449,11 @@ stupid-server.example.com/</screen>
  sites that you feel provide value to you:
 </para>
 
-<para>
 <screen>
 { allow-ads }
  .sourceforge.net
  .slashdot.org
  .osdn.net</screen>
-</para>
 
 <para>
  Note that <literal>allow-ads</literal> has been aliased to
@@ -6629,11 +6469,9 @@ stupid-server.example.com/</screen>
  it should I choose to.
 </para>
 
-<para>
 <screen>
 { handle-as-text }
  /.*\.sh$</screen>
-</para>
 
 <para>
  <filename>user.action</filename> is generally the best place to define
@@ -6645,11 +6483,9 @@ stupid-server.example.com/</screen>
  paths and patterns:
 </para>
 
-<para>
 <screen>
 { +<link linkend="set-image-blocker">set-image-blocker{blank}</link> }
 / # ALL sites</screen>
-</para>
 
 </sect3>
 </sect2>
@@ -6761,9 +6597,7 @@ stupid-server.example.com/</screen>
  like this:
 </para>
 
-<para>
  <screen>FILTER: foo Replace all "foo" with "bar"</screen>
-</para>
 
 <para>
  Below that line, and up to the next header line, come the jobs that
@@ -6829,9 +6663,7 @@ stupid-server.example.com/</screen>
  needed:
 </para>
 
-<para>
  <screen>s/foo/bar/</screen>
-</para>
 
 <para>
  But wait! Didn't the comment say that <emphasis>all</emphasis> occurrences
@@ -6840,17 +6672,14 @@ stupid-server.example.com/</screen>
  we'll need to add the <literal>g</literal> option:
 </para>
 
-<para>
  <screen>s/foo/bar/g</screen>
-</para>
 
 <para>
  Our complete filter now looks like this:
 </para>
-<para>
+
  <screen>FILTER: foo Replace all "foo" with "bar"
 s/foo/bar/g</screen>
-</para>
 
 <para>
  Let's look at some real filters for more interesting examples. Here you see
@@ -6859,14 +6688,12 @@ s/foo/bar/g</screen>
 </para>
 
 
-<para>
  <screen>
 FILTER: js-annoyances Get rid of particularly annoying JavaScript abuse
 
 # Get rid of JavaScript referrer tracking. Test page: http://www.randomoddness.com/untitled.htm
 #
 s|(&lt;script.*)document\.referrer(.*&lt;/script&gt;)|$1"Not Your Business!"$2|Usg</screen>
-</para>
 
 <para>
  Following the header line and a comment, you see the job. Note that it uses
@@ -6948,12 +6775,10 @@ s|(&lt;script.*)document\.referrer(.*&lt;/script&gt;)|$1"Not Your Business!"$2|U
  this time only point out the constructs of special interest:
 </para>
 
-<para>
  <screen>
 # The status bar is for displaying link targets, not pointless blahblah
 #
 s/window\.status\s*=\s*(['"]).*?\1/dUmMy=1/ig</screen>
-</para>
 
 <para>
  <literal>\s</literal> stands for whitespace characters (space, tab, newline,
@@ -6976,12 +6801,10 @@ s/window\.status\s*=\s*(['"]).*?\1/dUmMy=1/ig</screen>
  you move your mouse over links.
 </para>
 
-<para>
  <screen>
 # Kill OnUnload popups. Yummy. Test: http://www.zdnet.com/zdsubs/yahoo/tree/yfs.html
 #
 s/(&lt;body [^&gt;]*)onunload(.*&gt;)/$1never$2/iU</screen>
-</para>
 
 <para>
  Including the
@@ -7002,14 +6825,12 @@ s/(&lt;body [^&gt;]*)onunload(.*&gt;)/$1never$2/iU</screen>
  The last example is from the fun department:
 </para>
 
-<para>
  <screen>
 FILTER: fun Fun text replacements
 
 # Spice the daily news:
 #
 s/microsoft(?!\.com)/MicroSuck/ig</screen>
-</para>
 
 <para>
  Note the <literal>(?!\.com)</literal> part (a so-called negative lookahead)
@@ -7019,7 +6840,6 @@ s/microsoft(?!\.com)/MicroSuck/ig</screen>
  still replacing the word everywhere else.
 </para>
 
-<para>
  <screen>
 # Buzzword Bingo (example for extended regex syntax)
 #
@@ -7035,7 +6855,6 @@ s* industry[ -]leading \
 |  unrivalled \
 *&lt;font color="red"&gt;&lt;b&gt;BINGO!&lt;/b&gt;&lt;/font&gt; \
 *igx</screen>
-</para>
 
 <para>
  The <literal>x</literal> option in this job turns on extended syntax, and allows for
@@ -7070,6 +6889,7 @@ pre-defined filters for your convenience:
    <para>
     The purpose of this filter is to get rid of particularly annoying JavaScript abuse.
     To that end, it
+   </para>
    <itemizedlist>
     <listitem>
      <para>
@@ -7093,7 +6913,6 @@ pre-defined filters for your convenience:
      </para>
     </listitem>
    </itemizedlist>
-   </para>
    <para>
     Use with caution. This is an aggressive filter, and can break sites that
     rely heavily on JavaScript.
@@ -7552,7 +7371,7 @@ pre-defined filters for your convenience:
  &my-app; will temporary store the content to filter in the
  <literal><link linkend="temporary-directory">temporary-directory</link></literal>.
 </para>
-<para>
+
  <screen>
 EXTERNAL-FILTER: cat Pointless example filter that doesn't actually modify the content
 /bin/cat
@@ -7578,7 +7397,6 @@ EXTERNAL-FILTER: rotate-image Rotate an image by 180 degree. Test filter with li
 EXTERNAL-FILTER: citation-needed Adds a "[citation needed]" tag to an image. The coordinates may need adjustment.
 /usr/local/bin/convert - -pointsize 16 -fill white  -annotate +17+418 "[citation needed]" -
 </screen>
-</para>
 
 <warning>
  <para>
@@ -7651,14 +7469,12 @@ EXTERNAL-FILTER: citation-needed Adds a "[citation needed]" tag to an image. The
  is in an alpha or beta development stage:
 </para>
 
-<para>
  <screen>
 &lt;!-- @if-unstable-start --&gt;
 
   ... beta warning HTML code goes here ...
 
 &lt;!-- if-unstable-end@ --&gt;</screen>
-</para>
 
 <para>
  If the "unstable" symbol is set, everything in between and including
@@ -7666,9 +7482,7 @@ EXTERNAL-FILTER: citation-needed Adds a "[citation needed]" tag to an image. The
  will disappear, leaving nothing but an empty comment:
 </para>
 
-<para>
  <screen>&lt;!--  --&gt;</screen>
-</para>
 
 <para>
  There's also an if-then-else construct and an <literal>#include</literal>
@@ -7721,9 +7535,8 @@ Requests</title>
 
 <!--   ~~~~~       New section      ~~~~~     -->
 <sect2 id="license"><title>License</title>
-<para>
+
  <screen><![ RCDATA [ &GPLv2; ]]></screen>
-</para>
 
 </sect2>
 <!--  ~  End section  ~  -->
@@ -7812,35 +7625,35 @@ Requests</title>
  and then some examples:
 </para>
 
-<para><simplelist>
+<simplelist>
  <member>
   <emphasis>.</emphasis> - Matches any single character, e.g. <quote>a</quote>,
   <quote>A</quote>, <quote>4</quote>, <quote>:</quote>, or <quote>@</quote>.
  </member>
-</simplelist></para>
+</simplelist>
 
-<para><simplelist>
+<simplelist>
  <member>
   <emphasis>?</emphasis> - The preceding character or expression is matched ZERO or ONE
   times. Either/or.
  </member>
-</simplelist></para>
+</simplelist>
 
-<para><simplelist>
+<simplelist>
  <member>
   <emphasis>+</emphasis> - The preceding character or expression is matched ONE or MORE
   times.
  </member>
-</simplelist></para>
+</simplelist>
 
-<para><simplelist>
+<simplelist>
  <member>
   <emphasis>*</emphasis> - The preceding character or expression is matched ZERO or MORE
   times.
  </member>
-</simplelist></para>
+</simplelist>
 
-<para><simplelist>
+<simplelist>
  <member>
   <emphasis>\</emphasis> - The <quote>escape</quote> character denotes that
   the following character should be taken literally. This is used where one of the
@@ -7849,25 +7662,25 @@ Requests</title>
   sure the period is recognized only as a period (and not expanded to its
   meta-character meaning of any single character).
  </member>
-</simplelist></para>
+</simplelist>
 
-<para><simplelist>
+<simplelist>
  <member>
   <emphasis>[ ]</emphasis> - Characters enclosed in brackets will be matched if
   any of the enclosed characters are encountered. For instance, <quote>[0-9]</quote>
   matches any numeric digit (zero through nine). As an example, we can combine
   this with <quote>+</quote> to match any digit one of more times: <quote>[0-9]+</quote>.
  </member>
-</simplelist></para>
+</simplelist>
 
-<para><simplelist>
+<simplelist>
  <member>
   <emphasis>( )</emphasis> - parentheses are used to group a sub-expression,
   or multiple sub-expressions.
  </member>
-</simplelist></para>
+</simplelist>
 
-<para><simplelist>
+<simplelist>
  <member>
   <emphasis>|</emphasis> - The <quote>bar</quote> character works like an
   <quote>or</quote> conditional statement. A match is successful if the
@@ -7876,7 +7689,7 @@ Requests</title>
   and would match either <quote>this example</quote> or <quote>that
   example</quote>, and nothing else.
  </member>
-</simplelist></para>
+</simplelist>
 
 <para>
  These are just some of the ones you are likely to use when matching URLs with
@@ -8014,7 +7827,6 @@ Requests</title>
  necessary either.
 </para>
 
-<para>
  <itemizedlist>
 
  <listitem>
@@ -8106,7 +7918,6 @@ Requests</title>
  </listitem>
 
  </itemizedlist>
-</para>
 
 </sect2>
 
@@ -8120,7 +7931,6 @@ Requests</title>
  page is requested by your browser:
 </para>
 
-<para>
  <itemizedlist>
  <listitem>
   <para>
@@ -8229,7 +8039,7 @@ Requests</title>
  </listitem>
 
  </itemizedlist>
-</para>
+
 <para>
  NOTE: This is somewhat of a simplistic overview of what happens with each URL
  request. For the sake of brevity and simplicity, we have focused on
@@ -8302,7 +8112,6 @@ Requests</title>
  configuration may vary):
 </para>
 
-<para>
  <screen>
  Matches for http://www.google.com:
 
@@ -8332,7 +8141,6 @@ Requests</title>
 In file: user.action <guibutton>[ View ]</guibutton> <guibutton>[ Edit ]</guibutton>
 (no matches in this file)
 </screen>
-</para>
 
 <para>
  This is telling us how we have defined our
@@ -8390,7 +8198,6 @@ In file: user.action <guibutton>[ View ]</guibutton> <guibutton>[ Edit ]</guibut
  to <quote>google.com</quote>:
 </para>
 
-<para>
  <screen>
  Final results:
 
@@ -8450,7 +8257,6 @@ In file: user.action <guibutton>[ View ]</guibutton> <guibutton>[ Edit ]</guibut
  -server-header-filter{html-to-xml}
  -session-cookies-only
  +set-image-blocker {pattern} </screen>
-</para>
 
 <para>
  Notice the only difference here to the previous listing, is to
@@ -8463,7 +8269,6 @@ In file: user.action <guibutton>[ View ]</guibutton> <guibutton>[ Edit ]</guibut
  Now another example, <quote>ad.doubleclick.net</quote>:
 </para>
 
-<para>
  <screen>
  { +block{Domains starts with "ad"} }
   ad*.
@@ -8474,7 +8279,6 @@ In file: user.action <guibutton>[ View ]</guibutton> <guibutton>[ Edit ]</guibut
  { +block{Doubleclick banner server} +handle-as-image }
   .[a-vx-z]*.doubleclick.net
 </screen>
-</para>
 
 <para>
  We'll just show the interesting part here - the explicit matches. It is
@@ -8506,7 +8310,6 @@ In file: user.action <guibutton>[ View ]</guibutton> <guibutton>[ Edit ]</guibut
  This one is giving us problems. We are getting a blank page. Hmmm ...
 </para>
 
-<para>
  <screen>
  Matches for http://www.example.net/adsl/HOWTO/:
 
@@ -8571,7 +8374,6 @@ In file: user.action <guibutton>[ View ]</guibutton> <guibutton>[ Edit ]</guibut
  { +block{Path contains "ads".} +handle-as-image }
   /ads
 </screen>
-</para>
 
 <para>
  Ooops, the <quote>/adsl/</quote> is matching <quote>/ads</quote> in our
@@ -8587,12 +8389,10 @@ In file: user.action <guibutton>[ View ]</guibutton> <guibutton>[ Edit ]</guibut
   wins). There are various ways to handle such exceptions. Example:
 </para>
 
-<para>
  <screen>
  { -block }
   /adsl
 </screen>
-</para>
 
 <para>
  Now the page displays ;-)
@@ -8606,12 +8406,10 @@ In file: user.action <guibutton>[ View ]</guibutton> <guibutton>[ Edit ]</guibut
  we did with:
 </para>
 
-<para>
  <screen>
  { +block{Path starts with "ads".} +handle-as-image }
  /ads
 </screen>
-</para>
 
 <para>
  That actually was very helpful and pointed us quickly to where the problem
@@ -8625,7 +8423,6 @@ In file: user.action <guibutton>[ View ]</guibutton> <guibutton>[ Edit ]</guibut
  <link linkend="FILTER"><quote>+filter</quote></link>:
 </para>
 
-<para>
  <screen>
  { shop }
  .quietpc.com
@@ -8634,7 +8431,6 @@ In file: user.action <guibutton>[ View ]</guibutton> <guibutton>[ Edit ]</guibut
  .scan.co.uk
  .forbes.com
 </screen>
-</para>
 
 <para>
  <quote><literal>{ shop }</literal></quote> is an <quote>alias</quote> that expands to
@@ -8642,7 +8438,6 @@ In file: user.action <guibutton>[ View ]</guibutton> <guibutton>[ Edit ]</guibut
  Or you could do your own exception to negate filtering:
 </para>
 
-<para>
  <screen>
  { -filter }
  # Disable ALL filter actions for sites in this section
@@ -8650,7 +8445,6 @@ In file: user.action <guibutton>[ View ]</guibutton> <guibutton>[ Edit ]</guibut
  developer.ibm.com
  localhost
 </screen>
-</para>
 
 <para>
  This would turn off all filtering for these sites. This is best
@@ -8673,13 +8467,12 @@ In file: user.action <guibutton>[ View ]</guibutton> <guibutton>[ Edit ]</guibut
  actions that are the most likely to cause trouble. This can be used as a
  last resort for problem sites.
 </para>
-<para>
+
  <screen>
  { fragile }
  # Handle with care: easy to break
  mail.google.
  mybank.example.com</screen>
-</para>
 
 
 <para>