From b05f344df343dbb8380150fe925eaa3ffc306f8c Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Fri, 1 Mar 2013 17:48:32 +0000 Subject: [PATCH] Regenerate docs for 3.0.21 stable --- doc/webserver/developer-manual/contact.html | 361 ------------------ doc/webserver/developer-manual/copyright.html | 147 ------- doc/webserver/developer-manual/index.html | 59 +-- .../developer-manual/newrelease.html | 14 +- doc/webserver/developer-manual/seealso.html | 172 --------- .../developer-manual/webserver-update.html | 15 +- doc/webserver/faq/copyright.html | 24 +- doc/webserver/faq/index.html | 2 +- doc/webserver/index.html | 2 +- doc/webserver/user-manual/actions-file.html | 18 +- doc/webserver/user-manual/appendix.html | 28 +- doc/webserver/user-manual/configuration.html | 16 +- doc/webserver/user-manual/copyright.html | 2 +- doc/webserver/user-manual/filter-file.html | 2 +- doc/webserver/user-manual/index.html | 26 +- doc/webserver/user-manual/installation.html | 18 +- doc/webserver/user-manual/introduction.html | 18 +- doc/webserver/user-manual/quickstart.html | 2 +- doc/webserver/user-manual/startup.html | 4 +- 19 files changed, 82 insertions(+), 848 deletions(-) delete mode 100644 doc/webserver/developer-manual/contact.html delete mode 100644 doc/webserver/developer-manual/copyright.html delete mode 100644 doc/webserver/developer-manual/seealso.html diff --git a/doc/webserver/developer-manual/contact.html b/doc/webserver/developer-manual/contact.html deleted file mode 100644 index 16f3f1c2..00000000 --- a/doc/webserver/developer-manual/contact.html +++ /dev/null @@ -1,361 +0,0 @@ - - - - - Contacting the developers, Bug Reporting and Feature - Requests - - - - - - - - - -
- - - - - - - - - - - - -
Privoxy Developer Manual
PrevNext
-
-
- -
-

8. Contacting the - developers, Bug Reporting and Feature Requests

- -

We value your feedback. In fact, we rely on it to improve Privoxy and its configuration. However, please note - the following hints, so we can provide you with the best support.

- -
-

8.1. Please provide sufficient - information

- -

A lot of support requests don't contain enough information and can't - be solved without a lot of back and forth which causes unnecessary - delays. Reading this section should help to prevent that.

- -

Before contacting us to report a problem, please try to verify that - it is a Privoxy problem, and not a - browser or site problem or documented behaviour that just happens to be - different than what you expected. If unsure, try toggling - off Privoxy, and see if the - problem persists.

- -

If you are using your own custom configuration, please try the - default configuration to see if the problem is configuration related. - If you're having problems with a feature that is disabled by default, - please ask around on the mailing list if others can reproduce the - problem.

- -

If you aren't using the latest Privoxy version, the problem may have - been found and fixed in the meantime. We would appreciate if you could - take the time to upgrade to the latest version and verify that the problem - still exists.

- -

Please be sure to provide the following information when reporting - problems or requesting support:

- -
    -
  • -

    The exact Privoxy version you - are using.

    -
    • - -
  • -

    The operating system and versions you run Privoxy on, e.g. Windows XP SP2.

    -
    • - -
  • -

    The name, platform, and version of the browser you were using (e.g. Internet Explorer v5.5 for Mac).

    -
    • - -
  • -

    The URL where the problem occurred, or some way for us to - duplicate the problem (e.g. http://somesite.example.com/?somethingelse=123).

    -
    • - -
  • -

    Whether your version of Privoxy - is one supplied by the Privoxy - developers via SourceForge, or if you got your copy somewhere - else.

    -
    • - -
  • -

    Whether you are using Privoxy - together with another proxy such as Tor. If so, please temporary disable the other - proxy to see if the symptoms change.

    -
    • - -
  • -

    Whether you are using a personal firewall product. If so, does - Privoxy work without it?

    -
    • - -
  • -

    Any other pertinent information to help identify the problem - such as config or log file excerpts (yes, you should have log file - entries for each action taken). To get a meaningful logfile, please - make sure that the logfile directive is being used and the following - debug - options are enabled (all of them):

    - -

    - debug     1 # Log the destination for each request Privoxy let through. See also debug 1024.
    - - debug     2 # show each connection status
    - - debug     4 # show I/O status
    - - debug     8 # show header parsing
    - - debug   128 # debug redirects
    - debug   256 # debug GIF de-animation
    - - debug   512 # Common Log Format
    - - debug  1024 # Log the destination for requests Privoxy didn't let through, and the reason why.
    - - debug  4096 # Startup banner and warnings.
    - - debug  8192 # Non-fatal errors

    - -

    If you are having trouble with a filter, please additionally - enable

    - -

    - debug    64 # debug regular expression filters

    If - you are using Privoxy 3.0.17 or later and suspect that it - interprets the request or the response incorrectly, please enable - -

    - debug 32768 # log all data read from the network

    - -

    It's easy for us to ignore log messages that aren't relevant but - missing log messages may make it impossible to investigate a - problem. If you aren't sure which of the debug directives are - relevant, please just enable all of them and let us worry about - it.

    - -

    Note that Privoxy log files may contain sensitive information so - please don't submit any logfiles you didn't read first. You can - mask sensitive information as long as it's clear that you removed - something.

    -
    • -
- -

You don't have to tell us your actual name when filing a problem - report, but if you don't, please use a nickname so we can differentiate - between your messages and the ones entered by other "anonymous" users - that may respond to your request if they have the same problem or - already found a solution. Note that due to spam the trackers may not - always allow to post without being logged into SourceForge. If that's - the case, you are still free to create a login that isn't directly - linked to your name, though.

- -

Please also check the status of your request a few days after - submitting it, as we may request additional information. If you use a - SF id, you should automatically get a mail when someone responds to - your request. Please don't bother to add an email address when using - the tracker. If you prefer to communicate through email, just use one - of the mailing lists directly.

- -

If you are new to reporting problems, you might be interested in - How to Report Bugs Effectively.

- -

The appendix of the Privoxy User Manual also has helpful - information on understanding actions, and - action debugging.

-
- -
-

8.2. - Get Support

- -

For casual users, our support forum at SourceForge is probably best suited: - http://sourceforge.net/tracker/?group_id=11118&atid=211118

- -

All users are of course welcome to discuss their issues on the - users mailing list, where the developers also hang - around.

- -

Please don't sent private support requests to individual Privoxy - developers, either use the mailing lists or the support trackers.

- -

If you have to contact a Privoxy developer directly for other - reasons, please send a real mail and do not bother with SourceForge's - messaging system. Answers to SourceForge messages are usually bounced - by SourceForge's mail server in which case the developer wasted time - writing a response you don't get. From your point of view it will look - like your message has been completely ignored, so this is frustrating - for all parties involved.

- -

Note that the Privoxy mailing lists are moderated. Posts from - unsubscribed addresses have to be accepted manually by a moderator. - This may cause a delay of several days and if you use a subject that - doesn't clearly mention Privoxy or one of its features, your message - may be accidentally discarded as spam.

- -

If you aren't subscribed, you should therefore spend a few seconds - to come up with a proper subject. Additionally you should make it clear - that you want to get CC'd. Otherwise some responses will be directed to - the mailing list only, and you won't see them.

-
- -
-

8.3. Reporting - Problems

- -

"Problems" for our purposes, come in two - forms:

- -
    -
  • -

    Configuration issues, such as ads that slip through, or sites - that don't function properly due to one Privoxy "action" or - another being turned "on".

    -
    • - -
  • -

    "Bugs" in the programming code that - makes up Privoxy, such as that - might cause a crash.

    -
    • -
- -
-

8.3.1. - Reporting Ads or Other Configuration Problems

- -

Please send feedback on ads that slipped through, innocent images - that were blocked, sites that don't work properly, and other - configuration related problem of default.action file, to http://sourceforge.net/tracker/?group_id=11118&atid=460288, - the Actions File Tracker.

- -

New, improved default.action files may - occasionally be made available based on your feedback. These will be - announced on the ijbswa-announce list and available from our the files section of our project page.

-
- -
-

8.3.2. - Reporting Bugs

- -

Please report all bugs through our bug tracker: http://sourceforge.net/tracker/?group_id=11118&atid=111118.

- -

Before doing so, please make sure that the bug has not already been submitted - and observe the additional hints at the top of the submit form. If already submitted, please feel free - to add any info to the original report that might help to solve the - issue.

-
-
- -
-

8.4. - Request New Features

- -

You are welcome to submit ideas on new features or other proposals - for improvement through our feature request tracker at http://sourceforge.net/tracker/?atid=361118&group_id=11118.

-
- -
-

8.5. - Mailing Lists

- -

If you prefer to communicate through email, instead of using a web - interface, feel free to use one of the mailing lists. To discuss issues - that haven't been completely diagnosed yet, please use the Privoxy - users list. Technically interested users and people who wish to - contribute to the project are always welcome on the developers list. - You can find an overview of all Privoxy-related mailing lists, including list - archives, at: http://sourceforge.net/mail/?group_id=11118.

-
-
- -
-
- - - - - - - - - - - - - - - - - -
PrevHomeNext
Update the Webserver Privoxy Copyright, License - and History
-
- - diff --git a/doc/webserver/developer-manual/copyright.html b/doc/webserver/developer-manual/copyright.html deleted file mode 100644 index 1ffe6a5e..00000000 --- a/doc/webserver/developer-manual/copyright.html +++ /dev/null @@ -1,147 +0,0 @@ - - - - - Privoxy Copyright, License and History - - - - - - - - - -
- - - - - - - - - - - - -
Privoxy Developer Manual
PrevNext
-
-
- -
-

9. Privoxy - Copyright, License and History

- -

Copyright © 2001-2013 by Privoxy Developers <ijbswa-developers@lists.sourceforge.net>

- -

Some source code is based on code Copyright © 1997 by Anonymous - Coders and Junkbusters, Inc. and licensed under the GNU General Public License.

- -
-

9.1. License

- -

Privoxy is free software; you can - redistribute it and/or modify it under the terms of the GNU General Public License, version 2, as published by - the Free Software Foundation.

- -

This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - details.

- -

You should have received a copy of the GNU - GPL along with this program; if not, write to the

- -

 Free Software
-  Foundation, Inc. 51 Franklin - Street, Fifth Floor
-  Boston, MA 02110-1301
-  USA 

-
- -
-

9.2. History

- -

A long time ago, there was the Internet - Junkbuster, by Anonymous Coders and Junkbusters Corporation. - This saved many users a lot of pain in the early days of web - advertising and user tracking.

- -

But the web, its protocols and standards, and with it, the - techniques for forcing ads on users, give up autonomy over their - browsing, and for tracking them, keeps evolving. Unfortunately, the - Internet Junkbuster did not. Version - 2.0.2, published in 1998, was the last official release, available from - Junkbusters Corporation. Fortunately, it had been released under the - GNU GPL, which allowed further development by others.

- -

So Stefan Waldherr started maintaining an improved version of the - software, to which eventually a number of people contributed patches. - It could already replace banners with a transparent image, and had a - first version of pop-up killing, but it was still very closely based on - the original, with all its limitations, such as the lack of HTTP/1.1 - support, flexible per-site configuration, or content modification. The - last release from this effort was version 2.0.2-10, published in - 2000.

- -

Then, some developers picked up the thread, and started turning the - software inside out, upside down, and then reassembled it, adding many - new features along the way.

- -

The result of this is Privoxy, - whose first stable version, 3.0, was released August, 2002.

- -

As of 2012 the Junkbusters Corporation's website - (http://www.junkbusters.com/) has been shut down, but Privoxy is still - actively maintained.

-
-
- -
-
- - - - - - - - - - - - - - - - - -
PrevHomeNext
Contacting the developers, - Bug Reporting and Feature Requests See also
-
- - diff --git a/doc/webserver/developer-manual/index.html b/doc/webserver/developer-manual/index.html index c76ae5b0..3b8b4753 100644 --- a/doc/webserver/developer-manual/index.html +++ b/doc/webserver/developer-manual/index.html @@ -18,8 +18,10 @@

Privoxy Developer Manual

-

Copyright © - 2001-2009 by Privoxy +

Copyright © 2001-2012 by Privoxy Developers

$Id: developer-manual.sgml,v 2.53 2013/02/26 @@ -40,9 +42,11 @@ represents the state at the release of version 3.0.21. 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.

+ "_top">http://www.privoxy.org/developer-manual/. Please have a + look at the contact section in the user manual if you are interested + in contacting the developers.

@@ -319,51 +323,6 @@
7. Update the Webserver
- -
8. Contacting the developers, Bug - Reporting and Feature Requests
- -
-
-
8.1. Please - provide sufficient information
- -
8.2. Get - Support
- -
8.3. Reporting - Problems
- -
-
-
8.3.1. Reporting Ads - or Other Configuration Problems
- -
8.3.2. Reporting - Bugs
-
-
- -
8.4. Request New - Features
- -
8.5. Mailing - Lists
-
-
- -
9. Privoxy Copyright, License and - History
- -
-
-
9.1. License
- -
9.2. History
-
-
- -
10. See also
diff --git a/doc/webserver/developer-manual/newrelease.html b/doc/webserver/developer-manual/newrelease.html index 60995a2a..fb103267 100644 --- a/doc/webserver/developer-manual/newrelease.html +++ b/doc/webserver/developer-manual/newrelease.html @@ -185,11 +185,11 @@ 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 packagers. The formal docs - should be uploaded to the webserver. See the Section "Updating the - webserver" in this manual for details.

+ (and the html version of the man page) fall in this category. + REAMDE, the man page, AUTHORS, and config should all also be + committed to CVS for other packagers. The formal docs should be + uploaded to the webserver. See the Section "Updating the webserver" + in this manual for details.

  • @@ -738,7 +738,7 @@ 
    -  debchange -v 3.0.21-UNRELEASED-1 "New upstream version"
+  debchange -v 3.0.21-stable-1 "New upstream version"
    @@ -757,7 +757,7 @@

    This will create ../privoxy_3.0.21-UNRELEASED-1_i386.deb which can be + "FILENAME">../privoxy_3.0.21-stable-1_i386.deb which can be uploaded. To upload the package to Sourceforge, simply issue

    diff --git a/doc/webserver/developer-manual/seealso.html b/doc/webserver/developer-manual/seealso.html deleted file mode 100644 index 6a0f68fc..00000000 --- a/doc/webserver/developer-manual/seealso.html +++ /dev/null @@ -1,172 +0,0 @@ - - - - - See also - - - - - - - - -
    -
    - - - - - - - - - - - -
    Privoxy Developer Manual
    Prev 
    -
    - - -
    -

    10. See also

    - -

    Other references and sites of interest to Privoxy users:

    - - - - - - - -
    http://www.privoxy.org/, the Privoxy Home page.
    - - - - - - - -
    http://www.privoxy.org/faq/, the Privoxy FAQ.
    - - - - - - - -
    http://www.privoxy.org/developer-manual/, the - Privoxy developer manual.
    - - - - - - - -
    https://sourceforge.net/projects/ijbswa/, the Project - Page for Privoxy on SourceForge.
    - - - - - - - -
    http://config.privoxy.org/, the web-based user - interface. Privoxy must be running - for this to work. Shortcut: http://p.p/
    - - - - - - - -
    https://sourceforge.net/tracker/?group_id=11118&atid=460288, - to submit "misses" and other - configuration related suggestions to the developers.
    - - - - - - - -
    http://www.squid-cache.org/, a popular caching proxy, - which is often used together with Privoxy.
    - - - - - - - -
    http://www.pps.jussieu.fr/~jch/software/polipo/, - Polipo is a caching proxy with - advanced features like pipelining, multiplexing and caching of - partial instances. In many setups it can be used as Squid replacement.
    - - - - - - - -
    https://www.torproject.org/, Tor can help anonymize web browsing, web - publishing, instant messaging, IRC, SSH, and other - applications.
    -
    - -
    -
    - - - - - - - - - - - - - - - - - -
    PrevHome 
    Privoxy Copyright, License - and History  
    -
    - - diff --git a/doc/webserver/developer-manual/webserver-update.html b/doc/webserver/developer-manual/webserver-update.html index 7b0370fa..a6ce73a7 100644 --- a/doc/webserver/developer-manual/webserver-update.html +++ b/doc/webserver/developer-manual/webserver-update.html @@ -9,9 +9,6 @@ - @@ -31,8 +28,7 @@ - Next +  
    @@ -54,7 +50,7 @@ 
    -  make dok dok-pdf # (or 'make redhat-dok dok-pdf' if 'make dok' doesn't work for you)
+  make dok
    @@ -64,7 +60,6 @@ "FILENAME">doc/webserver/user-manual, doc/webserver/developer-manual, doc/webserver/faq, doc/pdf/*.pdf and doc/webserver/index.html automatically.

    If you changed the manual page sources, generate Home - Next +   @@ -124,8 +118,7 @@   - Contacting the developers, - Bug Reporting and Feature Requests +   diff --git a/doc/webserver/faq/copyright.html b/doc/webserver/faq/copyright.html index 177db393..a26dad7d 100644 --- a/doc/webserver/faq/copyright.html +++ b/doc/webserver/faq/copyright.html @@ -62,26 +62,16 @@ "CITETITLE">GNU General Public License, version 2, as published by the Free Software Foundation.

    -

    This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - details.

    - -

    You should have received a copy of the GNU - GPL along with this program; if not, write to the

    - -

     Free Software
    -  Foundation, Inc. 51 Franklin - Street, Fifth Floor
    -  Boston, MA 02110-1301
    -  USA 

    +

    Privoxy 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 license for details.

    -

    7.2. History

    +

    7.2. History

    A long time ago, there was the Internet Junkbuster, by Anonymous Coders and Junkbusters Corporation. diff --git a/doc/webserver/faq/index.html b/doc/webserver/faq/index.html index 1f18e336..0015aac0 100644 --- a/doc/webserver/faq/index.html +++ b/doc/webserver/faq/index.html @@ -515,7 +515,7 @@

    7.1. License
    -
    7.2. History
    +
    7.2. History
    diff --git a/doc/webserver/index.html b/doc/webserver/index.html index e6ed1946..b32c7e66 100644 --- a/doc/webserver/index.html +++ b/doc/webserver/index.html @@ -52,7 +52,7 @@

    The most recent release is 3.0.21 (UNRELEASED).

    + "_top">3.0.21 (stable).

    diff --git a/doc/webserver/user-manual/actions-file.html b/doc/webserver/user-manual/actions-file.html index 24b04496..c1a6cb33 100644 --- a/doc/webserver/user-manual/actions-file.html +++ b/doc/webserver/user-manual/actions-file.html @@ -117,7 +117,7 @@ in default.action are:

    - +

    Table 1. Default Configurations

    @@ -314,7 +314,7 @@ actions.

    -

    8.1. Finding the Right +

    8.1. Finding the Right Mix

    Note that some actions, like @@ -339,7 +339,7 @@

    -

    8.2. How to +

    8.2. How to Edit

    The easiest way to edit the actions files is with a browser by using @@ -529,7 +529,7 @@

    -

    8.4.1. The Domain +

    8.4.1. The Domain Pattern

    The matching of the domain part offers some flexible options: if @@ -634,7 +634,7 @@

    -

    8.4.2. The Path +

    8.4.2. The Path Pattern

    Privoxy uses

    -

    8.5.35. +

    8.5.35. Summary

    Note that many of these actions have the potential to cause a page @@ -4483,7 +4483,7 @@ example.org/instance-that-is-delivered-as-xml-but-is-not together:

    -

    8.7.1. +

    8.7.1. match-all.action

    Remember all actions @@ -4532,7 +4532,7 @@ example.org/instance-that-is-delivered-as-xml-but-is-not

    -

    8.7.2. +

    8.7.2. default.action

    If you aren't a developer, there's no need for you to edit the @@ -4875,7 +4875,7 @@ wiki.

    -

    8.7.3. +

    8.7.3. user.action

    So far we are painting with a broad brush by setting general diff --git a/doc/webserver/user-manual/appendix.html b/doc/webserver/user-manual/appendix.html index 96e0400c..a99d71d1 100644 --- a/doc/webserver/user-manual/appendix.html +++ b/doc/webserver/user-manual/appendix.html @@ -293,7 +293,7 @@

    -

    14.2. Privoxy's +

    14.2. Privoxy's Internal Pages

    Since Privoxy proxies each @@ -313,7 +313,7 @@

    diff --git a/doc/webserver/user-manual/copyright.html b/doc/webserver/user-manual/copyright.html index 1508dc72..c0705137 100644 --- a/doc/webserver/user-manual/copyright.html +++ b/doc/webserver/user-manual/copyright.html @@ -56,7 +56,7 @@ the Free Software Foundation and included in the next section.

    -

    12.1. License

    +

    12.1. License

    diff --git a/doc/webserver/user-manual/filter-file.html b/doc/webserver/user-manual/filter-file.html index 4bc2287e..a0c89922 100644 --- a/doc/webserver/user-manual/filter-file.html +++ b/doc/webserver/user-manual/filter-file.html @@ -151,7 +151,7 @@ FILTER: foo Replace all "foo" with "bar" started.

    -

    9.1. Filter File +

    9.1. Filter File Tutorial

    Now, let's complete our "foo" content diff --git a/doc/webserver/user-manual/index.html b/doc/webserver/user-manual/index.html index c13ef962..462fe446 100644 --- a/doc/webserver/user-manual/index.html +++ b/doc/webserver/user-manual/index.html @@ -117,7 +117,7 @@ from source

    2.1.7. FreeBSD
    + "installation.html#INSTALLATION-FREEBSD">FreeBSD @@ -173,7 +173,7 @@
    -
    6.1. Controlling Privoxy +
    6.1. Controlling Privoxy with Your Web Browser
    6.2. Configuration @@ -342,10 +342,10 @@
    -
    8.1. Finding the Right +
    8.1. Finding the Right Mix
    -
    8.2. How to Edit
    +
    8.2. How to Edit
    8.3. How Actions are Applied to Requests
    @@ -355,10 +355,10 @@
    -
    8.4.1. The Domain +
    8.4.1. The Domain Pattern
    -
    8.4.2. The Path +
    8.4.2. The Path Pattern
    8.4.3. The Tag @@ -472,7 +472,7 @@ "actions-file.html#SET-IMAGE-BLOCKER">set-image-blocker
    8.5.35. Summary
    + "actions-file.html#AEN4788">Summary
    @@ -484,13 +484,13 @@
    8.7.1. match-all.action
    + "actions-file.html#AEN4852">match-all.action
    8.7.2. default.action
    + "actions-file.html#AEN4874">default.action
    8.7.3. user.action
    + "actions-file.html#AEN4987">user.action
    @@ -500,7 +500,7 @@
    -
    9.1. Filter File +
    9.1. Filter File Tutorial
    9.2. The @@ -547,7 +547,7 @@
    -
    12.1. License
    +
    12.1. License
    12.2. History
    @@ -564,7 +564,7 @@
    14.1. Regular Expressions
    -
    14.2. Privoxy's Internal +
    14.2. Privoxy's Internal Pages
    diff --git a/doc/webserver/user-manual/installation.html b/doc/webserver/user-manual/installation.html index 3dd2556d..021c2e92 100644 --- a/doc/webserver/user-manual/installation.html +++ b/doc/webserver/user-manual/installation.html @@ -213,22 +213,12 @@

    -

    2.1.7. FreeBSD

    +

    2.1.7. FreeBSD

    Privoxy is part of FreeBSD's Ports Collection, you can build and install it with cd /usr/ports/www/privoxy; make install clean.

    - -

    If you don't use the ports, you can fetch and install the package - with pkg_add -r privoxy.

    - -

    The port skeleton and the package can also be downloaded from the - File Release Page, but there's no reason to use - them unless you're interested in the beta releases which are only - available there.

    @@ -262,8 +252,8 @@ diff --git a/doc/webserver/user-manual/introduction.html b/doc/webserver/user-manual/introduction.html index bf3bd70e..dcd6e5b5 100644 --- a/doc/webserver/user-manual/introduction.html +++ b/doc/webserver/user-manual/introduction.html @@ -40,18 +40,8 @@

    1. Introduction

    -

    This documentation is included with the current UNRELEASED version of - Privoxy, v.3.0.21, 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 a new version is currently nearing - completion, and includes significant changes and enhancements over - earlier versions.

    - -

    Since this is a UNRELEASED version, not all new features are well - tested. This documentation may be slightly out of sync as a result - (especially with CVS sources). And there may be bugs, though hopefully not many!

    +

    This documentation is included with the current stable version of + Privoxy, 3.0.21.

    1.1. @@ -60,8 +50,8 @@

    In addition to the core features of ad blocking and cookie management, Privoxy provides many - supplemental features, some of them currently under development, that - give the end-user more control, more privacy and more freedom:

    + supplemental features, that give the end-user more control, more + privacy and more freedom:

    • diff --git a/doc/webserver/user-manual/quickstart.html b/doc/webserver/user-manual/quickstart.html index e40e08e5..99765628 100644 --- a/doc/webserver/user-manual/quickstart.html +++ b/doc/webserver/user-manual/quickstart.html @@ -343,7 +343,7 @@ "GUIBUTTON">Edit":

      - +

      Figure 1. Actions Files in Use

      diff --git a/doc/webserver/user-manual/startup.html b/doc/webserver/user-manual/startup.html index 958d3624..05bfa585 100644 --- a/doc/webserver/user-manual/startup.html +++ b/doc/webserver/user-manual/startup.html @@ -55,7 +55,7 @@ protocols.

      - +

      Figure 2. Proxy Configuration Showing Mozilla/Netscape HTTP and HTTPS (SSL) Settings

      @@ -112,7 +112,7 @@ only HTTP and HTTPS (SSL)!

      - +

      Figure 3. Proxy Configuration Showing Internet Explorer HTTP and HTTPS (Secure) Settings

      -- 2.39.2 

    - tar xzvf privoxy-3.0.21-beta-src.tar.gz
- cd privoxy-3.0.21-beta
+ tar xzvf privoxy-3.0.21-stable-src.tar.gz
+ cd privoxy-3.0.21-stable