From: oes Date: Sat, 10 Aug 2002 15:31:16 +0000 (+0000) Subject: Generated X-Git-Tag: v_2_9_20~1 X-Git-Url: http://www.privoxy.org/gitweb/?a=commitdiff_plain;h=5a8847e60c3df89057b225c7ea6269b20989bc40;p=privoxy.git Generated --- diff --git a/doc/text/developer-manual.txt b/doc/text/developer-manual.txt index b5377eb1..49275ae7 100644 --- a/doc/text/developer-manual.txt +++ b/doc/text/developer-manual.txt @@ -2,7 +2,7 @@ Privoxy Developer Manual Copyright © 2001, 2002 by Privoxy Developers -$Id: developer-manual.sgml,v 1.46.2.4 2002/05/29 00:30:59 mal0rd Exp $ +$Id: developer-manual.sgml,v 1.46.2.6 2002/08/10 11:40:25 oes Exp $ The developer manual provides guidance on coding, testing, packaging, @@ -10,9 +10,10 @@ documentation and other issues of importance to those involved with Privoxy development. It is mandatory (and helpful!) reading for anyone who wants to join the team. -You can find the latest version of the this manual at http://www.privoxy.org/ -developer-manual/. Please see the Contact section on how to contact the -developers. +Please note that this document is constantly evolving. This copy represents the +state at the release of version 2.9.20. You can find the latest version of the +this manual at http://www.privoxy.org/developer-manual/. Please see the Contact +section on how to contact the developers. ------------------------------------------------------------------------------- Table of Contents @@ -202,6 +203,10 @@ guidelines:   * Before changing things on CVS, make sure that your changes are in line with the team's general consensus on what should be done (see below). +  * Don't commit into the stable branch, unless immediately before a new + release. (See Version Numbers below for details.) Collect your changes on + the patches tracker instead. + ------------------------------------------------------------------------------- 2.3. Discussing Changes First @@ -232,11 +237,21 @@ source/* directory. You will need Docbook, the Docbook DTD's and the Docbook modular stylesheets (or comparable alternatives), and either jade or openjade (recommended) installed in order to build docs from source. Currently there is user-manual, FAQ, and, of course this, the developer-manual in this format. The -README, AUTHORS privoxy.1 (man page) files are also now maintained as Docbook -SGML. The finished files are all in the top-level source directory are -generated files! Also, index.html, the Privoxy home page, is maintained as -SGML. DO NOT edit these directly. Edit the SGML source, or contact someone -involved in the documentation (at present Stefan and Hal). +README, AUTHORS privoxy.1 (man page), and config files are also now maintained +as Docbook SGML. These files, when built, in the top-level source directory are +generated files! Also, the Privoxy index.html (and a variation on this file, +privoxy-index.html, meant for inclusion with doc packages), are maintained as +SGML as well. DO NOT edit these directly. Edit the SGML source, or contact +someone involved in the documentation (at present Stefan and Hal). + +config requires some special handling. The reason it is maintained this way is +so that the extensive comments in the file mirror those in user-manual. But the +conversion process requires going from SGML to HTML to text to special +formatting required for the embedded comments. Some of this does not survive so +well. Especially some of the examples that are longer than 80 characters. The +build process for this file outputs to config.new, which should be reviewed for +errors and mis-formatting. Once satisfied that it is correct, then it should be +hand copied to config. Other, less formal documents (e.g. LICENSE, INSTALL) are maintained as plain text files in the top-level source directory. At least for the time being. @@ -411,7 +426,7 @@ entities are listed below. See any of the main docs for examples.   * Commonly used "internal entities": - p-version: the Privoxy version string, e.g. "2.9.18". + p-version: the Privoxy version string, e.g. "2.9.20". p-status: the project status, either "alpha", "beta", or "stable". p-not-stable: use to conditionally include text in "not stable" releases (e.g. "beta"). @@ -1295,49 +1310,49 @@ from the project). 4.8. Addendum: Template for files and function comment blocks: Example for file comments: -const char FILENAME_rcs[] = "$Id: developer-manual.sgml,v 1.46.2.4 2002/05/29 00:30:59 mal0rd 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.46.2.6 2002/08/10 11:40:25 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; 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 @@ -1349,71 +1364,71 @@ the code (via `forward-page' and `backward-page'). Please include it if you can. Example for file header comments: -#ifndef _FILENAME_H -#define _FILENAME_H -#define FILENAME_H_VERSION "$Id: developer-manual.sgml,v 1.46.2.4 2002/05/29 00:30:59 mal0rd 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.46.2.6 2002/08/10 11:40:25 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: +*/ Example for function comments: /********************************************************************* @@ -1551,7 +1566,8 @@ The following must be done by one of the developers prior to each new release. last minute changes.   * Increment the version number (point from odd to even in development - branches!) in configure.in. + branches!) in configure.in. (RPM spec files will need to be incremented as + well.)   * If default.action has changed since last release (i.e. software release or standalone actions file release), bump up its version info to A.B in this @@ -1562,9 +1578,17 @@ The following must be done by one of the developers prior to each new release. Then change the version info in doc/webserver/actions/index.php, line: '$required_actions_file_version = "A.B";' -  * If the HTML documentation is not in sync with the SGML sources you need to - regenerate and upload it to the webserver. (If in doubt, just do it.) See - the Section "Updating the webserver" in this manual for details. +  * All documentation should be rebuild after the version bump. Finished docs + should be then be committed to CVS (for those without the ability to build + these). Some docs may require rather obscure processing tools. config, the + man page (and the html version of the man page), and the PDF docs fall in + this category. REAMDE, the man page, AUTHORS, and config should all also be + committed to CVS for other packageers. The formal docs should be uploaded + to the webserver. See the Section "Updating the webserver" in this manual + for details. + +  * All developers should look at the ChangeLog and make sure noteworthy + changes are referenced.   * Commit all files that were changed in the above steps! @@ -1589,7 +1613,7 @@ reasons the first package to be released is always the source tarball. For all types of packages, including the source tarball, you must make sure that you build from clean sources by exporting the right version from CVS into -an empty directory:. +an empty directory (just press return when asked for a password): mkdir dist # delete or choose different name if it already exists cd dist @@ -1657,6 +1681,11 @@ package. These apply to all platforms! please add any notes that you know are important for your platform (or contact one of the doc maintainers to do this if you can't). +  * Packagers should do a "clean" install of their package after building it. + So any previous installs should be removed first to ensure the integrity of + the newly built package. Then run the package for a while to make sure + there are no obvious problems, before uploading. + ------------------------------------------------------------------------------- 6.3.2. Source Tarball @@ -1798,13 +1827,13 @@ First, make sure that you have freshly exported the right version into an empty directory. (See "Building and releasing packages" above). Then add a log entry to debian/changelog, if it is not already there, for example by running: - debchange -v 2.9.18-beta-1 "New upstream version" + debchange -v 2.9.20-beta-1 "New upstream version" Then, run: dpkg-buildpackage -rfakeroot -us -uc -b -This will create ../privoxy_2.9.18-beta-1_i386.deb which can be uploaded. To +This will create ../privoxy_2.9.20-beta-1_i386.deb which can be uploaded. To upload the package to Sourceforge, simply issue make debian-upload @@ -1925,7 +1954,7 @@ Once this done go to http://sourceforge.net/project/admin/editpackages.php? group_id=11118, making sure you are logged in. Find your target platform in the second column, and click Add Release. You will then need to create a new release for your package, using the format of $VERSION ($CODE_STATUS), e.g. -2.9.18 (beta). +2.9.20 (beta). Now just follow the prompts. Be sure to add any appropriate Release notes. You should see your freshly uploaded packages in "Step 2. Add Files To This diff --git a/doc/text/faq.txt b/doc/text/faq.txt index 87fdfa9d..e082ee57 100644 --- a/doc/text/faq.txt +++ b/doc/text/faq.txt @@ -2,10 +2,10 @@ Privoxy Frequently Asked Questions Copyright © 2001, 2002 by Privoxy Developers -$Id: faq.sgml,v 1.61.2.11 2002/08/06 08:54:03 oes Exp $ +$Id: faq.sgml,v 1.61.2.15 2002/08/10 11:34:22 oes Exp $ -This FAQ gives quick answers to frequently asked questions about Privoxy . It +This FAQ gives quick answers to frequently asked questions about Privoxy. It can't and doesn't replace the User Manual. Privoxy is a web proxy with advanced filtering capabilities for protecting @@ -17,8 +17,10 @@ networks. Privoxy is based on Internet Junkbuster (tm). -You can find the latest version of the document at http://www.privoxy.org/faq/. -Please see the Contact section if you want to contact the developers. +Please note that this document is constantly evolving. This copy represents the +state at the release of version 2.9.20. You can find the latest version of the +document at http://www.privoxy.org/faq/. Please see the Contact section if you +want to contact the developers. ------------------------------------------------------------------------------- Table of Contents @@ -48,9 +50,6 @@ Table of Contents 2.5. What is the proxy address of Privoxy? 2.6. I just installed Privoxy, and nothing is happening. All the ads are there. What's wrong? - 2.7. In Mac OSX, I dragged the Privoxy folder to the trash in order to - uninstall it. Now the finder tells me I don't have sufficient - privileges to empty the trash. 3. Configuration @@ -113,6 +112,9 @@ Table of Contents 5.5. I cannot connect to any FTP sites. Privoxy seems to be blocking me. 5.6. In Mac OSX, I can't configure Microsoft Internet Explorer to use Privoxy as the HTTP proxy. + 5.7. In Mac OSX, I dragged the Privoxy folder to the trash in order to + uninstall it. Now the finder tells me I don't have sufficient + privileges to empty the trash. 6. Contacting the developers, Bug Reporting and Feature Requests @@ -425,33 +427,6 @@ else (probably nothing at all), it could either be that the browser is not set up correctly, or that Privoxy is not running at all. Check the log file. ------------------------------------------------------------------------------- -2.7. In Mac OSX, I dragged the Privoxy folder to the trash in order to -uninstall it. Now the finder tells me I don't have sufficient privileges to -empty the trash. - -Privoxy is installed with root permissions. When you drag the Privoxy folder to -the trash, the general user does not have (as the Finder says) sufficient -privileges to delete it. Unfortunately, the finder does not offer a way to -enter the administrator password in order to prove you do in fact own this -computer. To fix this situation, open the Terminal application and carefully -enter the following commands: - - cd ~ - cd .Trash - sudo rm -rf Privoxy - -The trash may still appear full after this command; emptying the trash from the -desktop should make it appear empty again. - -+-----------------------------------------------------------------------------+ -| Warning | -+-----------------------------------------------------------------------------+ -|Be extra-sure to enter the commands EXACTLY as shown above. Removing files | -|recusively with administrator priviledges (as happens with sudo rm -rf is | -|serious business and even small typos can have devasting effects! | -+-----------------------------------------------------------------------------+ -------------------------------------------------------------------------------- - 3. Configuration 3.1. Where can I get updated Actions Files? @@ -774,7 +749,7 @@ built-in editor for the actions files. Note that the built-in URLs from earlier versions of Junkbuster / Privoxy, http://example.com/show-proxy-args and http://i.j.b/, are no longer supported. If you still use such an old version, you should really consider upgrading to -2.9.18. +2.9.20. ------------------------------------------------------------------------------- 4.4. Do you still maintain the blocklists? @@ -1099,6 +1074,20 @@ the entry field. Enter 8118 in the Port field. The next time you start IE, it should reflect these values. ------------------------------------------------------------------------------- +5.7. In Mac OSX, I dragged the Privoxy folder to the trash in order to +uninstall it. Now the finder tells me I don't have sufficient privileges to +empty the trash. + +Just dragging the Privoxy folder to the trash is not enough to delete it. +Privoxy supplies an uninstall.command file that takes care of these details. +Open the trash, drag the uninstall.command file out of the trash and +double-click on it. You will be prompted for confirmation and the +administration password. + +The trash may still appear full after this command; emptying the trash from the +desktop should make it appear empty again. +------------------------------------------------------------------------------- + 6. Contacting the developers, Bug Reporting and Feature Requests We value your feedback. In fact, we rely on it to improve Privoxy and its diff --git a/doc/text/user-manual.txt b/doc/text/user-manual.txt index be33d37a..add13530 100644 --- a/doc/text/user-manual.txt +++ b/doc/text/user-manual.txt @@ -1,8 +1,8 @@ -Privoxy 2.9.18 User Manual +Privoxy 2.9.20 User Manual Copyright © 2001, 2002 by Privoxy Developers -$Id: user-manual.sgml,v 1.123.2.14 2002/08/06 09:16:13 oes Exp $ +$Id: user-manual.sgml,v 1.123.2.16 2002/08/09 19:20:54 david__schmidt Exp $ The User Manual gives users information on how to install, configure and use @@ -182,7 +182,7 @@ Table of Contents 1. Introduction This documentation is included with the current beta version of Privoxy, -v.2.9.18, and is mostly complete at this point. The most up to date reference +v.2.9.20, and is mostly complete at this point. The most up to date reference for the time being is still the comments in the source files and in the individual configuration files. Development of version 3.0 is currently nearing completion, and includes many significant changes and enhancements over earlier @@ -259,7 +259,7 @@ How to install the binary packages depends on your operating system: 2.1.1. Red Hat, SuSE and Conectiva RPMs -RPMs can be installed with rpm -Uvh privoxy-2.9.18-1.rpm, and will use /etc/ +RPMs can be installed with rpm -Uvh privoxy-2.9.20-1.rpm, and will use /etc/ privoxy for the location of configuration files. Note that on Red Hat, Privoxy will not be automatically started on system boot. @@ -267,7 +267,7 @@ You will need to enable that using chkconfig, ntsysv, or similar methods. Note that SuSE will automatically start Privoxy in the boot process. If you have problems with failed dependencies, try rebuilding the SRC RPM: rpm ---rebuild privoxy-2.9.18-1.src.rpm. This will use your locally installed +--rebuild privoxy-2.9.20-1.src.rpm. This will use your locally installed libraries and RPM version. Also note that if you have a Junkbuster RPM installed on your system, you need @@ -277,7 +277,7 @@ remove Junkbuster automatically, before installing Privoxy. 2.1.2. Debian -DEBs can be installed with dpkg -i privoxy_2.9.18-1.deb, and will use /etc/ +DEBs can be installed with dpkg -i privoxy_2.9.20-1.deb, and will use /etc/ privoxy for the location of configuration files. ------------------------------------------------------------------------------- @@ -311,16 +311,20 @@ configuration files. 2.1.6. Mac OSX -Unzip the downloaded package (you can either double-click on the file in the -finder, or on the desktop if you downloaded it there). The Privoxy.pkg package -should appear after unzipping. Then, double-click on that Privoxy.pkg package -installer icon and follow the installation process. Privoxy will be installed -in the folder /Library/Privoxy. It will run automatically whenever you start -up. To prevent it from running automatically, remove or rename the folder / -Library/StartupItems/Privoxy. +Unzip the downloaded file (you can either double-click on the file from the +finder, or from the desktop if you downloaded it there). Then, double-click on +the package installer icon named Privoxy.pkg and follow the installation +process. Privoxy will be installed in the folder /Library/Privoxy. It will +start automatically whenever you start up. To prevent it from starting +automatically, remove or rename the folder /Library/StartupItems/Privoxy. -To run Privoxy by hand, double-click on RunPrivoxy.command. To run Privoxy from -Terminal, execute /Library/Privoxy/RunPrivoxy.command. +To start Privoxy by hand, double-click on StartPrivoxy.command in the /Library/ +Privoxy folder. Or, type this command in the Terminal: + + /Library/Privoxy/StartPrivoxy.command + + +You will be prompted for the administrator password. ------------------------------------------------------------------------------- 2.1.7. AmigaOS @@ -341,7 +345,7 @@ latest changes from the Portage tree. With emerge privoxy you install the latest version. Configuration files are in /etc/privoxy, the documentation is in /usr/share/doc -/privoxy-2.9.18 and the Log directory is in /var/log/privoxy. +/privoxy-2.9.20 and the Log directory is in /var/log/privoxy. ------------------------------------------------------------------------------- 2.2. Building from Source @@ -359,8 +363,8 @@ compiler like gcc are required. When building from a source tarball (either release version or nightly CVS tarball), first unpack the source: - tar xzvf privoxy-2.9.18-beta-src* [.tgz or .tar.gz] - cd privoxy-2.9.18-beta + tar xzvf privoxy-2.9.20-beta-src* [.tgz or .tar.gz] + cd privoxy-2.9.20-beta For retrieving the current CVS sources, you'll need CVS installed. Note that sources from CVS are development quality, and may not be stable, or well @@ -723,14 +727,14 @@ icon in the Privoxy folder. 5.7. Mac OSX During installation, Privoxy is configured to start automatically when the -system restarts. To run Privoxy by hand, double-click on the RunPrivoxy.command -icon in the /Library/Privoxy folder. Or, type this command in the Terminal: +system restarts. To start Privoxy by hand, double-click on the +StartPrivoxy.command icon in the /Library/Privoxy folder. Or, type this command +in the Terminal: - /Library/Privoxy/RunPrivoxy.command + /Library/Privoxy/StartPrivoxy.command -If you are not logged in as an administrator, you will be asked for the -administrator password when starting Privoxy by hand. +You will be prompted for the administrator password. ------------------------------------------------------------------------------- 5.8. AmigaOS @@ -1145,7 +1149,7 @@ Notes: Unix, in local filesystem: - user-manual  file:///usr/share/doc/privoxy-2.9.18/user-manual/ + user-manual  file:///usr/share/doc/privoxy-2.9.20/user-manual/ Any platform, on local webserver (called "local-webserver"): diff --git a/doc/webserver/developer-manual/coding.html b/doc/webserver/developer-manual/coding.html index 43471c68..23404e29 100644 --- a/doc/webserver/developer-manual/coding.html +++ b/doc/webserver/developer-manual/coding.html @@ -2018,7 +2018,7 @@ WIDTH="100%" >
const char FILENAME_rcs[] = "$Id: developer-manual.sgml,v 1.46.2.4 2002/05/29 00:30:59 mal0rd Exp $";
+>const char FILENAME_rcs[] = "$Id: developer-manual.sgml,v 1.46.2.6 2002/08/10 11:40:25 oes Exp $";
 /*********************************************************************
  *
  * File        :  $Source$
@@ -2096,7 +2096,7 @@ WIDTH="100%"
 CLASS="PROGRAMLISTING"
 >#ifndef _FILENAME_H
 #define _FILENAME_H
-#define FILENAME_H_VERSION "$Id: developer-manual.sgml,v 1.46.2.4 2002/05/29 00:30:59 mal0rd Exp $"
+#define FILENAME_H_VERSION "$Id: developer-manual.sgml,v 1.46.2.6 2002/08/10 11:40:25 oes Exp $"
 /*********************************************************************
  *
  * File        :  $Source$
diff --git a/doc/webserver/developer-manual/copyright.html b/doc/webserver/developer-manual/copyright.html
index 36266c98..09ea2904 100644
--- a/doc/webserver/developer-manual/copyright.html
+++ b/doc/webserver/developer-manual/copyright.html
@@ -92,7 +92,7 @@ CLASS="SECT2"
 >
9.1. License
9.2. History
  •             Don't commit into the stable branch, unless immediately before a new
+            release. (See Version Numbers below
+            for details.) Collect your changes on the patches
+            tracker instead.
+          
    • 
       
    privoxy.1 (man page) files are also now maintained
-    as Docbook SGML. The finished files are all in the top-level source
-    directory are generated files! Also, index.html, the
-     (man page), and
+    config files are also now maintained as Docbook
+    SGML. These files, when built, in the top-level source directory are
+    generated files! Also, the Privoxy home page, is maintained as SGML.
+> index.html (and a 
+    variation on this file, privoxy-index.html, 
+    meant for inclusion with doc packages), are maintained as SGML as well.
     DO NOT edit these directly
         config requires some special handling. The reason it
+     is maintained this way is so that the extensive comments in the file
+     mirror those in user-manual. But the conversion 
+     process requires going from SGML to HTML to text to special formatting 
+     required for the embedded comments. Some of this does not survive so
+     well. Especially some of the examples that are longer than 80 characters.
+     The build process for this file outputs to config.new, 
+     which should be reviewed for errors and mis-formatting. Once satisfied
+     that it is correct, then it should be hand copied to
+     config.
+
+    
         Other, less formal documents (e.g. LICENSE
    3.3. Privoxy Custom Entities
     
     version string, e.g. "2.9.18""2.9.20".
    
    $Id: developer-manual.sgml,v 1.46.2.4 2002/05/29 00:30:59 mal0rd Exp $
    $Id: developer-manual.sgml,v 1.46.2.6 2002/08/10 11:40:25 oes Exp $
     development. It is mandatory (and helpful!) reading
  for anyone who wants to join the team.
     You can find the latest version of the this manual at  Please note that this document is constantly evolving. This copy represents
+ the state at the release of version 2.9.20.
+ You can find the latest version of the this manual at http://www.privoxy.org/developer-manual/
    3.3. Privoxy Custom Entities
    9.1. License
    9.2. History
    configure.in.
+>. (RPM spec files 
+         will need to be incremented as well.)
        
  •         If the HTML documentation is not in sync with the SGML sources
-        you need to regenerate and upload it to the webserver. (If in
-        doubt, just do it.) See the Section "Updating the webserver" in
-        this manual for details.
+>        All documentation should be rebuild after the version bump.
+        Finished docs should be then be committed to CVS (for those 
+        without the ability to build these). Some docs may require 
+        rather obscure processing tools. config,
+        the man page (and the html version of the man page), and the PDF docs
+        fall in this category. REAMDE, the man page, AUTHORS, and config
+        should all also be committed to CVS for other packageers. The 
+        formal docs should be uploaded to the webserver. See the
+        Section "Updating the webserver" in this manual for details.
+       
  •         All developers should look at the ChangeLog and
+        make sure noteworthy changes are referenced.
        
  • you must make sure that you build from clean sources by exporting
-      the right version from CVS into an empty directory:.
+      the right version from CVS into an empty directory (just press return when
+      asked for a password):
      
          
  •        Packagers should do a "clean" install of their 
+       package after building it. So any previous installs should be 
+       removed first to ensure the integrity of the newly built package. 
+       Then run the package for a while to make sure there are no 
+       obvious problems, before uploading.
+     
    • 
      
      debchange -v 2.9.18-beta-1 "New upstream version"
      debchange -v 2.9.20-beta-1 "New upstream version"
            This will create
         ../privoxy_2.9.18-beta-1_i386.deb../privoxy_2.9.20-beta-1_i386.deb
         which can be uploaded.  To upload the package to Sourceforge, simply
 	issue
@@ -1591,7 +1622,7 @@ CLASS="LITERAL"
 >$VERSION ($CODE_STATUS), e.g. 2.9.18
+>2.9.20
      (beta).
     
    Configuration
    Prev
    3. Configuration
    3. Configuration
    3.1. Where can I get updated Actions Files?
    3.1. Where can I get updated Actions Files?
       Based on your feedback and the continuing development, updated actions files will be
    made available on the 
    3.2. Can I use my old config files?
    3.2. Can I use my old config files?
       The syntax, number, and purpose of configuration files has substantially
    changed from 
    3.3. What is an 3.3. What is an "actions" file?
     file?
     
    3.4. The 3.4. The "actions" concept confuses me. Please list 
 some of these "actions".
    .
     For a comprehensive discussion of the actions concept, please refer
  to the 
    3.5. How are actions files configured? What is the easiest
-way to do this?
    3.5. How are actions files configured? What is the easiest
+way to do this?
     Actions files are just text files in a special syntax and can be edited
  with a text editor. The probably easiest way is to access
@@ -250,11 +258,13 @@ CLASS="SECT2"
 >
    3.6. There are several different 3.6. There are several different "actions" files. What are
-the differences?
     As of 
    3.7. How can I make my Yahoo/Hotmail/GMX account work?
    3.7. How can I make my Yahoo/Hotmail/GMX account work?
      The default configuration shouldn't impact the usability of any of these services.
   It will, however, make all cookies temporary, so that your browser will forget your
@@ -361,7 +373,8 @@ CLASS="SECT2"
 >
    3.8. What's the difference between the
+NAME="CONFIGFILES"
+>3.8. What's the difference between the
 "Cautious" and "Advanced" defaults?
     defaults?
      Configuring 
    Table 1. Default Configurations
    3.9. Why can I change the configuration 
-with a browser? Does that not raise security issues?
    3.9. Why can I change the configuration 
+with a browser? Does that not raise security issues?
      It may seem strange that regular users can edit the config files with their
   browsers, although the whole 
    3.10. What is the 3.10. What is the default.filter file? What is a "filter"?
    ?
     The default.filter
- file is where filters are defined, which can be used to modify or
- remove, web page content on the fly. Filters apply to anything
  in the page source, including HTML tags, and JavaScript. Regular expressions are used
  to accomplish this. There are a number of pre-defined filters to deal with common
@@ -881,11 +895,13 @@ CLASS="SECT2"
 >
    3.11. How can I set up 3.11. How can I set up Privoxy to act as a proxy for my 
- LAN?
     By default, 
    3.12. Instead of ads, now I get a checkerboard pattern. I don't want to see anything.
    3.12. Instead of ads, now I get a checkerboard pattern. I don't want to see anything.
     The replacement for blocked images can be controlled with the handle-as-image
- and 
    3.13. Why would anybody want to see a checkerboard pattern?
    3.13. Why would anybody want to see a checkerboard pattern?
     Remember that don't have to see..
    3.14. I see some images being replaced by a text
-instead of the checkerboard image. Why and how do I get rid of this?
    3.14. I see some images being replaced by a text
+instead of the checkerboard image. Why and how do I get rid of this?
     This happens when the banners are not embedded in the HTML code of the
  page itself, but in separate HTML (sub)documents that are loaded into (i)frames
@@ -1074,11 +1090,13 @@ CLASS="SECT2"
 >
    3.15. Can 3.15. Can Privoxy run as a service 
-on Win2K/NT?
     Yes, it can run as a system service using 
    3.16. How can I make 3.16. How can I make Privoxy work with other 
 proxies like Squid?
    ?
     This can be done and is often useful to combine the benefits of
  
    3.17. Can 3.17. Can Privoxy run as a "transparent" proxy?
     proxy?
     No, 
    Next
    PrevContacting the developers, Bug Reporting and Feature Requests
    HomeNext
    Prev
    6. Contacting the developers, Bug Reporting and Feature Requests
    6. Contacting the developers, Bug Reporting and Feature Requests
     We value your feedback. In fact, we rely on it to improve
  
    6.1. Get Support
    6.1. Get Support
     For casual users, our support forum at
  
    6.2. Report Bugs
    6.2. Report Bugs
     Please report all bugs  Please report all bugs only through our
  bug tracker: 
  
    6.3. Request New Features
    6.3. Request New Features
     You are welcome to submit ideas on new features or other proposals
  for improvement through our feature request tracker at
@@ -192,7 +193,9 @@ CLASS="SECT2"
 >
    6.4. Report Ads or Other Actions-Related Problems
    6.4. Report Ads or Other Actions-Related Problems
     Please send feedback on ads that slipped through, innocent images that were blocked,
  and any other problems relating to the 
    6.5. Other
    6.5. Other
    For any other issues, feel free to use the mailing lists. Technically interested users
 and people who wish to contribute to the project are also welcome on the developers list!
@@ -254,7 +259,6 @@ CLASS="NAVFOOTER"
 >
    Next
    PrevPrivoxy Copyright, License and History
    HomeNext
    PrevPrivoxy 2.9.20 User ManualPrivoxy 2.9.20 User ManualPrivoxy 2.9.20 User ManualPrivoxy 2.9.20 User ManualPrivoxy 2.9.20 User Manual
    7. Privoxy Copyright, License and History
    7. Privoxy Copyright, License and History
     Copyright © 2001, 2002 by Privoxy Developers 
    		Privoxy 2.9.18 User Manual
    Privoxy, v.2.9.18, 
+>, v.2.9.20, 
  and is mostly complete at this point. The most up to date reference for the
  time being is still the comments in the source files and in the individual
  configuration files. Development of version 3.0 is currently nearing
@@ -251,7 +251,7 @@ HREF="installation.html"
 WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
->Privoxy 2.9.18 User ManualPrivoxy 2.9.18 User Manual
      
    		Privoxy 2.9.18 User Manual
    Privoxy 2.9.18 User Manual
      
    Privoxy is configured to
- start automatically when the system restarts.  To run Privoxy by hand,
+ start automatically when the system restarts.  To start Privoxy by hand,
  double-click on the RunPrivoxy.commandStartPrivoxy.command icon in the
  
      /Library/Privoxy/RunPrivoxy.command
+>  /Library/Privoxy/StartPrivoxy.command
   
     If you are not logged in as an administrator, you will be asked for the
- administrator password when starting Privoxy
- by hand.
     You will be prompted for the administrator password.
    Privoxy 2.9.18 User ManualPrivoxy 2.9.20 User ManualPrivoxy 2.9.18 User ManualPrivoxy 2.9.20 User Manual