Updated for recent changes to the main man page.

diff --git a/doc/webserver/man-page/privoxy-man-page.html b/doc/webserver/man-page/privoxy-man-page.html
index 659c288..789a202 100644 (file)
--- a/doc/webserver/man-page/privoxy-man-page.html
+++ b/doc/webserver/man-page/privoxy-man-page.html
@@ -90,13 +90,7 @@ or <B>Privoxy</B> can be combined with a packet
 filter to build an intercepting proxy
 (see <I>config</I>).  The default setting is  for
 localhost,  on port  8118 (configurable in the main config file).  To set the
 filter to build an intercepting proxy
 (see <I>config</I>).  The default setting is  for
 localhost,  on port  8118 (configurable in the main config file).  To set the

-HTTP proxy in Netscape and Mozilla, go through:  <B>Edit</B>;
-<B>Preferences</B>;  <B>Advanced</B>;
-<B>Proxies</B>;  <B>Manual Proxy Configuration</B>;
-<B>View</B>. 
-<P>
-
-For Firefox, go through: <B>Tools</B>; 
+HTTP proxy in Firefox, go through: <B>Tools</B>; 

 <B>Options</B>; <B>General</B>;
 <B>Connection Settings</B>;
 <B>Manual Proxy Configuration</B>. 
 <B>Options</B>; <B>General</B>;
 <B>Connection Settings</B>;
 <B>Manual Proxy Configuration</B>. 


@@ -122,12 +116,12 @@ For other browsers, check the documentation.
 
 <B>Privoxy</B> can be configured with the various configuration
 files. The default configuration files are: <I>config</I>,
 
 <B>Privoxy</B> can be configured with the various configuration
 files. The default configuration files are: <I>config</I>,

-<I>default.filter</I>, and
+<I>default.filter</I>, <I>default.action</I> and

 <I>default.action</I>. <I>user.action</I> should 
 <I>default.action</I>. <I>user.action</I> should 

-be used for locally defined exceptions to the default rules of
-<I>default.action</I>, and <I>user.filter</I> for 
-locally defined filters. These are well commented.  On Unix
-and Unix-like systems, these are located in
+be used for locally defined exceptions to the default rules in
+<I>match-all.action</I> and <I>default.action</I>,
+and <I>user.filter</I> for locally defined filters. These are
+well commented.  On Unix and Unix-like systems, these are located in

 <I>/etc/privoxy/</I> by default. 
 <P>
 
 <I>/etc/privoxy/</I> by default. 
 <P>
 


@@ -152,112 +146,6 @@ See the <I>User Manual</I> for a detailed
 explanation of installation, general usage, all configuration options, new
 features and notes on upgrading.
 <A NAME="lbAH">&nbsp;</A>
 explanation of installation, general usage, all configuration options, new
 features and notes on upgrading.
 <A NAME="lbAH">&nbsp;</A>

