From: Fabian Keil <fk@fabiankeil.de>
Date: Fri, 23 May 2008 16:46:02 +0000 (+0000)
Subject: Sync with user-manual.sgml 2.73.
X-Git-Tag: v_3_0_9~73
X-Git-Url: http://www.privoxy.org/gitweb/%22https:/faq/@default-cgi@/@default-cgi@show-status?a=commitdiff_plain;h=286e1eb8ecd11eb8cff1d14cdf8883b5b8934992;p=privoxy.git

Sync with user-manual.sgml 2.73.
---

diff --git a/doc/webserver/user-manual/actions-file.html b/doc/webserver/user-manual/actions-file.html
index 56f49678..12d3ac3a 100644
--- a/doc/webserver/user-manual/actions-file.html
+++ b/doc/webserver/user-manual/actions-file.html
@@ -262,7 +262,7 @@ CLASS="FILENAME"
 >    <DIV
 CLASS="TABLE"
 ><A
-NAME="AEN2176"
+NAME="AEN2207"
 ></A
 ><P
 ><B
@@ -531,7 +531,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2275"
+NAME="AEN2306"
 >8.1. Finding the Right Mix</A
 ></H2
 ><P
@@ -566,7 +566,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2282"
+NAME="AEN2313"
 >8.2. How to Edit</A
 ></H2
 ><P
@@ -680,7 +680,7 @@ CLASS="LITERAL"
 >handle-as-image</TT
 >  +<TT
 CLASS="LITERAL"
->block</TT
+>block{Banner ads.}</TT
 > }
   # Block these as if they were images. Send no block page.
    banners.example.com
@@ -772,16 +772,16 @@ CLASS="EMPHASIS"
 ><P
 > The pattern matching syntax is different for the domain and path parts of
  the URL. The domain part uses a simple globbing type matching technique, 
- while the path part uses a more flexible 
+ while the path part uses more flexible 
  <A
 HREF="http://en.wikipedia.org/wiki/Regular_expressions"
 TARGET="_top"
 ><SPAN
 CLASS="QUOTE"
 >"Regular
-  Expressions (PCRE)"</SPAN
+  Expressions"</SPAN
 ></A
-> based syntax.</P
+> (POSIX 1003.2).</P
 ><P
 ></P
 ><DIV
@@ -896,7 +896,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2373"
+NAME="AEN2404"
 >8.4.1. The Domain Pattern</A
 ></H3
 ><P
@@ -1136,49 +1136,37 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2449"
+NAME="AEN2480"
 >8.4.2. The Path Pattern</A
 ></H3
 ><P
 > <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
-> uses Perl compatible (PCRE)
+> uses <SPAN
+CLASS="QUOTE"
+>"modern"</SPAN
+> POSIX 1003.2
   <A
 HREF="http://en.wikipedia.org/wiki/Regular_expressions"
 TARGET="_top"
 ><SPAN
 CLASS="QUOTE"
 >"Regular
-  Expression"</SPAN
+  Expressions"</SPAN
 ></A
-> based syntax 
- (through the <A
-HREF="http://www.pcre.org/"
-TARGET="_top"
->PCRE</A
-> library) for
- matching the path portion (after the slash), and is thus more flexible.</P
+> for matching the path portion (after the slash),
+  and is thus more flexible.</P
 ><P
 > There is an <A
 HREF="appendix.html#REGEX"
 >Appendix</A
 > with a brief quick-start into regular
- expressions, and full (very technical) documentation on PCRE regex syntax is available on-line
- at <A
-HREF="http://www.pcre.org/man.txt"
-TARGET="_top"
->http://www.pcre.org/man.txt</A
->.
- You might also find the Perl man page on regular expressions (<TT
+ expressions, you also might want to have a look at your operating system's documentation
+ on regular expressions (try <TT
 CLASS="LITERAL"
->man perlre</TT
->)
- useful, which is available on-line at <A
-HREF="http://perldoc.perl.org/perlre.html"
-TARGET="_top"
->http://perldoc.perl.org/perlre.html</A
->.</P
+>man re_format</TT
+>).</P
 ><P
 > Note that the path pattern is automatically left-anchored at the <SPAN
 CLASS="QUOTE"
@@ -1567,7 +1555,7 @@ CLASS="REPLACEABLE"
 >  
    Example: <TT
 CLASS="LITERAL"
->+block</TT
+>+handle-as-image</TT
 >
   </P
 ></LI
@@ -1891,13 +1879,13 @@ HREF="actions-file.html#HANDLE-AS-EMPTY-DOCUMENT"
 >Type:</DT
 ><DD
 ><P
->Boolean.</P
+>Parameterized.</P
 ></DD
 ><DT
 >Parameter:</DT
 ><DD
 ><P
->N/A</P
+>A block reason that should be given to the user.</P
 ></DD
 ><DT
 >Notes:</DT
@@ -1910,27 +1898,10 @@ CLASS="APPLICATION"
 CLASS="QUOTE"
 >"BLOCKED"</SPAN
 > page
-    for requests to blocked pages. This page contains links to find out why the request
-    was blocked, and a click-through to the blocked content (the latter only if compiled with the
-    force feature enabled). The <SPAN
-CLASS="QUOTE"
->"BLOCKED"</SPAN
-> page adapts to the available
-    screen space -- it displays full-blown if space allows, or miniaturized and text-only
-    if loaded into a small frame or window. If you are using <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
->
-    right now, you can take a look at the 
-    <A
-HREF="http://ads.bannerserver.example.com/nasty-ads/sponsor.html"
-TARGET="_top"
-><SPAN
-CLASS="QUOTE"
->"BLOCKED"</SPAN
->
-    page</A
->.
+    for requests to blocked pages. This page contains the block reason given as
+    parameter, a link to find out why the block action applies, and a click-through
+    to the blocked content (the latter only if the force feature is available and
+    enabled).
    </P
 ><P
 > 
@@ -2000,18 +1971,18 @@ WIDTH="90%"
 ><TD
 ><PRE
 CLASS="SCREEN"
->{+block}      
+>{+block{No nasty stuff for you.}}
 # Block and replace with "blocked" page
  .nasty-stuff.example.com
 
-{+block +handle-as-image} 
+{+block{Doubleclick banners.} +handle-as-image} 
 # Block and replace with image
  .ad.doubleclick.net
  .ads.r.us/banners/
 
-{+block +handle-as-empty-document} 
+{+block{Layered ads.} +handle-as-empty-document} 
 # Block and then ignore
- adserver.exampleclick.net/.*\.js$</PRE
+ adserver.example.net/.*\.js$</PRE
 ></TD
 ></TR
 ></TABLE
@@ -2198,6 +2169,25 @@ CLASS="SCREEN"
 ># Tag every request with the User-Agent header
 {+client-header-tagger{user-agent}}
 /
+
+# Tagging itself doesn't change the action
+# settings, sections with TAG patterns do:
+#
+# If it's a download agent, use a different forwarding proxy,
+# show the real User-Agent and make sure resume works.
+{+forward-override{forward-socks5 10.0.0.2:2222 .} \
+ -hide-if-modified-since      \
+ -overwrite-last-modified     \
+ -hide-user-agent             \
+ -filter                      \
+ -deanimate-gifs              \
+}
+TAG:^User-Agent: NetBSD-ftp/
+TAG:^User-Agent: Novell ZYPP Installer
+TAG:^User-Agent: RPM APT-HTTP/
+TAG:^User-Agent: fetch libfetch/
+TAG:^User-Agent: Ubuntu APT-HTTP/
+TAG:^User-Agent: MPlayer/
     </PRE
 ></TD
 ></TR
@@ -3584,7 +3574,7 @@ WIDTH="90%"
 ><TD
 ><PRE
 CLASS="SCREEN"
->+filter{js-annoyances}       # Get rid of particularly annoying JavaScript abuse</PRE
+>+filter{js-annoyances}       # Get rid of particularly annoying JavaScript abuse.</PRE
 ></TD
 ></TR
 ></TABLE
@@ -3603,7 +3593,7 @@ WIDTH="90%"
 ><TD
 ><PRE
 CLASS="SCREEN"
