From: swa Date: Fri, 12 Apr 2002 11:04:09 +0000 (+0000) Subject: generated X-Git-Tag: v_2_9_14~45 X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=0eb052b2d480ed7354480491a5982ebad16d7d82 generated --- diff --git a/README b/README index bb5bb1d8..0d738817 100644 --- a/README +++ b/README @@ -33,7 +33,7 @@ *********************************************************************/ -This README is included with the development version of Privoxy 2.9.13, which +This README is included with the development version of Privoxy 2.9.14, which will eventually become Privoxy v3.0 (and soon we hope!). See http:// www.privoxy.org/ for more information. The current code level is beta, and seems stable to us :). @@ -76,8 +76,8 @@ There are several ways to install Privoxy. To build Privoxy from source, autoconf and GNU make (gmake) are required. Source is available as gzipped tar archives. For this, first unpack the source: - tar xzvf privoxy-2.9.13-beta-src* [.tgz or .tar.gz] - cd privoxy-2.9.13-beta + tar xzvf privoxy-2.9.14-beta-src* [.tgz or .tar.gz] + cd privoxy-2.9.14-beta For retrieving the current CVS sources, you'll need the CVS package installed @@ -174,12 +174,12 @@ Included documentation may vary according to platform and packager. We value your feedback. However, to provide you with the best support, please note: - * Use the Sourceforge Support Forum to get help: + * Use the Sourceforge Support Forum to get help: http://sourceforge.net/tracker/?group_id=11118&atid=211118 - * Submit bugs only through our Sourceforge Bug Forum: + * Submit bugs only through our Sourceforge Bug Forum: http://sourceforge.net/tracker/?group_id=11118&atid=111118. @@ -193,30 +193,29 @@ note: platform, browser, any pertinent log data, any other relevant details (please be specific) and, if possible, some way to reproduce the bug. - * Submit feature requests only through our Sourceforge feature request forum: + * Submit feature requests only through our Sourceforge feature request forum: http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse. - * Submit missed ads and banners, and incorrectly blocked images, popups, etc: - - http://p.p/, and select "actions file feedback system" + * You can also send feedback on websites that Privoxy has problems with. Please bookmark + the following link: "Privoxy - Submit Filter Feedback" + . Once you surf to a page with problems, use the + bookmark to send us feedback. We will look into the issue as soon as possible. - This page can also be reached from many of the internal CGI pages. - - * For any other issues, feel free to use the mailing lists: + * For any other issues, feel free to use the mailing lists: http://sourceforge.net/mail/?group_id=11118. Anyone interested in actively participating in development and related discussions can also join the appropriate mailing list. Archives are - available too. + available, too. ------------------------------------------------------------------------- ijbswa-developers@lists.sourceforge.net -$Id: readme.sgml,v 1.6 2002/04/08 22:59:26 hal9 Exp $ +$Id: readme.sgml,v 1.8 2002/04/12 10:09:50 swa Exp $ diff --git a/doc/text/developer-manual.txt b/doc/text/developer-manual.txt index 970be3b0..46c16d07 100644 --- a/doc/text/developer-manual.txt +++ b/doc/text/developer-manual.txt @@ -2,7 +2,7 @@ Privoxy Developer Manual By: Privoxy Developers -$Id: developer-manual.sgml,v 1.31 2002/04/11 09:32:52 oes Exp $ +$Id: developer-manual.sgml,v 1.33 2002/04/12 03:49:53 hal9 Exp $ The developer manual gives the users information on how to help the developer team. It provides guidance on coding, testing, documentation and other issues. @@ -155,7 +155,7 @@ to the list and wait until a project manager has added you. For the time being (read, this section is under construction), please note the following guidelines for changing stuff in the code. If it is - 1. A bug-fix / clean-up / cosmetic thing: shoot + 1. A bugfix / clean-up / cosmetic thing: shoot 2. A new feature that can be turned off: shoot @@ -165,6 +165,9 @@ following guidelines for changing stuff in the code. If it is 5. A major redesign of some part of the code: ask the list +Note that near a major public release, we get a bit more cautious - if unsure, +it doesn't hurt to ask first. + ------------------------------------------------------------------------------- 4. Documentation Guidelines @@ -193,7 +196,7 @@ uses the document SGML sources in doc/source/*/* to update all text files in doc/text/ and to update all HTML documents in doc/webserver/. Documentation writers should please make sure documents build successfully -before committing to CVS. +before committing to CVS, if possible. How do you update the webserver (i.e. the pages on privoxy.org)? @@ -237,17 +240,18 @@ sufficient for our purposes. Some common elements that you likely will use: -, paragraph delimiter. Most text needs to be within paragraph -elements (there are some exceptions). -, the stylesheets make this italics. -, files and directories. -, command examples. -, like 
, more or less.                     
-, list with bullets.                              
-, member of the above.                                    
-, screen output, implies .                     
-, like HTML  tag.                          
-, for, doh, quoting text.                                       
+, paragraph delimiter. Most text needs to be within paragraph elements (there  
+are some exceptions).                                                          
+, the stylesheets make this italics.                                           
+, files and directories.                                                       
+, command examples.                                                            
+, like                                                                         
+, more or less.                                                                
+, list with bullets.                                                           
+, member of the above.                                                         
+, screen output, implies .                                                     
+, like HTML tag.                                                               
+, for, doh, quoting text.                                                      
 
 Look at any of the existing docs for examples of all these and more.
 
