From afdf7f7b2cbdff9a333ac73e0bdb74474015705d Mon Sep 17 00:00:00 2001
From: Fabian Keil <fk@fabiankeil.de>
Date: Sat, 23 Jan 2016 14:13:09 +0000
Subject: [PATCH] Rebuild docs with updated OS X instructions

---
 doc/webserver/developer-manual/index.html    |  4 +--
 doc/webserver/user-manual/actions-file.html  | 16 +++++-----
 doc/webserver/user-manual/appendix.html      | 28 ++++++++---------
 doc/webserver/user-manual/configuration.html |  8 +++--
 doc/webserver/user-manual/filter-file.html   |  2 +-
 doc/webserver/user-manual/index.html         | 24 +++++++--------
 doc/webserver/user-manual/startup.html       | 32 ++++++++------------
 7 files changed, 55 insertions(+), 59 deletions(-)

diff --git a/doc/webserver/developer-manual/index.html b/doc/webserver/developer-manual/index.html
index f6cca5b7..729a9596 100644
--- a/doc/webserver/developer-manual/index.html
+++ b/doc/webserver/developer-manual/index.html
@@ -24,8 +24,8 @@
       "http://www.privoxy.org/" target="_top">Privoxy
       Developers</a></sub><br></p>
 
-      <p class="PUBDATE">$Id: developer-manual.sgml,v 2.62 2016/01/22
-      12:14:51 ler762 Exp $<br></p>
+      <p class="PUBDATE">$Id: developer-manual.sgml,v 2.65 2016/01/23
+      11:58:58 fabiankeil Exp $<br></p>
 
       <div>
         <div class="ABSTRACT">
diff --git a/doc/webserver/user-manual/actions-file.html b/doc/webserver/user-manual/actions-file.html
index af876b2b..a0efab22 100644
--- a/doc/webserver/user-manual/actions-file.html
+++ b/doc/webserver/user-manual/actions-file.html
@@ -117,7 +117,7 @@
         in <tt class="FILENAME">default.action</tt> are:</p>
 
         <div class="TABLE">
-          <a name="AEN2615" id="AEN2615"></a>
+          <a name="AEN2614" id="AEN2614"></a>
 
           <p><b>Table 1. Default Configurations</b></p>
 
@@ -314,7 +314,7 @@
     actions</a>.</p>
 
     <div class="SECT2">
-      <h2 class="SECT2"><a name="AEN2714" id="AEN2714">8.1. Finding the Right
+      <h2 class="SECT2"><a name="AEN2713" id="AEN2713">8.1. Finding the Right
       Mix</a></h2>
 
       <p>Note that some <a href="actions-file.html#ACTIONS">actions</a>, like
@@ -339,7 +339,7 @@
     </div>
 
     <div class="SECT2">
-      <h2 class="SECT2"><a name="AEN2721" id="AEN2721">8.2. How to
+      <h2 class="SECT2"><a name="AEN2720" id="AEN2720">8.2. How to
       Edit</a></h2>
 
       <p>The easiest way to edit the actions files is with a browser by using
@@ -644,7 +644,7 @@
       </div>
 
       <div class="SECT3">
-        <h3 class="SECT3"><a name="AEN2915" id="AEN2915">8.4.2. The Path
+        <h3 class="SECT3"><a name="AEN2914" id="AEN2914">8.4.2. The Path
         Pattern</a></h3>
 
         <p><span class="APPLICATION">Privoxy</span> uses <span class=
@@ -4513,7 +4513,7 @@ TAG:^image/
       </div>
 
       <div class="SECT3">
-        <h3 class="SECT3"><a name="AEN4654" id="AEN4654">8.5.36.
+        <h3 class="SECT3"><a name="AEN4653" id="AEN4653">8.5.36.
         Summary</a></h3>
 
         <p>Note that many of these actions have the potential to cause a page
@@ -4672,7 +4672,7 @@ TAG:^image/
       together:</p>
 
       <div class="SECT3">
-        <h3 class="SECT3"><a name="AEN4718" id="AEN4718">8.7.1.
+        <h3 class="SECT3"><a name="AEN4717" id="AEN4717">8.7.1.
         match-all.action</a></h3>
 
         <p>Remember <span class="emphasis"><i class="EMPHASIS">all actions
