X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=privoxy.1;h=6277ddfc6803acf624dfe0f53583bf7e1ea5d2f6;hb=3080bba2a782061801d0454422a31d8a05ccf58d;hp=57ca5580a3e7b5090dd37041a3b6c0b7ddc339e4;hpb=067ad6a04495bf01e179bfa32ceaa0c43f64c11d;p=privoxy.git

diff --git a/privoxy.1 b/privoxy.1
index 57ca5580..6277ddfc 100644
--- a/privoxy.1
+++ b/privoxy.1
@@ -50,23 +50,22 @@ current directory (except on Win32 where it will try \fBconfig.txt\fP).
 
 
 .SH DESCRIPTION
-\fBPrivoxy\fP
-is an instrumentable HTTP proxy that filters the 
-\s-2HTTP\s0
-data stream between
-web servers and browsers.
-\fBPrivoxy\fP can be used to protect privacy, manage cookies, filter web
-page content, manage access restrictions, and to discard such annoying Internet
-junk as ads, banners, and pop-ups. Or whatever other annoyances strike your
-fancy.
+\fBPrivoxy\fP is a web proxy with advanced filtering capabilities for
+protecting privacy, filtering web page content, managing cookies,
+controlling access, and removing ads, banners, pop-ups and other
+obnoxious Internet junk. \fBPrivoxy\fP has a very flexible configuration and
+can be customized to suit individual needs and tastes. \fBPrivoxy\fP has
+application for both stand-alone systems and multi-user networks.
 .PP
-\fBPrivoxy\fP is derived from \fBInternet Junkbuster (tm)\fP by 
-Junkbusters Corporation, which is no longer being developed. Many 
-new features and enhancements have been added.
+\fBPrivoxy\fP is based on code of the \fBInternet Junkbuster (tm)\fP. 
+\fBJunkbuster\fP was originally written by JunkBusters Corporation, and was
+released as free open-source software under the GNU GPL. Stefan Waldherr made
+many improvements, and started the SourceForge project to continue
+development.
 
 .SH INSTALLATION AND USE
 Browsers must be individually configured to use 
-\fBPrivoxy\fP as a HTTP proxy.
+\fBPrivoxy\fP as a \s-2HTTP\s0 proxy.
 The default setting is for localhost, 
 on port 8118 (configurable in the main config file).
 To set the 
@@ -111,7 +110,7 @@ itself is changed and much more sophisticated. See the user-manual for a brief
 explanation of all configuration options.
 .PP
 The actions list (ad blocks, etc) can also be configured with your 
-web browser at \fIhttp://ijbswa.sourceforge.net/config\fP.
+web browser at \fIhttp://www.privoxy.org/config\fP.
 \fBPrivoxy's\fP configuration parameters can also be viewed 
 at the same page. In addition, \fBPrivoxy\fP can be toggled on/off.
 This is an internal page. 
@@ -254,7 +253,7 @@ detect them automatically.
  
 .SH NOTES
 This is a \fBBETA\fP version of \fBPrivoxy\fP. Not all features are  
-complete or well tested.
+well tested.
 .PP
 Please see the user-maual on how to contact the developers for 
 feature requests, reporting problems, and other questions.
@@ -264,11 +263,17 @@ Probably. Please see the user-manual for how and where to report bugs.
 
 .SH SEE ALSO
 .br
-http://ijbswa.sourceforge.net/config
+http://www.privoxy.org/
+.br
+http://config.privoxy.org/
+.br
+http://www.privoxy.org/faq/
 .br
-http://ijbswa.sourceforge.net/
+http://www.privoxy.org/user-manual/
 .br
-http://sourceforge.net/projects/ijbswa
+http://www.privoxy.org/developer-manual/
+.br
+http://sourceforge.net/projects/ijbswa (Privoxy Project Page)
 .br
 http://www.waldherr.org/junkbuster/\" waldherr.org#
 .br
@@ -278,7 +283,7 @@ http://privacy.net/analyze/
 .br
 http://www.squid-cache.org/
 .br
-http://linuxalpha.ch/packages/
+http://linuxalpha.ch/steudten/software/
 
 .SH DEVELOPMENT TEAM
 .br
@@ -309,11 +314,13 @@ http://linuxalpha.ch/packages/
  Hal Burgiss
 .br
  Rodrigo Barbosa
+.br
+ Gábor Lipták
 
 .SH COPYRIGHT AND LICENSE
-Orginally written by, and copyrighted by, the Anonymous Coders and Junkbusters
-Corporation. 
-.PP
+\"Orginally written by, and copyrighted by, the Anonymous Coders and Junkbusters
+\"Corporation. 
+\".PP
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2 of the License, or