@@ -1019,13 +1023,13 @@ other header files.
 
 Example:
 
-#include      /* This is not a local include */                    
+#include      /* This is not a local include */                                
 #include "config.h"       /* This IS a local include */                        
 
 Exception:
 
 /* This is not a local include, but requires a path element. */                
-#include                                                       
+#include                                                                       
 
 Note: Please! do not add "-I." to the Makefile without a _very_ good reason.
 This duplicates the #include "file.h" behavior.
@@ -1308,49 +1312,49 @@ from the project).
 
 Example for file comments:
 
-const char FILENAME_rcs[] = "$Id: developer-manual.sgml,v 1.31 2002/04/11 09:32:52 oes Exp $"; 
-/*********************************************************************                         
- *                                                                                             
- * File        :  $Source$                                                                     
- *                                                                                             
- * Purpose     :  (Fill me in with a good description!)                                        
- *                                                                                             
- * Copyright   :  Written by and Copyright (C) 2001 the SourceForge                            
- *                Privoxy team. http://www.privoxy.org/                                        
- *                                                                                             
- *                Based on the Internet Junkbuster originally written                          
- *                by and Copyright (C) 1997 Anonymous Coders and                               
- *                Junkbusters Corporation.  http://www.junkbusters.com                         
- *                                                                                             
- *                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 (at                          
- *                your option) any later version.                                              
- *                                                                                             
- *                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                         
- *                PARTICULAR PURPOSE.  See the GNU General Public                              
- *                License for more details.                                                    
- *                                                                                             
- *                The GNU General Public License should be included with                       
- *                this file.  If not, you can view it at                                       
- *                http://www.gnu.org/copyleft/gpl.html                                         
- *                or write to the Free Software Foundation, Inc., 59                           
- *                Temple Place - Suite 330, Boston, MA  02111-1307, USA.                       
- *                                                                                             
- * Revisions   :                                                                               
- *    $Log$                                                                                    
- *                                                                                             
- *********************************************************************/                        
-                                                                                               
-                                                                                               
-#include "config.h"                                                                            
-                                                                                               
-   ...necessary include files for us to do our work...                                         
-                                                                                               
-const char FILENAME_h_rcs[] = FILENAME_H_VERSION;                                              
+const char FILENAME_rcs[] = "$Id: developer-manual.sgml,v 1.33 2002/04/12 03:49:53 hal9 Exp $"; 
+/*********************************************************************                          
+ *                                                                                              
+ * File        :  $Source$                                                                      
+ *                                                                                              
+ * Purpose     :  (Fill me in with a good description!)                                         
+ *                                                                                              
+ * Copyright   :  Written by and Copyright (C) 2001 the SourceForge                             
+ *                Privoxy team. http://www.privoxy.org/                                         
+ *                                                                                              
+ *                Based on the Internet Junkbuster originally written                           
+ *                by and Copyright (C) 1997 Anonymous Coders and                                
+ *                Junkbusters Corporation.  http://www.junkbusters.com                          
+ *                                                                                              
+ *                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 (at                           
+ *                your option) any later version.                                               
+ *                                                                                              
+ *                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                          
+ *                PARTICULAR PURPOSE.  See the GNU General Public                               
+ *                License for more details.                                                     
+ *                                                                                              
+ *                The GNU General Public License should be included with                        
+ *                this file.  If not, you can view it at                                        
+ *                http://www.gnu.org/copyleft/gpl.html                                          
+ *                or write to the Free Software Foundation, Inc., 59                            
+ *                Temple Place - Suite 330, Boston, MA  02111-1307, USA.                        
+ *                                                                                              
+ * Revisions   :                                                                                
+ *    $Log$                                                                                     
+ *                                                                                              
+ *********************************************************************/                         
+                                                                                                
+                                                                                                
+#include "config.h"                                                                             
+                                                                                                
+   ...necessary include files for us to do our work...                                          
+                                                                                                
+const char FILENAME_h_rcs[] = FILENAME_H_VERSION;                                               
 
 Note: This declares the rcs variables that should be added to the
 "show-proxy-args" page. If this is a brand new creation by you, you are free to
@@ -1363,71 +1367,71 @@ can.
 
 Example for file header comments:
 
