Apply patch from Mark: s/OSX/OS X/

[privoxy.git] / doc / source / user-manual.sgml

diff --git a/doc/source/user-manual.sgml b/doc/source/user-manual.sgml
index 427cf0f..3f88ffb 100644 (file)
--- a/doc/source/user-manual.sgml
+++ b/doc/source/user-manual.sgml
@@ -33,7 +33,7 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
 
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
 

- $Id: user-manual.sgml,v 2.54 2008/01/19 17:52:39 hal9 Exp $
+ $Id: user-manual.sgml,v 2.57 2008/02/03 19:10:14 fabiankeil Exp $

 
  Copyright (C) 2001-2008 Privoxy Developers http://www.privoxy.org/
  See LICENSE.
 
  Copyright (C) 2001-2008 Privoxy Developers http://www.privoxy.org/
  See LICENSE.


@@ -59,7 +59,7 @@
  </subscript>
 </pubdate>
 
  </subscript>
 </pubdate>
 

-<pubdate>$Id: user-manual.sgml,v 2.54 2008/01/19 17:52:39 hal9 Exp $</pubdate>
+<pubdate>$Id: user-manual.sgml,v 2.57 2008/02/03 19:10:14 fabiankeil Exp $</pubdate>

 
 <!--
 
 
 <!--
 


@@ -298,7 +298,7 @@ How to install the binary packages depends on your operating system:
 </sect3>
 
 <!--   ~~~~~       New section      ~~~~~     -->
 </sect3>
 
 <!--   ~~~~~       New section      ~~~~~     -->

-<sect3 id="installation-mac"><title>Mac OSX</title>
+<sect3 id="installation-mac"><title>Mac OS X</title>

 <para>
  Unzip the downloaded file (you can either double-click on the file
  from the finder, or from the desktop if you downloaded it there).
 <para>
  Unzip the downloaded file (you can either double-click on the file
  from the finder, or from the desktop if you downloaded it there).


@@ -1349,7 +1349,7 @@ Example Unix startup command:
 </sect2>
 
 <sect2 id="start-macosx">
 </sect2>
 
 <sect2 id="start-macosx">

-<title>Mac OSX</title>
+<title>Mac OS X</title>

 <para>
  During installation, <application>Privoxy</application> is configured to
  start automatically when the system restarts.  To start &my-app; manually,
 <para>
  During installation, <application>Privoxy</application> is configured to
  start automatically when the system restarts.  To start &my-app; manually,


@@ -2949,8 +2949,9 @@ for details.
   <listitem>
     <para>
      <screen>
   <listitem>
     <para>
      <screen>

+# Hide Tor exit notation in Host and Referer Headers

 {+client-header-filter{hide-tor-exit-notation}}
 {+client-header-filter{hide-tor-exit-notation}}

-.exit/
+/

     </screen>
     </para>
   </listitem>
     </screen>
     </para>
   </listitem>


@@ -4151,7 +4152,8 @@ new action
      <para>
       <quote>forward-socks4a 127.0.0.1:9050 .</quote> to use the socks4a proxy listening at
       127.0.0.1 port 9050. Replace <quote>forward-socks4a</quote> with <quote>forward-socks4</quote>
      <para>
       <quote>forward-socks4a 127.0.0.1:9050 .</quote> to use the socks4a proxy listening at
       127.0.0.1 port 9050. Replace <quote>forward-socks4a</quote> with <quote>forward-socks4</quote>

-      to use a socks4 connection  (with local DNS resolution) instead.
+      to use a socks4 connection  (with local DNS resolution) instead, use <quote>forward-socks5</quote>
+      for socks5 connections (with remote DNS resolution).

      </para>
     </listitem>
     <listitem>
      </para>
     </listitem>
     <listitem>


@@ -4159,7 +4161,8 @@ new action
       <quote>forward-socks4a 127.0.0.1:9050 proxy.example.org:8000</quote> to use the socks4a proxy
       listening at 127.0.0.1 port 9050 to reach the HTTP proxy listening at proxy.example.org port 8000.
       Replace <quote>forward-socks4a</quote> with <quote>forward-socks4</quote> to use a socks4 connection
       <quote>forward-socks4a 127.0.0.1:9050 proxy.example.org:8000</quote> to use the socks4a proxy
       listening at 127.0.0.1 port 9050 to reach the HTTP proxy listening at proxy.example.org port 8000.
       Replace <quote>forward-socks4a</quote> with <quote>forward-socks4</quote> to use a socks4 connection

-      (with local DNS resolution) instead.
+      (with local DNS resolution) instead, use <quote>forward-socks5</quote>
+      for socks5 connections (with remote DNS resolution).

      </para>
     </listitem>
    </itemizedlist>
      </para>
     </listitem>
    </itemizedlist>


