Explicitly list all %config files, like RH spec. Set noreplace flag for config

[privoxy.git] / privoxy.1

diff --git a/privoxy.1 b/privoxy.1
index 6382e44..d324c06 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>.
-.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
@@ -31,7 +31,7 @@ leader, don't detach from controlling tty, and do all logging there.
 \fB--pidfile \fIpidfile\fB\fR
 On startup, write the process ID to \fIpidfile\fR.
 Delete the \fIpidfile\fR on exit.
-Failiure to create or delete the \fIpidfile\fR
+Failure to create or delete the \fIpidfile\fR
 is non-fatal. If no \fB--pidfile\fR option is given, no PID file will be used.
 .TP
 \fB--user \fIuser[.group]\fB\fR
@@ -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
-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
-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.
@@ -112,8 +112,8 @@ configuration might look like:
  {{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
@@ -141,13 +141,13 @@ configuration might look like:
  -limit-connect \\
  +prevent-compression \\
  +session-cookies-only \\
- +prevent-reading-cookies \\
- +prevent-setting-cookies \\
+ -crunch-cookies \\
  -kill-popups \\
  }
- /   # Match all URLs
+ /   # '/' Matches *all* URL patterns
  
  # 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/).)*$
@@ -159,11 +159,10 @@ configuration might look like:
   .*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 
- # caught by +block above.
+ # caught by our +block patterns just above.
  {-block}
   adsl.
   advice.
@@ -174,14 +173,21 @@ Then for a \fIuser.action\fR, we would put local,
 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 #######
 
- # 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
  
+ # This site breaks easily.
  {-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
-documentation directory, though is not complete at this time.
+documentation directory.
 .SH "SIGNALS"
 .PP
 \fBPrivoxy\fR terminates on the \fBSIGINT\fR,