->+filter{js-events}           # Kill all JS event bindings (Radically destructive! Only for extra nasty sites)</PRE
+>+filter{js-events}           # Kill all JS event bindings and timers (Radically destructive! Only for extra nasty sites).</PRE
 ></TD
 ></TR
 ></TABLE
@@ -3622,7 +3612,7 @@ WIDTH="90%"
 ><TD
 ><PRE
 CLASS="SCREEN"
->+filter{html-annoyances}     # Get rid of particularly annoying HTML abuse</PRE
+>+filter{html-annoyances}     # Get rid of particularly annoying HTML abuse.</PRE
 ></TD
 ></TR
 ></TABLE
@@ -3641,7 +3631,7 @@ WIDTH="90%"
 ><TD
 ><PRE
 CLASS="SCREEN"
->+filter{content-cookies}     # Kill cookies that come in the HTML or JS content</PRE
+>+filter{content-cookies}     # Kill cookies that come in the HTML or JS content.</PRE
 ></TD
 ></TR
 ></TABLE
@@ -3660,7 +3650,7 @@ WIDTH="90%"
 ><TD
 ><PRE
 CLASS="SCREEN"
->+filter{refresh-tags}        # Kill automatic refresh tags (for dial-on-demand setups)</PRE
+>+filter{refresh-tags}        # Kill automatic refresh tags (for dial-on-demand setups).</PRE
 ></TD
 ></TR
 ></TABLE
@@ -3717,7 +3707,7 @@ WIDTH="90%"
 ><TD
 ><PRE
 CLASS="SCREEN"
->+filter{img-reorder}         # Reorder attributes in &#60;img&#62; tags to make the banners-by-* filters more effective</PRE
+>+filter{img-reorder}         # Reorder attributes in &#60;img&#62; tags to make the banners-by-* filters more effective.</PRE
 ></TD
 ></TR
 ></TABLE
@@ -3736,7 +3726,7 @@ WIDTH="90%"
 ><TD
 ><PRE
 CLASS="SCREEN"
->+filter{banners-by-size}     # Kill banners by size</PRE
+>+filter{banners-by-size}     # Kill banners by size.</PRE
 ></TD
 ></TR
 ></TABLE
@@ -3755,7 +3745,7 @@ WIDTH="90%"
 ><TD
 ><PRE
 CLASS="SCREEN"
->+filter{banners-by-link}     # Kill banners by their links to known clicktrackers</PRE
+>+filter{banners-by-link}     # Kill banners by their links to known clicktrackers.</PRE
 ></TD
 ></TR
 ></TABLE
@@ -3774,7 +3764,7 @@ WIDTH="90%"
 ><TD
 ><PRE
 CLASS="SCREEN"
->+filter{webbugs}             # Squish WebBugs (1x1 invisible GIFs used for user tracking)</PRE
+>+filter{webbugs}             # Squish WebBugs (1x1 invisible GIFs used for user tracking).</PRE
 ></TD
 ></TR
 ></TABLE
@@ -3793,7 +3783,7 @@ WIDTH="90%"
 ><TD
 ><PRE
 CLASS="SCREEN"
->+filter{tiny-textforms}      # Extend those tiny textareas up to 40x80 and kill the hard wrap</PRE
+>+filter{tiny-textforms}      # Extend those tiny textareas up to 40x80 and kill the hard wrap.</PRE
 ></TD
 ></TR
 ></TABLE
@@ -3812,7 +3802,7 @@ WIDTH="90%"
 ><TD
 ><PRE
 CLASS="SCREEN"
->+filter{jumping-windows}     # Prevent windows from resizing and moving themselves</PRE
+>+filter{jumping-windows}     # Prevent windows from resizing and moving themselves.</PRE
 ></TD
 ></TR
 ></TABLE
@@ -3831,7 +3821,7 @@ WIDTH="90%"
 ><TD
 ><PRE
 CLASS="SCREEN"
->+filter{frameset-borders}    # Give frames a border and make them resizeable</PRE
+>+filter{frameset-borders}    # Give frames a border and make them resizable.</PRE
 ></TD
 ></TR
 ></TABLE
@@ -3850,7 +3840,7 @@ WIDTH="90%"
 ><TD
 ><PRE
 CLASS="SCREEN"
->+filter{demoronizer}         # Fix MS's non-standard use of standard charsets</PRE
+>+filter{demoronizer}         # Fix MS's non-standard use of standard charsets.</PRE
 ></TD
 ></TR
 ></TABLE
@@ -3869,7 +3859,7 @@ WIDTH="90%"
 ><TD
 ><PRE
 CLASS="SCREEN"
->+filter{shockwave-flash}     # Kill embedded Shockwave Flash objects</PRE
+>+filter{shockwave-flash}     # Kill embedded Shockwave Flash objects.</PRE
 ></TD
 ></TR
 ></TABLE
@@ -3888,7 +3878,7 @@ WIDTH="90%"
 ><TD
 ><PRE
 CLASS="SCREEN"
->+filter{quicktime-kioskmode} # Make Quicktime movies savable</PRE
+>+filter{quicktime-kioskmode} # Make Quicktime movies saveable.</PRE
 ></TD
 ></TR
 ></TABLE
@@ -3926,7 +3916,7 @@ WIDTH="90%"
 ><TD
 ><PRE
 CLASS="SCREEN"
->+filter{crude-parental}      # Crude parental filtering (demo only)</PRE
+>+filter{crude-parental}      # Crude parental filtering. Note that this filter doesn't work reliable.</PRE
 ></TD
 ></TR
 ></TABLE
@@ -3945,7 +3935,7 @@ WIDTH="90%"
 ><TD
 ><PRE
 CLASS="SCREEN"
->+filter{ie-exploits}         # Disable a known Internet Explorer bug exploits</PRE
+>+filter{ie-exploits}         # Disable some known Internet Explorer bug exploits.</PRE
 ></TD
 ></TR
 ></TABLE
@@ -3964,7 +3954,7 @@ WIDTH="90%"
 ><TD
 ><PRE
 CLASS="SCREEN"
->+filter{site-specifics}      # Custom filters for specific site related problems</PRE
+>+filter{site-specifics}      # Cure for site-specific problems. Don't apply generally!</PRE
 ></TD
 ></TR
 ></TABLE
@@ -3972,7 +3962,7 @@ CLASS="SCREEN"
    </P
 ><P
 >    <A
-NAME="FILTER-GOOGLE"
+NAME="FILTER-NO-PING"
 ></A
 >
     <TABLE
@@ -3983,7 +3973,7 @@ WIDTH="90%"
 ><TD
 ><PRE
 CLASS="SCREEN"
->+filter{google}              # Removes text ads and other Google specific improvements</PRE
+>+filter{no-ping}             # Removes non-standard ping attributes in &#60;a&#62; and &#60;area&#62; tags.</PRE
 ></TD
 ></TR
 ></TABLE
@@ -3991,7 +3981,7 @@ CLASS="SCREEN"
    </P
 ><P
 >    <A
-NAME="FILTER-YAHOO"
+NAME="FILTER-GOOGLE"
 ></A
 >
     <TABLE
@@ -4002,7 +3992,7 @@ WIDTH="90%"
 ><TD
 ><PRE
 CLASS="SCREEN"
->+filter{yahoo}               # Removes text ads and other Yahoo specific improvements</PRE
+>+filter{google}              # CSS-based block for Google text ads. Also removes a width limitation and the toolbar advertisement.</PRE
 ></TD
 ></TR
 ></TABLE
@@ -4010,7 +4000,7 @@ CLASS="SCREEN"
    </P
 ><P
 >    <A
-NAME="FILTER-MSN"
+NAME="FILTER-YAHOO"
 ></A
 >
     <TABLE
@@ -4021,7 +4011,7 @@ WIDTH="90%"
 ><TD
 ><PRE
 CLASS="SCREEN"
->+filter{msn}                 # Removes text ads and other MSN specific improvements</PRE
+>+filter{yahoo}               # CSS-based block for Yahoo text ads. Also removes a width limitation.</PRE
 ></TD
 ></TR
 ></TABLE
@@ -4029,7 +4019,7 @@ CLASS="SCREEN"
    </P
 ><P
 >    <A
