Rebuild docs with recent changes

[privoxy.git] / doc / webserver / user-manual / startup.html

diff --git a/doc/webserver/user-manual/startup.html b/doc/webserver/user-manual/startup.html
index afc3a4b..c705eb2 100644 (file)
--- a/doc/webserver/user-manual/startup.html
+++ b/doc/webserver/user-manual/startup.html
@@ -157,7 +157,33 @@
     </div>
 
     <div class="SECT2">
-      <h2 class="SECT2"><a name="START-WINDOWS" id="START-WINDOWS">5.2.
+      <h2 class="SECT2"><a name="START-FREEBSD" id="START-FREEBSD">5.2.
+      FreeBSD and ElectroBSD</a></h2>
+
+      <p>To start <span class="APPLICATION">Privoxy</span> upon booting, add
+      "privoxy_enable='YES'" to <tt class="FILENAME">/etc/rc.conf</tt>.
+      <span class="APPLICATION">Privoxy</span> will use <tt class=
+      "FILENAME">/usr/local/etc/privoxy/config</tt> as its main configuration
+      file.</p>
+
+      <p>If you installed <span class="APPLICATION">Privoxy</span> into a
+      jail, the paths above are relative to the jail root.</p>
+
+      <p>To start <span class="APPLICATION">Privoxy</span> manually, run:</p>
+
+      <table border="0" bgcolor="#E0E0E0" width="100%">
+        <tr>
+          <td>
+            <pre class="SCREEN">
+ # service privoxy onestart
+</pre>
+          </td>
+        </tr>
+      </table>
+    </div>
+
+    <div class="SECT2">
+      <h2 class="SECT2"><a name="START-WINDOWS" id="START-WINDOWS">5.3.
       Windows</a></h2>
 
       <p>Click on the <span class="APPLICATION">Privoxy</span> Icon to start
@@ -178,8 +204,8 @@
     </div>
 
     <div class="SECT2">
-      <h2 class="SECT2"><a name="START-UNICES" id="START-UNICES">5.3.
-      Solaris, NetBSD, FreeBSD, HP-UX and others</a></h2>
+      <h2 class="SECT2"><a name="START-UNICES" id="START-UNICES">5.4. Generic
+      instructions for Unix derivates (Solaris, NetBSD, HP-UX etc.)</a></h2>
 
       <p>Example Unix startup command:</p>
 
@@ -187,15 +213,20 @@
         <tr>
           <td>
             <pre class="SCREEN">
- # /usr/sbin/privoxy /etc/privoxy/config
+ # /usr/sbin/privoxy --user privoxy /etc/privoxy/config
 </pre>
           </td>
         </tr>
       </table>
+
+      <p>Note that if you installed <span class="APPLICATION">Privoxy</span>
+      through a package manager, the package will probably contain a
+      platform-specific script or configuration file to start <span class=
+      "APPLICATION">Privoxy</span> upon boot.</p>
     </div>
 
     <div class="SECT2">
-      <h2 class="SECT2"><a name="START-OS2" id="START-OS2">5.4. OS/2</a></h2>
+      <h2 class="SECT2"><a name="START-OS2" id="START-OS2">5.5. OS/2</a></h2>
 
       <p>During installation, <span class="APPLICATION">Privoxy</span> is
       configured to start automatically when the system restarts. You can
@@ -205,7 +236,7 @@
     </div>
 
     <div class="SECT2">
-      <h2 class="SECT2"><a name="START-MACOSX" id="START-MACOSX">5.5. Mac OS
+      <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
@@ -233,7 +264,7 @@
     </div>
 
     <div class="SECT2">
-      <h2 class="SECT2"><a name="CMDOPTIONS" id="CMDOPTIONS">5.6. Command
+      <h2 class="SECT2"><a name="CMDOPTIONS" id="CMDOPTIONS">5.7. Command
       Line Options</a></h2>
 
       <p><span class="APPLICATION">Privoxy</span> may be invoked with the