From 2d1af75a04189057eb4cf4949908a3cdf9ca2b6e Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Mon, 23 Nov 2020 12:20:26 +0100 Subject: [PATCH] Rebuild docs for 3.0.29 stable --- INSTALL | 4 ++-- README | 21 +++++++------------ .../developer-manual/newrelease.html | 4 ++-- doc/webserver/faq/configuration.html | 2 +- doc/webserver/faq/copyright.html | 4 ++-- doc/webserver/faq/general.html | 11 ++++++---- doc/webserver/faq/index.html | 6 +++--- doc/webserver/index.html | 2 +- doc/webserver/user-manual/actions-file.html | 7 ++++--- doc/webserver/user-manual/appendix.html | 16 +++++++------- doc/webserver/user-manual/config.html | 5 ++++- doc/webserver/user-manual/configuration.html | 8 ++----- doc/webserver/user-manual/index.html | 2 +- doc/webserver/user-manual/installation.html | 4 ++-- doc/webserver/user-manual/introduction.html | 16 ++++++-------- doc/webserver/user-manual/quickstart.html | 2 +- doc/webserver/user-manual/startup.html | 4 ++-- 17 files changed, 55 insertions(+), 63 deletions(-) diff --git a/INSTALL b/INSTALL index 7cba5011..1d43f547 100644 --- a/INSTALL +++ b/INSTALL @@ -39,8 +39,8 @@ compiler like gcc are required. When building from a source tarball, first unpack the source: - tar xzvf privoxy-3.0.29-beta-src.tar.gz - cd privoxy-3.0.29-beta + tar xzvf privoxy-3.0.29-stable-src.tar.gz + cd privoxy-3.0.29-stable To build the development version, you can get the source code by doing: diff --git a/README b/README index 07db0310..9739c748 100644 --- a/README +++ b/README @@ -32,9 +32,8 @@ * *********************************************************************/ -This README is included with the development version of Privoxy 3.0.29. See -https://www.privoxy.org/ for more information. The current code maturity level -is "UNRELEASED", but seems stable to us :). +This README is included with Privoxy 3.0.29. See https://www.privoxy.org/ for +more information. The current code maturity level is "stable". ------------------------------------------------------------------------------- @@ -105,22 +104,16 @@ try it with FTP or other protocols for the simple reason it does not work. The actions list can be configured via the web interface accessed via http:// p.p/, as well other options. -All configuration files are subject to unannounced changes during the -development process. - ------------------------------------------------------------------------------- 5. DOCUMENTATION -There should be documentation in the 'doc' subdirectory, but it may not be -completed at this point. In particular, see the User Manual there, the FAQ, and -those interested in Privoxy development, should look at developer-manual. +There should be documentation in the 'doc' subdirectory. In particular, see the +User Manual there, the FAQ, and those interested in Privoxy development, should +look at developer-manual. -The most up to date source of information on the current development version, -may still be either comments in the source code, or the included configuration -files. The source and configuration files are all well commented. The main -configuration files are: 'config', 'default.action', and 'default.filter' in -the top-level source directory. +The source and configuration files are all well commented. The main +configuration files are: 'config', 'default.action', and 'default.filter'. Included documentation may vary according to platform and packager. All documentation is posted on https://www.privoxy.org, in case you don't have it, diff --git a/doc/webserver/developer-manual/newrelease.html b/doc/webserver/developer-manual/newrelease.html index cdf2f04d..6e355381 100644 --- a/doc/webserver/developer-manual/newrelease.html +++ b/doc/webserver/developer-manual/newrelease.html @@ -494,7 +494,7 @@ for-privoxy-version=3.0.11
- 
  debchange -v 3.0.29-UNRELEASED-1 "New upstream version"
+ 
  debchange -v 3.0.29-stable-1 "New upstream version"
@@ -506,7 +506,7 @@ for-privoxy-version=3.0.11 -

This will create ../privoxy_3.0.29-UNRELEASED-1_i386.deb which can be uploaded. To +

This will create ../privoxy_3.0.29-stable-1_i386.deb which can be uploaded. To upload the package to Sourceforge, simply issue