-NAME="FILTER-BLOGSPOT"
+NAME="FILTER-MSN"
 ></A
 >
     <TABLE
@@ -4040,7 +4030,7 @@ WIDTH="90%"
 ><TD
 ><PRE
 CLASS="SCREEN"
->+filter{blogspot}            # Cleans up Blogspot blogs</PRE
+>+filter{msn}                 # CSS-based block for MSN text ads. Also removes tracking URLs and a width limitation.</PRE
 ></TD
 ></TR
 ></TABLE
@@ -4048,7 +4038,7 @@ CLASS="SCREEN"
    </P
 ><P
 >    <A
-NAME="FILTER-NO-PING"
+NAME="FILTER-BLOGSPOT"
 ></A
 >
     <TABLE
@@ -4059,7 +4049,7 @@ WIDTH="90%"
 ><TD
 ><PRE
 CLASS="SCREEN"
->+filter{no-ping}             # Removes non-standard ping attributes from anchor and area tags</PRE
+>+filter{blogspot}            # Cleans up some Blogspot blogs. Read the fine print before using this.</PRE
 ></TD
 ></TR
 ></TABLE
@@ -4504,7 +4494,7 @@ WIDTH="90%"
 CLASS="SCREEN"
 ># Block all documents on example.org that end with ".js",
 # but send an empty document instead of the usual HTML message. 
-{+block +handle-as-empty-document}
+{+block{Blocked JavaScript} +handle-as-empty-document}
 example.org/.*\.js$
      </PRE
 ></TD
@@ -4638,11 +4628,8 @@ CLASS="SCREEN"
 # These don't look like images, but they're banners and should be
 # blocked as images:
 #
-{+block +handle-as-image}
-some.nasty-banner-server.com/junk.cgi\?output=trash
-
-# Banner source! Who cares if they also have non-image content?
-ad.doubleclick.net </PRE
+{+block{Nasty banners.} +handle-as-image}
+nasty-banner-server.example.com/junk.cgi\?output=trash</PRE
 ></TD
 ></TR
 ></TABLE
@@ -5523,261 +5510,8 @@ CLASS="SECT3"
 ><H4
 CLASS="SECT3"
 ><A
-NAME="INSPECT-JPEGS"
->8.5.26. inspect-jpegs</A
-></H4
-><P
-></P
-><DIV
-CLASS="VARIABLELIST"
-><DL
-><DT
->Typical use:</DT
-><DD
-><P
->Try to protect against a MS buffer over-run in JPEG processing</P
-></DD
-><DT
->Effect:</DT
-><DD
-><P
->    Protect against a known exploit
-   </P
-></DD
-><DT
->Type:</DT
-><DD
-><P
->Boolean.</P
-></DD
-><DT
->Parameter:</DT
-><DD
-><P
->    N/A
-   </P
-></DD
-><DT
->Notes:</DT
-><DD
-><P
->    See Microsoft Security Bulletin MS04-028. JPEG images are one of the most 
-    common image types found across the Internet. The exploit as described can 
-    allow execution of code on the target system, giving an attacker access 
-    to the system in question by merely planting an altered JPEG image, which 
-    would have no obvious indications of what lurks inside. This action
-    tries to prevent this exploit if delivered through unencrypted HTTP.
-   </P
-><P
->    Note that the exploit mentioned is several years old
-    and it's unlikely that your client is still vulnerable
-    against it. This action may be removed in one of the
-    next releases.
-   </P
-></DD
-><DT
->Example usage:</DT
-><DD
-><P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="90%"
-><TR
-><TD
-><PRE
-CLASS="SCREEN"
->+inspect-jpegs</PRE
-></TD
-></TR
-></TABLE
-></P
-></DD
-></DL
-></DIV
-></DIV
-><DIV
-CLASS="SECT3"
-><H4
-CLASS="SECT3"
-><A
-NAME="KILL-POPUPS"
->8.5.27. kill-popups<A
-NAME="KILL-POPUP"
-></A
-></A
-></H4
-><P
-></P
-><DIV
-CLASS="VARIABLELIST"
-><DL
-><DT
->Typical use:</DT
-><DD
-><P
->Eliminate those annoying pop-up windows (deprecated)</P
-></DD
-><DT
->Effect:</DT
-><DD
-><P
->    While loading the document, replace JavaScript code that opens
-    pop-up windows with (syntactically neutral) dummy code on the fly.
-   </P
-></DD
-><DT
->Type:</DT
-><DD
-><P
->Boolean.</P
-></DD
-><DT
->Parameter:</DT
-><DD
-><P
->    N/A
-   </P
-></DD
-><DT
->Notes:</DT
-><DD
-><P
->    This action is basically a built-in, hardwired special-purpose filter
-    action, but there are important differences: For <TT
-CLASS="LITERAL"
->kill-popups</TT
->,
-    the document need not be buffered, so it can be incrementally rendered while
-    downloading. But <TT
-CLASS="LITERAL"
->kill-popups</TT
-> doesn't catch as many pop-ups as
-    <TT
-CLASS="LITERAL"
-><A
-HREF="actions-file.html#FILTER-ALL-POPUPS"
->filter{<TT
-CLASS="REPLACEABLE"
-><I
->all-popups</I
-></TT
->}</A
-></TT
->
-    does and is not as smart as <TT
-CLASS="LITERAL"
-><A
-HREF="actions-file.html#FILTER-UNSOLICITED-POPUPS"
->filter{<TT
-CLASS="REPLACEABLE"
-><I
->unsolicited-popups</I
-></TT
->}</A
->
-    </TT
->is.
-   </P
-><P
->    Think of it as a fast and efficient replacement for a filter that you
-    can use if you don't want any filtering at all. Note that it doesn't make
-    sense to combine it with any <TT
-CLASS="LITERAL"
-><A
-HREF="actions-file.html#FILTER"
->filter</A
-></TT
-> action,
-    since as soon as one <TT
-CLASS="LITERAL"
-><A
-HREF="actions-file.html#FILTER"
->filter</A
-></TT
-> applies,
-    the whole document needs to be buffered anyway, which destroys the advantage of
-    the <TT
-CLASS="LITERAL"
->kill-popups</TT
-> action over its filter equivalent.
-   </P
-><P
->    Killing all pop-ups unconditionally is problematic. Many shops and banks rely on
-    pop-ups to display forms, shopping carts etc, and the <TT
-CLASS="LITERAL"
-><A
-HREF="actions-file.html#FILTER-UNSOLICITED-POPUPS"
->filter{<TT
-CLASS="REPLACEABLE"
-><I
->unsolicited-popups</I
-></TT
->}</A
->
-    </TT
-> does a better job of catching only the unwanted ones.
-   </P
-><P
->    If the only kind of pop-ups that you want to kill are exit consoles (those
-    <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->really nasty</I
-></SPAN
-> windows that appear when you close an other
-    one), you might want to use
-    <TT
-CLASS="LITERAL"
-><A
-HREF="actions-file.html#FILTER"
->filter</A
->{<TT
-CLASS="REPLACEABLE"
-><I
->js-annoyances</I
-></TT
->}</TT
->
-    instead. 
-   </P
-><P
->    This action is most appropriate for browsers that don't have any controls 
-    for unwanted pop-ups. Not recommended for general usage.
-   </P
-><P
->    This action doesn't work very reliable and may be removed in future releases.
-   </P
-></DD
-><DT
->Example usage:</DT
-><DD
-><P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="90%"
-><TR
-><TD
-><PRE
-CLASS="SCREEN"
->+kill-popups</PRE
-></TD
-></TR
-></TABLE
-></P
-></DD
-></DL
-></DIV
-></DIV
-><DIV
-CLASS="SECT3"
-><H4
-CLASS="SECT3"
-><A
 NAME="LIMIT-CONNECT"
->8.5.28. limit-connect</A
+>8.5.26. limit-connect</A
 ></H4
 ><P
 ></P
@@ -5825,13 +5559,12 @@ CLASS="LITERAL"
     <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