-#ifndef _FILENAME_H                                                                          
-#define _FILENAME_H                                                                          
-#define FILENAME_H_VERSION "$Id: developer-manual.sgml,v 1.31 2002/04/11 09:32:52 oes Exp $" 
-/*********************************************************************                       
- *                                                                                           
- * File        :  $Source$                                                                   
- *                                                                                           
- * Purpose     :  (Fill me in with a good description!)                                      
- *                                                                                           
- * Copyright   :  Written by and Copyright (C) 2001 the SourceForge                          
- *                Privoxy team. http://www.privoxy.org/                                      
- *                                                                                           
- *                Based on the Internet Junkbuster originally written                        
- *                by and Copyright (C) 1997 Anonymous Coders and                             
- *                Junkbusters Corporation.  http://www.junkbusters.com                       
- *                                                                                           
- *                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 (at                        
- *                your option) any later version.                                            
- *                                                                                           
- *                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                       
- *                PARTICULAR PURPOSE.  See the GNU General Public                            
- *                License for more details.                                                  
- *                                                                                           
- *                The GNU General Public License should be included with                     
- *                this file.  If not, you can view it at                                     
- *                http://www.gnu.org/copyleft/gpl.html                                       
- *                or write to the Free Software Foundation, Inc., 59                         
- *                Temple Place - Suite 330, Boston, MA  02111-1307, USA.                     
- *                                                                                           
- * Revisions   :                                                                             
- *    $Log$                                                                                  
- *                                                                                           
- *********************************************************************/                      
-                                                                                             
-                                                                                             
-#include "project.h"                                                                         
-                                                                                             
-#ifdef __cplusplus                                                                           
-extern "C" {                                                                                 
-#endif                                                                                       
-                                                                                             
-   ... function headers here ...                                                             
-                                                                                             
-                                                                                             
-/* Revision control strings from this header and associated .c file */                       
-extern const char FILENAME_rcs[];                                                            
-extern const char FILENAME_h_rcs[];                                                          
-                                                                                             
-                                                                                             
-#ifdef __cplusplus                                                                           
-} /* extern "C" */                                                                           
-#endif                                                                                       
-                                                                                             
-#endif /* ndef _FILENAME_H */                                                                
-                                                                                             
-/*                                                                                           
-  Local Variables:                                                                           
-  tab-width: 3                                                                               
-  end:                                                                                       
-*/                                                                                           
+#ifndef _FILENAME_H                                                                           
+#define _FILENAME_H                                                                           
+#define FILENAME_H_VERSION "$Id: developer-manual.sgml,v 1.33 2002/04/12 03:49:53 hal9 Exp $" 
+/*********************************************************************                        
+ *                                                                                            
+ * File        :  $Source$                                                                    
+ *                                                                                            
+ * Purpose     :  (Fill me in with a good description!)                                       
+ *                                                                                            
+ * Copyright   :  Written by and Copyright (C) 2001 the SourceForge                           
+ *                Privoxy team. http://www.privoxy.org/                                       
+ *                                                                                            
+ *                Based on the Internet Junkbuster originally written                         
+ *                by and Copyright (C) 1997 Anonymous Coders and                              
+ *                Junkbusters Corporation.  http://www.junkbusters.com                        
+ *                                                                                            
+ *                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 (at                         
+ *                your option) any later version.                                             
+ *                                                                                            
+ *                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                        
+ *                PARTICULAR PURPOSE.  See the GNU General Public                             
+ *                License for more details.                                                   
+ *                                                                                            
+ *                The GNU General Public License should be included with                      
+ *                this file.  If not, you can view it at                                      
+ *                http://www.gnu.org/copyleft/gpl.html                                        
+ *                or write to the Free Software Foundation, Inc., 59                          
+ *                Temple Place - Suite 330, Boston, MA  02111-1307, USA.                      
+ *                                                                                            
+ * Revisions   :                                                                              
+ *    $Log$                                                                                   
+ *                                                                                            
+ *********************************************************************/                       
+                                                                                              
+                                                                                              
+#include "project.h"                                                                          
+                                                                                              
+#ifdef __cplusplus                                                                            
+extern "C" {                                                                                  
+#endif                                                                                        
+                                                                                              
+   ... function headers here ...                                                              
+                                                                                              
+                                                                                              
+/* Revision control strings from this header and associated .c file */                        
+extern const char FILENAME_rcs[];                                                             
+extern const char FILENAME_h_rcs[];                                                           
+                                                                                              
+                                                                                              
+#ifdef __cplusplus                                                                            
+} /* extern "C" */                                                                            
+#endif                                                                                        
+                                                                                              
+#endif /* ndef _FILENAME_H */                                                                 
+                                                                                              
+/*                                                                                            
+  Local Variables:                                                                            
+  tab-width: 3                                                                                
+  end:                                                                                        
+*/                                                                                            
 
 Example for function comments:
 
@@ -1691,19 +1695,29 @@ archive to Sourceforge's ftp server and release the file publicly.
 
 8.6. Windows
 
-Ensure that you have the latest code version. Hence run
+You should ensure you have the latest version of Cygwin (from http://
+www.cygwin.com/). Run the following commands from within a Cygwin bash shell.
 
-  cvs -d:pserver:anonymous@cvs.ijbswa.sourceforge.net:/cvsroot/ijbswa login                           
-  cvs -z3  -d:pserver:anonymous@cvs.ijbswa.sourceforge.net:/cvsroot/ijbswa export -r  v_X_Y_Z current 
-  cd current                                                                                          
+First check out a clean copy of the correct code version, by running:
+
+        mkdir dist                                                                                    
+        cd dist                                                                                       
+        cvs -d:pserver:anonymous@cvs.ijbswa.sourceforge.net:/cvsroot/ijbswa login                     
+        cvs -z3  -d:pserver:anonymous@cvs.ijbswa.sourceforge.net:/cvsroot/ijbswa export -r  v_X_Y_Z . 
                                                                                                       
 
-Run:
+(Note: It is important that this is a clean copy of the code, do not re-use a
+working directory after you have manually compiled there).
 
