From 658f146ef977d736c87909dce05c2ce2f0acdc77 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Thu, 13 Aug 2020 14:46:35 +0200 Subject: [PATCH] Regenerate docs after removing OS/2-specific stuff --- doc/webserver/developer-manual/index.html | 11 ++-- .../developer-manual/newrelease.html | 64 +++---------------- doc/webserver/faq/installation.html | 2 +- doc/webserver/user-manual/actions-file.html | 2 +- doc/webserver/user-manual/appendix.html | 16 ++--- doc/webserver/user-manual/configuration.html | 11 ++-- doc/webserver/user-manual/index.html | 14 ++-- doc/webserver/user-manual/installation.html | 20 ++---- doc/webserver/user-manual/quickstart.html | 2 +- doc/webserver/user-manual/startup.html | 14 ++-- 10 files changed, 43 insertions(+), 113 deletions(-) diff --git a/doc/webserver/developer-manual/index.html b/doc/webserver/developer-manual/index.html index cd846bf2..ba5d74ad 100644 --- a/doc/webserver/developer-manual/index.html +++ b/doc/webserver/developer-manual/index.html @@ -152,12 +152,11 @@
6.3.1. Note on Privoxy Packaging
6.3.2. Source Tarball
6.3.3. SuSE, Conectiva or Red Hat RPM
-
6.3.4. OS/2
-
6.3.5. Solaris
-
6.3.6. Windows
-
6.3.7. Debian
-
6.3.8. Mac OS X
-
6.3.9. FreeBSD
+
6.3.4. Solaris
+
6.3.5. Windows
+
6.3.6. Debian
+
6.3.7. Mac OS X
+
6.3.8. FreeBSD
6.4. Uploading and Releasing Your Package
diff --git a/doc/webserver/developer-manual/newrelease.html b/doc/webserver/developer-manual/newrelease.html index 0a076ca2..cdf2f04d 100644 --- a/doc/webserver/developer-manual/newrelease.html +++ b/doc/webserver/developer-manual/newrelease.html @@ -421,55 +421,7 @@ for-privoxy-version=3.0.11 the source tarball package.

-

6.3.4. OS/2

-

First, make sure that you have freshly exported the right version - into an empty directory. (See "Building and releasing packages" above). Then get the OS/2 Setup - module:

- - - - -
- 
  cvs -z3 -d:pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa co os2setup
-
-

You will need a mix of development tools. The main compilation takes place with IBM Visual Age C++. Some - ancillary work takes place with GNU tools, available from various sources like hobbes.nmsu.edu. Specifically, - you will need autoheader, autoconf and sh tools. The packaging takes place with WarpIN, available from various sources, including its - home page: xworkplace.

-

Change directory to the os2setup directory. Edit the os2build.cmd file to set the - final executable filename. For example,

- - - - -
- 
  installExeName='privoxyos2_setup_X.Y.Z.exe'
-
-

Next, edit the IJB.wis file so the release number matches in the PACKAGEID section:

- - - - -
- 
  PACKAGEID="Privoxy Team\Privoxy\Privoxy Package\X\Y\Z"
-
-

You're now ready to build. Run:

- - - - -
- 
  os2build
-
-

You will find the WarpIN-installable executable in the ./files directory. Upload - this anonymously to uploads.sourceforge.net/incoming, create a release for it, and - you're done. Use the release notes and Change Log from the source tarball package.

-
-
-

6.3.5. Solaris

+

6.3.4. Solaris

Login to Sourceforge's compilefarm via ssh:

@@ -502,7 +454,7 @@ for-privoxy-version=3.0.11 release the file publicly. Use the release notes and Change Log from the source tarball package.

-

6.3.6. Windows

+

6.3.5. Windows

Note that the docbook generated files might need some hand editing, so the Windows build makefile does not rebuild the docs.

First, make sure that you have freshly exported the right version @@ -535,7 +487,7 @@ for-privoxy-version=3.0.11 package.

-

6.3.7. Debian

+

6.3.6. 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:

@@ -565,13 +517,13 @@ for-privoxy-version=3.0.11
-

6.3.8. Mac OS X

+

6.3.7. Mac OS X

First, make sure that you have freshly exported the right version into an empty directory. (See "Building and releasing packages" above).

There are three modules available in the Git repository for use on Mac OS X, though technically only two of them generate a release (the other can be used to install from source).

-

6.3.8.1. +

6.3.7.1. OSXPackageBuilder module

The OSXPackageBuilder module generates OS X installer packages supporting all Macs running OS X 10.4 and above. Obtain it from Git as follows into a folder parallel to the exported privoxy source:

@@ -591,7 +543,7 @@ for-privoxy-version=3.0.11 makes it clear which package is for whichversion of OS X.

-

6.3.8.2. osxsetup module +

6.3.7.2. osxsetup module (DEPRECATED)

This module is deprecated since the installer it generates places all Privoxy files in one folder in a non-standard location, and supports only Intel Macs running OS X @@ -633,7 +585,7 @@ for-privoxy-version=3.0.11 package supports.

-

6.3.8.3. macsetup module

+

6.3.7.3. macsetup module

The macsetup module is ideal if you wish to build and install Privoxy from source on a single machine.

Check out the module from Git as follows into a folder parallel to the exported privoxy source:

@@ -649,7 +601,7 @@ for-privoxy-version=3.0.11
-

6.3.9. FreeBSD

+

6.3.8. FreeBSD

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 @@

2.2. Which operating systems are supported?

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 Menu

+

    Privoxy Menu


@@ -93,16 +93,15 @@

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.

+ 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:

-

2.1.3. 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.

-
-
-

2.1.4. Mac OS X

+

2.1.3. Mac OS X

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.5. Installation from +

2.1.4. Installation from ready-built package

The downloaded file will either be a .pkg (for OS X 10.5 upwards) or a bzipped .mpkg file (for OS X 10.4). The former can be double-clicked as is and the installation will start; double-clicking the latter will unzip @@ -101,7 +89,7 @@

To uninstall, run /Applications/Privoxy/uninstall.command as sudo from an administrator account.

-

2.1.6. Installation from +

2.1.5. Installation from source

To build and install the Privoxy source code on OS X you will need to obtain the macsetup module from the Privoxy Sourceforge CVS repository (refer to Sourceforge help for details of how to set up a CVS client to have @@ -121,7 +109,7 @@

To uninstall, run the macsetup module's uninstall.sh as sudo from an administrator account.

-

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":

- +

Figure 1. Actions Files in Use

diff --git a/doc/webserver/user-manual/startup.html b/doc/webserver/user-manual/startup.html index 57b2494b..ddcad779 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

@@ -136,13 +136,7 @@ "APPLICATION">Privoxy upon boot.

-

5.5. 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.

-
-
-

5.6. Mac OS X

+

5.5. Mac OS X

The privoxy service will automatically start after a successful installation (and thereafter every time your computer starts up) however you will need to configure your web browser(s) to use it. To do so, configure them to use a proxy for HTTP and HTTPS at the address 127.0.0.1:8118.

@@ -153,7 +147,7 @@ /Applications/Privoxy. They must be run from an administrator account, using sudo.

-

5.7. Command Line Options

+

5.6. Command Line Options

Privoxy may be invoked with the following command-line options:

  • -- 2.39.2