-> only allows HTTP CONNECT
-    requests to port 443 (the standard, secure HTTPS port). Use 
-    <TT
+> allows HTTP CONNECT requests to all
+    ports. Use <TT
 CLASS="LITERAL"
 >limit-connect</TT
-> if more fine-grained control is desired
-    for some or all destinations.
+> if fine-grained control
+    is desired for some or all destinations.
    </P
 ><P
 >    The CONNECT methods exists in HTTP to allow access to secure websites
@@ -5853,15 +5586,6 @@ CLASS="APPLICATION"
 >Privoxy</SPAN
 >'s
    filters. By specifying an invalid port range you can disable HTTPS entirely.
-   If you plan to disable SSL by default, consider enabling 
-   <TT
-CLASS="LITERAL"
-><A
-HREF="actions-file.html#TREAT-FORBIDDEN-CONNECTS-LIKE-BLOCKS"
->treat-forbidden-connects-like-blocks</A
-></TT
->
-   as well, to be able to quickly create exceptions.
   </P
 ></DD
 ><DT
@@ -5876,7 +5600,7 @@ WIDTH="90%"
 ><TD
 ><PRE
 CLASS="SCREEN"
->+limit-connect{443}                   # This is the default and need not be specified.
+>+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
@@ -5896,7 +5620,7 @@ CLASS="SECT3"
 CLASS="SECT3"
 ><A
 NAME="PREVENT-COMPRESSION"
->8.5.29. prevent-compression</A
+>8.5.27. prevent-compression</A
 ></H4
 ><P
 ></P
@@ -5948,21 +5672,15 @@ CLASS="LITERAL"
 HREF="actions-file.html#FILTER"
 >filter</A
 ></TT
->, <TT
+> and
+    <TT
 CLASS="LITERAL"
 ><A
 HREF="actions-file.html#DEANIMATE-GIFS"
 >deanimate-gifs</A
 ></TT
 >