@@ -4721,7 +4721,7 @@ TAG:^image/
       </div>
 
       <div class="SECT3">
-        <h3 class="SECT3"><a name="AEN4740" id="AEN4740">8.7.2.
+        <h3 class="SECT3"><a name="AEN4739" id="AEN4739">8.7.2.
         default.action</a></h3>
 
         <p>If you aren't a developer, there's no need for you to edit the
@@ -5064,7 +5064,7 @@ wiki.
       </div>
 
       <div class="SECT3">
-        <h3 class="SECT3"><a name="AEN4853" id="AEN4853">8.7.3.
+        <h3 class="SECT3"><a name="AEN4852" id="AEN4852">8.7.3.
         user.action</a></h3>
 
         <p>So far we are painting with a broad brush by setting general
diff --git a/doc/webserver/user-manual/appendix.html b/doc/webserver/user-manual/appendix.html
index 5ac8c35c..80ff44fe 100644
--- a/doc/webserver/user-manual/appendix.html
+++ b/doc/webserver/user-manual/appendix.html
@@ -293,7 +293,7 @@
     </div>
 
     <div class="SECT2">
-      <h2 class="SECT2"><a name="AEN5760" id="AEN5760">14.2. Privoxy's
+      <h2 class="SECT2"><a name="AEN5759" id="AEN5759">14.2. Privoxy's
       Internal Pages</a></h2>
 
       <p>Since <span class="APPLICATION">Privoxy</span> proxies each
@@ -313,7 +313,7 @@
 
       <ul>
         <li>
-          <p>Privoxy main page:</p><a name="AEN5774" id="AEN5774"></a>
+          <p>Privoxy main page:</p><a name="AEN5773" id="AEN5773"></a>
 
           <blockquote class="BLOCKQUOTE">
             <p><a href="http://config.privoxy.org/" target=
@@ -328,8 +328,8 @@
 
         <li>
           <p>Show information about the current configuration, including
-          viewing and editing of actions files:</p><a name="AEN5782" id=
-          "AEN5782"></a>
+          viewing and editing of actions files:</p><a name="AEN5781" id=
+          "AEN5781"></a>
 
           <blockquote class="BLOCKQUOTE">
             <p><a href="http://config.privoxy.org/show-status" target=
@@ -338,8 +338,8 @@
         </li>
 
         <li>
-          <p>Show the source code version numbers:</p><a name="AEN5787" id=
-          "AEN5787"></a>
+          <p>Show the source code version numbers:</p><a name="AEN5786" id=
+          "AEN5786"></a>
 
           <blockquote class="BLOCKQUOTE">
             <p><a href="http://config.privoxy.org/show-version" target=
@@ -348,8 +348,8 @@
         </li>
 
         <li>
-          <p>Show the browser's request headers:</p><a name="AEN5792" id=
-          "AEN5792"></a>
+          <p>Show the browser's request headers:</p><a name="AEN5791" id=
+          "AEN5791"></a>
 
           <blockquote class="BLOCKQUOTE">
             <p><a href="http://config.privoxy.org/show-request" target=
@@ -358,8 +358,8 @@
         </li>
 
         <li>
-          <p>Show which actions apply to a URL and why:</p><a name="AEN5797"
-          id="AEN5797"></a>
+          <p>Show which actions apply to a URL and why:</p><a name="AEN5796"
+          id="AEN5796"></a>
 
           <blockquote class="BLOCKQUOTE">
             <p><a href="http://config.privoxy.org/show-url-info" target=
@@ -373,20 +373,20 @@
           <span class="QUOTE">"off"</span>, <span class=
           "QUOTE">"Privoxy"</span> continues to run, but only as a
           pass-through proxy, with no actions taking place:</p><a name=
-          "AEN5805" id="AEN5805"></a>
+          "AEN5804" id="AEN5804"></a>
 
           <blockquote class="BLOCKQUOTE">
             <p><a href="http://config.privoxy.org/toggle" target=
             "_top">http://config.privoxy.org/toggle</a></p>
           </blockquote>
 
-          <p>Short cuts. Turn off, then on:</p><a name="AEN5809" id=
-          "AEN5809"></a>
+          <p>Short cuts. Turn off, then on:</p><a name="AEN5808" id=
+          "AEN5808"></a>
 
           <blockquote class="BLOCKQUOTE">
             <p><a href="http://config.privoxy.org/toggle?set=disable" target=
             "_top">http://config.privoxy.org/toggle?set=disable</a></p>
