From ae4ff5fcb1cfe4c42e6decdda9ec92cfc565e276 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Wed, 3 Feb 2021 11:09:17 +0100 Subject: [PATCH] Rebuild docs for 3.0.32 UNRELEASED --- INSTALL | 4 ++-- README | 21 ++++++++++++------- .../developer-manual/documentation.html | 2 +- doc/webserver/developer-manual/index.html | 2 +- .../developer-manual/newrelease.html | 18 +++++++++------- doc/webserver/faq/index.html | 2 +- doc/webserver/index.html | 2 +- doc/webserver/privoxy-index.html | 2 +- doc/webserver/user-manual/actions-file.html | 4 ++-- doc/webserver/user-manual/appendix.html | 20 +++++++++--------- doc/webserver/user-manual/config.html | 4 ++-- doc/webserver/user-manual/configuration.html | 14 ++++++++----- doc/webserver/user-manual/contact.html | 4 ++-- doc/webserver/user-manual/copyright.html | 4 ++-- doc/webserver/user-manual/filter-file.html | 4 ++-- doc/webserver/user-manual/index.html | 4 ++-- doc/webserver/user-manual/installation.html | 8 +++---- doc/webserver/user-manual/introduction.html | 21 ++++++++++++------- doc/webserver/user-manual/quickstart.html | 6 +++--- doc/webserver/user-manual/seealso.html | 4 ++-- doc/webserver/user-manual/startup.html | 8 +++---- doc/webserver/user-manual/templates.html | 4 ++-- doc/webserver/user-manual/whatsnew.html | 4 ++-- 23 files changed, 94 insertions(+), 72 deletions(-) diff --git a/INSTALL b/INSTALL index 2e1b2e62..8018fae3 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.31-stable-src.tar.gz - cd privoxy-3.0.31-stable + tar xzvf privoxy-3.0.32-beta-src.tar.gz + cd privoxy-3.0.32-beta To build the development version, you can get the source code by doing: diff --git a/README b/README index 75c8344e..6b6c3fae 100644 --- a/README +++ b/README @@ -32,8 +32,9 @@ * *********************************************************************/ -This README is included with Privoxy 3.0.31. See https://www.privoxy.org/ for -more information. The current code maturity level is "stable". +This README is included with the development version of Privoxy 3.0.32. See +https://www.privoxy.org/ for more information. The current code maturity level +is "UNRELEASED", but seems stable to us :). ------------------------------------------------------------------------------- @@ -104,16 +105,22 @@ 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. 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, 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. -The source and configuration files are all well commented. The main -configuration files are: 'config', 'default.action', and 'default.filter'. +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. 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/documentation.html b/doc/webserver/developer-manual/documentation.html index d5f3b8fc..38ff7003 100644 --- a/doc/webserver/developer-manual/documentation.html +++ b/doc/webserver/developer-manual/documentation.html @@ -236,7 +236,7 @@ p-version: the Privoxy version string, e.g. "3.0.31". + "APPLICATION">Privoxy version string, e.g. "3.0.32". p-status: the project status, either diff --git a/doc/webserver/developer-manual/index.html b/doc/webserver/developer-manual/index.html index ba0faf27..6e7da100 100644 --- a/doc/webserver/developer-manual/index.html +++ b/doc/webserver/developer-manual/index.html @@ -22,7 +22,7 @@ helpful!) reading for anyone who wants to join the team. Note that it's currently out of date and may not be entirely correct. As always, patches are welcome.

Please note that this document is constantly evolving. This copy represents the state at the release of - version 3.0.31. You can find the latest version of the this manual at https://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.

diff --git a/doc/webserver/developer-manual/newrelease.html b/doc/webserver/developer-manual/newrelease.html index 79a0f1ee..c945f3dd 100644 --- a/doc/webserver/developer-manual/newrelease.html +++ b/doc/webserver/developer-manual/newrelease.html @@ -205,6 +205,10 @@ for-privoxy-version=3.0.11

