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

diff --git a/doc/source/developer-manual.sgml b/doc/source/developer-manual.sgml
index 585cddb..b7b101c 100644 (file)
--- a/doc/source/developer-manual.sgml
+++ b/doc/source/developer-manual.sgml
@@ -23,7 +23,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: developer-manual.sgml,v 2.15 2008/01/19 15:03:05 hal9 Exp $
+ $Id: developer-manual.sgml,v 2.16 2008/01/19 17:52:38 hal9 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.


@@ -50,7 +50,7 @@
     </pubdate>
 
 
     </pubdate>
 
 

-    <pubdate>$Id: developer-manual.sgml,v 2.15 2008/01/19 15:03:05 hal9 Exp $</pubdate>
+    <pubdate>$Id: developer-manual.sgml,v 2.16 2008/01/19 17:52:38 hal9 Exp $</pubdate>

 
 <!--
 
 
 <!--
 


@@ -1833,7 +1833,7 @@ static void unload_re_filterfile( void *f ) { ... }</programlisting>
 
     <para><emphasis>Example for file comments:</emphasis></para>
 <programlisting>
 
     <para><emphasis>Example for file comments:</emphasis></para>
 <programlisting>

-const char FILENAME_rcs[] = "$Id: developer-manual.sgml,v 2.15 2008/01/19 15:03:05 hal9 Exp $";
+const char FILENAME_rcs[] = "$Id: developer-manual.sgml,v 2.16 2008/01/19 17:52:38 hal9 Exp $";

 /*********************************************************************
  *
  * File        :  $S<!-- Break CVS Substitution -->ource$
 /*********************************************************************
  *
  * File        :  $S<!-- Break CVS Substitution -->ource$


@@ -1894,7 +1894,7 @@ const char FILENAME_h_rcs[] = FILENAME_H_VERSION;
 <programlisting>
 #ifndef _FILENAME_H
 #define _FILENAME_H
 <programlisting>
 #ifndef _FILENAME_H
 #define _FILENAME_H

-#define FILENAME_H_VERSION "$Id: developer-manual.sgml,v 2.15 2008/01/19 15:03:05 hal9 Exp $"
+#define FILENAME_H_VERSION "$Id: developer-manual.sgml,v 2.16 2008/01/19 17:52:38 hal9 Exp $"

 /*********************************************************************
  *
  * File        :  $S<!-- Break CVS Substitution -->ource$
 /*********************************************************************
  *
  * File        :  $S<!-- Break CVS Substitution -->ource$


@@ -2678,11 +2678,11 @@ at sourceforge. Three simple steps:
       </para>
     </sect3>
 
       </para>
     </sect3>
 

-    <sect3 id="newrelease-macosx"><title>Mac OSX</title>
+    <sect3 id="newrelease-macosx"><title>Mac OS X</title>

       <para>
        First, <emphasis>make sure that you have freshly exported the right
         version into an empty directory</emphasis>. (See "Building and releasing
       <para>
        First, <emphasis>make sure that you have freshly exported the right
         version into an empty directory</emphasis>. (See "Building and releasing

-        packages" above). Then get the Mac OSX setup module:
+        packages" above). Then get the Mac OS X setup module:

        </para>
        <para>
        <programlisting>
        </para>
        <para>
        <programlisting>


@@ -3026,6 +3026,9 @@ at sourceforge. Three simple steps:
   Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
   $Log: developer-manual.sgml,v $
   Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
   $Log: developer-manual.sgml,v $

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

   Revision 2.15  2008/01/19 15:03:05  hal9
   Doc sources tagged for 3.0.8 release.
 
   Revision 2.15  2008/01/19 15:03:05  hal9
   Doc sources tagged for 3.0.8 release.
 


@@ -3199,7 +3202,7 @@ at sourceforge. Three simple steps:
   More boilerplate text for use across multiple docs.
 
   Revision 1.20  2002/04/04 03:28:27  david__schmidt
   More boilerplate text for use across multiple docs.
 
   Revision 1.20  2002/04/04 03:28:27  david__schmidt

-  Add Mac OSX section
+  Add Mac OS X section

 
   Revision 1.19  2002/04/03 15:09:42  david__schmidt
   Add OS/2 build section
 
   Revision 1.19  2002/04/03 15:09:42  david__schmidt
   Add OS/2 build section

diff --git a/doc/source/faq.sgml b/doc/source/faq.sgml
index cc76dd8..5602b19 100644 (file)
--- a/doc/source/faq.sgml
+++ b/doc/source/faq.sgml
@@ -26,7 +26,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: faq.sgml,v 2.37 2008/01/19 15:03:05 hal9 Exp $
+ $Id: faq.sgml,v 2.38 2008/01/19 17:52:39 hal9 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.


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

-<pubdate>$Id: faq.sgml,v 2.37 2008/01/19 15:03:05 hal9 Exp $</pubdate>
+<pubdate>$Id: faq.sgml,v 2.38 2008/01/19 17:52:39 hal9 Exp $</pubdate>

 
 <!--
 
 
 <!--
 


@@ -2462,8 +2462,8 @@ every time I start IE. What gives?</title>
 </sect2>
 
 <!--   ~~~~~       New section      ~~~~~     -->
 </sect2>
 
 <!--   ~~~~~       New section      ~~~~~     -->

-<sect2 id="osxie" renderas="sect3">
-<title>In Mac OSX, I can't configure Microsoft Internet Explorer to use 
+<sect2 id="macosxie" renderas="sect3">
+<title>In Mac OS X, I can't configure Microsoft Internet Explorer to use 

  Privoxy as the HTTP proxy.</title>
  <para>
   Microsoft Internet Explorer (in versions like 5.1) respects system-wide
  Privoxy as the HTTP proxy.</title>
  <para>
   Microsoft Internet Explorer (in versions like 5.1) respects system-wide


@@ -2477,8 +2477,8 @@ every time I start IE. What gives?</title>
 </sect2>
 
 <!--   ~~~~~       New section      ~~~~~     -->
 </sect2>
 
 <!--   ~~~~~       New section      ~~~~~     -->

-<sect2 renderas="sect3" id="osxuninstall">
-<title>In Mac OSX, I dragged the Privoxy folder to the trash in order to 
+<sect2 renderas="sect3" id="macosxuninstall">
+<title>In Mac OS X, I dragged the Privoxy folder to the trash in order to 

  uninstall it.  Now the finder tells me I don't have sufficient privileges to
  empty the trash.</title>
  <para>
  uninstall it.  Now the finder tells me I don't have sufficient privileges to
  empty the trash.</title>
  <para>


@@ -2497,12 +2497,12 @@ every time I start IE. What gives?</title>
 
 
 <!--   ~~~~~       New section      ~~~~~     -->
 
 
 <!--   ~~~~~       New section      ~~~~~     -->

-<sect2 renderas="sect3" id="osximages">
-<title>In Mac OSX Panther (10.3), images often fail to load and/or I
+<sect2 renderas="sect3" id="macosximages">
+<title>In Mac OS X Panther (10.3), images often fail to load and/or I

  experience random delays in page loading. I'm using
  <literal>localhost</literal> as my browser's proxy setting.</title>
  <para>
  experience random delays in page loading. I'm using
  <literal>localhost</literal> as my browser's proxy setting.</title>
  <para>

-  We believe this is due to an IPv6-related bug in OSX, but don't fully
+  We believe this is due to an IPv6-related bug in Mac OS X, but don't fully

   understand the issue yet. In any case, changing the proxy setting to 
   <literal>127.0.0.1</literal> instead of <literal>localhost</literal>
   works around the problem.
   understand the issue yet. In any case, changing the proxy setting to 
   <literal>127.0.0.1</literal> instead of <literal>localhost</literal>
   works around the problem.


@@ -2808,6 +2808,9 @@ browsing has slowed to a crawl. What gives? </title>
  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 $Log: faq.sgml,v $
  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 $Log: faq.sgml,v $

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

 Revision 2.37  2008/01/19 15:03:05  hal9
 Doc sources tagged for 3.0.8 release.
 
 Revision 2.37  2008/01/19 15:03:05  hal9
 Doc sources tagged for 3.0.8 release.
 


@@ -2917,7 +2920,7 @@ Revision 1.61.2.41  2004/04/05 13:44:05  oes
 Fixed allow-all-cookies alias name; closes SR #929746
 
 Revision 1.61.2.40  2004/01/30 17:00:33  oes
 Fixed allow-all-cookies alias name; closes SR #929746
 
 Revision 1.61.2.40  2004/01/30 17:00:33  oes

-Added OSX Panther problem
+Added Mac OS X Panther problem

 
 Revision 1.61.2.39  2004/01/29 22:53:08  hal9
 Minor changes for exempting docs of text/plain. Change copyright date.
 
 Revision 1.61.2.39  2004/01/29 22:53:08  hal9
 Minor changes for exempting docs of text/plain. Change copyright date.


@@ -3004,28 +3007,28 @@ Revision 1.61.2.15  2002/08/10 11:34:22  oes
 Add disclaimer about probably being out-of-date
 
 Revision 1.61.2.14  2002/08/07 02:53:43  hal9
 Add disclaimer about probably being out-of-date
 
 Revision 1.61.2.14  2002/08/07 02:53:43  hal9

-Fix some minor markup errors, and move one OSX Q/A to troubleshooting section.
+Fix some minor markup errors, and move one Mac OS X Q/A to troubleshooting section.

 
 Revision 1.61.2.13  2002/08/06 11:55:32  oes
 Added missing close tag
 
 Revision 1.61.2.12  2002/08/06 11:43:46  david__schmidt
 
 Revision 1.61.2.13  2002/08/06 11:55:32  oes
 Added missing close tag
 
 Revision 1.61.2.12  2002/08/06 11:43:46  david__schmidt

-Updated OSX uninstall FAQ... we have an uninstall script now.
+Updated Mac OS X uninstall FAQ... we have an uninstall script now.

 
 Revision 1.61.2.11  2002/08/06 08:54:03  oes
 Style police: Fixed formatting details
 
 Revision 1.61.2.10  2002/08/02 14:00:25  david__schmidt
 
 Revision 1.61.2.11  2002/08/06 08:54:03  oes
 Style police: Fixed formatting details
 
 Revision 1.61.2.10  2002/08/02 14:00:25  david__schmidt

-Made the OSX removal commands far less dangerous
+Made the Mac OS X removal commands far less dangerous

 
 Revision 1.61.2.9  2002/08/02 13:14:45  oes
 
 Revision 1.61.2.9  2002/08/02 13:14:45  oes

-Added warning about sudo rm -r for Mac OSX deinstallation; moved this item to install section
+Added warning about sudo rm -r for Mac OS X deinstallation; moved this item to install section

 
 Revision 1.61.2.8  2002/08/02 02:01:42  david__schmidt
 
 Revision 1.61.2.8  2002/08/02 02:01:42  david__schmidt

-Add FAQ item for MSIE on OSX HTTP proxy confusion
+Add FAQ item for MSIE on Mac OS X HTTP proxy confusion

 
 Revision 1.61.2.7  2002/08/02 01:46:01  david__schmidt
 
 Revision 1.61.2.7  2002/08/02 01:46:01  david__schmidt

-Added FAQ item for Mac OSX uninstall woes
+Added FAQ item for Mac OS X uninstall woes

 
 Revision 1.61.2.6  2002/07/30 20:04:56  hal9
 Fix typo: 'schould'.
 
 Revision 1.61.2.6  2002/07/30 20:04:56  hal9
 Fix typo: 'schould'.

diff --git a/doc/source/user-manual.sgml b/doc/source/user-manual.sgml
index 96e9dd6..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.56 2008/01/31 19:11:35 fabiankeil 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.56 2008/01/31 19:11:35 fabiankeil 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,


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


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


@@ -9219,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.


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


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