From d5bba1fd0bce2185b191b7a8280cae9a62c829d6 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Mon, 26 Aug 2019 13:45:10 +0200 Subject: [PATCH] Rebuild docs with cors-allowed-origin directive --- INSTALL | 4 +- README | 21 +++-- .../developer-manual/documentation.html | 2 +- doc/webserver/developer-manual/index.html | 2 +- .../developer-manual/newrelease.html | 26 ++--- doc/webserver/faq/configuration.html | 4 +- doc/webserver/faq/index.html | 2 +- doc/webserver/index.html | 2 +- doc/webserver/privoxy-index.html | 2 +- doc/webserver/user-manual/actions-file.html | 94 +++++++++---------- doc/webserver/user-manual/appendix.html | 30 +++--- doc/webserver/user-manual/config.html | 59 +++++++++++- doc/webserver/user-manual/configuration.html | 17 ++-- doc/webserver/user-manual/contact.html | 4 +- doc/webserver/user-manual/copyright.html | 4 +- doc/webserver/user-manual/filter-file.html | 4 +- doc/webserver/user-manual/index.html | 5 +- doc/webserver/user-manual/installation.html | 8 +- doc/webserver/user-manual/introduction.html | 21 +++-- doc/webserver/user-manual/quickstart.html | 6 +- doc/webserver/user-manual/seealso.html | 4 +- doc/webserver/user-manual/startup.html | 8 +- doc/webserver/user-manual/templates.html | 4 +- doc/webserver/user-manual/whatsnew.html | 4 +- 24 files changed, 204 insertions(+), 133 deletions(-) diff --git a/INSTALL b/INSTALL index 4acc4cf9..9be9bd85 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.28-stable-src.tar.gz - cd privoxy-3.0.28-stable + tar xzvf privoxy-3.0.29-beta-src.tar.gz + cd privoxy-3.0.29-beta To build the development version, you can get the source code by doing: diff --git a/README b/README index a8c512da..2da1e781 100644 --- a/README +++ b/README @@ -32,8 +32,9 @@ * *********************************************************************/ -This README is included with Privoxy 3.0.28. See https://www.privoxy.org/ for -more information. The current code maturity level is "stable". +This README is included with the development version of Privoxy 3.0.29. See +https://www.privoxy.org/ for more information. The current code maturity level +is "UNRELEASED", but seems stable to us :). ------------------------------------------------------------------------------- @@ -104,16 +105,22 @@ 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. 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, 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. -The source and configuration files are all well commented. The main -configuration files are: 'config', 'default.action', and 'default.filter'. +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. 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/documentation.html b/doc/webserver/developer-manual/documentation.html index 60daf5d8..70a0845d 100644 --- a/doc/webserver/developer-manual/documentation.html +++ b/doc/webserver/developer-manual/documentation.html @@ -238,7 +238,7 @@ p-version: the Privoxy version string, e.g. "3.0.28". + "APPLICATION">Privoxy version string, e.g. "3.0.29". p-status: the project status, either diff --git a/doc/webserver/developer-manual/index.html b/doc/webserver/developer-manual/index.html index 5119524d..decc62d5 100644 --- a/doc/webserver/developer-manual/index.html +++ b/doc/webserver/developer-manual/index.html @@ -22,7 +22,7 @@ helpful!) reading for anyone who wants to join the team. Note that it's currently out of date and may not be entirely correct. As always, patches are welcome.

Please note that this document is constantly evolving. This copy represents the state at the release of - version 3.0.28. You can find the latest version of the this manual at https://www.privoxy.org/developer-manual/. Please have a look at the contact section in the user manual if you are interested in contacting the developers.

diff --git a/doc/webserver/developer-manual/newrelease.html b/doc/webserver/developer-manual/newrelease.html index df956dce..9c106a5b 100644 --- a/doc/webserver/developer-manual/newrelease.html +++ b/doc/webserver/developer-manual/newrelease.html @@ -160,8 +160,8 @@ for-privoxy-version=3.0.11
-
  $ utils/changelog2doc.pl /tmp/change.log >| doc/source/changelog.sgml