-    and <TT
-CLASS="LITERAL"
-><A
-HREF="actions-file.html#KILL-POPUPS"
->kill-popups</A
-></TT
-> actions need
-    access to the uncompressed data.
+    actions need access to the uncompressed data.
    </P
 ><P
 >    When compiled with zlib support (available since <SPAN
@@ -6044,7 +5762,7 @@ CLASS="SECT3"
 CLASS="SECT3"
 ><A
 NAME="OVERWRITE-LAST-MODIFIED"
->8.5.30. overwrite-last-modified</A
+>8.5.28. overwrite-last-modified</A
 ></H4
 ><P
 ></P
@@ -6208,7 +5926,7 @@ CLASS="SECT3"
 CLASS="SECT3"
 ><A
 NAME="REDIRECT"
->8.5.31. redirect</A
+>8.5.29. redirect</A
 ></H4
 ><P
 ></P
@@ -6320,168 +6038,8 @@ CLASS="SECT3"
 ><H4
 CLASS="SECT3"
 ><A
-NAME="SEND-VANILLA-WAFER"
->8.5.32. send-vanilla-wafer</A
-></H4
-><P
-></P
-><DIV
-CLASS="VARIABLELIST"
-><DL
-><DT
->Typical use:</DT
-><DD
-><P
->    Feed log analysis scripts with useless data.
-   </P
-></DD
-><DT
->Effect:</DT
-><DD
-><P
->    Sends a cookie with each request stating that you do not accept any copyright
-    on cookies sent to you, and asking the site operator not to track you.
-   </P
-></DD
-><DT
->Type:</DT
-><DD
-><P
->Boolean.</P
-></DD
-><DT
->Parameter:</DT
-><DD
-><P
->    N/A
-   </P
-></DD
-><DT
->Notes:</DT
-><DD
-><P
->    The vanilla wafer is a (relatively) unique header and could conceivably be used to track you.
-   </P
-><P
->    This action is rarely used and not enabled in the default configuration.
-   </P
-></DD
-><DT
->Example usage:</DT
-><DD
-><P
->     <TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="90%"
-><TR
-><TD
-><PRE
-CLASS="SCREEN"
->+send-vanilla-wafer</PRE
-></TD
-></TR
-></TABLE
->
-   </P
-></DD
-></DL
-></DIV
-></DIV
-><DIV
-CLASS="SECT3"
-><H4
-CLASS="SECT3"
-><A
-NAME="SEND-WAFER"
->8.5.33. send-wafer</A
-></H4
-><P
-></P
-><DIV
-CLASS="VARIABLELIST"
-><DL
-><DT
->Typical use:</DT
-><DD
-><P
->    Send custom cookies or feed log analysis scripts with even more useless data.
-   </P
-></DD
-><DT
->Effect:</DT
-><DD
-><P
->    Sends a custom, user-defined cookie with each request.
-   </P
-></DD
-><DT
->Type:</DT
-><DD
-><P
->Multi-value.</P
-></DD
-><DT
->Parameter:</DT
-><DD
-><P
->    A string of the form <SPAN
-CLASS="QUOTE"
->"<TT
-CLASS="REPLACEABLE"
-><I
->name</I
-></TT
->=<TT
-CLASS="REPLACEABLE"
-><I
->value</I
-></TT
->"</SPAN
->.
-   </P
-></DD
-><DT
->Notes:</DT
-><DD
-><P
->    Being multi-valued, multiple instances of this action can apply to the same request,
-    resulting in multiple cookies being sent.
-   </P
-><P
->    This action is rarely used and not enabled in the default configuration.
-   </P
-></DD
-><DT
->Example usage (section):</DT
-><DD
-><P
->    <TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="90%"
-><TR
-><TD
-><PRE
-CLASS="SCREEN"
->{+send-wafer{UsingPrivoxy=true}}
-my-internal-testing-server.void</PRE
-></TD
-></TR
-></TABLE
->
-   </P
-></DD
-></DL
-></DIV
-></DIV
-><DIV
-CLASS="SECT3"
-><H4
-CLASS="SECT3"
-><A
 NAME="SERVER-HEADER-FILTER"
->8.5.34. server-header-filter</A
+>8.5.30. server-header-filter</A
 ></H4
 ><P
 ></P
@@ -6575,7 +6133,7 @@ CLASS="SECT3"
 CLASS="SECT3"
 ><A
 NAME="SERVER-HEADER-TAGGER"
->8.5.35. server-header-tagger</A
+>8.5.31. server-header-tagger</A
 ></H4
 ><P
 ></P
@@ -6675,7 +6233,7 @@ CLASS="SECT3"
 CLASS="SECT3"
 ><A
 NAME="SESSION-COOKIES-ONLY"
->8.5.36. session-cookies-only</A
+>8.5.32. session-cookies-only</A
 ></H4
 ><P
 ></P
@@ -6843,7 +6401,7 @@ CLASS="SECT3"
 CLASS="SECT3"
 ><A
 NAME="SET-IMAGE-BLOCKER"
->8.5.37. set-image-blocker</A
+>8.5.33. set-image-blocker</A
 ></H4
 ><P
 ></P
@@ -7098,121 +6656,11 @@ CLASS="SCREEN"
 ></DIV
 ><DIV
 CLASS="SECT3"
-><H4
-CLASS="SECT3"
-><A
-NAME="TREAT-FORBIDDEN-CONNECTS-LIKE-BLOCKS"
->8.5.38. treat-forbidden-connects-like-blocks</A
-></H4
-><P
-></P
-><DIV
-CLASS="VARIABLELIST"
-><DL
-><DT
->Typical use:</DT
-><DD
-><P
->Block forbidden connects with an easy to find error message.</P
-></DD
-><DT
->Effect:</DT
-><DD
-><P
->    If this action is enabled, <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> no longer
-    makes a difference between forbidden connects and ordinary blocks. 
-   </P
-></DD
-><DT
->Type:</DT
-><DD
-><P
->Boolean</P
-></DD
-><DT
->Parameter:</DT
-><DD
-><P
->N/A</P
-></DD
-><DT
->Notes:</DT
-><DD
-><P
->    By default <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> answers
-    <A
-HREF="actions-file.html#LIMIT-CONNECT"
->forbidden <SPAN
-CLASS="QUOTE"
->"Connect"</SPAN
-> requests</A
->
-    with a short error message inside the headers. If the browser doesn't display
-    headers (most don't), you just see an empty page.
-   </P
-><P
->    With this action enabled, <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> displays
-    the message that is used for ordinary blocks instead. If you decide
-    to make an exception for the page in question, you can do so by
-    following the <SPAN
-CLASS="QUOTE"
->"See why"</SPAN
-> link.
-   </P
-><P
->    For <SPAN
-CLASS="QUOTE"
->"Connect"</SPAN
-> requests the clients tell
-    <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> which host they are interested
-    in, but not which document they plan to get later. As a result, the
-    <SPAN
-CLASS="QUOTE"
->"Go there anyway"</SPAN
-> wouldn't work and is therefore suppressed.
-   </P
-></DD
-><DT
->Example usage:</DT
-><DD
-><P
->    <TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="90%"
-><TR
-><TD
-><PRE
-CLASS="SCREEN"
->+treat-forbidden-connects-like-blocks</PRE
-></TD
-></TR
-></TABLE
->
-   </P
-></DD
-></DL
-></DIV
-></DIV
-><DIV
-CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN4263"
->8.5.39. Summary</A
+NAME="AEN4101"
+>8.5.34. Summary</A
 ></H3
 ><P
 > Note that many of these actions have the potential to cause a page to
@@ -7371,7 +6819,7 @@ HREF="actions-file.html#CRUNCH-INCOMING-COOKIES"
 HREF="actions-file.html#CRUNCH-OUTGOING-COOKIES"
 >crunch-outgoing-cookies</A
 >
- +block-as-image      = +block +handle-as-image
+ +block-as-image      = +block{Blocked image.} +handle-as-image
  allow-all-cookies   = -crunch-all-cookies -<A
 HREF="actions-file.html#SESSION-COOKIES-ONLY"
 >session-cookies-only</A
@@ -7396,9 +6844,6 @@ HREF="actions-file.html#FAST-REDIRECTS"
 HREF="actions-file.html#HIDE-REFERER"
 >hide-referrer</A
 > -<A
-HREF="actions-file.html#KILL-POPUPS"
->kill-popups</A
-> -<A
 HREF="actions-file.html#PREVENT-COMPRESSION"
 >prevent-compression</A
 >
@@ -7406,9 +6851,6 @@ HREF="actions-file.html#PREVENT-COMPRESSION"
  shop        = -crunch-all-cookies -<A
 HREF="actions-file.html#FILTER-ALL-POPUPS"
 >filter{all-popups}</A
-> -<A
-HREF="actions-file.html#KILL-POPUPS"
->kill-popups</A
 >
 
  # Short names for other aliases, for really lazy people ;-)
@@ -7454,7 +6896,7 @@ CLASS="SCREEN"
 
  # These shops require pop-ups:
  #
- {-kill-popups -filter{all-popups} -filter{unsolicited-popups}}
+ {-filter{all-popups} -filter{unsolicited-popups}}
   .dabs.com
   .overclockers.co.uk</PRE
 ></TD
@@ -7516,7 +6958,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN4328"
+NAME="AEN4164"
 >8.7.1. default.action</A
 ></H3
 ><P
@@ -7599,7 +7041,7 @@ HREF="actions-file.html#CRUNCH-INCOMING-COOKIES"
 HREF="actions-file.html#CRUNCH-OUTGOING-COOKIES"
 >crunch-outgoing-cookies</A
 >
- +block-as-image      = +block +handle-as-image
+ +block-as-image      = +block{Blocked image.} +handle-as-image
  mercy-for-cookies   = -crunch-all-cookies -<A
 HREF="actions-file.html#SESSION-COOKIES-ONLY"
 >session-cookies-only</A
@@ -7623,16 +7065,10 @@ HREF="actions-file.html#FAST-REDIRECTS"
 > -<A
 HREF="actions-file.html#HIDE-REFERER"
 >hide-referrer</A
-> -<A
-HREF="actions-file.html#KILL-POPUPS"
->kill-popups</A
 >
  shop        = -crunch-all-cookies -<A
 HREF="actions-file.html#FILTER-ALL-POPUPS"
 >filter{all-popups}</A
-> -<A
-HREF="actions-file.html#KILL-POPUPS"
->kill-popups</A
 ></PRE
 ></TD
 ></TR
@@ -8016,7 +7452,7 @@ CLASS="SCREEN"
 ##########################################################################
 { <A
 HREF="actions-file.html#BLOCK"
->+block</A
+>+block{Banner ads.}</A
 > }
 
 # Generic patterns:
@@ -8237,7 +7673,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN4464"
+NAME="AEN4298"
 >8.7.2. user.action</A
 ></H3
 ><P
@@ -8321,14 +7757,14 @@ CLASS="SCREEN"
 +crunch-all-cookies = +crunch-incoming-cookies +crunch-outgoing-cookies
 -crunch-all-cookies = -crunch-incoming-cookies -crunch-outgoing-cookies
  allow-all-cookies  = -crunch-all-cookies -session-cookies-only
- allow-popups       = -filter{all-popups} -kill-popups
-+block-as-image     = +block +handle-as-image
+ allow-popups       = -filter{all-popups}
++block-as-image     = +block{Blocked as image.} +handle-as-image
 -block-as-image     = -block
 
 # These aliases define combinations of actions that are useful for
 # certain types of sites:
 #
-fragile     = -block -crunch-all-cookies -filter -fast-redirects -hide-referrer -kill-popups
+fragile     = -block -crunch-all-cookies -filter -fast-redirects -hide-referrer
 shop        = -crunch-all-cookies allow-popups
 
 # Allow ads for selected useful free sites:
@@ -8440,7 +7876,7 @@ CLASS="QUOTE"
  and pasted the URL below while removing the leading http://, into a 
  <TT
 CLASS="LITERAL"
->{ +block }</TT
+>{ +block{} }</TT
 > section. Note that <TT
 CLASS="LITERAL"
 >{ +handle-as-image
@@ -8463,7 +7899,7 @@ CLASS="SCREEN"
 >{ +<A
 HREF="actions-file.html#BLOCK"
 >block</A
-> }
+>{Nasty ads.} }
  www.example.com/nasty-ads/sponsor\.gif
  another.example.net/more/junk/here/</PRE
 ></TD
diff --git a/doc/webserver/user-manual/appendix.html b/doc/webserver/user-manual/appendix.html
index d706d0e9..88e6e2ca 100644
--- a/doc/webserver/user-manual/appendix.html
+++ b/doc/webserver/user-manual/appendix.html
@@ -748,7 +748,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN5349"
+NAME="AEN5184"
 >14.2. Privoxy's Internal Pages</A
 ></H2
 ><P
@@ -794,7 +794,7 @@ CLASS="APPLICATION"
    Privoxy main page: 
   </P
 ><A
-NAME="AEN5363"
+NAME="AEN5198"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -827,7 +827,7 @@ CLASS="APPLICATION"
     editing of actions files:
   </P
 ><A
-NAME="AEN5371"
+NAME="AEN5206"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -847,7 +847,7 @@ TARGET="_top"
     Show the source code version numbers:
   </P
 ><A
-NAME="AEN5376"
+NAME="AEN5211"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -867,7 +867,7 @@ TARGET="_top"
    Show the browser's request headers:
   </P
 ><A
-NAME="AEN5381"
+NAME="AEN5216"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -887,7 +887,7 @@ TARGET="_top"
    Show which actions apply to a URL and why:
   </P
 ><A
-NAME="AEN5386"
+NAME="AEN5221"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -919,7 +919,7 @@ CLASS="QUOTE"
    place:
   </P
 ><A
-NAME="AEN5394"
+NAME="AEN5229"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -936,7 +936,7 @@ TARGET="_top"
 >   Short cuts. Turn off, then on: 
   </P
 ><A
-NAME="AEN5398"
+NAME="AEN5233"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -950,7 +950,7 @@ TARGET="_top"
    </P
 ></BLOCKQUOTE
 ><A
-NAME="AEN5401"
+NAME="AEN5236"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -1021,7 +1021,7 @@ CLASS="QUOTE"
 ><LI
 ><P
 >    <A
-HREF="javascript:void(window.open('http://config.privoxy.org/toggle?mini=y&set=enabled','ijbstatus','width=250,height=100,resizable=yes,scrollbars=no,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());"
+HREF="javascript:void(window.open('http://config.privoxy.org/toggle?mini=y&#38;set=enabled','ijbstatus','width=250,height=100,resizable=yes,scrollbars=no,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());"
 TARGET="_top"
 >Privoxy - Enable</A
 >
@@ -1030,7 +1030,7 @@ TARGET="_top"
 ><LI
 ><P
 >    <A
-HREF="javascript:void(window.open('http://config.privoxy.org/toggle?mini=y&set=disabled','ijbstatus','width=250,height=100,resizable=yes,scrollbars=no,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());"
+HREF="javascript:void(window.open('http://config.privoxy.org/toggle?mini=y&#38;set=disabled','ijbstatus','width=250,height=100,resizable=yes,scrollbars=no,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());"
 TARGET="_top"
 >Privoxy - Disable</A
 >
@@ -1039,7 +1039,7 @@ TARGET="_top"
 ><LI
 ><P
 >    <A
-HREF="javascript:void(window.open('http://config.privoxy.org/toggle?mini=y&set=toggle','ijbstatus','width=250,height=100,resizable=yes,scrollbars=no,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());"
+HREF="javascript:void(window.open('http://config.privoxy.org/toggle?mini=y&#38;set=toggle','ijbstatus','width=250,height=100,resizable=yes,scrollbars=no,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());"
 TARGET="_top"
 >Privoxy - Toggle Privoxy</A
 > (Toggles between enabled and disabled)
@@ -1236,19 +1236,6 @@ CLASS="QUOTE"
 ></LI
 ><LI
 ><P
->   If the <A
-HREF="actions-file.html#KILL-POPUPS"
-><SPAN
-CLASS="QUOTE"
->"+kill-popups"</SPAN
-></A
->
-   action applies, and it is an HTML or JavaScript document, the popup-code in the
-   response is filtered on-the-fly as it is received.
-  </P
-></LI
-><LI
-><P
 >   If any <A
 HREF="actions-file.html#FILTER"
 ><SPAN
@@ -1696,19 +1683,14 @@ CLASS="SCREEN"
  -hide-if-modified-since
  +hide-referrer {forge}
  -hide-user-agent
- -inspect-jpegs
- -kill-popups
  -limit-connect
  -overwrite-last-modified
  -prevent-compression
  -redirect
- -send-vanilla-wafer
- -send-wafer
  -server-header-filter{xml-to-html}
  -server-header-filter{html-to-xml} 
  -session-cookies-only
- +set-image-blocker {pattern}
- -treat-forbidden-connects-like-blocks </PRE
+ +set-image-blocker {pattern} </PRE
 ></TD
 ></TR
 ></TABLE
@@ -1741,13 +1723,13 @@ WIDTH="100%"
 ><TD
 ><PRE
 CLASS="SCREEN"
->&#13; { +block }
+>&#13; { +block{Domains starts with "ad"} }
   ad*.
 
- { +block }
+ { +block{Domain contains "ad"} }
   .ad.
 
- { +block +handle-as-image }
+ { +block{Doubleclick banner server} +handle-as-image }
   .[a-vx-z]*.doubleclick.net</PRE
 ></TD
 ></TR
@@ -1757,11 +1739,11 @@ CLASS="SCREEN"
 > We'll just show the interesting part here - the explicit matches. It is 
  matched three different times. Two <SPAN
 CLASS="QUOTE"
->"+block"</SPAN
+>"+block{}"</SPAN
 > sections, 
  and a <SPAN
 CLASS="QUOTE"
->"+block +handle-as-image"</SPAN
+>"+block{} +handle-as-image"</SPAN
 >,
  which is the expanded form of one of our aliases that had been defined as: 
  <SPAN
@@ -1789,7 +1771,7 @@ CLASS="QUOTE"
 HREF="actions-file.html#BLOCK"
 ><SPAN
 CLASS="QUOTE"
->"+block"</SPAN
+>"+block{}"</SPAN
 ></A
 >
  <SPAN
@@ -1886,21 +1868,16 @@ CLASS="GUIBUTTON"
   +hide-from-header{block} 
   +hide-referer{forge} 
   -hide-user-agent 
-  -inspect-jpegs
-  -kill-popups 
   -overwrite-last-modified
   +prevent-compression 
   -redirect
-  -send-vanilla-wafer 
-  -send-wafer
   -server-header-filter{xml-to-html}
   -server-header-filter{html-to-xml} 
   +session-cookies-only 
-  +set-image-blocker{blank} 
-  -treat-forbidden-connects-like-blocks }
+  +set-image-blocker{blank} }
    /
 
