From 9c79b235e69182b1e8e1243d9da7918ccfc43ae6 Mon Sep 17 00:00:00 2001 From: hal9 Date: Sun, 5 May 2002 20:32:26 +0000 Subject: [PATCH] Sync with sgml to cleanup copyright vs license. --- doc/text/developer-manual.txt | 266 ++++++++++++++++++---------------- doc/text/faq.txt | 38 +++-- doc/text/user-manual.txt | 47 +++--- 3 files changed, 193 insertions(+), 158 deletions(-) diff --git a/doc/text/developer-manual.txt b/doc/text/developer-manual.txt index 5541e660..ca4f08d0 100644 --- a/doc/text/developer-manual.txt +++ b/doc/text/developer-manual.txt @@ -1,8 +1,8 @@ Privoxy Developer Manual -By: Privoxy Developers +Copyright © 2001, 2002 by Privoxy Developers -$Id: developer-manual.sgml,v 1.40 2002/05/04 00:43:43 hal9 Exp $ +$Id: developer-manual.sgml,v 1.41 2002/05/04 08:44:44 swa 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. @@ -129,10 +129,11 @@ Table of Contents 8.4. Report ads or other filter problems 8.5. Other -9. Copyright and History +9. Copyright, License and History 9.1. Copyright - 9.2. History + 9.2. License + 9.3. History 10. See also @@ -296,18 +297,17 @@ 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.
 
@@ -1082,13 +1082,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.
@@ -1371,49 +1371,49 @@ from the project).
 
 Example for file comments:
 
-const char FILENAME_rcs[] = "$Id: developer-manual.sgml,v 1.40 2002/05/04 00:43:43 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;                                               
+const char FILENAME_rcs[] = "$Id: developer-manual.sgml,v 1.41 2002/05/04 08:44:44 swa 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
@@ -1426,71 +1426,71 @@ can.
 
 Example for file header comments:
 
-#ifndef _FILENAME_H                                                                           
-#define _FILENAME_H                                                                           
-#define FILENAME_H_VERSION "$Id: developer-manual.sgml,v 1.40 2002/05/04 00:43:43 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:                                                                                        
-*/                                                                                            
+#ifndef _FILENAME_H                                                                          
+#define _FILENAME_H                                                                          
+#define FILENAME_H_VERSION "$Id: developer-manual.sgml,v 1.41 2002/05/04 08:44:44 swa 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:
 
@@ -2072,10 +2072,20 @@ too. See the page on Sourceforge.
 
 -------------------------------------------------------------------------------
 
-9. Copyright and History
+9. Copyright, License and History
 
 9.1. Copyright
 
+Permission is granted to copy, distribute and/or modify this document under the
+terms of the GNU Free Documentation License, Version 1.1 or any later version
+published by the Free Software Foundation with no Invariant Sections, no
+Front-Cover Texts, and no Back-Cover Texts. A copy of the license can be found 
+http://www.gnu.org/licenses/fdl.html.
+
+-------------------------------------------------------------------------------
+
+9.2. 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
@@ -2093,7 +2103,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA.
 
 -------------------------------------------------------------------------------
 
-9.2. History
+9.3. History
 
 Privoxy is evolved, and derived from, the Internet Junkbuster, with many
 improvments and enhancements over the original.
diff --git a/doc/text/faq.txt b/doc/text/faq.txt
index 5027daa8..96af8366 100644
--- 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.55 2002/05/04 00:41:56 hal9 Exp $
+$Id: faq.sgml,v 1.56 2002/05/04 08:44:44 swa Exp $
 
 This FAQ gives users and developers alike answers to frequently asked questions
 about Privoxy .
@@ -110,21 +110,22 @@ Table of Contents
     6.4. Report ads or other filter problems
     6.5. Other
    
-7. Copyright and History
+7. Copyright, License and History
    
     7.1. Copyright
-    7.2. History
+    7.2. License
+    7.3. History
    
 1. General Information
 
 1.1. What is this new version of Privoxy?
 
-The original Internet Junkbuster™ (tm) is a copyrighted product of 
-Junkbusters Corporation. Development of this effort stopped some time ago as of
-version 2.0.2. Stefan Waldherr started the ijbswa project on Sourceforge to
-rekindle development. Other developers subsequently joined with Stefan, and
-have since added many new features, refinements and enhancements. The result of
-this effort is Privoxy.
+The original Internet JunkbusterTM (tm) is a copyrighted product of Junkbusters
+Corporation. Development of this effort stopped some time ago as of version
+2.0.2. Stefan Waldherr started the ijbswa project on Sourceforge to rekindle
+development. Other developers subsequently joined with Stefan, and have since
+added many new features, refinements and enhancements. The result of this
+effort is Privoxy.
 
 Privoxy has evolved from the Junkbuster 2.0.2 code base, and has advanced
 significantly at this point.
@@ -974,10 +975,23 @@ too. See the page on Sourceforge.
 
 -------------------------------------------------------------------------------
 
-7. Copyright and History
+7. Copyright, License and History
 
 7.1. Copyright
 
