From 75397537c3986cafa8dc1b4b37af40f93ab9372f Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Fri, 21 Dec 2018 18:07:09 +0100 Subject: [PATCH] Rebuild docs for Privoxy 3.0.27 stable --- INSTALL | 4 ++-- README | 21 +++++++------------ doc/webserver/developer-manual/index.html | 2 +- .../developer-manual/newrelease.html | 11 +++++----- doc/webserver/index.html | 4 ++-- doc/webserver/privoxy-index.html | 2 +- doc/webserver/user-manual/actions-file.html | 2 +- doc/webserver/user-manual/appendix.html | 16 +++++++------- doc/webserver/user-manual/configuration.html | 8 ++----- doc/webserver/user-manual/installation.html | 4 ++-- doc/webserver/user-manual/introduction.html | 13 +++--------- doc/webserver/user-manual/quickstart.html | 2 +- doc/webserver/user-manual/startup.html | 4 ++-- 13 files changed, 38 insertions(+), 55 deletions(-) diff --git a/INSTALL b/INSTALL index 67995e57..1f00e94c 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.27-beta-src.tar.gz - cd privoxy-3.0.27-beta + tar xzvf privoxy-3.0.27-stable-src.tar.gz + cd privoxy-3.0.27-stable To build the development version, you can get the source code by doing: diff --git a/README b/README index 7b27a1c1..80878943 100644 --- a/README +++ b/README @@ -32,9 +32,8 @@ * *********************************************************************/ -This README is included with the development version of Privoxy 3.0.27. 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.27. 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/index.html b/doc/webserver/developer-manual/index.html index 4d584ace..9c8c8c6e 100644 --- a/doc/webserver/developer-manual/index.html +++ b/doc/webserver/developer-manual/index.html @@ -145,7 +145,7 @@
6.1. Version numbers
-
6.2. Before the Release: Freeze
+
6.2. Before the Release
6.3. Building and Releasing the Packages
diff --git a/doc/webserver/developer-manual/newrelease.html b/doc/webserver/developer-manual/newrelease.html index 265edc7e..8aa7015f 100644 --- a/doc/webserver/developer-manual/newrelease.html +++ b/doc/webserver/developer-manual/newrelease.html @@ -84,7 +84,7 @@ "LITERAL">v_3_0_branch at the moment).

-

6.2. Before the Release: Freeze

+

6.2. Before the Release

The following must be done by one of the developers prior to each new release.

    @@ -175,9 +175,10 @@ for-privoxy-version=3.0.11 @@ -540,7 +541,7 @@ for-privoxy-version=3.0.11
    - 
      $ make dok
+                
      $ make man
+  $ make dok
+  $ make dok-man
   $ make dok-tidy
-  $ make man
   $ make config-file
    - 
      debchange -v 3.0.27-UNRELEASED-1 "New upstream version"
    + 
      debchange -v 3.0.27-stable-1 "New upstream version"
    @@ -552,7 +553,7 @@ for-privoxy-version=3.0.11 -

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

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

    diff --git a/doc/webserver/index.html b/doc/webserver/index.html index b0aedab1..d0f30288 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.27 (UNRELEASED).

    +

    The most recent release is 3.0.27 (stable).

    @@ -40,7 +40,7 @@

    Download

    You can download Privoxy here, from this mirror, or from this mirror, or from SourceForge.

    Note that the Privoxy project currently has no trusted build infrastructure. Binary packages are built and uploaded by individual members of the Privoxy project or external contributors. For details check the diff --git a/doc/webserver/privoxy-index.html b/doc/webserver/privoxy-index.html index 9c58695d..bd33dd85 100644 --- a/doc/webserver/privoxy-index.html +++ b/doc/webserver/privoxy-index.html @@ -40,7 +40,7 @@

    Download

    You can download Privoxy here, from this mirror, or from this mirror, or from SourceForge.

    Note that the Privoxy project currently has no trusted build infrastructure. Binary packages are built and uploaded by individual members of the Privoxy project or external contributors. For details check the diff --git a/doc/webserver/user-manual/actions-file.html b/doc/webserver/user-manual/actions-file.html index 5fc01d7d..d1c0e092 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

    diff --git a/doc/webserver/user-manual/appendix.html b/doc/webserver/user-manual/appendix.html index 0148eec2..38dd3763 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


    @@ -93,8 +93,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 and OS/2 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.

    + "APPLICATION">Privoxy 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/installation.html b/doc/webserver/user-manual/installation.html index 283ec9a6..68270a14 100644 --- a/doc/webserver/user-manual/installation.html +++ b/doc/webserver/user-manual/installation.html @@ -140,8 +140,8 @@
    - 
     tar xzvf privoxy-3.0.27-beta-src.tar.gz
- cd privoxy-3.0.27-beta
    + 
     tar xzvf privoxy-3.0.27-stable-src.tar.gz
+ cd privoxy-3.0.27-stable
    diff --git a/doc/webserver/user-manual/introduction.html b/doc/webserver/user-manual/introduction.html index feecba64..a1044a99 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.27, 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.27.

    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 diff --git a/doc/webserver/user-manual/quickstart.html b/doc/webserver/user-manual/quickstart.html index ebf55f54..70d9d45d 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 a55dfd0e..fa653dd7 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