Change for crunch-cookie actions, and other small changes.

diff --git a/doc/source/privoxy-man-page.sgml b/doc/source/privoxy-man-page.sgml
index dabab05..026f511 100644 (file)
--- a/doc/source/privoxy-man-page.sgml
+++ b/doc/source/privoxy-man-page.sgml
@@ -5,7 +5,7 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
                 
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
                 

- $Id: privoxy-man-page.sgml,v 1.11 2002/05/05 20:26:02 hal9 Exp $
+ $Id: privoxy-man-page.sgml,v 1.12 2002/05/10 01:48:20 hal9 Exp $

 
  Copyright (C) 2001, 2002 Privoxy Developers <developers@privoxy.org>
  See LICENSE.
 
  Copyright (C) 2001, 2002 Privoxy Developers <developers@privoxy.org>
  See LICENSE.


@@ -53,7 +53,7 @@
 
 <refentry id="privoxy">
 <refentryinfo>
 
 <refentry id="privoxy">
 <refentryinfo>

- <date>2002-04-11</date>
+ <date>2002-05-14</date>

 </refentryinfo>
 <refmeta>
  <refentrytitle>privoxy</refentrytitle> 
 </refentryinfo>
 <refmeta>
  <refentrytitle>privoxy</refentrytitle> 


@@ -218,11 +218,11 @@
  versions, and is subject to change as development progresses. In fact, the
  configuration itself is changed  and  much more sophisticated. See the
  <ulink url="http://www.privoxy.org/user-manual/">user-manual</ulink> for a
  versions, and is subject to change as development progresses. In fact, the
  configuration itself is changed  and  much more sophisticated. See the
  <ulink url="http://www.privoxy.org/user-manual/">user-manual</ulink> for a

- brief explanation of all configuration options. 
+ complete explanation of all configuration options and general usage.

 </para>
 <para>
  The actions list (ad blocks, etc) can also be configured with your
 </para>
 <para>
  The actions list (ad blocks, etc) can also be configured with your

- web browser at <ulink url="http://ijbswa.sourceforge.net/config">http://ijbswa.sourceforge.net/config</ulink>.
+ web browser at <ulink url="http://config.privoxy.org/">http://config.privoxy.org/</ulink>.

  <command>Privoxy's</command> configuration parameters  can also  be viewed at
  the same page. In addition, <command>Privoxy</command> can be toggled on/off.
  This is an internal page.
  <command>Privoxy's</command> configuration parameters  can also  be viewed at
  the same page. In addition, <command>Privoxy</command> can be toggled on/off.
  This is an internal page.


@@ -242,8 +242,8 @@
  {{alias}}
 
  # Useful aliases
  {{alias}}
 
  # Useful aliases

- +prevent-cookies = +prevent-setting-cookies +prevent-reading-cookies
- -prevent-cookies = -prevent-setting-cookies -prevent-reading-cookies
+ +crunch-cookies = +crunch-incoming-cookies +crunch-outgoing-cookies
+ -crunch-cookies = -crunch-incoming-cookies -crunch-outgoing-cookies

  +imageblock      = +block +handle-as-image
 
  # Fragile sites should have the minimum changes
  +imageblock      = +block +handle-as-image
 
  # Fragile sites should have the minimum changes


@@ -271,13 +271,13 @@
  -limit-connect \
  +prevent-compression \
  +session-cookies-only \
  -limit-connect \
  +prevent-compression \
  +session-cookies-only \

- +prevent-reading-cookies \
- +prevent-setting-cookies \
+ -crunch-cookies \

  -kill-popups \
  }
  -kill-popups \
  }

- /   # Match all URLs
+ /   # '/' Matches *all* URL patterns

  
  # Block, and treat these URL patterns as if they were 'images'.
  
  # Block, and treat these URL patterns as if they were 'images'.

+ # We would expect these to be ads.

  {+imageblock}
   .ad.doubleclick.net
   .a[0-9].yimg.com/(?:(?!/i/).)*$
  {+imageblock}
   .ad.doubleclick.net
   .a[0-9].yimg.com/(?:(?!/i/).)*$


@@ -289,11 +289,10 @@
   .*ads.
   banner?.
   /.*count(er)?\.(pl|cgi|exe|dll|asp|php[34]?)
   .*ads.
   banner?.
   /.*count(er)?\.(pl|cgi|exe|dll|asp|php[34]?)

-  /(?:.*/)?(publicite|werbung|rekla(ma|me|am)|maino(kset|nta|s)?)/

   .hitbox.com 
 
  # Make exceptions for these harmless ones that would be 
   .hitbox.com 
 
  # Make exceptions for these harmless ones that would be 

- # caught by +block above.
+ # caught by our +block patterns just above.

  {-block}
   adsl.
   advice.
  {-block}
   adsl.
   advice.


@@ -307,14 +306,21 @@
 </para>
 
 <literallayout>
 </para>
 
 <literallayout>

+ # 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 #######
 
  # Set personal exceptions to the policies in default.action #######
 

- # Sites where we want persistant cookies
- {-prevent-reading-cookies -prevent-setting-cookies -session-cookies-only}
+ # Sites where we want persistant cookies, so allow *all* cookies
+ {-crunch-cookies -session-cookies-only}

   .redhat.com
   .sun.com
   .msdn.microsoft.com
  
   .redhat.com
   .sun.com
   .msdn.microsoft.com
  

+ # This site breaks easily.

  {-block -fast-redirects}
   .forbes.com
 
  {-block -fast-redirects}
   .forbes.com
 


@@ -348,7 +354,7 @@
 <para>
  Various other files should be included, but may vary depending on platform
  and build configuration. More documentation should be included in the local
 <para>
  Various other files should be included, but may vary depending on platform
  and build configuration. More documentation should be included in the local

