-
+
Update the www/privoxy port and submit a diff upstream. For details see the FreeBSD Porter's
Handbook.
diff --git a/doc/webserver/faq/installation.html b/doc/webserver/faq/installation.html
index 80fdb35a..2962beee 100644
--- a/doc/webserver/faq/installation.html
+++ b/doc/webserver/faq/installation.html
@@ -39,7 +39,7 @@
At present, Privoxy is known to run on Windows 95 and later versions (98, ME,
2000, XP, Vista, Windows 7 etc.), GNU/Linux (RedHat, SuSE, Debian, Fedora, Gentoo, Slackware and others), Mac OS
- X (10.4 and upwards on PPC and Intel processors), OS/2, Haiku, DragonFly, ElectroBSD, FreeBSD, NetBSD, OpenBSD,
+ X (10.4 and upwards on PPC and Intel processors), Haiku, DragonFly, ElectroBSD, FreeBSD, NetBSD, OpenBSD,
Solaris, and various other flavors of Unix.
But any operating system that runs TCP/IP, can conceivably take advantage of Privoxy in a networked situation where Privoxy would run as
diff --git a/doc/webserver/user-manual/actions-file.html b/doc/webserver/user-manual/actions-file.html
index a333825f..d1b65672 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 06b472f5..60324e00 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/configuration.html b/doc/webserver/user-manual/configuration.html
index 36513904..0dd6d07f 100644
--- a/doc/webserver/user-manual/configuration.html
+++ b/doc/webserver/user-manual/configuration.html
@@ -40,7 +40,7 @@
- Privoxy Menu
+ Privoxy Menu
@@ -93,16 +93,15 @@
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.
+ by default. For MS Windows 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.
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:
-
The main configuration file is named config on
- GNU/Linux, Unix, BSD, and OS/2, and config.txt on Windows. This is a required
- file.
+ GNU/Linux, Unix, BSD, and config.txt on Windows. This is a required file.
-
match-all.action is used to define which "actions"
diff --git a/doc/webserver/user-manual/index.html b/doc/webserver/user-manual/index.html
index 4ad15040..eb00d89f 100644
--- a/doc/webserver/user-manual/index.html
+++ b/doc/webserver/user-manual/index.html
@@ -61,12 +61,11 @@
- 2.1.1. Debian and Ubuntu
- 2.1.2. Windows
- - 2.1.3. OS/2
- - 2.1.4. Mac OS X
- - 2.1.5. Installation from ready-built
+
- 2.1.3. Mac OS X
+ - 2.1.4. Installation from ready-built
package
- - 2.1.6. Installation from source
- - 2.1.7. FreeBSD
+ - 2.1.5. Installation from source
+ - 2.1.6. FreeBSD
- 2.2. Building from Source
@@ -98,9 +97,8 @@
- 5.3. Windows
- 5.4. Generic instructions for Unix derivates (Solaris, NetBSD,
HP-UX etc.)
- - 5.5. OS/2
- - 5.6. Mac OS X
- - 5.7. Command Line Options
+ - 5.5. Mac OS X
+ - 5.6. Command Line Options
- 6. Privoxy Configuration
diff --git a/doc/webserver/user-manual/installation.html b/doc/webserver/user-manual/installation.html
index ec7bca81..e57e4e6c 100644
--- a/doc/webserver/user-manual/installation.html
+++ b/doc/webserver/user-manual/installation.html
@@ -68,24 +68,12 @@
files.
-
- 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.
-
-
-
+
Installation instructions for the OS X platform depend upon whether you downloaded a ready-built
installation package (.pkg or .mpkg) or have downloaded the source code.
- 2.1.7. FreeBSD
+ 2.1.6. FreeBSD
Privoxy is part of FreeBSD's Ports Collection, you can build and install it with cd
/usr/ports/www/privoxy; make install clean.
diff --git a/doc/webserver/user-manual/quickstart.html b/doc/webserver/user-manual/quickstart.html
index 7fc0edf7..1193746c 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":
|