Tag all files in Git with the version number with "git tag -s v_X_Y_Z". Don't use vX_Y_Z, ver_X_Y_Z, v_X.Y.Z (won't work) etc.

+
  • +

    Push the tag to the remote with "git push origin + v_X_Y_Z".

    +

  • On the webserver, copy the user manual to a new top-level directory called X.Y.Z. This ensures that help links from the CGI pages, which have the version as a prefix, @@ -474,7 +478,7 @@ for-privoxy-version=3.0.11
    - 
      dch -v 3.0.31-1
    + 
      dch -v 3.0.32-1
    @@ -491,7 +495,7 @@ for-privoxy-version=3.0.11
    - 
      lintian -iI ../build-area/privoxy_3.0.31-1_amd64.changes
    + 
      lintian -iI ../build-area/privoxy_3.0.32-1_amd64.changes
    @@ -500,7 +504,7 @@ for-privoxy-version=3.0.11 

      sudo cowbuilder --build --basepath /var/cache/pbuilder/base.cow ../build-area/privoxy_3.0.31-1.dsc
    + "PROGRAMLISTING"> sudo cowbuilder --build --basepath /var/cache/pbuilder/base.cow ../build-area/privoxy_3.0.32-1.dsc @@ -509,19 +513,19 @@ for-privoxy-version=3.0.11 
      autopkgtest /var/cache/pbuilder/result/privoxy_3.0.31-1_amd64.changes -s -- schroot sid
    + "PROGRAMLISTING"> autopkgtest /var/cache/pbuilder/result/privoxy_3.0.32-1_amd64.changes -s -- schroot sid

    Or just push the changes to salsa.debian.org, where a CI pipeline is defined for the package, that builds and tests it.

    If everything is okay, run cowbuilder with i386 and amd64 environments for current Debian stable release and - build privoxy_3.0.31-1_i386.deb and privoxy_3.0.31-1_amd64.deb. Then sign both files:

    + build privoxy_3.0.32-1_i386.deb and privoxy_3.0.32-1_amd64.deb. Then sign both files:

    - 
      gpg --detach-sign --armor privoxy_3.0.31-1_i386.deb
-  gpg --detach-sign --armor privoxy_3.0.31-1_amd64.deb
    + 
      gpg --detach-sign --armor privoxy_3.0.32-1_i386.deb
