From: hal9 <hal9@users.sourceforge.net>
Date: Mon, 24 Sep 2001 14:31:36 +0000 (+0000)
Subject: Diddling.
X-Git-Tag: v_2_9_9~35
X-Git-Url: http://www.privoxy.org/gitweb/@default-cgi@/faq/%22https:/developer-manual/static/diff?a=commitdiff_plain;h=7d0c7e266569a998baf3c475d876f83aac5f5b21;p=privoxy.git

Diddling.
---

diff --git a/doc/source/user-manual.sgml b/doc/source/user-manual.sgml
index aa5b7d97..dc4548b6 100644
--- a/doc/source/user-manual.sgml
+++ b/doc/source/user-manual.sgml
@@ -7,7 +7,7 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
                 
- $Id: user-manual.sgml,v 1.2 2001/09/13 15:27:40 swa Exp $
+ $Id: user-manual.sgml,v 1.6 2001/09/24 14:10:32 hal9 Exp $
 
  Written by and Copyright (C) 2001 the SourceForge
  IJBSWA team.  http://ijbswa.sourceforge.net
@@ -30,7 +30,7 @@ Hal Burgiss <hal@foobox.net>
 <artheader>
 <title>Junkbuster User Manual</title>
 
-<pubdate>$Id: user-manual.sgml,v 1.2 2001/09/13 15:27:40 swa Exp $</pubdate>
+<pubdate>$Id: user-manual.sgml,v 1.6 2001/09/24 14:10:32 hal9 Exp $</pubdate>
 
 <authorgroup>
  <author>
@@ -355,10 +355,11 @@ configuration section below.
 <sect1 id="configuration"><title>Junkbuster Configuration</title>
 <para>
  For Unix and Linux, all configuraton files are located in
- <filename>/etc/junkbuster/</filename> by default. For MS Windows, these 
- are all in the same directory as the <application>Junkbuster</application>
- executable. The name and number of configuration files has changed from
- previous versions, and is subject to change as development progresses.
+ <filename>/etc/junkbuster/</filename> by default. For MS Windows and OS/2,
+ these are all in the same directory as the
+ <application>Junkbuster</application> executable. The name and number of
+ configuration files has changed from previous versions, and is subject to
+ change as development progresses.
 </para>
 
 <para>
@@ -373,7 +374,8 @@ configuration section below.
   <listitem>
    <para>
      The main configuration file is named <filename>config</filename>
-     on Linux and Unix, and <filename>junkbustr.txt</filename> on Windows.
+     on Linux, Unix, and OS/2, and <filename>junkbustr.txt</filename> on
+     Windows.
    </para>
   </listitem> 
 
@@ -410,7 +412,7 @@ configuration section below.
 <title>The Main Configuration File</title>
 <para>
  Again, the main configuration file is named <filename>config</filename> on
- Linux and Unix, and <filename>junkbustr.txt</filename> on Windows.
+ Linux/Unix and OS/2, and <filename>junkbustr.txt</filename> on Windows.
  Configuration lines consist of an initial keyword followed by a list of
  values, all separated by whitespace (any number of spaces or tabs). For
  example:
@@ -473,8 +475,8 @@ configuration section below.
 
 <para>
  On <application>Windows</application>, <application>Junkbuster</application>
- looks for these files in the same directory as the executable.  On Unix,
- <application>Junkbuster</application> looks for these files in the current
+ looks for these files in the same directory as the executable.  On Unix and 
+ OS/2, <application>Junkbuster</application> looks for these files in the current
  working directory.  In either case, an absolute path name can be used to
  avoid problems.
 </para>
@@ -2522,6 +2524,12 @@ communication (bugs, feature requests, etc.)
  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
  $Log: user-manual.sgml,v $
+<<<<<<< user-manual.sgml
+=======
+ Revision 1.6  2001/09/24 14:10:32  hal9
+ Including David's OS/2 installation instructions.
+
+>>>>>>> 1.6
  Revision 1.2  2001/09/13 15:27:40  swa
  cosmetics