Fix ijbswa cvs links. Update notes on release process, and which config files

[privoxy.git] / privoxy.1

diff --git a/privoxy.1 b/privoxy.1
index 120033d..de4b32a 100644 (file)
--- a/privoxy.1
+++ b/privoxy.1
@@ -3,15 +3,12 @@
 .\" <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" "01 September 2006" "Privoxy 3.0.4 beta" ""
+.TH "PRIVOXY" "1" "05 September 2006" "Privoxy 3.0.4 beta" ""
 .SH NAME
 privoxy \- Privacy Enhancing Proxy
 .SH SYNOPSIS
 
-\fBprivoxy\fR [\fB--help\fR ] [\fB--version\fR ] [\fB--no-daemon\fR ] [\fB--pidfile \fIpidfile\fB\fR ] [\fB--user \fIuser[.group]\fB\fR ] [\fB--chroot\fR ] [\fB\fIconfigfile\fB\fR ]\fB (UNIX)\fR
-
-
-\fBprivoxy.exe\fR [\fB\fIconfigfile\fB\fR ]\fB (Windows)\fR
+\fBprivoxy\fR [\fB--help\fR ] [\fB--version\fR ] [\fB--no-daemon\fR ] [\fB--pidfile \fIpidfile\fB\fR ] [\fB--user \fIuser[.group]\fB\fR ] [\fB--chroot\fR ] [\fB\fIconfigfile\fB\fR ]
 
 .SH "OPTIONS"
 .PP
@@ -52,8 +49,7 @@ that hierarchy.
 .PP
 If the \fIconfigfile\fR is not specified on  the  command  line,
 \fBPrivoxy\fR  will  look for a file named
-\fIconfig\fR in the current directory (except on Win32 where
-it will try \fIconfig.txt\fR). If no
+\fIconfig\fR in the current directory . If no
 \fIconfigfile\fR is found, \fBPrivoxy\fR will 
 fail to start.
 .SH "DESCRIPTION"
@@ -78,6 +74,11 @@ and Mozilla, go through:  \fBEdit\fR;
 \fBProxies\fR;  \fBManual Proxy Configuration\fR;
 \fBView\fR. 
 .PP
+For Firefox, go through: \fBTools\fR; 
+\fBOptions\fR; \fBGeneral\fR;
+\fBConnection Settings\fR;
+\fBManual Proxy Configuration\fR. 
+.PP
 For Internet Explorer, go through: \fBTools\fR; 
 \fBInternet Properties\fR; \fBConnections\fR;
 \fBLAN Settings\fR. 
@@ -99,11 +100,9 @@ be used for locally defined exceptions to the default rules of
 \fIdefault.action\fR, and \fIuser.filter\fR for 
 locally defined filters. These are well commented.  On Unix
 and Unix-like systems, these are located in
-\fI/etc/privoxy/\fR by default. On Windows, OS/2 and AmigaOS,
-these files are in the same directory as the \fBPrivoxy\fR
-executable.
+\fI/etc/privoxy/\fR by default. 
 .PP
-See the user-manual for a complete
+See the \fIUser Manual\fR for a detailed
 explanation of installation, general usage, all configuration options, new
 features and notes on upgrading.
 .PP
@@ -132,7 +131,7 @@ configuration might look like:
 
  ## Turn some actions on ################################
  ## NOTE: Actions are off by default, unless explictily turned on 
- ## otherwise.
+ ## otherwise with the '+' operator.
 
 { \\
 -add-header \\
@@ -193,7 +192,6 @@ configuration might look like:
 }
 / # '/' Match *all* URL patterns
 
-
  
  # Block, and treat these URL patterns as if they were 'images'.
  # We would expect these to be ads.
@@ -242,8 +240,8 @@ narrowly defined exceptions:
 .fi
 .PP
 See the comments in the configuration files themselves, or the 
-\fIuser-manual\fR
-for explanations of the above syntax, and other \fBPrivoxy\fR
+\fIUser Manual\fR
+for full explanations of the above syntax, and other \fBPrivoxy\fR
 configuration options.
 .SH "FILES"
 
@@ -300,7 +298,8 @@ http://config.privoxy.org/,
 the web-based user interface. \fBPrivoxy\fR must be
 running for this to work. Shortcut: http://p.p/
 
-http://www.privoxy.org/actions/, to submit ``misses'' to the developers. 
+http://sourceforge.net/tracker/?group_id=11118&atid=460288, to submit ``misses'' and other
+configuration related suggestions to the developers. 
 
 http://www.junkbusters.com/ht/en/cookies.html,
 an explanation how cookies are used to track web users.
@@ -308,12 +307,16 @@ an explanation how cookies are used to track web users.
 http://www.junkbusters.com/ijb.html,
 the original Internet Junkbuster.
 
-http://privacy.net/analyze/, a useful site
+http://privacy.net/, a useful site
 to check what information about you is leaked while you browse the web.
 
 http://www.squid-cache.org/, a very popular
 caching proxy, which is often used together with \fBPrivoxy\fR.
 
+http://tor.eff.org/, 
+\fBTOR\fR can help anonymize web browsing, 
+web publishing, instant messaging, IRC, SSH, and other applications.
+
 http://www.privoxy.org/developer-manual/, 
 the \fBPrivoxy\fR developer manual. 
 .SH "DEVELOPMENT TEAM"