- { +block +handle-as-image }
+ { +block{Path contains "ads".} +handle-as-image }
   /ads</PRE
 ></TD
 ></TR
@@ -1980,7 +1957,7 @@ WIDTH="100%"
 ><TD
 ><PRE
 CLASS="SCREEN"
->&#13; { +block +handle-as-image }
+>&#13; { +block{Path starts with "ads".} +handle-as-image }
  /ads</PRE
 ></TD
 ></TR
diff --git a/doc/webserver/user-manual/config.html b/doc/webserver/user-manual/config.html
index f0612e83..cec7b061 100644
--- a/doc/webserver/user-manual/config.html
+++ b/doc/webserver/user-manual/config.html
@@ -1457,7 +1457,7 @@ CLASS="APPLICATION"
   debug       128 # debug redirects
   debug       256 # debug GIF de-animation
   debug       512 # Common Log Format
-  debug      1024 # debug kill pop-ups
+  debug      1024 # Unused
   debug      2048 # CGI user interface
   debug      4096 # Startup banner and warnings.
   debug      8192 # Non-fatal errors</PRE
@@ -1601,6 +1601,72 @@ CLASS="EMPHASIS"
 ></DL
 ></DIV
 ></DIV
+><DIV
+CLASS="SECT3"
+><H4
+CLASS="SECT3"
+><A
+NAME="HOSTNAME"
+>7.3.3. hostname</A
+></H4
+><P
+></P
+><DIV
+CLASS="VARIABLELIST"
+><DL
+><DT
+>Specifies:</DT
+><DD
+><P
+>    The hostname shown on the CGI pages.
+   </P
+></DD
+><DT
+>Type of value:</DT
+><DD
+><P
+>Text</P
+></DD
+><DT
+>Default value:</DT
+><DD
+><P
+><SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>Unset</I
+></SPAN
+></P
+></DD
+><DT
+>Effect if unset:</DT
+><DD
+><P
+>    The hostname provided by the operating system is used.
+   </P
+></DD
+><DT
+>Notes:</DT
+><DD
+><P
+>    On some misconfigured systems resolving the hostname fails or
+    takes too much time and slows Privoxy down. Setting a fixed hostname
+    works around the problem.
+   </P
+><P
+>    In other circumstances it might be desirable to show a hostname
+    other than the one returned by the operating system. For example
+    if the system has several different hostnames and you don't want
+    to use the first one.
+   </P
+><P
+>    Note that Privoxy does not validate the specified hostname value.
+   </P
+></DD
+></DL
+></DIV
+></DIV
 ></DIV
 ><DIV
 CLASS="SECT2"
diff --git a/doc/webserver/user-manual/configuration.html b/doc/webserver/user-manual/configuration.html
index 69516213..618c28a6 100644
--- a/doc/webserver/user-manual/configuration.html
+++ b/doc/webserver/user-manual/configuration.html
@@ -98,7 +98,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN817"
+NAME="AEN822"
 >6.1. Controlling Privoxy with Your Web Browser</A
 ></H2
 ><P
@@ -129,7 +129,7 @@ CLASS="SCREEN"
 > <H2
 CLASS="BRIDGEHEAD"
 ><A
-NAME="AEN825"
+NAME="AEN830"
 ></A
 >    Privoxy Menu</H2
 ><P
diff --git a/doc/webserver/user-manual/contact.html b/doc/webserver/user-manual/contact.html
index 1ba9ef4c..e972a4ac 100644
--- a/doc/webserver/user-manual/contact.html
+++ b/doc/webserver/user-manual/contact.html
@@ -102,13 +102,13 @@ NAME="CONTACT-SUPPORT"
 ><P
 > For casual users, our 
  <A