+Permission is granted to copy, distribute and/or modify this document under the
+terms of the GNU Free Documentation License, Version 1.1 or any later version
+published by the Free Software Foundation with no Invariant Sections, no
+Front-Cover Texts, and no Back-Cover Texts. A copy of the license can be found 
+http://www.gnu.org/licenses/fdl.html.
+
+Portions of this document are "borrowed" from the original Junkbuster (tm) FAQ,
+and modified as appropriate for Privoxy.
+
+-------------------------------------------------------------------------------
+
+7.2. 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
@@ -995,7 +1009,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA.
 
 -------------------------------------------------------------------------------
 
-7.2. History
+7.3. History
 
 Privoxy is evolved, and derived from, the Internet Junkbuster, with many
 improvments and enhancements over the original.
diff --git a/doc/text/user-manual.txt b/doc/text/user-manual.txt
index 9aa97ee2..d3b91f38 100644
--- a/doc/text/user-manual.txt
+++ b/doc/text/user-manual.txt
@@ -1,8 +1,8 @@
 Privoxy User Manual
 
-By: Privoxy Developers
+Copyright © 2001, 2002 by Privoxy Developers
 
-$Id: user-manual.sgml,v 1.103 2002/05/04 00:40:53 hal9 Exp $
+$Id: user-manual.sgml,v 1.104 2002/05/04 08:44:45 swa Exp $
 
 The user manual gives users information on how to install, configure and use 
 Privoxy.
@@ -149,10 +149,11 @@ Table of Contents
     11.4. Report ads or other filter problems
     11.5. Other
    
-12. Copyright and History
+12. Copyright, License and History
    
     12.1. Copyright
-    12.2. History
+    12.2. License
+    12.3. History
    
 13. See Also
 14. Appendix
@@ -582,11 +583,11 @@ config.privoxy.org/ (shortcut: http://p.p/), which is a built-in page and works
 without Internet access. You will see the following section: 
 
  Privoxy Menu                                                                  
-        ??  View & change the current configuration                            
-        ??  View the source code version numbers                               
-        ??  View the request headers.                                          
-        ??  Look up which actions apply to a URL and why                       
-        ??  Toggle Privoxy on or off                                           
+        ?  View & change the current configuration                             
+        ?  View the source code version numbers                                
+        ?  View the request headers.                                           
+        ?  Look up which actions apply to a URL and why                        
+        ?  Toggle Privoxy on or off                                            
                                                                                
 
 This should be self-explanatory. Note the first item leads to an editor for the
@@ -3076,10 +3077,20 @@ too. See the page on Sourceforge.
 
 -------------------------------------------------------------------------------
 
-12. Copyright and History
+12. Copyright, License and History
 
 12.1. Copyright
 
+Permission is granted to copy, distribute and/or modify this document under the
+terms of the GNU Free Documentation License, Version 1.1 or any later version
+published by the Free Software Foundation with no Invariant Sections, no
+Front-Cover Texts, and no Back-Cover Texts. A copy of the license can be found 
+http://www.gnu.org/licenses/fdl.html.
+
+-------------------------------------------------------------------------------
+
+12.2. 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
@@ -3097,7 +3108,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA.
 
 -------------------------------------------------------------------------------
 
-12.2. History
+12.3. History
 
 Privoxy is evolved, and derived from, the Internet Junkbuster, with many
 improvments and enhancements over the original.
@@ -3508,7 +3519,7 @@ Then, for our user.action file, we again have no hits.
 And finally we pull it all together in the bottom section and summarize how
 Privoxy is applying all its "actions" to "google.com": 
 
-  Final results:                                                                   
+ Final results:                                                                    
  -add-header -block +deanimate-gifs{last} -downgrade-http-version -fast-redirects  
  -filter{popups} -filter{fun} -filter{shockwave-flash} -filter{crude-parental}     
  +filter{html-annoyances} +filter{js-annoyances} +filter{content-cookies}          
@@ -3523,7 +3534,7 @@ and "session-cookies-only".
 
 Now another example, "ad.doubleclick.net":
 
-  { +block +handle-as-image }                                                  
+ { +block +handle-as-image }                                                   
   .ad.doubleclick.net                                                          
                                                                                
  { +block +handle-as-image }                                                   
@@ -3549,7 +3560,7 @@ and make it more readable.
 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-http-version +fast-redirects        
    +filter{html-annoyances} +filter{js-annoyances} +filter{kill-popups}              
@@ -3568,7 +3579,7 @@ see why we get the blank page. We could now add a new action below this that
 explicitly does not block ("{-block}") paths with "adsl". There are various
 ways to handle such exceptions. Example:
 
-  { -block }                                                                   
+ { -block }                                                                    
   /adsl                                                                        
 
 Now the page displays ;-) Be sure to flush your browser's caches when making
@@ -3577,7 +3588,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 +handle-as-image }                                                  
+ { +block +handle-as-image }                                                   
  /ads                                                                          
 
 That actually was very telling and pointed us quickly to where the problem was.
@@ -3587,7 +3598,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                                                                   
@@ -3597,7 +3608,7 @@ to one of aliases that turn off "+filter":
 "{shop}" is an "alias" that expands to "{ -filter -session-cookies-only }". Or
 you could do your own exception to negate filtering: 
 
-  {-filter}                                                                    
+ {-filter}                                                                     
  .forbes.com                                                                   
 
 This would probably be most appropriately put in user.action, for local site
-- 
2.39.2