-  autoheader && autoconf && ./configure                                        
+Then you can build the package. This is fully automated, and is controlled by
+winsetup/GNUmakefile. All you need to do is:
+
+        cd winsetup                                                            
+        make                                                                   
                                                                                
 
-Then do FIXME.
+Now you can manually rename privoxy_setup.exe to privoxy_setup_X_Y_Z.exe, and
+upload it to SourceForge.
 
 -------------------------------------------------------------------------------
 
@@ -1893,12 +1907,12 @@ archive to Sourceforge's ftp server and release the file publicly.
 We value your feedback. However, to provide you with the best support, please
 note:
 
-  *  Use the Sourceforge Support Forum to get help:
+  * Use the Sourceforge Support Forum to get help:
        
         http://sourceforge.net/tracker/?group_id=11118&atid=211118
        
    
-  *  Submit bugs only through our Sourceforge Bug Forum:
+  * Submit bugs only through our Sourceforge Bug Forum:
      
         http://sourceforge.net/tracker/?group_id=11118&atid=111118. 
         
@@ -1912,26 +1926,25 @@ note:
     platform, browser, any pertinent log data, any other relevant details
     (please be specific) and, if possible, some way to reproduce the bug.
    
-  *  Submit feature requests only through our Sourceforge feature request forum:
+  * Submit feature requests only through our Sourceforge feature request forum:
      
         http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse.
        
    
-  *  Submit missed ads and banners, and incorrectly blocked images, popups, etc:
-          
-        http://p.p/, and select "actions file feedback system"
+  * You can also send feedback on websites that Privoxy has problems with. Please bookmark
+    the following link: "Privoxy - Submit Filter Feedback"
+    . Once you surf to a page with problems, use the
+    bookmark to send us feedback. We will look into the issue as soon as possible.
        
    
-    This page can also be reached from many of the internal CGI pages.
-   
-  *  For any other issues, feel free to use the mailing lists:
+  * For any other issues, feel free to use the mailing lists:
      
         http://sourceforge.net/mail/?group_id=11118.
      
    
     Anyone interested in actively participating in development and related
     discussions can also join the appropriate mailing list. Archives are
-    available too.
+    available, too.
    
 -------------------------------------------------------------------------------
 
diff --git a/doc/text/faq.txt b/doc/text/faq.txt
index 75032934..66ddc673 100644
--- a/doc/text/faq.txt
+++ b/doc/text/faq.txt
@@ -2,7 +2,7 @@ Privoxy Frequently Asked Questions
 
 By: Privoxy Developers
 
-$Id: faq.sgml,v 1.47 2002/04/10 04:05:32 hal9 Exp $
+$Id: faq.sgml,v 1.49 2002/04/12 10:10:18 swa Exp $
 
 This FAQ gives users and developers alike answers to frequently asked questions
 about Privoxy .
@@ -687,7 +687,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.13).
+consider upgrading to 2.9.14).
 
 -------------------------------------------------------------------------------
 
@@ -959,12 +959,12 @@ Time for you to go!
 We value your feedback. However, to provide you with the best support, please
 note:
 
-  *  Use the Sourceforge Support Forum to get help:
+  * Use the Sourceforge Support Forum to get help:
        
         http://sourceforge.net/tracker/?group_id=11118&atid=211118
        
    
-  *  Submit bugs only through our Sourceforge Bug Forum:
+  * Submit bugs only through our Sourceforge Bug Forum:
      
         http://sourceforge.net/tracker/?group_id=11118&atid=111118. 
         
@@ -978,26 +978,25 @@ note:
     platform, browser, any pertinent log data, any other relevant details
     (please be specific) and, if possible, some way to reproduce the bug.
    
-  *  Submit feature requests only through our Sourceforge feature request forum:
+  * Submit feature requests only through our Sourceforge feature request forum:
      
         http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse.
        
    
-  *  Submit missed ads and banners, and incorrectly blocked images, popups, etc:
-          
-        http://p.p/, and select "actions file feedback system"
+  * You can also send feedback on websites that Privoxy has problems with. Please bookmark
+    the following link: "Privoxy - Submit Filter Feedback"
+    . Once you surf to a page with problems, use the
+    bookmark to send us feedback. We will look into the issue as soon as possible.
        
    
-    This page can also be reached from many of the internal CGI pages.
-   
-  *  For any other issues, feel free to use the mailing lists:
+  * For any other issues, feel free to use the mailing lists:
      
         http://sourceforge.net/mail/?group_id=11118.
      
    
     Anyone interested in actively participating in development and related
     discussions can also join the appropriate mailing list. Archives are
-    available too.
+    available, too.
    
 -------------------------------------------------------------------------------
 