+
+                $ utils/changelog2doc.pl /tmp/change.log >| doc/source/changelog.sgml
@@ -427,8 +427,8 @@ for-privoxy-version=3.0.11
-
  cvs -z3 -d:pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa co os2setup
+
+              cvs -z3 -d:pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa co os2setup
@@ -541,7 +541,7 @@ for-privoxy-version=3.0.11
-
  debchange -v 3.0.28-stable-1 "New upstream version"
+
  debchange -v 3.0.29-UNRELEASED-1 "New upstream version"
@@ -553,7 +553,7 @@ for-privoxy-version=3.0.11 -

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

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

@@ -577,8 +577,8 @@ for-privoxy-version=3.0.11
-
  cvs -z3 -d:pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa co OSXPackageBuilder
+
+                cvs -z3 -d:pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa co OSXPackageBuilder
@@ -599,8 +599,8 @@ for-privoxy-version=3.0.11
-
  cvs -z3 -d:pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa co osxsetup
+
+                cvs -z3 -d:pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa co osxsetup
@@ -638,8 +638,8 @@ for-privoxy-version=3.0.11
-
  cvs -z3 -d:pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa co macsetup
+
+                cvs -z3 -d:pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa co macsetup
@@ -675,7 +675,7 @@ for-privoxy-version=3.0.11 "_top">https://sourceforge.net/project/admin/editpackages.php?group_id=11118, making sure you are logged in. Find your target platform in the second column, and click Add Release. You will then need to create a new release for your package, using the format of $VERSION - ($CODE_STATUS), e.g. 3.0.28 (beta).

+ ($CODE_STATUS), e.g. 3.0.29 (beta).

Now just follow the prompts. Be sure to add any appropriate Release notes. You should see your freshly uploaded packages in "Step 2. Add Files To This Release". Check the appropriate box(es). Remember at each step to hit the "Refresh/Submit" buttons! You should now see diff --git a/doc/webserver/faq/configuration.html b/doc/webserver/faq/configuration.html index 76ce4684..7802ae2e 100644 --- a/doc/webserver/faq/configuration.html +++ b/doc/webserver/faq/configuration.html @@ -395,8 +395,8 @@ diff --git a/doc/webserver/faq/index.html b/doc/webserver/faq/index.html index 407f389e..07a7967e 100644 --- a/doc/webserver/faq/index.html +++ b/doc/webserver/faq/index.html @@ -39,7 +39,7 @@

Please note that this document is a work in progress. This copy represents the state at the release of - version 3.0.28. You can find the latest version of the document at https://www.privoxy.org/faq/. Please see the Contact section if you want to contact the developers.

diff --git a/doc/webserver/index.html b/doc/webserver/index.html index 0b7d360b..896bcdd4 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.28 (stable).

+

The most recent release is 3.0.29 (UNRELEASED).


diff --git a/doc/webserver/privoxy-index.html b/doc/webserver/privoxy-index.html index 13d4be04..30c9743e 100644 --- a/doc/webserver/privoxy-index.html +++ b/doc/webserver/privoxy-index.html @@ -12,7 +12,7 @@

Privoxy - The Privacy Enhancing Proxy

-

Project Index Page v3.0.28

+

Project Index Page v3.0.29

diff --git a/doc/webserver/user-manual/actions-file.html b/doc/webserver/user-manual/actions-file.html index da7401d6..48968c4c 100644 --- a/doc/webserver/user-manual/actions-file.html +++ b/doc/webserver/user-manual/actions-file.html @@ -4,7 +4,7 @@ Actions Files - + @@ -15,7 +15,7 @@
-
 { -crunch-incoming-cookies -crunch-outgoing-cookies -session-cookies-only -filter{content-cookies} }
