X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=doc%2Fsource%2Fuser-manual.sgml;h=08ba0597bcf9817beaadb20d1fbef873ce18cb64;hp=1c15cc5ab45a07ca036ceeb6c965754b4be8abe8;hb=2f84790ebbdce45364ef2bde8e42fcf3372b22c2;hpb=9f1d548ce368763dcdda8cb392e2c2533dbd19e9
diff --git a/doc/source/user-manual.sgml b/doc/source/user-manual.sgml
index 1c15cc5a..08ba0597 100644
--- a/doc/source/user-manual.sgml
+++ b/doc/source/user-manual.sgml
@@ -15,10 +15,10 @@
-
+
-
-
+
+
@@ -227,31 +227,6 @@ How to install the binary packages depends on your operating system:
-
-OS/2
-
-
- First, make sure that no previous installations of
- Junkbuster and / or
- Privoxy are left on your
- system. Check that no Junkbuster
- or Privoxy objects are in
- your startup folder.
-
-
-
- Then, just double-click the WarpIN self-installing archive, which will
- guide you through the installation process. A shadow of the
- Privoxy executable will be placed in your
- startup folder so it will start automatically whenever OS/2 starts.
-
-
-
- The directory you choose to install Privoxy
- into will contain all of the configuration files.
-
-
-
Mac OS X
@@ -1062,13 +1037,13 @@ MAKENSIS = ./nsis/makensis.exe
@@ -1079,7 +1054,7 @@ MAKENSIS = ./nsis/makensis.exe
- Tools -> Options -> Advanced -> Network ->Connection -> Settings
+ Edit -> Preferences -> Network Settings -> Settings
@@ -1218,16 +1193,6 @@ Example Unix startup command:
-
-OS/2
-
- During installation, Privoxy is configured to
- start automatically when the system restarts. You can start it manually by
- double-clicking on the Privoxy icon in the
- Privoxy folder.
-
-
-
Mac OS X
@@ -1518,7 +1483,7 @@ for details.
▪ View & change the current configuration
- ▪ View or toggle the tags that can be set based on the clients address
+ ▪ View or toggle the tags that can be set based on the client's address
▪ View the request headers.
@@ -1577,7 +1542,7 @@ for details.
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
+ /etc/privoxy/ by default. For MS Windows
these are all in the same directory as the
Privoxy executable.
The main configuration file is named config
- on GNU/Linux, Unix, BSD, and OS/2, and config.txt
+ on GNU/Linux, Unix, BSD, and config.txt
on Windows. This is a required file.
@@ -2294,6 +2259,12 @@ for details.
While flexible, this is not the sophistication of full regular expression based syntax.
+
+ When compiled with FEATURE_PCRE_HOST_PATTERNS patterns can be prefixed with
+ PCRE-HOST-PATTERN: in which case full regular expression
+ (PCRE) can be used for the host pattern as well.
+
+
@@ -5196,7 +5167,7 @@ new action
Before this works the directives in the
- TLS section
+ HTTPS inspection section
of the config file have to be configured.
@@ -5205,6 +5176,9 @@ new action
a pattern with path doesn't work as the path is only seen
by &my-app; if the action is already enabled.
+
+ This is an experimental feature.
+
@@ -5778,6 +5752,10 @@ example.com/.*toChange=(?!bar)
# Redirect Destination = https://www.illumos.org/issues/4974
i[0-9][0-9][0-9][0-9]*/
+# Redirect requests for the old Tor Hidden Service of the Privoxy website to the new one
+{+redirect{s@^http://jvauzb4sb3bwlsnc.onion/@http://l3tczdiiwoo63iwxty4lhs6p7eaxop5micbn7vbliydgv63x5zrrrfyd.onion/@}}
+jvauzb4sb3bwlsnc.onion/
+
# Redirect remote requests for this manual
# to the local version delivered by Privoxy
{+redirect{s@^http://www@http://config@}}
@@ -7877,10 +7855,11 @@ Requests
The same is true for Privoxy binaries
- unless they are linked with
- mbed TLS in which
- case you can redistribute them and/or modify them under the terms
- of the GNU General Public License
+ unless they are linked with a
+ mbed TLS version
+ that is licensed under the Apache 2.0 license in which
+ case you can redistribute and/or modify the Privoxy
+ binaries under the terms of the GNU General Public License
as published by the Free Software Foundation, either version 3
of the license, or (at your option) any later version.