diff --git a/doc/text/user-manual.txt b/doc/text/user-manual.txt
index 399fa66d..4042576c 100644
--- a/doc/text/user-manual.txt
+++ b/doc/text/user-manual.txt
@@ -2,7 +2,7 @@ Privoxy User Manual
 
 By: Privoxy Developers
 
-$Id: user-manual.sgml,v 1.73 2002/04/10 18:45:15 swa Exp $
+$Id: user-manual.sgml,v 1.75 2002/04/12 02:08:48 david__schmidt Exp $
 
 The user manual gives users information on how to install, configure and use
 Privoxy.
@@ -270,37 +270,6 @@ start automatically whenever OS/2 starts.
 The directory you choose to install Privoxy into will contain all of the
 configuration files.
 
-If you would like to build binary images on OS/2 yourself, you will need a few
-Unix-like tools: autoconf, autoheader and sh. These tools will be used to
-create the required config.h file, which is not part of the source distribution
-because it differs based on platform. You will also need a compiler. The
-distribution has been created using IBM VisualAge compilers, but you can use
-any compiler you like. GCC/EMX has the disadvantage of needing to be
-single-threaded due to a limitation of EMX's implementation of the select()
-socket call.
-
-In addition to needing the source code distribution as outlined earlier, you
-will want to extract the os2seutp directory from CVS:
-
- cvs -d:pserver:anonymous@cvs.ijbswa.sourceforge.net:/cvsroot/ijbswa login           
- cvs -z3 -d:pserver:anonymous@cvs.ijbswa.sourceforge.net:/cvsroot/ijbswa co os2setup 
-                                                                                     
-
-This will create a directory named os2setup/, which will contain the
-Makefile.vac makefile and os2build.cmd which is used to completely create the
-binary distribution. The sequence of events for building the executable for
-yourself goes something like this:
-
- cd current                                                                    
- autoheader                                                                    
- autoconf                                                                      
- sh configure                                                                  
- cd ..\os2setup                                                                
- nmake -f Makefile.vac                                                         
-                                                                               
-
-You will see this sequence laid out in os2build.cmd.
-
 -------------------------------------------------------------------------------
 
 3.1.4. Windows
@@ -452,7 +421,7 @@ Privoxy can be reached by the special URL http://p.p/ (or alternately http://
 config.privoxy.org/), which is an internal page. You will see the following
 section: 
 
-Please choose from the following options:                                      
+ Please choose from the following options:                                     
                                                                                
     * Show information about the current configuration                         
     * Show the source code version numbers                                     
@@ -1743,12 +1712,12 @@ desired.
 We value your feedback. However, to provide you with the best support, please
 note:
 
-  *  Use the Sourceforge Support Forum to get help:
+  * Use the Sourceforge Support Forum to get help:
        
         http://sourceforge.net/tracker/?group_id=11118&atid=211118
        
    
-  *  Submit bugs only through our Sourceforge Bug Forum:
+  * Submit bugs only through our Sourceforge Bug Forum:
      
         http://sourceforge.net/tracker/?group_id=11118&atid=111118. 
         
@@ -1762,26 +1731,25 @@ note:
     platform, browser, any pertinent log data, any other relevant details
     (please be specific) and, if possible, some way to reproduce the bug.
    
-  *  Submit feature requests only through our Sourceforge feature request forum:
+  * Submit feature requests only through our Sourceforge feature request forum:
      
         http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse.
        
    
-  *  Submit missed ads and banners, and incorrectly blocked images, popups, etc:
-          
-        http://p.p/, and select "actions file feedback system"
+  * You can also send feedback on websites that Privoxy has problems with. Please bookmark
+    the following link: "Privoxy - Submit Filter Feedback"
+    . Once you surf to a page with problems, use the
+    bookmark to send us feedback. We will look into the issue as soon as possible.
        
    
-    This page can also be reached from many of the internal CGI pages.
-   
-  *  For any other issues, feel free to use the mailing lists:
+  * For any other issues, feel free to use the mailing lists:
      
         http://sourceforge.net/mail/?group_id=11118.
      
    
     Anyone interested in actively participating in development and related
     discussions can also join the appropriate mailing list. Archives are
-    available too.
+    available, too.
    
 -------------------------------------------------------------------------------
 
@@ -2120,7 +2088,7 @@ basically what Privoxy would do if there were not any "actions" defined, i.e.
 it does nothing. Every action is disabled. This is not particularly informative
 for our purposes here. OK, next section:
 