-HREF="http://sourceforge.net/tracker/?group_id=11118&atid=211118"
+HREF="http://sourceforge.net/tracker/?group_id=11118&#38;atid=211118"
 TARGET="_top"
 >support forum at SourceForge</A
 >
  is probably best suited:
  <A
-HREF="http://sourceforge.net/tracker/?group_id=11118&atid=211118"
+HREF="http://sourceforge.net/tracker/?group_id=11118&#38;atid=211118"
 TARGET="_top"
 >http://sourceforge.net/tracker/?group_id=11118&#38;atid=211118</A
 ></P
@@ -120,6 +120,9 @@ TARGET="_top"
  mailing list</A
 >, where the developers also hang around.</P
 ><P
+> Please don't sent private support requests to individual Privoxy
+ developers, either use the mailing lists or the support trackers.</P
+><P
 > Note that the Privoxy mailing lists are moderated. Posts from unsubscribed
  addresses have to be accepted manually by a moderator. This may cause a
  delay of several days and if you use a subject that doesn't clearly
@@ -192,7 +195,7 @@ CLASS="FILENAME"
 >default.action</TT
 > file, to 
  <A
-HREF="http://sourceforge.net/tracker/?group_id=11118&atid=460288"
+HREF="http://sourceforge.net/tracker/?group_id=11118&#38;atid=460288"
 TARGET="_top"
 > http://sourceforge.net/tracker/?group_id=11118&#38;atid=460288</A
 >,
@@ -229,7 +232,7 @@ NAME="CONTACT-BUGS"
 ><P
 > Please report all bugs through our bug tracker: 
  <A
-HREF="http://sourceforge.net/tracker/?group_id=11118&atid=111118"
+HREF="http://sourceforge.net/tracker/?group_id=11118&#38;atid=111118"
 TARGET="_top"
 >http://sourceforge.net/tracker/?group_id=11118&#38;atid=111118</A
 >. </P
@@ -242,7 +245,7 @@ CLASS="EMPHASIS"
 ></SPAN
 >
   and observe the additional hints at the top of the <A
-HREF="http://sourceforge.net/tracker/?func=add&group_id=11118&atid=111118"
+HREF="http://sourceforge.net/tracker/?func=add&#38;group_id=11118&#38;atid=111118"
 TARGET="_top"
 >submit
   form</A
@@ -420,7 +423,7 @@ NAME="CONTACT-FEATURE"
 > You are welcome to submit ideas on new features or other proposals
  for improvement through our feature request tracker at
  <A
-HREF="http://sourceforge.net/tracker/?atid=361118&group_id=11118"
+HREF="http://sourceforge.net/tracker/?atid=361118&#38;group_id=11118"
 TARGET="_top"
 >http://sourceforge.net/tracker/?atid=361118&#38;group_id=11118</A
 >.</P
diff --git a/doc/webserver/user-manual/copyright.html b/doc/webserver/user-manual/copyright.html
index 25427c2a..2304bb16 100644
--- a/doc/webserver/user-manual/copyright.html
+++ b/doc/webserver/user-manual/copyright.html
@@ -102,7 +102,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN5092"
+NAME="AEN4927"
 >12.1. License</A
 ></H2
 ><P
@@ -113,28 +113,24 @@ CLASS="APPLICATION"
  redistribute it and/or modify it under the terms of the 
  <I
 CLASS="CITETITLE"
->GNU General Public
- License</I
->, version 2, as published by the Free Software Foundation.</P
+>GNU General Public License</I
+>, version 2,
+ as published by the Free Software Foundation.</P
 ><P
 > This program is distributed in the hope that it will be useful, but WITHOUT
  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the 
- <I
-CLASS="CITETITLE"
->GNU General Public License</I
-> for
- 
- more details, which is available from the Free Software Foundation, Inc, 
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA</P
-><P
-> You should have received a copy of the <A
-HREF="http://www.gnu.org/copyleft/gpl.html"
+ FITNESS FOR A PARTICULAR PURPOSE.  See the <A
+HREF="http://www.gnu.org/licenses/old-licenses/gpl-2.0.html"
 TARGET="_top"
 > <I
 CLASS="CITETITLE"
 >GNU General Public License</I
 ></A
+> for details.</P
+><P
+> You should have received a copy of the <I
+CLASS="CITETITLE"
+>GNU GPL</I
 >
  along with this program; if not, write to the <P
 CLASS="ADDRESS"
@@ -262,6 +258,7 @@ CLASS="LITERALLAYOUT"
 &nbsp;David&nbsp;Schmidt,&nbsp;developer<br>
 &nbsp;<br>
 &nbsp;Hal&nbsp;Burgiss<br>
+&nbsp;Mark&nbsp;Miller<br>
 &nbsp;Gerry&nbsp;Murphy<br>
 &nbsp;Roland&nbsp;Rosenfeld<br>
 &nbsp;Jörg&nbsp;Strohmayer</P
diff --git a/doc/webserver/user-manual/filter-file.html b/doc/webserver/user-manual/filter-file.html
index e85aab72..bfe2b8d1 100644
--- a/doc/webserver/user-manual/filter-file.html
+++ b/doc/webserver/user-manual/filter-file.html
@@ -366,7 +366,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN4619"
+NAME="AEN4453"
 >9.1. Filter File Tutorial</A
 ></H2
 ><P
diff --git a/doc/webserver/user-manual/index.html b/doc/webserver/user-manual/index.html
index 664b73a3..7261ceac 100644
--- a/doc/webserver/user-manual/index.html
+++ b/doc/webserver/user-manual/index.html
@@ -50,7 +50,7 @@ TARGET="_top"
 ><BR></P
 ><P
 CLASS="PUBDATE"
->$Id: user-manual.sgml,v 2.61 2008/02/11 03:41:47 markm68k Exp $<BR></P
+>$Id: user-manual.sgml,v 2.73 2008/05/23 14:43:18 fabiankeil Exp $<BR></P
 ><DIV
 ><DIV
 CLASS="ABSTRACT"
@@ -295,7 +295,7 @@ HREF="configuration.html"
 ><DL
 ><DT
 >6.1. <A
-HREF="configuration.html#AEN817"
+HREF="configuration.html#AEN822"
 >Controlling Privoxy with Your Web Browser</A
 ></DT
 ><DT
@@ -407,6 +407,11 @@ HREF="config.html#DEBUG"
 HREF="config.html#SINGLE-THREADED"
 >single-threaded</A
 ></DT
+><DT
+>7.3.3. <A
+HREF="config.html#HOSTNAME"
+>hostname</A
+></DT
 ></DL
 ></DD
 ><DT
@@ -518,12 +523,12 @@ HREF="actions-file.html"
 ><DL
 ><DT
 >8.1. <A
-HREF="actions-file.html#AEN2275"
+HREF="actions-file.html#AEN2306"
 >Finding the Right Mix</A
 ></DT
 ><DT
 >8.2. <A
-HREF="actions-file.html#AEN2282"
+HREF="actions-file.html#AEN2313"
 >How to Edit</A
 ></DT
 ><DT
@@ -540,12 +545,12 @@ HREF="actions-file.html#AF-PATTERNS"
 ><DL
 ><DT
 >8.4.1. <A
-HREF="actions-file.html#AEN2373"
+HREF="actions-file.html#AEN2404"
 >The Domain Pattern</A
 ></DT
 ><DT
 >8.4.2. <A
-HREF="actions-file.html#AEN2449"
+HREF="actions-file.html#AEN2480"
 >The Path Pattern</A
 ></DT
 ><DT
@@ -689,75 +694,47 @@ HREF="actions-file.html#HIDE-USER-AGENT"
 ></DT
 ><DT
 >8.5.26. <A
-HREF="actions-file.html#INSPECT-JPEGS"
->inspect-jpegs</A
-></DT
-><DT
->8.5.27. <A
-HREF="actions-file.html#KILL-POPUPS"
->kill-popups<A
-NAME="KILL-POPUP"
-></A
-></A
-></DT
-><DT
->8.5.28. <A
 HREF="actions-file.html#LIMIT-CONNECT"
 >limit-connect</A
 ></DT
 ><DT
