- Changed more (all?) references to actions to the

[privoxy.git] / doc / text / faq.txt

diff --git a/doc/text/faq.txt b/doc/text/faq.txt
index 2661ccc..5c4cbeb 100644 (file)
--- a/doc/text/faq.txt
+++ b/doc/text/faq.txt
@@ -1,8 +1,8 @@
 Privoxy Frequently Asked Questions
 
-By: Privoxy Developers
+Copyright © 2001, 2002 by Privoxy Developers
 
-$Id: faq.sgml,v 1.53 2002/05/03 01:34:52 hal9 Exp $
+$Id: faq.sgml,v 1.57 2002/05/05 20:26:02 hal9 Exp $
 
 This FAQ gives users and developers alike answers to frequently asked questions
 about Privoxy .
@@ -22,7 +22,6 @@ Please see the Contact section if you want to contact the developers.
 -------------------------------------------------------------------------------
 
 Table of Contents
- 
 1. General Information
    
     1.1. What is this new version of Privoxy?
@@ -111,13 +110,11 @@ Table of Contents
     6.4. Report ads or other filter problems
     6.5. Other
    
-7. Copyright and History
+7. Privoxy Copyright, License and History
    
-    7.1. Copyright
+    7.1. License
     7.2. History
    
--------------------------------------------------------------------------------
-
 1. General Information
 
 1.1. What is this new version of Privoxy?
@@ -170,14 +167,16 @@ configuration is now.
 
 1.4. What are some of the new features?
 
-  * FIXME: complete the list of features. change the order: most important
-    features to the top of the list. prefix new features with "NEW".
-   
   * Integrated browser based configuration and control utility at http://
     config.privoxy.org/ (shortcut: http://p.p/). Browser-based tracing of rule
     and filter effects. Remote toggling.
    
-  * Blocking of annoying pop-up browser windows.
+  * Web page content filtering (removes banners based on size, invisible
+    "web-bugs", JavaScript and HTML annoyances, pop-up windows, etc.)
+   
+  * Modularized configuration that allows for standard settings and user
+    settings to reside in separate files, so that installing updated actions
+    files won't overwrite idividual user settings.
    
   * HTTP/1.1 compliant (but not all optional 1.1 features are supported).
    
@@ -185,20 +184,18 @@ configuration is now.
     and generally a more sophisticated and flexible configuration syntax over
     previous versions.
    
-  * GIF de-animation.
+  * Improved cookie management features (e.g. session based cookies).
    
-  * Web page content filtering (removes banners based on size, invisible
-    "web-bugs", JavaScript and HTML annoyances, pop-ups, etc.)
+  * GIF de-animation.
    
   * Bypass many click-tracking scripts (avoids script redirection).
    
   * Multi-threaded (POSIX and native threads).
    
-  * Auto-detection and re-reading of config file changes.
-   
-  * User-customizable HTML templates (e.g. 404 error page).
+  * User-customizable HTML templates for all proxy-generated pages (e.g.
+    "blocked" page).
    
-  * Improved cookie management features (e.g. session based cookies).
+  * Auto-detection and re-reading of config file changes.
    
   * Improved signal handling, and a true daemon mode (Unix).
    
@@ -281,7 +278,7 @@ you don't have to maintain a similar configuration for possibly many browsers.
 Privoxy is licensed under the GNU General Public License (GPL). It is free to
 use, copy, modify or distribute as you wish under the terms of this license.
 Please see the Copyright section for more information on the license and
-copyright.
+copyright. Or the LICENSE file that should be included.
 
 There is no warranty of any kind, expressed, implied or otherwise. That is
 something that would cost real money ;-) There is no registration either.
@@ -664,7 +661,7 @@ Privoxy.
 
 If you have version 2.0.2, then the equivalent is http://example.com/
 show-proxy-args (but you get far less information, and you should really
-consider upgrading to 2.9.14).
+consider upgrading to 2.9.15).
 
 -------------------------------------------------------------------------------
 
@@ -977,14 +974,23 @@ too. See the page on Sourceforge.
 
 -------------------------------------------------------------------------------
 
-7. Copyright and History
+7. Privoxy Copyright, License and History
+
+Copyright © 2001, 2002 by Privoxy Developers <developers@privoxy.org>
 
-7.1. Copyright
+Some source code is based on code Copyright © 1997 by Anonymous Coders and
+Junkbusters, Inc. and licensed under the GNU General Public License.
+
+Portions of this document are "borrowed" from the original Junkbuster (tm) FAQ,
+and modified as appropriate for Privoxy.
+
+-------------------------------------------------------------------------------
+
+7.1. License
 
 Privoxy 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 (at your option) any later
-version.
+terms of the GNU General Public License, version 2, as published by the Free
+Software Foundation.
 
 This program is distributed in the hope that it will be useful, but WITHOUT ANY
 WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
@@ -993,8 +999,12 @@ is available from the Free Software Foundation, Inc, 59 Temple Place - Suite
 330, Boston, MA 02111-1307, USA.
 
 You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-Place, Suite 330, Boston, MA 02111-1307 USA.
+this program; if not, write to the
+
+ Free Software
+ Foundation, Inc. 59 Temple Place - Suite 330
+ Boston, MA 02111-1307
+ USA 
 
 -------------------------------------------------------------------------------