From 588a5b9623579728b1f7baa2e6bc62e41e89a063 Mon Sep 17 00:00:00 2001 From: joergs Date: Sun, 3 Mar 2002 09:26:06 +0000 Subject: [PATCH] AmigaOS changes, config is now loaded from PROGDIR: instead of AmiTCP:db/junkbuster/ if no configuration file is specified on the command line. --- doc/source/user-manual.sgml | 30 ++++++++++++++++-------------- doc/text/user-manual.txt | 29 ++++++++++++++--------------- 2 files changed, 30 insertions(+), 29 deletions(-) diff --git a/doc/source/user-manual.sgml b/doc/source/user-manual.sgml index 4217aae3..a42a858a 100644 --- a/doc/source/user-manual.sgml +++ b/doc/source/user-manual.sgml @@ -6,7 +6,7 @@ This file belongs into ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/ - $Id: user-manual.sgml,v 1.30 2002/03/02 22:00:14 hal9 Exp $ + $Id: user-manual.sgml,v 1.31 2002/03/02 22:45:52 david__schmidt Exp $ Written by and Copyright (C) 2001 the SourceForge IJBSWA team. http://ijbswa.sourceforge.net @@ -28,7 +28,7 @@ Hal Burgiss Junkbuster User Manual -$Id: user-manual.sgml,v 1.30 2002/03/02 22:00:14 hal9 Exp $ +$Id: user-manual.sgml,v 1.31 2002/03/02 22:45:52 david__schmidt Exp $ @@ -448,8 +448,8 @@ configuration section below. HB.) Junkbuster Configuration For Unix, *BSD and Linux, all configuration files are located in - /etc/junkbuster/ by default. For MS Windows and OS/2, - these are all in the same directory as the + /etc/junkbuster/ by default. For MS Windows, OS/2, and + AmigaOS these are all in the same directory as the Junkbuster executable. The name and number of configuration files has changed from previous versions, and is subject to change as development progresses. @@ -467,9 +467,8 @@ configuration section below. HB.) The main configuration file is named config - on Linux, Unix, BSD, and OS/2, and config.txt on - Windows. On Amiga, it is - AmiTCP:db/junkbuster/config. + on Linux, Unix, BSD, OS/2, and AmigaOS and config.txt + on Windows. @@ -582,9 +581,10 @@ configuration section below. HB.) - On Windows, Junkbuster - looks for these files in the same directory as the executable. On Unix and - OS/2, Junkbuster looks for these files in the current + On Windows and AmigaOS, + Junkbuster looks for these files in the same + directory as the executable. On Unix and OS/2, + Junkbuster looks for these files in the current working directory. In either case, an absolute path name can be used to avoid problems. @@ -2820,10 +2820,9 @@ For RedHat: /etc/rc.d/init.d/junkbuster start If no configuration file is specified on the command line, Junkbuster will look for a file named - config in the current directory. Except on Amiga where - it will look for AmiTCP:db/junkbuster/config and Win32 - where it will try config.txt. If no file is specified - on the command line and no default configuration file can be found, + config in the current directory. Except on Win32 where + it will try config.txt. If no file is specified on the + command line and no default configuration file can be found, Junkbuster will fail to start. @@ -3280,6 +3279,9 @@ communication (bugs, feature requests, etc.) Temple Place - Suite 330, Boston, MA 02111-1307, USA. $Log: user-manual.sgml,v $ + Revision 1.31 2002/03/02 22:45:52 david__schmidt + Just tweaking + Revision 1.30 2002/03/02 22:00:14 hal9 Updated 'New Features' list. Ran through spell-checker. diff --git a/doc/text/user-manual.txt b/doc/text/user-manual.txt index 8f40923b..eef8c32f 100644 --- a/doc/text/user-manual.txt +++ b/doc/text/user-manual.txt @@ -2,7 +2,7 @@ Junkbuster User Manual By: Junkbuster Developers -$Id: user-manual.sgml,v 1.31 2002/03/02 22:45:52 david__schmidt Exp $ +$Id: user-manual.txt,v 1.20 2002/03/03 01:33:50 hal9 Exp $ The user manual gives the users information on how to install and configure Internet Junkbuster. Internet Junkbuster is an application that provides @@ -283,17 +283,17 @@ the same as above for Linux/Unix. 3. Junkbuster Configuration For Unix, *BSD and Linux, all configuration files are located in /etc/ -junkbuster/ by default. For MS Windows and OS/2, these are all in the same -directory as the Junkbuster executable. The name and number of configuration -files has changed from previous versions, and is subject to change as -development progresses. +junkbuster/ by default. For MS Windows, OS/2 and AmigaOS, these are all in the +same directory as the Junkbuster executable. The name and number of +configuration files has changed from previous versions, and is subject to +change as development progresses. The installed defaults provide a reasonable starting point, though possibly aggressive by some standards. For the time being, there are only three default configuration files (this will change in time): - * The main configuration file is named config on Linux, Unix, BSD, and OS/2, - and config.txt on Windows. On Amiga, it is AmiTCP:db/junkbuster/config. + * The main configuration file is named config on Linux, Unix, BSD, OS/2, + and AmigaOS and config.txt on Windows. * The ijb.action file is used to define various "actions" relating to images, banners, pop-ups, access restrictions, banners and cookies. There is a CGI @@ -353,10 +353,10 @@ Junkbuster can use a number of other files to tell it what ads to block, what cookies to accept, etc. This section of the configuration file tells Junkbuster where to find all those other files. -On Windows, Junkbuster looks for these files in the same directory as the -executable. On Unix and OS/2, Junkbuster looks for these files in the current -working directory. In either case, an absolute path name can be used to avoid -problems. +On Windows and AmigaOS, Junkbuster looks for these files in the same directory +as the executable. On Unix and OS/2, Junkbuster looks for these files in the +current working directory. In either case, an absolute path name can be used +to avoid problems. When development goes modular and multi-user, the blocker, filter, and per-user config will be stored in subdirectories of "confdir". For now, only confdir/ @@ -1448,10 +1448,9 @@ For for SuSE: /etc/rc.d/junkbuster start For RedHat: /etc/rc.d/init.d/junkbuster start If no configuration file is specified on the command line, Junkbuster will look -for a file named config in the current directory. Except on Amiga where it will -look for AmiTCP:db/junkbuster/config and Win32 where it will try config.txt. If -no file is specified on the command line and no default configuration file can -be found, Junkbuster will fail to start. +for a file named config in the current directory. Except on Win32 where it will +try config.txt. If no file is specified on the command line and no default +configuration file can be found, Junkbuster will fail to start. Be sure your browser is set to use the proxy which is by default at localhost, port 8000. With Netscape (and Mozilla), this can be set under Edit -> -- 2.39.2