+            
+            { -crunch-incoming-cookies -crunch-outgoing-cookies -session-cookies-only -filter{content-cookies} }
   .example.com
- + @@ -73,7 +73,7 @@

The default profiles, and their associated actions, as pre-defined in default.action are:

- +

Table 1. Default Configurations

Privoxy 3.0.28 User ManualPrivoxy 3.0.29 User Manual
Prev
@@ -1622,8 +1622,8 @@ problem-host.example.com
-
+filter{js-annoyances}       # Get rid of particularly annoying JavaScript abuse.
+
+                    +filter{js-annoyances}       # Get rid of particularly annoying JavaScript abuse.
@@ -1631,8 +1631,8 @@ problem-host.example.com
-
+filter{js-events}           # Kill JavaScript event bindings and timers (Radically destructive! Only for extra nasty sites).
+
+                    +filter{js-events}           # Kill JavaScript event bindings and timers (Radically destructive! Only for extra nasty sites).
@@ -1640,8 +1640,8 @@ problem-host.example.com
-
+filter{html-annoyances}     # Get rid of particularly annoying HTML abuse.
+
+                    +filter{html-annoyances}     # Get rid of particularly annoying HTML abuse.
@@ -1649,8 +1649,8 @@ problem-host.example.com
-
+filter{content-cookies}     # Kill cookies that come in the HTML or JS content.
+
+                    +filter{content-cookies}     # Kill cookies that come in the HTML or JS content.
@@ -1658,8 +1658,8 @@ problem-host.example.com
-
+filter{refresh-tags}        # Kill automatic refresh tags if refresh time is larger than 9 seconds.
+
+                    +filter{refresh-tags}        # Kill automatic refresh tags if refresh time is larger than 9 seconds.
@@ -1683,8 +1683,8 @@ problem-host.example.com
-
+filter{img-reorder}         # Reorder attributes in <img> tags to make the banners-by-* filters more effective.
+
+                    +filter{img-reorder}         # Reorder attributes in <img> tags to make the banners-by-* filters more effective.
@@ -1700,8 +1700,8 @@ problem-host.example.com
-
+filter{banners-by-link}     # Kill banners by their links to known clicktrackers.
+
+                    +filter{banners-by-link}     # Kill banners by their links to known clicktrackers.
@@ -1709,8 +1709,8 @@ problem-host.example.com
-
+filter{webbugs}             # Squish WebBugs (1x1 invisible GIFs used for user tracking).
+
+                    +filter{webbugs}             # Squish WebBugs (1x1 invisible GIFs used for user tracking).
@@ -1718,8 +1718,8 @@ problem-host.example.com
-
+filter{tiny-textforms}      # Extend those tiny textareas up to 40x80 and kill the hard wrap.
+
+                    +filter{tiny-textforms}      # Extend those tiny textareas up to 40x80 and kill the hard wrap.
@@ -1727,8 +1727,8 @@ problem-host.example.com
-
+filter{jumping-windows}     # Prevent windows from resizing and moving themselves.
+
+                    +filter{jumping-windows}     # Prevent windows from resizing and moving themselves.
@@ -1736,8 +1736,8 @@ problem-host.example.com
-
+filter{frameset-borders}    # Give frames a border and make them resizable.
+
+                    +filter{frameset-borders}    # Give frames a border and make them resizable.
@@ -1745,8 +1745,8 @@ problem-host.example.com
-
+filter{iframes}             # Removes all detected iframes. Should only be enabled for individual sites.
+
+                    +filter{iframes}             # Removes all detected iframes. Should only be enabled for individual sites.
@@ -1754,8 +1754,8 @@ problem-host.example.com
-
+filter{demoronizer}         # Fix MS's non-standard use of standard charsets.
+
+                    +filter{demoronizer}         # Fix MS's non-standard use of standard charsets.
@@ -1779,8 +1779,8 @@ problem-host.example.com
-
+filter{fun}                 # Text replacements for subversive browsing fun!
+
+                    +filter{fun}                 # Text replacements for subversive browsing fun!
@@ -1788,8 +1788,8 @@ problem-host.example.com
-
+filter{crude-parental}      # Crude parental filtering. Note that this filter doesn't work reliably.
+
+                    +filter{crude-parental}      # Crude parental filtering. Note that this filter doesn't work reliably.
@@ -1797,8 +1797,8 @@ problem-host.example.com
-
+filter{ie-exploits}         # Disable some known Internet Explorer bug exploits.
+
+                    +filter{ie-exploits}         # Disable some known Internet Explorer bug exploits.
@@ -1806,8 +1806,8 @@ problem-host.example.com
-
+filter{site-specifics}      # Cure for site-specific problems. Don't apply generally!
+
+                    +filter{site-specifics}      # Cure for site-specific problems. Don't apply generally!
@@ -1815,8 +1815,8 @@ problem-host.example.com
-
+filter{no-ping}             # Removes non-standard ping attributes in <a> and <area> tags.
+
+                    +filter{no-ping}             # Removes non-standard ping attributes in <a> and <area> tags.
@@ -1824,8 +1824,8 @@ problem-host.example.com
-
+filter{google}              # CSS-based block for Google text ads. Also removes a width limitation and the toolbar advertisement.
+
+                    +filter{google}              # CSS-based block for Google text ads. Also removes a width limitation and the toolbar advertisement.
@@ -1833,8 +1833,8 @@ problem-host.example.com
-
+filter{yahoo}               # CSS-based block for Yahoo text ads. Also removes a width limitation.
+
+                    +filter{yahoo}               # CSS-based block for Yahoo text ads. Also removes a width limitation.
@@ -1842,8 +1842,8 @@ problem-host.example.com
-
+filter{msn}                 # CSS-based block for MSN text ads. Also removes tracking URLs and a width limitation.
+
+                    +filter{msn}                 # CSS-based block for MSN text ads. Also removes tracking URLs and a width limitation.
@@ -1851,8 +1851,8 @@ problem-host.example.com
-
+filter{blogspot}            # Cleans up some Blogspot blogs. Read the fine print before using this.
+
+                    +filter{blogspot}            # Cleans up some Blogspot blogs. Read the fine print before using this.
diff --git a/doc/webserver/user-manual/appendix.html b/doc/webserver/user-manual/appendix.html index aa58db9b..e82e5cf6 100644 --- a/doc/webserver/user-manual/appendix.html +++ b/doc/webserver/user-manual/appendix.html @@ -4,7 +4,7 @@ Appendix - + @@ -14,7 +14,7 @@