diff --git a/doc/webserver/faq/configuration.html b/doc/webserver/faq/configuration.html index f9c4c4db..6ed183b7 100644 --- a/doc/webserver/faq/configuration.html +++ b/doc/webserver/faq/configuration.html @@ -66,7 +66,7 @@ "../user-manual/config.html#ENABLE-EDIT-ACTIONS" target="_top">enable-edit-actions).

-

3.4. There are several different 3.4. There are several different "actions" files. What are the differences?

Please have a look at the the actions chapter in the User Manual for a detailed explanation.

diff --git a/doc/webserver/faq/copyright.html b/doc/webserver/faq/copyright.html index 09f69649..9b27c3d3 100644 --- a/doc/webserver/faq/copyright.html +++ b/doc/webserver/faq/copyright.html @@ -33,7 +33,7 @@ "APPLICATION">Junkbuster (tm) FAQ, and modified as appropriate for Privoxy.

-

7.1. License

+

7.1. License

Privoxy is free software; you can redistribute and/or modify its source code 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.

@@ -48,7 +48,7 @@ "CITETITLE">license for details.

-

7.2. History

+

7.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.

diff --git a/doc/webserver/faq/general.html b/doc/webserver/faq/general.html index e4cf8d43..7be6d347 100644 --- a/doc/webserver/faq/general.html +++ b/doc/webserver/faq/general.html @@ -139,6 +139,9 @@

  • Supports tagging which allows to change the behaviour based on client and server headers.

    • +
  • +

    Supports https inspection which allows to filter https requests.

    +

  • Can be run as an "intercepting" proxy, which obviates the need to configure browsers individually.

    • @@ -337,13 +340,13 @@
    Gold (12000 USD/year)
    -

    Logo shown at the bottom of the Privoxy homepage. - Logo, link and self description on the sponsor - page.

    +

    Logo or text link shown at the bottom of the Privoxy + homepage. Logo, link and self description on the sponsor page.

    Silver (1200 USD/year)
    -

    Logo shown randomly at the bottom of the Privoxy +

    Logo or text link shown at the bottom of the Privoxy homepage. Logo, link and self description on the sponsor page.

    diff --git a/doc/webserver/faq/index.html b/doc/webserver/faq/index.html index c576a21e..6ea03321 100644 --- a/doc/webserver/faq/index.html +++ b/doc/webserver/faq/index.html @@ -110,7 +110,7 @@ me. Please list some of these "actions".
    3.3. How are actions files configured? What is the easiest way to do this?
    -
    3.4. There are several different 3.4. There are several different "actions" files. What are the differences?
    3.5. Where can I get updated Actions Files?
    3.6. Can I use my old config files?
    @@ -285,8 +285,8 @@
    7. Privoxy Copyright, License and History
    -
    7.1. License
    -
    7.2. History
    +
    7.1. License
    +
    7.2. History
    diff --git a/doc/webserver/index.html b/doc/webserver/index.html index d204aeb1..346be7b0 100644 --- a/doc/webserver/index.html +++ b/doc/webserver/index.html @@ -32,7 +32,7 @@ "_top">https://www.privoxy.org/faq/general.html#DONATE

    -

    The most recent release is 3.0.28 (stable).

    +

    The most recent release is 3.0.29 (stable).

    diff --git a/doc/webserver/user-manual/actions-file.html b/doc/webserver/user-manual/actions-file.html index 68c0b5e8..a5a7d7a4 100644 --- a/doc/webserver/user-manual/actions-file.html +++ b/doc/webserver/user-manual/actions-file.html @@ -73,7 +73,7 @@

    The default profiles, and their associated actions, as pre-defined in default.action are:

    - +

    Table 1. Default Configurations

    @@ -2526,8 +2526,9 @@ nasty-banner-server.example.com/junk.cgi\?output=trash

    This action allows Privoxy to filter encrypted requests and responses. For this to work Privoxy has to generate a certificate and send it to the client which has to accept it.

    -

    Before this works the directives in the TLS section of the config file have to be configured.

    +

    Before this works the directives in the HTTPS inspection section of the config + file have to be configured.

    Note that the action has to be enabled based on the CONNECT request which doesn't contain a path. Enabling it based on a pattern with path doesn't work as the path is only seen by Privoxy if the action is already enabled.

    diff --git a/doc/webserver/user-manual/appendix.html b/doc/webserver/user-manual/appendix.html index d809b3ed..0f598070 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 Menu

    +

        Privoxy Menu


    @@ -94,8 +94,7 @@

    6.2. Configuration Files Overview

    For Unix, *BSD and GNU/Linux, all configuration files are located in /etc/privoxy/ by default. For MS Windows these are all in the same directory as the Privoxy - executable. The name and number of configuration files has changed from previous versions, and is subject to - change as development progresses.

    + executable.

    The installed defaults provide a reasonable starting point, though some settings may be aggressive by some standards. For the time being, the principle configuration files are:

      @@ -146,9 +145,6 @@ listening address of Privoxy, these "wake up" requests must obviously be sent to the old listening address.

      -

      While under development, the configuration content is subject to change. The below documentation may not be - accurate by the time you read this. Also, what constitutes a "default" setting, may - change, so please check all your configuration files on important issues.

      diff --git a/doc/webserver/user-manual/index.html b/doc/webserver/user-manual/index.html index 082b58a9..bf530d48 100644 --- a/doc/webserver/user-manual/index.html +++ b/doc/webserver/user-manual/index.html @@ -194,7 +194,7 @@
      7.6.19. receive-buffer-size
      -
      7.7. TLS/SSL Inspection (Experimental)
      +
      7.7. HTTPS Inspection (Experimental)
      7.7.1. ca-directory
      diff --git a/doc/webserver/user-manual/installation.html b/doc/webserver/user-manual/installation.html index e57e4e6c..3f5be857 100644 --- a/doc/webserver/user-manual/installation.html +++ b/doc/webserver/user-manual/installation.html @@ -128,8 +128,8 @@
    - 
     tar xzvf privoxy-3.0.29-beta-src.tar.gz
