From 46471693916537291afcf7eadd40e6b93277bfaa Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Wed, 9 Dec 2020 15:44:44 +0100 Subject: [PATCH] Rebuild documentation --- .../developer-manual/documentation.html | 10 +++--- doc/webserver/developer-manual/index.html | 2 +- .../developer-manual/introduction.html | 5 +-- .../developer-manual/newrelease.html | 30 ++++++++--------- .../developer-manual/webserver-update.html | 5 +-- doc/webserver/faq/configuration.html | 16 +++++----- doc/webserver/faq/contact.html | 2 +- doc/webserver/faq/copyright.html | 2 +- doc/webserver/faq/general.html | 32 +++++++++---------- doc/webserver/faq/installation.html | 3 +- doc/webserver/faq/misc.html | 2 +- doc/webserver/faq/trouble.html | 6 ++-- doc/webserver/user-manual/actions-file.html | 12 +++---- doc/webserver/user-manual/appendix.html | 16 +++++----- doc/webserver/user-manual/config.html | 4 +-- doc/webserver/user-manual/contact.html | 2 +- doc/webserver/user-manual/copyright.html | 2 +- doc/webserver/user-manual/filter-file.html | 2 +- doc/webserver/user-manual/introduction.html | 2 +- doc/webserver/user-manual/quickstart.html | 4 +-- doc/webserver/user-manual/startup.html | 4 +-- 21 files changed, 82 insertions(+), 81 deletions(-) diff --git a/doc/webserver/developer-manual/documentation.html b/doc/webserver/developer-manual/documentation.html index 8bee4e34..86a725ac 100644 --- a/doc/webserver/developer-manual/documentation.html +++ b/doc/webserver/developer-manual/documentation.html @@ -27,7 +27,7 @@

3. Documentation Guidelines