+ + + +

7.5. Forwarding

@@ -1329,8 +1380,8 @@ diff --git a/doc/webserver/user-manual/configuration.html b/doc/webserver/user-manual/configuration.html index 23a8c042..36513904 100644 --- a/doc/webserver/user-manual/configuration.html +++ b/doc/webserver/user-manual/configuration.html @@ -4,7 +4,7 @@ Privoxy Configuration - + @@ -15,7 +15,7 @@
-
  forward-socks4a   /              socks-gw.example.com:1080  www-cache.isp.example.net:8080
+                    
+                    forward-socks4a   /              socks-gw.example.com:1080  www-cache.isp.example.net:8080
   forward           .example.com   .
- + @@ -40,7 +40,7 @@
Privoxy 3.0.28 User ManualPrivoxy 3.0.29 User Manual
Prev
 
-

    Privoxy Menu

+

    Privoxy Menu


@@ -51,7 +51,8 @@ + "http://config.privoxy.org/client-tags" target="_top">View or toggle the tags that can be set based + on the clients address + "https://www.privoxy.org/3.0.29/user-manual/" target="_top">Documentation
        ▪  View the source code version numbers
        ▪  
        ▪  Documentation
@@ -93,7 +94,8 @@

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.

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

    @@ -145,6 +147,9 @@ 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.