+  gpg --detach-sign --armor privoxy_3.0.32-1_amd64.deb
    diff --git a/doc/webserver/faq/index.html b/doc/webserver/faq/index.html index b4376896..9b15ea5d 100644 --- a/doc/webserver/faq/index.html +++ b/doc/webserver/faq/index.html @@ -38,7 +38,7 @@

    • Please note that this document is a work in progress. This copy represents the state at the release of - version 3.0.31. You can find the latest version of the document at https://www.privoxy.org/faq/. Please see the Contact section if you want to contact the developers.

    diff --git a/doc/webserver/index.html b/doc/webserver/index.html index a0f702e9..341b4ed7 100644 --- a/doc/webserver/index.html +++ b/doc/webserver/index.html @@ -32,7 +32,7 @@

    https://www.privoxy.org/donate

    -

    The most recent release is 3.0.31 (stable).

    +

    The most recent release is 3.0.32 (UNRELEASED).

    diff --git a/doc/webserver/privoxy-index.html b/doc/webserver/privoxy-index.html index ec38fcd3..a0dc7c7c 100644 --- a/doc/webserver/privoxy-index.html +++ b/doc/webserver/privoxy-index.html @@ -12,7 +12,7 @@

    Privoxy - The Privacy Enhancing Proxy

    -

    Project Index Page v3.0.31

    +

    Project Index Page v3.0.32

    diff --git a/doc/webserver/user-manual/actions-file.html b/doc/webserver/user-manual/actions-file.html index a0b6ec5f..54b0e7b9 100644 --- a/doc/webserver/user-manual/actions-file.html +++ b/doc/webserver/user-manual/actions-file.html @@ -4,7 +4,7 @@ Actions Files - + @@ -15,7 +15,7 @@
    - + diff --git a/doc/webserver/user-manual/appendix.html b/doc/webserver/user-manual/appendix.html index 615eacd9..d87c5969 100644 --- a/doc/webserver/user-manual/appendix.html +++ b/doc/webserver/user-manual/appendix.html @@ -4,7 +4,7 @@ Appendix - + @@ -14,7 +14,7 @@
    Privoxy 3.0.31 User ManualPrivoxy 3.0.32 User Manual
    Prev
    - + @@ -202,7 +202,7 @@ these. If not, you will get a friendly error message. Internet access is not necessary either.

    Privoxy 3.0.31 User ManualPrivoxy 3.0.32 User Manual
    Prev
    - + diff --git a/doc/webserver/user-manual/configuration.html b/doc/webserver/user-manual/configuration.html index 67d060af..5bb31c64 100644 --- a/doc/webserver/user-manual/configuration.html +++ b/doc/webserver/user-manual/configuration.html @@ -4,7 +4,7 @@ Privoxy Configuration - + @@ -15,7 +15,7 @@
    Privoxy 3.0.31 User ManualPrivoxy 3.0.32 User Manual
    Prev
    - + @@ -40,7 +40,7 @@
    Privoxy 3.0.31 User ManualPrivoxy 3.0.32 User Manual
    Prev
    -

        Privoxy Menu

    +

        Privoxy Menu


    @@ -69,7 +69,7 @@ + "https://www.privoxy.org/3.0.32/user-manual/" target="_top">Documentation
            ▪  Documentation
    @@ -94,7 +94,8 @@

    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.

    + executable. The name and number of configuration files has changed from previous versions, and is subject to + change as development progresses.

    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:

      @@ -145,6 +146,9 @@ 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/contact.html b/doc/webserver/user-manual/contact.html index b9c6dbe8..06fb8f68 100644 --- a/doc/webserver/user-manual/contact.html +++ b/doc/webserver/user-manual/contact.html @@ -4,7 +4,7 @@ Contacting the Developers, Bug Reporting and Feature Requests - + @@ -15,7 +15,7 @@
      - + diff --git a/doc/webserver/user-manual/copyright.html b/doc/webserver/user-manual/copyright.html index 3b6bbcdc..5260c273 100644 --- a/doc/webserver/user-manual/copyright.html +++ b/doc/webserver/user-manual/copyright.html @@ -4,7 +4,7 @@ Privoxy Copyright, License and History - + @@ -15,7 +15,7 @@
      Privoxy 3.0.31 User ManualPrivoxy 3.0.32 User Manual
      Prev
      - + diff --git a/doc/webserver/user-manual/filter-file.html b/doc/webserver/user-manual/filter-file.html index 4988094e..0e209dd1 100644 --- a/doc/webserver/user-manual/filter-file.html +++ b/doc/webserver/user-manual/filter-file.html @@ -4,7 +4,7 @@ Filter Files - + @@ -15,7 +15,7 @@
      Privoxy 3.0.31 User ManualPrivoxy 3.0.32 User Manual
      Prev
      - + diff --git a/doc/webserver/user-manual/index.html b/doc/webserver/user-manual/index.html index 193aeabe..9dccaa5f 100644 --- a/doc/webserver/user-manual/index.html +++ b/doc/webserver/user-manual/index.html @@ -2,7 +2,7 @@ "http://www.w3.org/TR/html4/loose.dtd"> - Privoxy 3.0.31 User Manual + Privoxy 3.0.32 User Manual @@ -12,7 +12,7 @@
      -

      Privoxy 3.0.31 User Manual

      +

      Privoxy 3.0.32 User Manual

      Copyright © 2001-2021 by Privoxy Developers

      diff --git a/doc/webserver/user-manual/installation.html b/doc/webserver/user-manual/installation.html index e54fed74..d09b1b6b 100644 --- a/doc/webserver/user-manual/installation.html +++ b/doc/webserver/user-manual/installation.html @@ -4,7 +4,7 @@ Installation - + @@ -15,7 +15,7 @@
      Privoxy 3.0.31 User ManualPrivoxy 3.0.32 User Manual
      Prev
      - + @@ -128,8 +128,8 @@
      Privoxy 3.0.31 User ManualPrivoxy 3.0.32 User Manual
      Prev
      - 
       tar xzvf privoxy-3.0.31-stable-src.tar.gz