-          </blockquote><a name="AEN5812" id="AEN5812"></a>
+          </blockquote><a name="AEN5811" id="AEN5811"></a>
 
           <blockquote class="BLOCKQUOTE">
             <p><a href="http://config.privoxy.org/toggle?set=enable" target=
diff --git a/doc/webserver/user-manual/configuration.html b/doc/webserver/user-manual/configuration.html
index 182ef675..af213507 100644
--- a/doc/webserver/user-manual/configuration.html
+++ b/doc/webserver/user-manual/configuration.html
@@ -46,7 +46,7 @@
     controlled easily with a web browser.</p>
 
     <div class="SECT2">
-      <h2 class="SECT2"><a name="AEN812" id="AEN812">6.1. Controlling Privoxy
+      <h2 class="SECT2"><a name="AEN811" id="AEN811">6.1. Controlling Privoxy
       with Your Web Browser</a></h2>
 
       <p><span class="APPLICATION">Privoxy</span>'s user interface can be
@@ -63,8 +63,10 @@
 
 </pre>
 
-            <h2 class="BRIDGEHEAD"><a name="AEN820" id=
-            "AEN820"></a>&nbsp;&nbsp;&nbsp;&nbsp;Privoxy Menu</h2>
+            <h2 class="BRIDGEHEAD"><a name="AEN819" id=
+            "AEN819"></a>&nbsp;&nbsp;&nbsp;&nbsp;Privoxy Menu</h2>
+            <pre>
+</pre>
 
             <table border="0">
               <tbody>
diff --git a/doc/webserver/user-manual/filter-file.html b/doc/webserver/user-manual/filter-file.html
index e34e1236..2fe7948a 100644
--- a/doc/webserver/user-manual/filter-file.html
+++ b/doc/webserver/user-manual/filter-file.html
@@ -177,7 +177,7 @@ FILTER: foo Replace all "foo" with "bar"
     started.</p>
 
     <div class="SECT2">
-      <h2 class="SECT2"><a name="AEN5021" id="AEN5021">9.1. Filter File
+      <h2 class="SECT2"><a name="AEN5020" id="AEN5020">9.1. Filter File
       Tutorial</a></h2>
 
       <p>Now, let's complete our <span class="QUOTE">"foo"</span> content
diff --git a/doc/webserver/user-manual/index.html b/doc/webserver/user-manual/index.html
index 399c7d8c..7b9add8c 100644
--- a/doc/webserver/user-manual/index.html
+++ b/doc/webserver/user-manual/index.html
@@ -23,8 +23,8 @@
       2001-2014 by <a href="http://www.privoxy.org/" target="_top">Privoxy
       Developers</a></sub><br></p>
 
-      <p class="PUBDATE">$Id: user-manual.sgml,v 2.199 2016/01/21 15:55:49
-      fabiankeil Exp $<br></p>
+      <p class="PUBDATE">$Id: user-manual.sgml,v 2.202 2016/01/23 13:57:17
+      diem Exp $<br></p>
 
       <div>
         <div class="ABSTRACT">
@@ -176,7 +176,7 @@
 
         <dd>
           <dl>
-            <dt>6.1. <a href="configuration.html#AEN812">Controlling Privoxy
+            <dt>6.1. <a href="configuration.html#AEN811">Controlling Privoxy
             with Your Web Browser</a></dt>
 
             <dt>6.2. <a href="configuration.html#CONFOVERVIEW">Configuration
@@ -351,10 +351,10 @@
 
         <dd>
           <dl>
-            <dt>8.1. <a href="actions-file.html#AEN2714">Finding the Right
+            <dt>8.1. <a href="actions-file.html#AEN2713">Finding the Right
             Mix</a></dt>
 
-            <dt>8.2. <a href="actions-file.html#AEN2721">How to Edit</a></dt>
+            <dt>8.2. <a href="actions-file.html#AEN2720">How to Edit</a></dt>
 
             <dt>8.3. <a href="actions-file.html#ACTIONS-APPLY">How Actions
             are Applied to Requests</a></dt>