- cd privoxy-3.0.29-beta
    + 
     tar xzvf privoxy-3.0.29-stable-src.tar.gz
+ cd privoxy-3.0.29-stable
    diff --git a/doc/webserver/user-manual/introduction.html b/doc/webserver/user-manual/introduction.html index 210e8579..13cd1933 100644 --- a/doc/webserver/user-manual/introduction.html +++ b/doc/webserver/user-manual/introduction.html @@ -27,20 +27,13 @@

    1. Introduction

    -

    This documentation is included with the current UNRELEASED version of Privoxy, - 3.0.29, 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 git sources). And there may be bugs, though - hopefully not many!

    +

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

    1.1. Features

    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:

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

    • Supports "Connection: keep-alive". Outgoing connections can be kept alive independently from the @@ -52,6 +45,9 @@

    • Supports tagging which allows to change the behaviour based on client and server headers.

      • +
    • +

      Supports https inspection which allows to filter https requests.

      +

    • Can be run as an "intercepting" proxy, which obviates the need to configure browsers individually.

      • diff --git a/doc/webserver/user-manual/quickstart.html b/doc/webserver/user-manual/quickstart.html index 1193746c..7409cf27 100644 --- a/doc/webserver/user-manual/quickstart.html +++ b/doc/webserver/user-manual/quickstart.html @@ -219,7 +219,7 @@

      Find user.action in the top section, and click on "Edit":

      - +

      Figure 1. Actions Files in Use

      diff --git a/doc/webserver/user-manual/startup.html b/doc/webserver/user-manual/startup.html index ddcad779..48ca3d2c 100644 --- a/doc/webserver/user-manual/startup.html +++ b/doc/webserver/user-manual/startup.html @@ -35,7 +35,7 @@

      Please note that Privoxy can only proxy HTTP and HTTPS traffic. It will not work with FTP or other protocols.

      - +

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

      @@ -67,7 +67,7 @@ protocols" is UNCHECKED. You want only HTTP and HTTPS (SSL)!

      - +

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

      -- 2.39.2