- cd privoxy-3.0.31-stable
      + 
       tar xzvf privoxy-3.0.32-beta-src.tar.gz
+ cd privoxy-3.0.32-beta
      diff --git a/doc/webserver/user-manual/introduction.html b/doc/webserver/user-manual/introduction.html index 245c12db..994603cc 100644 --- a/doc/webserver/user-manual/introduction.html +++ b/doc/webserver/user-manual/introduction.html @@ -4,8 +4,8 @@ Introduction - - + + @@ -15,7 +15,7 @@
      - + @@ -27,13 +27,20 @@

      1. Introduction

      -

      This documentation is included with the current stable version of Privoxy, - 3.0.31.

      +

      This documentation is included with the current UNRELEASED version of Privoxy, + 3.0.32, 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!

      1.1. Features

      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:

      + features, some of them currently under development, 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 @@ -104,7 +111,7 @@

      - + diff --git a/doc/webserver/user-manual/quickstart.html b/doc/webserver/user-manual/quickstart.html index be238a55..70e202b6 100644 --- a/doc/webserver/user-manual/quickstart.html +++ b/doc/webserver/user-manual/quickstart.html @@ -4,7 +4,7 @@ Quickstart to Using Privoxy - + @@ -15,7 +15,7 @@
      Privoxy 3.0.31 User ManualPrivoxy 3.0.32 User Manual
      Prev Next
      Privoxy 3.0.31 User ManualPrivoxy 3.0.32 User Manual   Installation
      - + @@ -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/seealso.html b/doc/webserver/user-manual/seealso.html index 88a97c7d..cfd25486 100644 --- a/doc/webserver/user-manual/seealso.html +++ b/doc/webserver/user-manual/seealso.html @@ -4,7 +4,7 @@ See Also - + @@ -15,7 +15,7 @@
      Privoxy 3.0.31 User ManualPrivoxy 3.0.32 User Manual
      Prev
      - + diff --git a/doc/webserver/user-manual/startup.html b/doc/webserver/user-manual/startup.html index 1c345848..1898f923 100644 --- a/doc/webserver/user-manual/startup.html +++ b/doc/webserver/user-manual/startup.html @@ -4,7 +4,7 @@ Starting Privoxy - + @@ -15,7 +15,7 @@
      Privoxy 3.0.31 User ManualPrivoxy 3.0.32 User Manual
      Prev
      - + @@ -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 Firefox HTTP and HTTPS (SSL) Settings

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

      - +

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

      diff --git a/doc/webserver/user-manual/templates.html b/doc/webserver/user-manual/templates.html index d647ed31..f38ffe6f 100644 --- a/doc/webserver/user-manual/templates.html +++ b/doc/webserver/user-manual/templates.html @@ -4,7 +4,7 @@ Privoxy's Template Files - + @@ -15,7 +15,7 @@
      Privoxy 3.0.31 User ManualPrivoxy 3.0.32 User Manual
      Prev
      - + diff --git a/doc/webserver/user-manual/whatsnew.html b/doc/webserver/user-manual/whatsnew.html index d2f86576..65f29e53 100644 --- a/doc/webserver/user-manual/whatsnew.html +++ b/doc/webserver/user-manual/whatsnew.html @@ -4,7 +4,7 @@ What's New in this Release - + @@ -15,7 +15,7 @@
      Privoxy 3.0.31 User ManualPrivoxy 3.0.32 User Manual
      Prev
      - + -- 2.39.2
      Privoxy 3.0.31 User ManualPrivoxy 3.0.32 User Manual
      Prev