->8.5.29. <A
+>8.5.27. <A
 HREF="actions-file.html#PREVENT-COMPRESSION"
 >prevent-compression</A
 ></DT
 ><DT
->8.5.30. <A
+>8.5.28. <A
 HREF="actions-file.html#OVERWRITE-LAST-MODIFIED"
 >overwrite-last-modified</A
 ></DT
 ><DT
->8.5.31. <A
+>8.5.29. <A
 HREF="actions-file.html#REDIRECT"
 >redirect</A
 ></DT
 ><DT
->8.5.32. <A
-HREF="actions-file.html#SEND-VANILLA-WAFER"
->send-vanilla-wafer</A
-></DT
-><DT
->8.5.33. <A
-HREF="actions-file.html#SEND-WAFER"
->send-wafer</A
-></DT
-><DT
->8.5.34. <A
+>8.5.30. <A
 HREF="actions-file.html#SERVER-HEADER-FILTER"
 >server-header-filter</A
 ></DT
 ><DT
->8.5.35. <A
+>8.5.31. <A
 HREF="actions-file.html#SERVER-HEADER-TAGGER"
 >server-header-tagger</A
 ></DT
 ><DT
->8.5.36. <A
+>8.5.32. <A
 HREF="actions-file.html#SESSION-COOKIES-ONLY"
 >session-cookies-only</A
 ></DT
 ><DT
->8.5.37. <A
+>8.5.33. <A
 HREF="actions-file.html#SET-IMAGE-BLOCKER"
 >set-image-blocker</A
 ></DT
 ><DT
->8.5.38. <A
-HREF="actions-file.html#TREAT-FORBIDDEN-CONNECTS-LIKE-BLOCKS"
->treat-forbidden-connects-like-blocks</A
-></DT
-><DT
->8.5.39. <A
-HREF="actions-file.html#AEN4263"
+>8.5.34. <A
+HREF="actions-file.html#AEN4101"
 >Summary</A
 ></DT
 ></DL
@@ -776,12 +753,12 @@ HREF="actions-file.html#ACT-EXAMPLES"
 ><DL
 ><DT
 >8.7.1. <A
-HREF="actions-file.html#AEN4328"
+HREF="actions-file.html#AEN4164"
 >default.action</A
 ></DT
 ><DT
 >8.7.2. <A
-HREF="actions-file.html#AEN4464"
+HREF="actions-file.html#AEN4298"
 >user.action</A
 ></DT
 ></DL
@@ -797,7 +774,7 @@ HREF="filter-file.html"
 ><DL
 ><DT
 >9.1. <A
-HREF="filter-file.html#AEN4619"
+HREF="filter-file.html#AEN4453"
 >Filter File Tutorial</A
 ></DT
 ><DT
@@ -865,7 +842,7 @@ HREF="copyright.html"
 ><DL
 ><DT
 >12.1. <A
-HREF="copyright.html#AEN5092"
+HREF="copyright.html#AEN4927"
 >License</A
 ></DT
 ><DT
@@ -899,7 +876,7 @@ HREF="appendix.html#REGEX"
 ></DT
 ><DT
 >14.2. <A
-HREF="appendix.html#AEN5349"
+HREF="appendix.html#AEN5184"
 >Privoxy's Internal Pages</A
 ></DT
 ><DD
diff --git a/doc/webserver/user-manual/installation.html b/doc/webserver/user-manual/installation.html
index 76c53b03..88e5b27c 100644
--- a/doc/webserver/user-manual/installation.html
+++ b/doc/webserver/user-manual/installation.html
@@ -384,14 +384,9 @@ CLASS="LITERAL"
 >/Library/StartupItems/Privoxy</TT
 >. </P
 ><P
-> To manually start or stop the privoxy service, download and install the
- <A
-HREF="https://sourceforge.net/project/showfiles.php?group_id=11118&package_id=29783"
-TARGET="_top"
->Privoxy Utility</A
-> for Mac OS X.
- This application controls the privoxy service (e.g. starting and
- stopping the service as well as uninstalling the software).</P
+> To manually start or stop the privoxy service, use the Privoxy Utility
+ for Mac OS X.  This application controls the privoxy service (e.g.
+ starting and stopping the service as well as uninstalling the software).</P
 ></DIV
 ><DIV
 CLASS="SECT3"
@@ -506,7 +501,7 @@ CLASS="APPLICATION"
 > sources
  is to download the source tarball from our 
  <A
-HREF="http://sourceforge.net/project/showfiles.php?group_id=11118&package_id=10571"
+HREF="http://sourceforge.net/project/showfiles.php?group_id=11118&#38;package_id=10571"
 TARGET="_top"
 >project download
  page</A
@@ -978,7 +973,7 @@ NAME="INSTALLATION-KEEPUPDATED"
 HREF="actions-file.html"
 >actions file</A
 > (as a <A
-HREF="http://sourceforge.net/project/showfiles.php?group_id=11118&release_id=103670"
+HREF="http://sourceforge.net/project/showfiles.php?group_id=11118&#38;release_id=103670"
 TARGET="_top"
 >separate
  package</A
diff --git a/doc/webserver/user-manual/quickstart.html b/doc/webserver/user-manual/quickstart.html
index 4f756f15..365652b5 100644
--- a/doc/webserver/user-manual/quickstart.html
+++ b/doc/webserver/user-manual/quickstart.html
@@ -727,7 +727,7 @@ CLASS="GUIBUTTON"
 >  <DIV
 CLASS="FIGURE"
 ><A
-NAME="AEN569"
+NAME="AEN568"
 ></A
 ><P
 ><B
diff --git a/doc/webserver/user-manual/seealso.html b/doc/webserver/user-manual/seealso.html
index cde3da41..55aaa3fa 100644
--- a/doc/webserver/user-manual/seealso.html
+++ b/doc/webserver/user-manual/seealso.html
@@ -198,7 +198,7 @@ BORDER="0"
 ><TR
 ><TD
 >   <A
-HREF="http://sourceforge.net/tracker/?group_id=11118&atid=460288"
+HREF="http://sourceforge.net/tracker/?group_id=11118&#38;atid=460288"
 TARGET="_top"
 >http://sourceforge.net/tracker/?group_id=11118&#38;atid=460288</A
 >, to submit <SPAN
diff --git a/doc/webserver/user-manual/startup.html b/doc/webserver/user-manual/startup.html
index ab268702..2deb978b 100644
--- a/doc/webserver/user-manual/startup.html
+++ b/doc/webserver/user-manual/startup.html
@@ -114,7 +114,7 @@ CLASS="APPLICATION"
 >  <DIV
 CLASS="FIGURE"
 ><A
-NAME="AEN624"
+NAME="AEN623"
 ></A
 ><P
 ><B
@@ -251,7 +251,7 @@ CLASS="EMPHASIS"
 >  <DIV
 CLASS="FIGURE"
 ><A
-NAME="AEN669"
+NAME="AEN668"
 ></A
 ><P
 ><B
@@ -490,6 +490,28 @@ NAME="START-MACOSX"
 >5.6. Mac OS X</A
 ></H2
 ><P
+>  After downloading the privoxy software, unzip the downloaded file by
+  double-clicking on the zip file icon.  Then, double-click on the
+  installer package icon and follow the installation process.</P
+><P
+>  The privoxy service will automatically start after a successful
+  installation.  In addition, the privoxy service will automatically
+  start every time your computer starts up.</P
+><P
+>  To prevent the privoxy service from automatically starting when your
+  computer starts up, remove or rename the folder named
+  /Library/StartupItems/Privoxy.</P
+><P
+>  A simple application named Privoxy Utility has been created which
+  enables administrators to easily start and stop the privoxy service.</P
+><P
+>  In addition, the Privoxy Utility presents a simple way for
+  administrators to edit the various privoxy config files.  A method
+  to uninstall the software is also available.</P
+><P
+>  An administrator username and password must be supplied in order for
+  the Privoxy Utility to perform any of the tasks.</P
+><P
 > During installation, <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN