From 32b80c1607bb8338384942a1ae9d9c22d1eb4f67 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Thu, 17 Dec 2020 14:56:19 +0100 Subject: [PATCH] Rebuild docs --- .../developer-manual/newrelease.html | 5 +- doc/webserver/faq/contact.html | 6 +- doc/webserver/faq/copyright.html | 3 +- doc/webserver/faq/general.html | 3 +- doc/webserver/index.html | 3 +- doc/webserver/user-manual/appendix.html | 16 ++--- doc/webserver/user-manual/config.html | 62 ++++++------------- doc/webserver/user-manual/contact.html | 6 +- doc/webserver/user-manual/copyright.html | 3 +- 9 files changed, 38 insertions(+), 69 deletions(-) diff --git a/doc/webserver/developer-manual/newrelease.html b/doc/webserver/developer-manual/newrelease.html index d8a91e46..dc47f64b 100644 --- a/doc/webserver/developer-manual/newrelease.html +++ b/doc/webserver/developer-manual/newrelease.html @@ -403,7 +403,8 @@ for-privoxy-version=3.0.11

6.3.4. Debian

First, make sure that you have freshly exported the right version into an empty directory. (See "Building and releasing packages" above). Then add a log entry to - debian/changelog, if it is not already there, for example by running:

+ debian/changelog, if it is not already there, for example by running (from the debian + directory):

@@ -411,7 +412,7 @@ for-privoxy-version=3.0.11
-

Then, run:

+

Then, run (from the root directory):

diff --git a/doc/webserver/faq/contact.html b/doc/webserver/faq/contact.html index d6c5626f..13215a02 100644 --- a/doc/webserver/faq/contact.html +++ b/doc/webserver/faq/contact.html @@ -63,7 +63,7 @@

  • Whether your version of Privoxy is one supplied by the Privoxy developers via SourceForge, or if you got your copy somewhere else.

    + "APPLICATION">Privoxy developers, or if you got your copy somewhere else.

  • Whether you are using Privoxy together with another proxy such as @@ -86,7 +86,7 @@             #   See also debug 1024.
    debug     2 # show each connection status
    - debug     4 # show I/O status
    + debug     4 # show tagging-related messages
    debug     8 # show header parsing
    debug   128 # debug redirects
    debug   256 # debug GIF de-animation
    @@ -120,8 +120,6 @@ information. If you use a SF id, you should automatically get a mail when someone responds to your request. 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.

    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 a762bfd1..9741d065 100644 --- a/doc/webserver/faq/copyright.html +++ b/doc/webserver/faq/copyright.html @@ -27,8 +27,7 @@

    7. Privoxy Copyright, License and History

    Copyright © 2001-2020 by Privoxy Developers

    -

    Some source code is based on code Copyright © 1997 by Anonymous Coders and Junkbusters, Inc. and licensed - under the GNU General Public License.

    +

    Some source code is based on code Copyright © 1997 by Anonymous Coders and Junkbusters, Inc.

    Portions of this document are "borrowed" from the original Junkbuster (tm) FAQ, and modified as appropriate for Privoxy.

    diff --git a/doc/webserver/faq/general.html b/doc/webserver/faq/general.html index f0295d86..42c364ec 100644 --- a/doc/webserver/faq/general.html +++ b/doc/webserver/faq/general.html @@ -361,7 +361,8 @@

    The details may change over time but changes will only affect new sponsors (or existing sponsors that explicitly agreed to the changes).

    If you want to become a sponsor, please contact Fabian - Keil and include the link target in the mail. New sponsors are only accepted if no developer objects.

    + Keil and include the link target in the mail. New sponsors are only accepted if no Privoxy team member objects.

    diff --git a/doc/webserver/index.html b/doc/webserver/index.html index 81feb1d1..46f7fa5f 100644 --- a/doc/webserver/index.html +++ b/doc/webserver/index.html @@ -97,8 +97,7 @@

    Hosting and development is funded in part by:

    https://www.top10vpn.com

    -

    Become a - sponsor

    +

    Become a sponsor

    diff --git a/doc/webserver/user-manual/appendix.html b/doc/webserver/user-manual/appendix.html index 6fb335bc..716930f3 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 6bf71205..e647e135 100644 --- a/doc/webserver/user-manual/config.html +++ b/doc/webserver/user-manual/config.html @@ -550,7 +550,7 @@ 
        debug     1 # Log the destination for each request. See also debug 1024.
   debug     2 # show each connection status
-  debug     4 # show I/O status
+  debug     4 # show tagging-related messages
   debug     8 # show header parsing
   debug    16 # log all data written to the network
   debug    32 # debug force feature
@@ -694,7 +694,8 @@
               whenever the IP address is assigned to the system
      
               
      IPv6 addresses containing colons have to be quoted by brackets. They can only be used if Privoxy has been compiled with IPv6 support. If you aren't sure if your version
-              supports it, have a look at http://config.privoxy.org/show-status.
      
+              supports it, have a look at http://config.privoxy.org/show-status.
      
               
      Some operating systems will prefer IPv6 to IPv4 addresses even if the system has no IPv6 connectivity
               which is usually not expected by the user. Some even rely on DNS to resolve localhost which mean the
               "localhost" address used may not actually be local.
      
@@ -2203,18 +2204,6 @@
             
             
      Notes:
      
             
      
-              
      
-                
-                  
-                    
-                  
-                  
-                    
-                  
-                
      Warning
      
-                      
      This is an experimental feature. The syntax is likely to change in future versions.
      
-                    
      
-              
      
               
      Client-specific tags allow Privoxy admins to create different profiles and let the users chose which
               one they want without impacting other users.
      
               
      One use case is allowing users to circumvent certain blocks without having to allow them to circumvent
@@ -2232,7 +2221,7 @@
               
      Clients can request tags to be set by using the CGI interface http://config.privoxy.org/client-tags. The
               specific tag description is only used on the web page and should be phrased in away that the user
-              understand the effect of the tag.
      
+              understands the effect of the tag.
      
             
      
             
      Examples:
      
             
      
@@ -2242,7 +2231,12 @@
                     
          # Define a couple of tags, the described effect requires action sections
     # that are enabled based on CLIENT-TAG patterns.
     client-specific-tag circumvent-blocks Overrule blocks but do not affect other actions
-    client-specific-tag disable-content-filters Disable content-filters but do not affect other actions
      
+    client-specific-tag disable-content-filters Disable content-filters but do not affect other actions
+    client-specific-tag overrule-redirects Overrule redirect sections
+    client-specific-tag allow-cookies Do not crunch cookies in either direction
+    client-specific-tag change-tor-socks-port Change forward-socks5 settings to use a different Tor socks port (and circuits)
+    client-specific-tag no-https-inspection Disable HTTPS inspection
+    client-specific-tag no-tls-verification Don't verify certificates when http-inspection is enabled
    		•
    @@ -2268,18 +2262,6 @@
    Notes:
    -
    - - - - - - - -
    Warning
    -

    This is an experimental feature. The syntax is likely to change in future versions.

    -
    -

    In case of some tags users may not want to enable them permanently, but only for a short amount of time, for example to circumvent a block that is the result of an overly-broad URL pattern.

    The CGI interface

    Notes:
    -
    - - - - - - - -
    Warning
    -

    This is an experimental feature. The syntax is likely to change in future versions.

    -
    -

    If clients reach Privoxy through another proxy, for example a load balancer, Privoxy can't tell the client's IP address from the connection. If multiple clients use the same proxy, they will share the same client tag settings which is usually not desired.

    @@ -2408,8 +2378,10 @@

    7.7. HTTPS Inspection (Experimental)

    -

    HTTPS inspection allows to filter encrypted requests. This is only supported when Privoxy has been built with FEATURE_HTTPS_INSPECTION.

    +

    HTTPS inspection allows to filter encrypted requests and responses. This is only supported when Privoxy has been built with FEATURE_HTTPS_INSPECTION. If you aren't sure if your version + supports it, have a look at http://config.privoxy.org/show-status.

    7.7.1. ca-directory

    @@ -2506,6 +2478,7 @@

    This directive specifies the name of the CA key file in ".pem" format. The ca-cert-file section contains a command to generate it.

    +

    Access to the key should be limited to Privoxy.

    Example:
    @@ -2748,8 +2721,9 @@ AES128-SHA

    This directive specifies the trusted CAs file that is used when validating certificates for intercepted TLS/SSL requests.

    -

    An example file can be downloaded from https://curl.haxx.se/ca/cacert.pem.

    +

    An example file can be downloaded from https://curl.se/ca/cacert.pem. If you want to create the file yourself, please see: https://curl.se/docs/caextract.html.

    Example:
    diff --git a/doc/webserver/user-manual/contact.html b/doc/webserver/user-manual/contact.html index 6751dcd4..d600df69 100644 --- a/doc/webserver/user-manual/contact.html +++ b/doc/webserver/user-manual/contact.html @@ -64,7 +64,7 @@

  • Whether your version of Privoxy is one supplied by the Privoxy developers via SourceForge, or if you got your copy somewhere else.

    + "APPLICATION">Privoxy developers, or if you got your copy somewhere else.

  • Whether you are using Privoxy together with another proxy such as @@ -87,7 +87,7 @@             #   See also debug 1024.
    debug     2 # show each connection status
    - debug     4 # show I/O status
    + debug     4 # show tagging-related messages
    debug     8 # show header parsing
    debug   128 # debug redirects
    debug   256 # debug GIF de-animation
    @@ -121,8 +121,6 @@ information. If you use a SF id, you should automatically get a mail when someone responds to your request. 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.

    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 572f61d2..29b114ab 100644 --- a/doc/webserver/user-manual/copyright.html +++ b/doc/webserver/user-manual/copyright.html @@ -29,8 +29,7 @@

    12. Privoxy Copyright, License and History

    Copyright © 2001-2020 by Privoxy Developers

    -

    Some source code is based on code Copyright © 1997 by Anonymous Coders and Junkbusters, Inc. and licensed - under the GNU General Public License.

    +

    Some source code is based on code Copyright © 1997 by Anonymous Coders and Junkbusters, Inc.

    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.

    -- 2.39.2