All formal documents are maintained in Docbook SGML and located in the doc/source/* directory. You will need doc/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 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.

+ does not survive so well. Especially some of the examples that are longer than 80 characters.

Other, less formal documents (e.g. LICENSE) are maintained as plain text files in the top-level source directory.

Packagers are encouraged to include this documentation. For those without the ability to build the docs locally, @@ -63,7 +61,7 @@

  • Run make webserver which copies all files from doc/webserver to the sourceforge webserver via scp.

    + "COMPUTEROUTPUT">doc/webserver to the sourceforge webserver via ssh.

    • Finished docs should be occasionally submitted to Git (doc/webserver/*/*.html) so that @@ -209,7 +207,7 @@

    -

    3.3. Privoxy Custom Entities

    +

    3.3. Privoxy Custom Entities

    Privoxy documentation is using a number of customized "entities" to facilitate documentation maintenance.

    We are using a set of "boilerplate" files with generic text, that is used by diff --git a/doc/webserver/developer-manual/index.html b/doc/webserver/developer-manual/index.html index ba5d74ad..5f206b0a 100644 --- a/doc/webserver/developer-manual/index.html +++ b/doc/webserver/developer-manual/index.html @@ -53,7 +53,7 @@

    3.1. Quickstart to Docbook and SGML
    3.2. Privoxy Documentation Style
    -
    3.3. Privoxy Custom Entities
    +
    3.3. Privoxy Custom Entities
    4. Coding Guidelines
    diff --git a/doc/webserver/developer-manual/introduction.html b/doc/webserver/developer-manual/introduction.html index f029e78e..1c81cd60 100644 --- a/doc/webserver/developer-manual/introduction.html +++ b/doc/webserver/developer-manual/introduction.html @@ -36,8 +36,9 @@

    1.1. Quickstart to Privoxy Development

    The first step is to join the privoxy-devel mailing list. You can submit your ideas or, even better, patches. Patches are best - submitted to the Sourceforge tracker set up for this purpose, but can be sent to the list for review too.

    + "_top">privoxy-devel mailing list. You can submit your ideas or, even better, patches. Patches can also be + submitted to the Sourceforge patch + tracker.

    You will also need to have a git package installed, in order to access the git repository. Having the GNU build tools is also going to be important (particularly, autoconf and gmake).

    For the time being (read, this section is under construction), you can also refer to the extensive comments in diff --git a/doc/webserver/developer-manual/newrelease.html b/doc/webserver/developer-manual/newrelease.html index ac3a9bef..7d4ed88a 100644 --- a/doc/webserver/developer-manual/newrelease.html +++ b/doc/webserver/developer-manual/newrelease.html @@ -31,9 +31,8 @@ important that great care is taken to ensure that everything runs fine, and not to introduce problems in the very last minute.

    So when releasing a new version, please adhere exactly to the procedure outlined in this chapter.

    -

    The following programs are required to follow this process: ncftpput (ncftp), - scp, ssh (ssh), gmake (GNU's version of make), autoconf, - cvs.

    +

    The following programs are required to follow this process: ssh, gmake (GNU's version of make), autoconf, git, a web browser.

    6.1. Version numbers

    First you need to determine which version number the release will have.

    X, the version major, is rarely ever changed. It is increased by one if turning a development branch into stable substantially changes the functionality, user interface or configuration syntax. Majors 1 and 2 were - Junkbuster, and 3 will be the first stable Junkbuster, and 3 is the first stable Privoxy release.

  • @@ -198,9 +197,9 @@ for-privoxy-version=3.0.11 is version sensitive, so that the user will get appropriate help for his/her release. So with each release a fresh version should be uploaded to the webserver (this is in addition to the main User Manual link from the main page since we need to keep manuals for various versions available). The CGI - pages will link to something like http://privoxy.org/$(VERSION)/user-manual/. This - will need to be updated for each new release. There is no Makefile target for this at this time!!! It needs - to be done manually.

    + pages will link to something like https://www.privoxy.org/$(VERSION)/user-manual/. + This will need to be updated for each new release. There is no Makefile target for this at this time!!! It + needs to be done manually.

  • Tag all files in Git with the version number with "git tag @@ -520,13 +519,13 @@ for-privoxy-version=3.0.11

    6.3.7. Mac OS X

    First, make sure that you have freshly exported the right version into an empty directory. (See "Building and releasing packages" above).

    -

    There are three modules available in the Git repository for use on Mac OS X, though technically only two of - them generate a release (the other can be used to install from source).

    +

    There are three modules available in the CVS repository backups for use on Mac OS X, though technically only + two of them generate a release (the other can be used to install from source).

    6.3.7.1. - OSXPackageBuilder module

    + OSXPackageBuilder module (Documentation out of date)

    The OSXPackageBuilder module generates OS X installer packages supporting all Macs running OS X 10.4 and - above. Obtain it from Git as follows into a folder parallel to the exported privoxy source:

    + above. Obtain it from CVS as follows into a folder parallel to the exported privoxy source:

    @@ -544,11 +543,11 @@ for-privoxy-version=3.0.11

    6.3.7.2. osxsetup module - (DEPRECATED)

    + (DEPRECATED) (Documentation out of date)

    This module is deprecated since the installer it generates places all Privoxy files in one folder in a non-standard location, and supports only Intel Macs running OS X 10.6 or higher.

    -

    Check out the module from Git as follows into a folder parallel to the exported privoxy source:

    +

    Check out the module from CVS as follows into a folder parallel to the exported privoxy source:

    @@ -585,9 +584,10 @@ for-privoxy-version=3.0.11 package supports.

    -

    6.3.7.3. macsetup module

    +

    6.3.7.3. macsetup module + (Documentation out of date)

    The macsetup module is ideal if you wish to build and install Privoxy from source on a single machine.

    -

    Check out the module from Git as follows into a folder parallel to the exported privoxy source:

    +

    Check out the module from CVS as follows into a folder parallel to the exported privoxy source:

    diff --git a/doc/webserver/developer-manual/webserver-update.html b/doc/webserver/developer-manual/webserver-update.html index 5183b2b9..1abeaef5 100644 --- a/doc/webserver/developer-manual/webserver-update.html +++ b/doc/webserver/developer-manual/webserver-update.html @@ -55,8 +55,9 @@
    -

    This will do the upload to the webserver (www.privoxy.org) - and ensure all files and directories there are group writable.

    +

    This will do the upload to the SourceForge webserver (which is manually syncronized with www.privoxy.org) and ensure all files and directories there are group + writable.

    Please do NOT use any other means of transferring files to the webserver to avoid permission problems. Also, please do not upload docs from development branches or versions. The publicly posted docs should be in sync with the last official release.

    diff --git a/doc/webserver/faq/configuration.html b/doc/webserver/faq/configuration.html index fe2de36f..d508843b 100644 --- a/doc/webserver/faq/configuration.html +++ b/doc/webserver/faq/configuration.html @@ -41,7 +41,7 @@ pattern basis, i.e. for single URLs, whole web sites, groups or parts thereof etc. Actions can also be grouped together and then applied to requests matching one or more patterns. There are many possible actions that might apply to any given site. As an example, if you are blocking cookies as one of your default actions, but need + "https://en.wikipedia.org/wiki/Browser_cookie" target="_top">cookies as one of your default actions, but need to accept cookies from a given site, you would need to define an exception for this site in one of your actions files, preferably in user.action.

    @@ -104,7 +104,7 @@

    3.8. How can I make my Yahoo/Hotmail/Gmail account work?

    The default configuration shouldn't impact the usability of any of these services. It may, however, make all - cookies temporary, so that your browser + cookies temporary, so that your browser will forget your login credentials in between browser sessions. If you would like not to have to log in manually each time you access those websites, simply turn off all cookie handling for them in the user.action file. An example for yahoo might look like:

    @@ -121,7 +121,7 @@
    -

    These kinds of sites are often quite complex and heavy with These kinds of sites are often quite complex and heavy with Javascript and thus "fragile". So if still a problem, we have an alias just for such sticky situations:

    @@ -311,7 +311,7 @@

    3.19. Can Privoxy run as a "transparent" proxy?

    The whole idea of Privoxy is to modify client requests and server responses in all sorts of ways and therefore - it's not a transparent proxy as described in RFC + it's not a transparent proxy as described in RFC 2616.

    However, some people say "transparent proxy" when they mean "intercepting proxy". If you are one of them, please read the

    3.23. I sometimes notice cookies sneaking through. How?

    -

    Cookies can be set in several ways. +

    Cookies can be set in several ways. The classic method is via the Set-Cookie HTTP header. This is straightforward, and an easy one to manipulate, such as the Privoxy concept of session-cookies-only. There is also the - possibility of using Javascript to set + possibility of using Javascript to set cookies (Privoxy calls these content-cookies). This is trickier because the syntax can vary widely, and thus requires a certain amount of guesswork. It is not realistic to catch all of these short of disabling Javascript, which would break many sites. And lastly, if the cookies are @@ -371,14 +371,14 @@

    3.24. Are all cookies bad? Why?

    -

    No, in fact there are many beneficial uses of No, in fact there are many beneficial uses of cookies. Cookies are just a method that browsers can use to store data between pages, or between browser sessions. Sometimes there is a good reason for this, and the user's life is a bit easier as a result. But there is a long history of some websites taking advantage of this layer of trust, and using the data they glean from you and your browsing habits for their own purposes, and maybe to your potential detriment. Such sites are using you and storing their data on your system. That is why the privacy conscious watch from whom those cookies come, and why they really need to be there.

    -

    See the Wikipedia cookie definition +

    See the Wikipedia cookie definition for more.

    diff --git a/doc/webserver/faq/contact.html b/doc/webserver/faq/contact.html index 08ec0e65..d6c5626f 100644 --- a/doc/webserver/faq/contact.html +++ b/doc/webserver/faq/contact.html @@ -121,7 +121,7 @@ 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.

    + "https://www.chiark.greenend.org.uk/~sgtatham/bugs.html" target="_top">How to Report Bugs Effectively.

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

    diff --git a/doc/webserver/faq/copyright.html b/doc/webserver/faq/copyright.html index 70a91974..a762bfd1 100644 --- a/doc/webserver/faq/copyright.html +++ b/doc/webserver/faq/copyright.html @@ -56,7 +56,7 @@ 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 + "https://www.gnu.org/licenses/old-licenses/gpl-2.0.html" target="_top">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 diff --git a/doc/webserver/faq/general.html b/doc/webserver/faq/general.html index cd569be6..f0295d86 100644 --- a/doc/webserver/faq/general.html +++ b/doc/webserver/faq/general.html @@ -39,28 +39,28 @@ installation will benefit the most.

    One of Privoxy's strengths is that it is highly configurable giving you the ability to completely personalize your installation. Being familiar with, or at least having an interest in - learning about HTTP and other networking protocols, - HTML, and "Regular + learning about HTTP and other networking + protocols, HTML, and "Regular Expressions" will be a big plus and will help you get the most out of Privoxy. A new installation just includes a very basic configuration. The user should take this as a starting point only, and enhance it as he or she sees fit. In fact, the user is encouraged, and expected to, fine-tune the configuration.

    Much of Privoxy's configuration can be done with a Web browser. But there are areas where configuration - is done using a text editor to edit - configuration files. Also note that the web-based action editor doesn't use authentication and should only be - enabled in environments where all clients with access to Privoxy listening port - can be trusted.

    + "https://en.wikipedia.org/wiki/Web_browser" target="_top">Web browser. But there are areas where + configuration is done using a text editor + to edit configuration files. Also note that the web-based action editor doesn't use authentication and should + only be enabled in environments where all clients with access to Privoxy + listening port can be trusted.

    1.3. What is a "proxy"? How does Privoxy work?

    -

    A web proxy is a service, based on a +

    A web proxy is a service, based on a software such as Privoxy, that clients (i.e. browsers) can use instead of connecting to web servers directly. The clients then ask the proxy to request objects (web pages, images, movies etc) on their behalf and to forward the data to the clients. It is a "go-between". For - details, see Wikipedia's proxy + details, see Wikipedia's proxy definition.

    There are many reasons to use web proxies, such as security (firewalling), efficiency (caching) and others, and there are any number of proxies to accommodate those needs.

    @@ -87,7 +87,7 @@ 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 + "https://www.gnu.org/licenses/old-licenses/gpl-2.0.html" target="_top">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 @@ -125,7 +125,7 @@

    1.7. How does Privoxy differ from the old Junkbuster?

    Privoxy picks up where Junkbuster left off. Privoxy still blocks ads and banners, still manages cookies, and still helps protect your privacy. + "https://en.wikipedia.org/wiki/Browser_cookie" target="_top">cookies, and still helps protect your privacy. But, most of these features have been enhanced, and many new ones have been added, all in the same vein.

    Privoxy's new features include:

      @@ -263,11 +263,9 @@

      1.14. Is there is a license or fee? What about a warranty? Registration?

      -

      Privoxy is free software and licensed under the GNU General Public License (GPL) version - 2. It is free to use, copy, modify or distribute as you wish under the terms of this license. Please see the - Copyright section for more information on the license and copyright. Or the - LICENSE file that should be included.

      +

      Privoxy is free software. It is free to use, copy, modify or distribute as + you wish under the terms of its license. Please see the Copyright section for more + information on the license and copyright.

      There is no warranty of any kind, expressed, implied or otherwise. That is something that would cost real money ;-) There is no registration either.

      diff --git a/doc/webserver/faq/installation.html b/doc/webserver/faq/installation.html index 2962beee..ee82fdc2 100644 --- a/doc/webserver/faq/installation.html +++ b/doc/webserver/faq/installation.html @@ -67,7 +67,8 @@ client isn't explicitly configured to use Privoxy, but where possible, configuring the client is recommended. See the User Manual for more details. You should also flush your browser's memory and disk cache to get rid of any cached junk - items, and remove any stored cookies.

      + items, and remove any stored cookies.

    2.5. What is the proxy address of Privoxy?

    diff --git a/doc/webserver/faq/misc.html b/doc/webserver/faq/misc.html index 14097d77..3164082e 100644 --- a/doc/webserver/faq/misc.html +++ b/doc/webserver/faq/misc.html @@ -255,7 +255,7 @@

    4.12. Can Privoxy act as a "caching" proxy to speed up web browsing?

    No, it does not have this ability at all. You want something like Squid or Polipo for + target="_top">Squid or Polipo for this. And, yes, before you ask, Privoxy can co-exist with other kinds of proxies like Squid. See the forwarding chapter in the user manual for diff --git a/doc/webserver/faq/trouble.html b/doc/webserver/faq/trouble.html index 3db5b4df..310ae020 100644 --- a/doc/webserver/faq/trouble.html +++ b/doc/webserver/faq/trouble.html @@ -310,7 +310,7 @@ Request: 66.70.21.80/scripts/click.php?hid=a71b9f6504b0c5681fa5&si=Ua

    5.16. Why do I keep seeing "PrivoxyWindowOpen()" in raw source code?

    Privoxy is attempting to disable malicious Javascript in this case, with the Javascript in this case, with the unsolicited-popups filter. Privoxy cannot tell very well "good" code snippets from "bad" code snippets.

    If you see this in HTML source, and the page displays without problems, then this is good, and likely some @@ -392,6 +392,8 @@ Request: 66.70.21.80/scripts/click.php?hid=a71b9f6504b0c5681fa5&si=Ua "QUOTE">"Preferences", click the "Settings" button located on the "Network" tab in the "Advanced" section, and add "127.0.0.1:0" in the "No Proxy for:" field.

    +

    You can also prevent the problem by enabling https-inspection in which case Privoxy's error messages are delivered encrypted.

    5.22. I get selinux error messages. How can I fix @@ -448,7 +450,7 @@ Request: 66.70.21.80/scripts/click.php?hid=a71b9f6504b0c5681fa5&si=Ua Privoxy bug.

    To prevent the crashes you can rewrite your filter to use less resources, increase the relevant memory limit or recompile pcre to use less stack space. For details please see the pcrestack man page and the documentation of + "https://pcre.org/original/doc/html/pcrestack.html" target="_top">pcrestack man page and the documentation of your operating system.

    diff --git a/doc/webserver/user-manual/actions-file.html b/doc/webserver/user-manual/actions-file.html index add8d7ce..44a6f9f0 100644 --- a/doc/webserver/user-manual/actions-file.html +++ b/doc/webserver/user-manual/actions-file.html @@ -271,7 +271,7 @@ already!

    The pattern matching syntax is different for the host and path parts of the URL. The host part uses a simple globbing type matching technique, while the path part uses more flexible "Regular + "https://en.wikipedia.org/wiki/Regular_expressions" target="_top">"Regular Expressions" (POSIX 1003.2).

    The port part of a pattern is a decimal port number preceded by a colon (:). If the host part contains a numerical IPv6 address, it has to be put into angle brackets (<, @@ -363,7 +363,7 @@

    Additionally, there are wild-cards that you can use in the domain names themselves. These work similarly to shell globbing type wild-cards: "*" represents zero or more arbitrary characters - (this is equivalent to the "Regular Expression" based syntax of ".*"), "?" represents any single character (this is equivalent to the regular expression syntax of a simple "."), and you can define "character @@ -401,7 +401,7 @@

    8.4.2. The Path Pattern

    Privoxy uses "modern" POSIX 1003.2 "Regular + "https://en.wikipedia.org/wiki/Regular_expressions" target="_top">"Regular Expressions" for matching the path portion (after the slash), and is thus more flexible.

    There is an Appendix with a brief quick-start into regular expressions, you also might want to have a look at your operating system's documentation on regular expressions (try @@ -1587,8 +1587,8 @@ problem-host.example.com completely rendered doesn't change much, but it may be perceived as slower since the page is not incrementally displayed.) This effect will be more noticeable on slower connections.

    "Rolling your own" filters requires a knowledge of "Regular - Expressions" and "Regular + Expressions" and "HTML". This is very powerful feature, and potentially very intrusive. Filters should be used with caution, and where an equivalent "action" is not available.

    The amount of data that can be filtered is limited to the occasionally useful to forge this in order to access sites that won't let you in otherwise (though there may be a good reason in some cases).

    More information on known user-agent strings can be found at http://www.user-agents.org/ and http://www.user-agents.org/ and http://en.wikipedia.org/wiki/User_agent.

    Example usage:
    diff --git a/doc/webserver/user-manual/appendix.html b/doc/webserver/user-manual/appendix.html index 8f3e6905..919ab35e 100644 --- a/doc/webserver/user-manual/appendix.html +++ b/doc/webserver/user-manual/appendix.html @@ -202,7 +202,7 @@ these. If not, you will get a friendly error message. Internet access is not necessary either.

    • -

      Privoxy main page:

      +

      Privoxy main page:

      http://config.privoxy.org/

      @@ -211,7 +211,7 @@ "APPLICATION">Privoxy)

    • -

      View and toggle client tags:

      +

      View and toggle client tags:

      http://config.privoxy.org/client-tags

      @@ -219,21 +219,21 @@

    • Show information about the current configuration, including viewing and editing of actions - files:

      + files:

      http://config.privoxy.org/show-status

    • -

      Show the browser's request headers:

      +

      Show the browser's request headers:

      http://config.privoxy.org/show-request

    • -

      Show which actions apply to a URL and why:

      +

      Show which actions apply to a URL and why:

      http://config.privoxy.org/show-url-info

      @@ -242,15 +242,15 @@

    • Toggle Privoxy on or off. This feature can be turned off/on in the main config file. When toggled "off", "Privoxy" continues to run, - but only as a pass-through proxy, with no actions taking place:

      + but only as a pass-through proxy, with no actions taking place:

      http://config.privoxy.org/toggle

      -

      Short cuts. Turn off, then on:

      +

      Short cuts. Turn off, then on:

      http://config.privoxy.org/toggle?set=disable

      -
      +

      • http://config.privoxy.org/toggle?set=enable

      diff --git a/doc/webserver/user-manual/config.html b/doc/webserver/user-manual/config.html index 3037bc6c..13759ae7 100644 --- a/doc/webserver/user-manual/config.html +++ b/doc/webserver/user-manual/config.html @@ -2472,8 +2472,8 @@ target="_top">https-inspection       action.

      Privoxy clients should import the certificate so that they can validate the generated certificates.

      -

      The file can be generated with: openssl req -new -x509 -extensions v3_ca -keyout cakey.pem -out - cacert.crt -days 3650

      +

      The file can be generated with: openssl req -new -x509 -extensions v3_ca -keyout + cakey.pem -out cacert.crt -days 3650

      Example:
      diff --git a/doc/webserver/user-manual/contact.html b/doc/webserver/user-manual/contact.html index e57b8c3f..24b524ec 100644 --- a/doc/webserver/user-manual/contact.html +++ b/doc/webserver/user-manual/contact.html @@ -122,7 +122,7 @@ 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.

      + "https://www.chiark.greenend.org.uk/~sgtatham/bugs.html" target="_top">How to Report Bugs Effectively.

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

      diff --git a/doc/webserver/user-manual/copyright.html b/doc/webserver/user-manual/copyright.html index 8a7ecd99..a56c521d 100644 --- a/doc/webserver/user-manual/copyright.html +++ b/doc/webserver/user-manual/copyright.html @@ -1085,7 +1085,7 @@ Public License instead of this License. But first, please read 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 + "https://www.gnu.org/licenses/old-licenses/gpl-2.0.html" target="_top">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 diff --git a/doc/webserver/user-manual/filter-file.html b/doc/webserver/user-manual/filter-file.html index 4cb2aaed..42639f76 100644 --- a/doc/webserver/user-manual/filter-file.html +++ b/doc/webserver/user-manual/filter-file.html @@ -96,7 +96,7 @@ '<' should be save, while '?' will sooner or later cause conflicts with $url.

      The non-standard option letter T (trivial) prevents parsing for backreferences in the substitute. Use it if you want to include text like '$&' in your substitute without quoting.

      -

      If you are new to If you are new to "Regular Expressions", you might want to take a look at the Appendix on regular expressions, and see the Perl manual for

      1.1. Features

      -

      In addition to the core features of ad blocking and In addition to the core features of ad blocking and cookie management, Privoxy provides many 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 2108f118..e793ac3a 100644 --- a/doc/webserver/user-manual/quickstart.html +++ b/doc/webserver/user-manual/quickstart.html @@ -44,7 +44,7 @@

      • Set your browser to use Privoxy as HTTP and HTTPS (SSL) proxy by setting the proxy configuration for + "https://en.wikipedia.org/wiki/Proxy_server" target="_top">proxy by setting the proxy configuration for address of 127.0.0.1 and port 8118. DO NOT activate proxying for FTP or any protocols besides HTTP and HTTPS (SSL) unless you intend to prevent your browser from using these @@ -52,7 +52,7 @@

      • Flush your browser's disk and memory caches, to remove any cached ad images. If using Privoxy to manage Privoxy to manage cookies, you should remove any currently stored cookies too.

      • diff --git a/doc/webserver/user-manual/startup.html b/doc/webserver/user-manual/startup.html index a929c785..171a8d32 100644 --- a/doc/webserver/user-manual/startup.html +++ b/doc/webserver/user-manual/startup.html @@ -29,7 +29,7 @@

        5. Starting Privoxy

        Before launching Privoxy for the first time, you will want to configure your browser(s) to use Privoxy as a HTTP and HTTPS (SSL) proxy. The default is 127.0.0.1 (or localhost) for + "https://en.wikipedia.org/wiki/Proxy_server" target="_top">proxy. The default is 127.0.0.1 (or localhost) for the proxy address, and port 8118 (earlier versions used port 8000). This is the one configuration step that must be done!

        Please note that Privoxy can only proxy HTTP and HTTPS traffic. It will not @@ -73,7 +73,7 @@

    After doing this, flush your browser's disk and memory caches to force a re-reading of all pages and to get rid - of any ads that may be cached. Remove any cookies, if you want Privoxy to manage that. You are now ready to start enjoying the benefits of using Privoxy!

    Privoxy itself is typically started by specifying the main configuration file -- 2.39.2