@@ -4170,7 +4173,7 @@ new action
   <term>Notes:</term>
   <listitem>
    <para>
   <term>Notes:</term>
   <listitem>
    <para>

-    This action takes parameters similar to the <!-- I hope this link actual works -->
+    This action takes parameters similar to the

     <link linkend="forwarding">forward</link> directives in the configuration
     file, but without the URL pattern. It can be used as replacement, but normally it's only
     used in cases where matching based on the request URL isn't sufficient.
     <link linkend="forwarding">forward</link> directives in the configuration
     file, but without the URL pattern. It can be used as replacement, but normally it's only
     used in cases where matching based on the request URL isn't sufficient.


@@ -8920,6 +8923,16 @@ In file: user.action <guibutton>[ View ]</guibutton> <guibutton>[ Edit ]</guibut
  USA
 
  $Log: user-manual.sgml,v $
  USA
 
  $Log: user-manual.sgml,v $

+ Revision 2.57  2008/02/03 19:10:14  fabiankeil
+ Mention forward-socks5.
+
+ Revision 2.56  2008/01/31 19:11:35  fabiankeil
+ Let the +client-header-filter{hide-tor-exit-notation} example apply
+ to all requests as "tainted" Referers aren't limited to exit TLDs.
+
+ Revision 2.55  2008/01/19 21:26:37  hal9
+ Add IE7 to configuration section per Gerry.
+

  Revision 2.54  2008/01/19 17:52:39  hal9
  Re-commit to fix various minor issues for new release.
 
  Revision 2.54  2008/01/19 17:52:39  hal9
  Re-commit to fix various minor issues for new release.
 


@@ -9184,7 +9197,7 @@ In file: user.action <guibutton>[ View ]</guibutton> <guibutton>[ Edit ]</guibut
  Spell checked (only one typo this time!).
 
  Revision 1.123.2.16  2002/08/09 19:20:54  david__schmidt
  Spell checked (only one typo this time!).
 
  Revision 1.123.2.16  2002/08/09 19:20:54  david__schmidt

- Update to Mac OSX startup script name
+ Update to Mac OS X startup script name

 
  Revision 1.123.2.15  2002/08/07 17:32:11  oes
  Converted some internal links from ulink to link for PDF creation; no content changed
 
  Revision 1.123.2.15  2002/08/07 17:32:11  oes
  Converted some internal links from ulink to link for PDF creation; no content changed


@@ -9209,7 +9222,7 @@ In file: user.action <guibutton>[ View ]</guibutton> <guibutton>[ Edit ]</guibut
 
  Revision 1.123.2.9  2002/07/11 03:40:28  david__schmidt
 
 
  Revision 1.123.2.9  2002/07/11 03:40:28  david__schmidt
 

- Updated Mac OSX sections due to installation location change
+ Updated Mac OS X sections due to installation location change

 
  Revision 1.123.2.8  2002/06/09 16:36:32  hal9
  Clarifications on filtering and MIME. Hardcode 'latest release' in index.html.
 
  Revision 1.123.2.8  2002/06/09 16:36:32  hal9
  Clarifications on filtering and MIME. Hardcode 'latest release' in index.html.


@@ -9229,7 +9242,7 @@ In file: user.action <guibutton>[ View ]</guibutton> <guibutton>[ Edit ]</guibut
  Ooops missed something from David.
 
  Revision 1.123.2.3  2002/05/27 03:23:17  hal9
  Ooops missed something from David.
 
  Revision 1.123.2.3  2002/05/27 03:23:17  hal9

- Fix FIXMEs for OS2 and OSX startup. Fix Redhat typos (should be Red Hat).
+ Fix FIXMEs for OS2 and Mac OS X startup. Fix Redhat typos (should be Red Hat).

  That's a wrap, I think.
 
  Revision 1.123.2.2  2002/05/26 19:02:09  hal9
  That's a wrap, I think.
 
  Revision 1.123.2.2  2002/05/26 19:02:09  hal9


@@ -9364,7 +9377,7 @@ In file: user.action <guibutton>[ View ]</guibutton> <guibutton>[ Edit ]</guibut
  Add AmigaOS install stuff.
 
  Revision 1.87  2002/04/23 02:53:15  david__schmidt
  Add AmigaOS install stuff.
 
  Revision 1.87  2002/04/23 02:53:15  david__schmidt

- Updated OSX installation section
+ Updated Mac OS X installation section

  Added a few English tweaks here an there
 
  Revision 1.86  2002/04/21 01:46:32  hal9
  Added a few English tweaks here an there
 
  Revision 1.86  2002/04/21 01:46:32  hal9