-<H2>SAMPLE CONFIGURATION</H2>
-
-<P>
-
-A brief example of what a simple <I>default.action</I>
-configuration might look like:
-<P>
-<PRE>
- # Define a few useful custom aliases for later use
- {{alias}}
-
- # Useful aliases that combine more than one action
- +crunch-cookies = +crunch-incoming-cookies +crunch-outgoing-cookies
- -crunch-cookies = -crunch-incoming-cookies -crunch-outgoing-cookies
- +block-as-image = +block +handle-as-image
-
- # Fragile sites should have the minimum changes
- fragile     = -block -deanimate-gifs -fast-redirects -filter \
-               -hide-referer -prevent-cookies
-
- ## Turn some actions on ################################
- ## NOTE: Actions are off by default, unless explictily turned on 
- ## otherwise with the '+' operator.
-
-{ \
-+change-x-forwarded-for{block} \
-+deanimate-gifs{last} \
-+filter{refresh-tags} \
-+filter{img-reorder} \
-+filter{banners-by-size} \
-+filter{webbugs} \
-+filter{jumping-windows} \
-+filter{ie-exploits} \
-+hide-from-header{block} \
-+hide-referrer{conditional-block} \
-+session-cookies-only \
-+set-image-blocker{pattern} \
-}
-/ # '/' Match *all* URL patterns
-
- 
- # Block all URLs that match these patterns
- { +block }
-  ad.
-  ad[sv].
-  .*ads.
-  banner?.
-  /.*count(er)?\.(pl|cgi|exe|dll|asp|php[34]?)
-  .hitbox.com 
-  media./.*(ads|banner)
-
- # Block, and treat these URL patterns as if they were 'images'.
- # We would expect these to be ads.
- { +block-as-image }
-  .ad.doubleclick.net
-  .a[0-9].yimg.com/(?:(?!/i/).)*$
-  ad.*.doubleclick.net
-
- # Make exceptions for these harmless ones that would be 
- # caught by our +block patterns just above.
- { -block }
-  adsl.
-  adobe.
-  advice.
-  .*downloads.
-  # uploads or downloads
-  /.*loads
-</PRE>
-
-<P>
-
-Then for a <I>user.action</I>, we would put local,
-narrowly defined exceptions:
-<P>
-<PRE>
- # Re-define aliases as needed here
- {{alias}}
-
- # Useful aliases
- -crunch-cookies = -crunch-incoming-cookies -crunch-outgoing-cookies
- 
- # Set personal exceptions to the policies in default.action #######
-
- # Sites where we want persistent cookies, so allow *all* cookies
- { -crunch-cookies -session-cookies-only }
-  .redhat.com
-  .sun.com
-  .msdn.microsoft.com
- 
- # These sites break easily. Use our &quot;fragile&quot; alias here.
- { fragile }
-  .forbes.com
-  mybank.example.com
-
- # Replace example.com's style sheet with one of my choosing
- { +redirect{<A HREF="http://localhost/css-replacements/example.com.css}">http://localhost/css-replacements/example.com.css}</A> }
-  .example.com/stylesheet.css
-</PRE>
-
-<P>
-
-See the comments in the configuration files themselves, or the 
-<I>User Manual</I>
-for full explanations of the above syntax, and other <B>Privoxy</B>
-configuration options.
-<A NAME="lbAI">&nbsp;</A>

 <H2>FILES</H2>
 
 <P>
 <H2>FILES</H2>
 
 <P>


@@ -280,7 +168,7 @@ configuration options.
 Various other files should be included, but may vary depending on platform
 and build configuration. Additional documentation should be included in the local
 documentation directory.
 Various other files should be included, but may vary depending on platform
 and build configuration. Additional documentation should be included in the local
 documentation directory.

-<A NAME="lbAJ">&nbsp;</A>
+<A NAME="lbAI">&nbsp;</A>

 <H2>SIGNALS</H2>
 
 <P>
 <H2>SIGNALS</H2>
 
 <P>


@@ -292,14 +180,14 @@ rotation scripts may cause a re-opening of the logfile by sending a
 other daemons,  <B>Privoxy</B> does not need to be made aware of
 config file changes by <B>SIGHUP</B> -- it will detect them
 automatically. 
 other daemons,  <B>Privoxy</B> does not need to be made aware of
 config file changes by <B>SIGHUP</B> -- it will detect them
 automatically. 

-<A NAME="lbAK">&nbsp;</A>
+<A NAME="lbAJ">&nbsp;</A>

 <H2>NOTES</H2>
 
 <P>
 
 Please see the <I>User Manual</I> on how to contact the
 developers, for feature requests, reporting problems, and other questions.
 <H2>NOTES</H2>
 
 <P>
 
 Please see the <I>User Manual</I> on how to contact the
 developers, for feature requests, reporting problems, and other questions.

-<A NAME="lbAL">&nbsp;</A>
+<A NAME="lbAK">&nbsp;</A>

 <H2>SEE ALSO</H2>
 
 <P>
 <H2>SEE ALSO</H2>
 
 <P>


@@ -326,27 +214,9 @@ running for this to work. Shortcut: <A HREF="http://p.p/">http://p.p/</A>
 <A HREF="https://sourceforge.net/tracker/?group_id=11118">https://sourceforge.net/tracker/?group_id=11118</A>&amp;atid=460288, to submit ``misses'' and other
 configuration related suggestions to the developers. 
 <P>
 <A HREF="https://sourceforge.net/tracker/?group_id=11118">https://sourceforge.net/tracker/?group_id=11118</A>&amp;atid=460288, to submit ``misses'' and other
 configuration related suggestions to the developers. 
 <P>

-<A HREF="http://www.junkbusters.com/ht/en/cookies.html">http://www.junkbusters.com/ht/en/cookies.html,</A>
-an explanation how cookies are used to track web users.
-<P>
-<A HREF="http://www.junkbusters.com/ijb.html">http://www.junkbusters.com/ijb.html,</A>
-the original Internet Junkbuster.
-<P>
-<A HREF="http://www.squid-cache.org/">http://www.squid-cache.org/,</A> a popular
-caching proxy, which is often used together with <B>Privoxy</B>.
-<P>
-<A HREF="http://www.pps.jussieu.fr/~jch/software/polipo/">http://www.pps.jussieu.fr/~jch/software/polipo/,</A>
-<B>Polipo</B> is a caching proxy with advanced features
-like pipelining, multiplexing and caching of partial instances. In many setups
-it can be used as <B>Squid</B> replacement.
-<P>
-<A HREF="https://www.torproject.org/">https://www.torproject.org/,</A> 
-<B>Tor</B> can help anonymize web browsing, 
-web publishing, instant messaging, IRC, SSH, and other applications.
-<P>

 <A HREF="http://www.privoxy.org/developer-manual/">http://www.privoxy.org/developer-manual/,</A> 
 the <B>Privoxy</B> developer manual. 
 <A HREF="http://www.privoxy.org/developer-manual/">http://www.privoxy.org/developer-manual/,</A> 
 the <B>Privoxy</B> developer manual. 

-<A NAME="lbAM">&nbsp;</A>
+<A NAME="lbAL">&nbsp;</A>

 <H2>DEVELOPMENT TEAM</H2>
 
 <P>
 <H2>DEVELOPMENT TEAM</H2>
 
 <P>


@@ -362,10 +232,10 @@ the <B>Privoxy</B> developer manual.
  J&ouml;rg Strohmayer
 </PRE>
 
  J&ouml;rg Strohmayer
 </PRE>
 

-<A NAME="lbAN">&nbsp;</A>
+<A NAME="lbAM">&nbsp;</A>

 <H2>COPYRIGHT AND LICENSE</H2>
 
 <H2>COPYRIGHT AND LICENSE</H2>
 

-<A NAME="lbAO">&nbsp;</A>
+<A NAME="lbAN">&nbsp;</A>

 <H3>COPYRIGHT</H3>
 
 <P>
 <H3>COPYRIGHT</H3>
 
 <P>


@@ -376,7 +246,7 @@ Copyright (C) 2001-2009 by Privoxy Developers &lt;<A HREF="mailto:ijbswa-develop
 Some source code is based on code Copyright (C) 1997 by Anonymous Coders
 and Junkbusters, Inc. and licensed under the <I>GNU General Public
 License</I>.
 Some source code is based on code Copyright (C) 1997 by Anonymous Coders
 and Junkbusters, Inc. and licensed under the <I>GNU General Public
 License</I>.

-<A NAME="lbAP">&nbsp;</A>
+<A NAME="lbAO">&nbsp;</A>

 <H3>LICENSE</H3>
 
 <P>
 <H3>LICENSE</H3>
 
 <P>


@@ -408,22 +278,21 @@ USA
 <DT><A HREF="#lbAE">DESCRIPTION</A><DD>
 <DT><A HREF="#lbAF">INSTALLATION AND USAGE</A><DD>
 <DT><A HREF="#lbAG">CONFIGURATION</A><DD>
 <DT><A HREF="#lbAE">DESCRIPTION</A><DD>
 <DT><A HREF="#lbAF">INSTALLATION AND USAGE</A><DD>
 <DT><A HREF="#lbAG">CONFIGURATION</A><DD>

-<DT><A HREF="#lbAH">SAMPLE CONFIGURATION</A><DD>
-<DT><A HREF="#lbAI">FILES</A><DD>
-<DT><A HREF="#lbAJ">SIGNALS</A><DD>
-<DT><A HREF="#lbAK">NOTES</A><DD>
-<DT><A HREF="#lbAL">SEE ALSO</A><DD>
-<DT><A HREF="#lbAM">DEVELOPMENT TEAM</A><DD>
-<DT><A HREF="#lbAN">COPYRIGHT AND LICENSE</A><DD>
+<DT><A HREF="#lbAH">FILES</A><DD>
+<DT><A HREF="#lbAI">SIGNALS</A><DD>
+<DT><A HREF="#lbAJ">NOTES</A><DD>
+<DT><A HREF="#lbAK">SEE ALSO</A><DD>
+<DT><A HREF="#lbAL">DEVELOPMENT TEAM</A><DD>
+<DT><A HREF="#lbAM">COPYRIGHT AND LICENSE</A><DD>

 <DL>
 <DL>

-<DT><A HREF="#lbAO">COPYRIGHT</A><DD>
-<DT><A HREF="#lbAP">LICENSE</A><DD>
+<DT><A HREF="#lbAN">COPYRIGHT</A><DD>
+<DT><A HREF="#lbAO">LICENSE</A><DD>

 </DL>
 </DL>
 <HR>
 This document was created by
 man2html,
 using the manual pages.<BR>
 </DL>
 </DL>
 <HR>
 This document was created by
 man2html,
 using the manual pages.<BR>

-Time: 18:45:33 GMT, February 15, 2009
+Time: 20:29:58 GMT, February 15, 2009

 </BODY>
 </HTML>
 </BODY>
 </HTML>