@@ -367,7 +367,7 @@
                 <dt>8.4.1. <a href="actions-file.html#HOST-PATTERN">The Host
                 Pattern</a></dt>
 
-                <dt>8.4.2. <a href="actions-file.html#AEN2915">The Path
+                <dt>8.4.2. <a href="actions-file.html#AEN2914">The Path
                 Pattern</a></dt>
 
                 <dt>8.4.3. <a href="actions-file.html#TAG-PATTERN">The Tag
@@ -488,7 +488,7 @@
                 "actions-file.html#SET-IMAGE-BLOCKER">set-image-blocker</a></dt>
 
                 <dt>8.5.36. <a href=
-                "actions-file.html#AEN4654">Summary</a></dt>
+                "actions-file.html#AEN4653">Summary</a></dt>
               </dl>
             </dd>
 
@@ -500,13 +500,13 @@
             <dd>
               <dl>
                 <dt>8.7.1. <a href=
-                "actions-file.html#AEN4718">match-all.action</a></dt>
+                "actions-file.html#AEN4717">match-all.action</a></dt>
 
                 <dt>8.7.2. <a href=
-                "actions-file.html#AEN4740">default.action</a></dt>
+                "actions-file.html#AEN4739">default.action</a></dt>
 
                 <dt>8.7.3. <a href=
-                "actions-file.html#AEN4853">user.action</a></dt>
+                "actions-file.html#AEN4852">user.action</a></dt>
               </dl>
             </dd>
           </dl>
@@ -516,7 +516,7 @@
 
         <dd>
           <dl>
-            <dt>9.1. <a href="filter-file.html#AEN5021">Filter File
+            <dt>9.1. <a href="filter-file.html#AEN5020">Filter File
             Tutorial</a></dt>
 
             <dt>9.2. <a href="filter-file.html#PREDEFINED-FILTERS">The
@@ -587,7 +587,7 @@
             <dt>14.1. <a href="appendix.html#REGEX">Regular
             Expressions</a></dt>
 
-            <dt>14.2. <a href="appendix.html#AEN5760">Privoxy's Internal
+            <dt>14.2. <a href="appendix.html#AEN5759">Privoxy's Internal
             Pages</a></dt>
 
             <dt>14.3. <a href="appendix.html#CHAIN">Chain of Events</a></dt>
diff --git a/doc/webserver/user-manual/startup.html b/doc/webserver/user-manual/startup.html
index c705eb20..fddc6225 100644
--- a/doc/webserver/user-manual/startup.html
+++ b/doc/webserver/user-manual/startup.html
@@ -239,28 +239,22 @@
       <h2 class="SECT2"><a name="START-MACOSX" id="START-MACOSX">5.6. Mac OS
       X</a></h2>
 
-      <p>After downloading the privoxy software, unzip the downloaded file by
-      double-clicking on the zip file icon. Then, double-click on the
-      installer package icon and follow the installation process.</p>
-
       <p>The privoxy service will automatically start after a successful
-      installation. In addition, the privoxy service will automatically start
-      every time your computer starts up.</p>
+      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.</p>
 
       <p>To prevent the privoxy service from automatically starting when your
-      computer starts up, remove or rename the folder named
-      /Library/StartupItems/Privoxy.</p>
-
-      <p>A simple application named Privoxy Utility has been created which
-      enables administrators to easily start and stop the privoxy
-      service.</p>
-
-      <p>In addition, the Privoxy Utility presents a simple way for
-      administrators to edit the various privoxy config files. A method to
-      uninstall the software is also available.</p>
-
-      <p>An administrator username and password must be supplied in order for
-      the Privoxy Utility to perform any of the tasks.</p>
+      computer starts up, remove or rename the file <tt class=
+      "LITERAL">/Library/LaunchDaemons/org.ijbswa.privoxy.plist</tt> (on OS X
+      10.5 and higher) or the folder named <tt class=
+      "LITERAL">/Library/StartupItems/Privoxy</tt> (on OS X 10.4
+      'Tiger').</p>
+
+      <p>To manually start or stop the privoxy service, use the scripts
+      startPrivoxy.sh and stopPrivoxy.sh supplied in /Applications/Privoxy.
+      They must be run from an administrator account, using sudo.</p>
     </div>
 
     <div class="SECT2">
-- 
2.39.2