From 3b9bf106047d2b580f7406652b27035c865a274d Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sat, 18 Feb 2023 10:07:39 +0100 Subject: [PATCH] Regenerate docs --- INSTALL | 4 ++-- README | 21 ++++++++++++------- .../developer-manual/documentation.html | 2 +- doc/webserver/developer-manual/index.html | 4 ++-- .../developer-manual/newrelease.html | 14 ++++++------- doc/webserver/faq/index.html | 2 +- doc/webserver/index.html | 2 +- doc/webserver/privoxy-index.html | 2 +- doc/webserver/user-manual/actions-file.html | 7 +++++-- 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(+), 73 deletions(-) diff --git a/INSTALL b/INSTALL index ff0eb2e3..cdc5cb2c 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.34-stable-src.tar.gz - cd privoxy-3.0.34-stable + tar xzvf privoxy-3.0.35-beta-src.tar.gz + cd privoxy-3.0.35-beta To build the development version, you can get the source code by doing: diff --git a/README b/README index dd7528a8..70787489 100644 --- a/README +++ b/README @@ -32,8 +32,9 @@ * *********************************************************************/ -This README is included with Privoxy 3.0.34. 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.35. 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 a4a8311a..a29bd90f 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.34". + "APPLICATION">Privoxy version string, e.g. "3.0.35". p-status: the project status, either diff --git a/doc/webserver/developer-manual/index.html b/doc/webserver/developer-manual/index.html index 50f4b98e..be4ecc07 100644 --- a/doc/webserver/developer-manual/index.html +++ b/doc/webserver/developer-manual/index.html @@ -13,7 +13,7 @@

Privoxy Developer Manual

Copyright - © 2001-2021 by Privoxy Developers

+ © 2001-2023 by Privoxy Developers

@@ -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.34. 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 4fd3b028..f973801d 100644 --- a/doc/webserver/developer-manual/newrelease.html +++ b/doc/webserver/developer-manual/newrelease.html @@ -492,7 +492,7 @@
- 
  dch -v 3.0.34-1
+ 
  dch -v 3.0.35-1
@@ -509,7 +509,7 @@
- 
  lintian -iI ../build-area/privoxy_3.0.34-1_amd64.changes
+ 
  lintian -iI ../build-area/privoxy_3.0.35-1_amd64.changes
@@ -518,7 +518,7 @@ 
  sudo cowbuilder --build --basepath /var/cache/pbuilder/base.cow ../build-area/privoxy_3.0.34-1.dsc
+ "PROGRAMLISTING"> sudo cowbuilder --build --basepath /var/cache/pbuilder/base.cow ../build-area/privoxy_3.0.35-1.dsc @@ -527,19 +527,19 @@ 
  autopkgtest /var/cache/pbuilder/result/privoxy_3.0.34-1_amd64.changes -s -- schroot sid
+ "PROGRAMLISTING"> autopkgtest /var/cache/pbuilder/result/privoxy_3.0.35-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.34-1_i386.deb and privoxy_3.0.34-1_amd64.deb. Then sign both files:

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

- 
  gpg --detach-sign --armor privoxy_3.0.34-1_i386.deb
-  gpg --detach-sign --armor privoxy_3.0.34-1_amd64.deb
+ 
  gpg --detach-sign --armor privoxy_3.0.35-1_i386.deb
+  gpg --detach-sign --armor privoxy_3.0.35-1_amd64.deb
diff --git a/doc/webserver/faq/index.html b/doc/webserver/faq/index.html index 56ae919c..e45c45f6 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.34. 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 7159850a..e9f2f7e2 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.34 (stable).

+

The most recent release is 3.0.35 (UNRELEASED).

diff --git a/doc/webserver/privoxy-index.html b/doc/webserver/privoxy-index.html index d154ea41..8b680da4 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.34

+

Project Index Page v3.0.35

diff --git a/doc/webserver/user-manual/actions-file.html b/doc/webserver/user-manual/actions-file.html index f642fe91..f718b154 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 @@
- + @@ -1547,6 +1547,9 @@

This feature is experimental, the syntax may change in the future.

+

If you want to apply external filters to images or other content that isn't text-based, enable the + force-text-mode action as + well.

Example usage:
diff --git a/doc/webserver/user-manual/appendix.html b/doc/webserver/user-manual/appendix.html index a3900282..e78842a8 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.34 User ManualPrivoxy 3.0.35 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.34 User ManualPrivoxy 3.0.35 User Manual
Prev
- + diff --git a/doc/webserver/user-manual/configuration.html b/doc/webserver/user-manual/configuration.html index ede51292..6ef0bf64 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.34 User ManualPrivoxy 3.0.35 User Manual
Prev
- + @@ -40,7 +40,7 @@
Privoxy 3.0.34 User ManualPrivoxy 3.0.35 User Manual
Prev
-

    Privoxy Menu

+

    Privoxy Menu


@@ -69,7 +69,7 @@ + "https://www.privoxy.org/3.0.35/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 07441007..8f412b38 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 ebe3a225..74ec3f12 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.34 User ManualPrivoxy 3.0.35 User Manual
    Prev
    - + diff --git a/doc/webserver/user-manual/filter-file.html b/doc/webserver/user-manual/filter-file.html index 09d4bad1..8b625a8c 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.34 User ManualPrivoxy 3.0.35 User Manual
    Prev
    - + diff --git a/doc/webserver/user-manual/index.html b/doc/webserver/user-manual/index.html index 6307c154..58edcc90 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.34 User Manual + Privoxy 3.0.35 User Manual @@ -12,7 +12,7 @@
    -

    Privoxy 3.0.34 User Manual

    +

    Privoxy 3.0.35 User Manual

    Copyright © 2001-2023 by Privoxy Developers

    diff --git a/doc/webserver/user-manual/installation.html b/doc/webserver/user-manual/installation.html index 87474c0e..07bc9246 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.34 User ManualPrivoxy 3.0.35 User Manual
    Prev
    - + @@ -131,8 +131,8 @@
    Privoxy 3.0.34 User ManualPrivoxy 3.0.35 User Manual
    Prev
    - 
      tar xzvf privoxy-3.0.34-stable-src.tar.gz
-  cd privoxy-3.0.34-stable
    + 
      tar xzvf privoxy-3.0.35-beta-src.tar.gz
+  cd privoxy-3.0.35-beta
    diff --git a/doc/webserver/user-manual/introduction.html b/doc/webserver/user-manual/introduction.html index 3482fe3b..50a8a301 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.34.

    +

    This documentation is included with the current UNRELEASED version of Privoxy, + 3.0.35, 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 d4eef79e..7ff309cc 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.34 User ManualPrivoxy 3.0.35 User Manual
    Prev Next
    Privoxy 3.0.34 User ManualPrivoxy 3.0.35 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 d78670cb..65ea6df3 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.34 User ManualPrivoxy 3.0.35 User Manual
    Prev
    - + diff --git a/doc/webserver/user-manual/startup.html b/doc/webserver/user-manual/startup.html index beb5f780..fa07939c 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.34 User ManualPrivoxy 3.0.35 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 0c64035f..74bdf594 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.34 User ManualPrivoxy 3.0.35 User Manual
    Prev
    - + diff --git a/doc/webserver/user-manual/whatsnew.html b/doc/webserver/user-manual/whatsnew.html index b283e356..954b9e58 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.34 User ManualPrivoxy 3.0.35 User Manual
    Prev
    - + -- 2.39.2
    Privoxy 3.0.34 User ManualPrivoxy 3.0.35 User Manual
    Prev