- Matches for http://google.com:                                                
+  Matches for http://google.com:                                               
                                                                                
  { -add-header -block +deanimate-gifs -downgrade +fast-redirects               
    +filter{html-annoyances} +filter{js-annoyances} +filter{no-popups}          
@@ -2160,7 +2128,7 @@ referenced in these sections.
 And now we pull it altogether in the bottom section and summarize how Privoxy
 is appying all its "actions" to "google.com": 
 
- Final results:                                                                
+  Final results:                                                               
                                                                                
  -add-header -block -deanimate-gifs -downgrade -fast-redirects                 
  +filter{html-annoyances} +filter{js-annoyances} +filter{no-popups}            
@@ -2174,7 +2142,7 @@ is appying all its "actions" to "google.com":
 
 Now another example, "ad.doubleclick.net":
 
- { +block +image }                                                             
+  { +block +image }                                                            
   .ad.doubleclick.net                                                          
                                                                                
  { +block +image }                                                             
@@ -2201,7 +2169,7 @@ defined as "ad.doubleclick.net" is done here -- as both a "+block" and an
 One last example. Let's try "http://www.rhapsodyk.net/adsl/HOWTO/". This one is
 giving us problems. We are getting a blank page. Hmmm...
 
- Matches for http://www.rhapsodyk.net/adsl/HOWTO/:                             
+  Matches for http://www.rhapsodyk.net/adsl/HOWTO/:                            
                                                                                
  { -add-header -block +deanimate-gifs -downgrade +fast-redirects               
    +filter{html-annoyances} +filter{js-annoyances} +filter{no-popups}          
@@ -2222,7 +2190,7 @@ see why we get the blank page. We could now add a new action below this that
 explictly does not block (-block) pages with "adsl". There are various ways to
 handle such exceptions. Example:
 
- { -block }                                                                    
+  { -block }                                                                   
   /adsl                                                                        
                                                                                
                                                                                
@@ -2233,7 +2201,7 @@ such changes. Or, try using Shift+Reload.
 But now what about a situation where we get no explicit matches like we did
 with:
 
- { -block }                                                                    
+  { -block }                                                                   
   /adsl                                                                        
                                                                                
                                                                                
@@ -2245,7 +2213,7 @@ and maybe a little trial and error to isolate the offending rule. One likely
 cause would be one of the "{+filter}" actions. Try adding the URL for the site
 to one of aliases that turn off "+filter":
 
- {shop}                                                                        
+  {shop}                                                                       
  .quietpc.com                                                                  
  .worldpay.com   # for quietpc.com                                             
  .jungle.com                                                                   
@@ -2257,7 +2225,7 @@ to one of aliases that turn off "+filter":
 "{shop}" is an "alias" that expands to "{ -filter -no-cookies -no-cookies-keep
 }". Or you could do your own exception to negate filtering: 
 
- {-filter}                                                                     
+  {-filter}                                                                    
  .forbes.com                                                                   
                                                                                
                                                                                
diff --git a/doc/webserver/developer-manual/coding.html b/doc/webserver/developer-manual/coding.html
index d20b0628..1735242b 100644
--- a/doc/webserver/developer-manual/coding.html
+++ b/doc/webserver/developer-manual/coding.html
@@ -2019,7 +2019,7 @@ WIDTH="100%"
 >
const char FILENAME_rcs[] = "$Id: developer-manual.sgml,v 1.31 2002/04/11 09:32:52 oes Exp $";
+>const char FILENAME_rcs[] = "$Id: developer-manual.sgml,v 1.33 2002/04/12 03:49:53 hal9 Exp $";
 /*********************************************************************
  *
  * File        :  $Source$
@@ -2097,7 +2097,7 @@ WIDTH="100%"
 CLASS="PROGRAMLISTING"
 >#ifndef _FILENAME_H
 #define _FILENAME_H
-#define FILENAME_H_VERSION "$Id: developer-manual.sgml,v 1.31 2002/04/11 09:32:52 oes Exp $"
+#define FILENAME_H_VERSION "$Id: developer-manual.sgml,v 1.33 2002/04/12 03:49:53 hal9 Exp $"
 /*********************************************************************
  *
  * File        :  $Source$
diff --git a/doc/webserver/developer-manual/contact.html b/doc/webserver/developer-manual/contact.html
index 29cdb34e..7aebb4c4 100644
--- a/doc/webserver/developer-manual/contact.html
+++ b/doc/webserver/developer-manual/contact.html
@@ -83,7 +83,7 @@ NAME="CONTACT"
 >
  •  Use the Sourceforge Support Forum to get help:
    
+>Use the Sourceforge Support Forum to get help:
    
    
    
     
  •  Submit bugs only through our Sourceforge Bug Forum:
    
+>Submit bugs only through our Sourceforge Bug Forum:
    
  
    
     
  •  Submit feature requests only through our Sourceforge feature request forum:
    
+>Submit feature requests only through our Sourceforge feature request forum:
    
  
    
     
  •  Submit missed ads and banners, and incorrectly blocked images, popups, etc:
    
-      
    
-        http://p.p/, and select You can also send feedback on websites that Privoxy has problems with. Please bookmark
    
+the following link:     "actions file feedback system""Privoxy - Submit Filter Feedback"
    
+>. Once you surf to a page with problems, use the
    
+bookmark to send us feedback. We will look into the issue as soon as possible.
    
    
        This page can also be reached from many of the internal CGI pages.
-   
  •  For any other issues, feel free to use the mailing lists:
    
+>For any other issues, feel free to use the mailing lists:
    
  
    
     
      Anyone interested in actively participating in development and related
   discussions can also join the appropriate mailing list. Archives are
-  available too. 
+  available, too. 
  
    • 10.1. Copyright
     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.
     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 PARTICULAR PURPOSE.  See the GNU General Public License for
- 
  more details, which is available from the Free Software Foundation, Inc, 59
  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    10.2. History
         Documentation writers should please make sure documents build
-     successfully before committing to CVS.
+     successfully before committing to CVS, if possible.
     
         How do you update the webserver (i.e. the pages on privoxy.org)?
@@ -595,7 +595,7 @@ CLASS="SECT2"
 >
    4.3. Privoxy Custom Entities
    $Id: developer-manual.sgml,v 1.31 2002/04/11 09:32:52 oes Exp $
    $Id: developer-manual.sgml,v 1.33 2002/04/12 03:49:53 hal9 Exp $
    4.3. Privoxy Custom Entities
    10.1. Copyright
    10.2. History
    8.6. Windows
    	Ensure that you have the latest code version. Hence run
-	
            You should ensure you have the latest version of Cygwin (from
+        http://www.cygwin.com/).
+        Run the following commands from within a Cygwin bash shell.
+      
    	        First check out a clean copy of the correct code version, by running:
+      
          
      cvs -d:pserver:anonymous@cvs.ijbswa.sourceforge.net:/cvsroot/ijbswa login
-  cvs -z3  -d:pserver:anonymous@cvs.ijbswa.sourceforge.net:/cvsroot/ijbswa export -r  v_X_Y_Z current
-  cd current
-	
            mkdir dist
+        cd dist
+        cvs -d:pserver:anonymous@cvs.ijbswa.sourceforge.net:/cvsroot/ijbswa login
+        cvs -z3  -d:pserver:anonymous@cvs.ijbswa.sourceforge.net:/cvsroot/ijbswa export -r  v_X_Y_Z .
+      
    
-	
    	 Run:
-	
            (Note: It is important that this is a clean copy of the code,
+        do not re-use a working directory after you have manually compiled
+        there).
+      
    	        Then you can build the package.  This is fully automated, and is
+        controlled by winsetup/GNUmakefile.
+        All you need to do is:
+      
          
      autoheader && autoconf && ./configure
-	
            cd winsetup
+        make
+      
    
-	
    	Then do FIXME.
-	
            Now you can manually rename privoxy_setup.exe to
+        privoxy_setup_X_Y_Z.exe, and upload it to
+        SourceForge.
+      
    3. Quickstart to Privoxy Development
    You'll need an account on       You'll need an account on Sourceforge to support our development.
-Mail your ID to the list and wait until a project manager has added you.
     to support our
+      development.  Mail your ID to the list and wait until a project
+      manager has added you.
+    
    For the time being (read, this section is under construction), please note the
-following guidelines for changing stuff in the code. If it is
-	
          For the time being (read, this section is under construction), please
+      note the following guidelines for changing stuff in the code. If it is
+      
    1. 	      	A bug-fix / clean-up / cosmetic thing: shoot
-               	
                A bugfix / clean-up / cosmetic thing: shoot
+        
    2.       		A new feature that can be turned off: shoot
-               	
                A new feature that can be turned off: shoot
+        
    3. 	      	A clear improvement w/o side effects on other parts of the code: shoot
-                
                A clear improvement w/o side effects on other parts of the code: shoot
+        
    4. 	        A matter of taste: ask the list
-              	
                A matter of taste: ask the list
+        
    5. 	        A major redesign of some part of the code: ask the list
-                
                A major redesign of some part of the code: ask the list
+        
    	
- 
    
+    
          Note that near a major public release, we get a bit more cautious - if
+      unsure, it doesn't hurt to ask first.
+    
  •  Use the Sourceforge Support Forum to get help:
    
+>Use the Sourceforge Support Forum to get help:
    
    
    
     
  •  Submit bugs only through our Sourceforge Bug Forum:
    
+>Submit bugs only through our Sourceforge Bug Forum:
    
  
    
     
  •  Submit feature requests only through our Sourceforge feature request forum:
    
+>Submit feature requests only through our Sourceforge feature request forum:
    
  
    
     
  •  Submit missed ads and banners, and incorrectly blocked images, popups, etc:
    
-      
    
-        http://p.p/, and select You can also send feedback on websites that Privoxy has problems with. Please bookmark
    
+the following link:     "actions file feedback system""Privoxy - Submit Filter Feedback"
    
+>. Once you surf to a page with problems, use the
    
+bookmark to send us feedback. We will look into the issue as soon as possible.
    
    
        This page can also be reached from many of the internal CGI pages.
-   
  •  For any other issues, feel free to use the mailing lists:
    
+>For any other issues, feel free to use the mailing lists:
    
  
    
     
      Anyone interested in actively participating in development and related
   discussions can also join the appropriate mailing list. Archives are
-  available too. 
+  available, too. 
  
    • 8.1. Copyright
    8.2. History
    $Id: faq.sgml,v 1.47 2002/04/10 04:05:32 hal9 Exp $
    $Id: faq.sgml,v 1.49 2002/04/12 10:10:18 swa Exp $
    8.1. Copyright
    8.2. History
     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.13).
    More infosMore info
    Copyright
    History
    More infosMore info
    	Pictures of the Privoxy Team
    
+	
  • 	Developer Manual
  •  Use the Sourceforge Support Forum to get help:
    
+>Use the Sourceforge Support Forum to get help:
    
    
    
     
  •  Submit bugs only through our Sourceforge Bug Forum:
    
+>Submit bugs only through our Sourceforge Bug Forum:
    
  
    
     
  •  Submit feature requests only through our Sourceforge feature request forum:
    
+>Submit feature requests only through our Sourceforge feature request forum:
    
  
    
     
  •  Submit missed ads and banners, and incorrectly blocked images, popups, etc:
    
-      
    
-        http://p.p/, and select You can also send feedback on websites that Privoxy has problems with. Please bookmark
    
+the following link:     "actions file feedback system""Privoxy - Submit Filter Feedback"
    
+>. Once you surf to a page with problems, use the
    
+bookmark to send us feedback. We will look into the issue as soon as possible.
    
    
        This page can also be reached from many of the internal CGI pages.
-   
  •  For any other issues, feel free to use the mailing lists:
    
+>For any other issues, feel free to use the mailing lists:
    
  
    
     
      Anyone interested in actively participating in development and related
   discussions can also join the appropriate mailing list. Archives are
-  available too. 
+  available, too. 
  
    • Copyright
    History
    9.2. Privoxy
       Short cuts. Turn off, then on: 
   
    5.1. Controlling Privoxy
    5.2. Configuration Files Overview
    5.3. The Main Configuration File
    5.3.1. Defining Other Configuration Files
    5.3.2. Other Configuration Options
    5.3.3. Access Control List (ACL)
    5.3.5. Windows GUI Options
    5.4.1. URL Domain and Path Syntax
    5.4.2. Actions
     include:
   
    5.4.3. Aliases
    5.6. Templates
  •  Use the Sourceforge Support Forum to get help:
    
+>Use the Sourceforge Support Forum to get help:
    
    
    
     
  •  Submit bugs only through our Sourceforge Bug Forum:
    
+>Submit bugs only through our Sourceforge Bug Forum:
    
  
    
     
  •  Submit feature requests only through our Sourceforge feature request forum:
    
+>Submit feature requests only through our Sourceforge feature request forum:
    
  
    
     
  •  Submit missed ads and banners, and incorrectly blocked images, popups, etc:
    
-      
    
-        http://p.p/, and select You can also send feedback on websites that Privoxy has problems with. Please bookmark
    
+the following link:     "actions file feedback system""Privoxy - Submit Filter Feedback"
    
+>. Once you surf to a page with problems, use the
    
+bookmark to send us feedback. We will look into the issue as soon as possible.
    
    
        This page can also be reached from many of the internal CGI pages.
-   
  •  For any other issues, feel free to use the mailing lists:
    
+>For any other issues, feel free to use the mailing lists:
    
  
    
     
      Anyone interested in actively participating in development and related
   discussions can also join the appropriate mailing list. Archives are
-  available too. 
+  available, too. 
  
    • 7.1. Copyright
    $Id: user-manual.sgml,v 1.73 2002/04/10 18:45:15 swa Exp $
    $Id: user-manual.sgml,v 1.75 2002/04/12 02:08:48 david__schmidt Exp $
    4.1. Command Line Options
    5.1. Controlling Privoxy
    5.2. Configuration Files Overview
    5.3. The Main Configuration File
    5.3.1. Defining Other Configuration Files
    5.3.2. Other Configuration Options
    5.3.3. Access Control List (ACL)
    5.3.5. Windows GUI Options
    5.4.1. URL Domain and Path Syntax
    5.4.2. Actions
    5.4.3. Aliases
    5.6. Templates
    7.1. Copyright
    9.2. PrivoxyPrivoxy
  into will contain all of the configuration files.
     If you would like to build binary images on OS/2 yourself, you will need
- a few Unix-like tools: autoconf, autoheader and sh.  These tools will be
- used to create the required config.h file, which is not part of the 
- source distribution because it differs based on platform.  You will also
- need a compiler.
- The distribution has been created using IBM VisualAge compilers, but you
- can use any compiler you like. GCC/EMX has the disadvantage of needing 
- to be single-threaded due to a limitation of EMX's implementation of the
- select() socket call.
     In addition to needing the source code distribution as outlined earlier,
- you will want to extract the os2seutp directory from CVS:
- 
     cvs -d:pserver:anonymous@cvs.ijbswa.sourceforge.net:/cvsroot/ijbswa login          
- cvs -z3 -d:pserver:anonymous@cvs.ijbswa.sourceforge.net:/cvsroot/ijbswa co os2setup
- 
    
- This will create a directory named os2setup/, which will contain the
- Makefile.vac makefile and os2build.cmd
- which is used to completely create the binary distribution.  The sequence
- of events for building the executable for yourself goes something like this:
- 
     cd current
- autoheader
- autoconf
- sh configure
- cd ..\os2setup
- nmake -f Makefile.vac
- 
    
- You will see this sequence laid out in os2build.cmd.
    4.1. Command Line Options