- documentation directory, though is not complete at this time.
+ documentation directory.

 </para>
 
 </refsect1>
 </para>
 
 </refsect1>

diff --git a/privoxy.1 b/privoxy.1
index 6382e44..19cc5e2 100644 (file)
--- a/privoxy.1
+++ b/privoxy.1
@@ -3,7 +3,7 @@
 .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
 .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.

-.TH "PRIVOXY" "1" "09 May 2002" "Privoxy 2.9.15 beta" ""
+.TH "PRIVOXY" "1" "14 May 2002" "Privoxy 2.9.15 beta" ""

 .SH NAME
 privoxy \- Privacy Enhancing Proxy
 .SH SYNOPSIS
 .SH NAME
 privoxy \- Privacy Enhancing Proxy
 .SH SYNOPSIS


@@ -95,10 +95,10 @@ The name and number of configuration files has changed from previous
 versions, and is subject to change as development progresses. In fact, the
 configuration itself is changed  and  much more sophisticated. See the
 user-manual for a
 versions, and is subject to change as development progresses. In fact, the
 configuration itself is changed  and  much more sophisticated. See the
 user-manual for a

-brief explanation of all configuration options. 
+complete explanation of all configuration options and general usage.

 .PP
 The actions list (ad blocks, etc) can also be configured with your
 .PP
 The actions list (ad blocks, etc) can also be configured with your

-web browser at http://ijbswa.sourceforge.net/config.
+web browser at http://config.privoxy.org/.

 \fBPrivoxy's\fR configuration parameters  can also  be viewed at
 the same page. In addition, \fBPrivoxy\fR can be toggled on/off.
 This is an internal page.
 \fBPrivoxy's\fR configuration parameters  can also  be viewed at
 the same page. In addition, \fBPrivoxy\fR can be toggled on/off.
 This is an internal page.


@@ -112,8 +112,8 @@ configuration might look like:
  {{alias}}
 
  # Useful aliases
  {{alias}}
 
  # Useful aliases

- +prevent-cookies = +prevent-setting-cookies +prevent-reading-cookies
- -prevent-cookies = -prevent-setting-cookies -prevent-reading-cookies
+ +crunch-cookies = +crunch-incoming-cookies +crunch-outgoing-cookies
+ -crunch-cookies = -crunch-incoming-cookies -crunch-outgoing-cookies

  +imageblock      = +block +handle-as-image
 
  # Fragile sites should have the minimum changes
  +imageblock      = +block +handle-as-image
 
  # Fragile sites should have the minimum changes


@@ -141,13 +141,13 @@ configuration might look like:
  -limit-connect \\
  +prevent-compression \\
  +session-cookies-only \\
  -limit-connect \\
  +prevent-compression \\
  +session-cookies-only \\

- +prevent-reading-cookies \\
- +prevent-setting-cookies \\
+ -crunch-cookies \\

  -kill-popups \\
  }
  -kill-popups \\
  }

- /   # Match all URLs
+ /   # '/' Matches *all* URL patterns

  
  # Block, and treat these URL patterns as if they were 'images'.
  
  # Block, and treat these URL patterns as if they were 'images'.

+ # We would expect these to be ads.

  {+imageblock}
   .ad.doubleclick.net
   .a[0-9].yimg.com/(?:(?!/i/).)*$
  {+imageblock}
   .ad.doubleclick.net
   .a[0-9].yimg.com/(?:(?!/i/).)*$


@@ -159,11 +159,10 @@ configuration might look like:
   .*ads.
   banner?.
   /.*count(er)?\\.(pl|cgi|exe|dll|asp|php[34]?)
   .*ads.
   banner?.
   /.*count(er)?\\.(pl|cgi|exe|dll|asp|php[34]?)

-  /(?:.*/)?(publicite|werbung|rekla(ma|me|am)|maino(kset|nta|s)?)/

   .hitbox.com 
 
  # Make exceptions for these harmless ones that would be 
   .hitbox.com 
 
  # Make exceptions for these harmless ones that would be 

- # caught by +block above.
+ # caught by our +block patterns just above.

  {-block}
   adsl.
   advice.
  {-block}
   adsl.
   advice.


@@ -174,14 +173,21 @@ Then for a \fIuser.action\fR, we would put local,
 narrowly defined exceptions:
 
 .nf
 narrowly defined exceptions:
 
 .nf

+ # 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 #######
 
  # Set personal exceptions to the policies in default.action #######
 

- # Sites where we want persistant cookies
- {-prevent-reading-cookies -prevent-setting-cookies -session-cookies-only}
+ # Sites where we want persistant cookies, so allow *all* cookies
+ {-crunch-cookies -session-cookies-only}

   .redhat.com
   .sun.com
   .msdn.microsoft.com
  
   .redhat.com
   .sun.com
   .msdn.microsoft.com
  

+ # This site breaks easily.

  {-block -fast-redirects}
   .forbes.com
 .fi
  {-block -fast-redirects}
   .forbes.com
 .fi


@@ -207,7 +213,7 @@ configuration options.
 .PP
 Various other files should be included, but may vary depending on platform
 and build configuration. More documentation should be included in the local
 .PP
 Various other files should be included, but may vary depending on platform
 and build configuration. More documentation should be included in the local

-documentation directory, though is not complete at this time.
+documentation directory.

 .SH "SIGNALS"
 .PP
 \fBPrivoxy\fR terminates on the \fBSIGINT\fR,
 .SH "SIGNALS"
 .PP
 \fBPrivoxy\fR terminates on the \fBSIGINT\fR,