make adjustments to the manuals and add help for accept and reject

diff --git a/Changes b/Changes
index 653ab9bdf0caab82e779992495dca7d079efd29c..10bed394ba60aeb320f3a8b96d621b34c1bfcbb5 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,6 @@
+15Mar02=======================================================================
+1. add help for 'accept' and 'reject'.
+2. adjustments to the manuals

 23Feb02=======================================================================
 1. remove old satellites from keps.
 2. Add information on setting up the ax25 utils to the installation manual
 23Feb02=======================================================================
 1. remove old satellites from keps.
 2. Add information on setting up the ax25 utils to the installation manual

diff --git a/cmd/Commands_en.hlp b/cmd/Commands_en.hlp
index 41d6313b625d5ee1f3d9d4f91040cf4d5869155c..e6e8c28dd619e3717e28ca304b20ce6d66d837ce 100644 (file)
--- a/cmd/Commands_en.hlp
+++ b/cmd/Commands_en.hlp
@@ -11,6 +11,12 @@
 #
 # Comment lines are indented before printing
 #
 #
 # Comment lines are indented before printing
 #

+=== 0^ACCEPT^Set a filter to accept something
+Create a filter to accept something
+
+There are 2 types of filter, accept and reject.  See HELP FILTERING for more
+info.
+

 === 0^ACCEPT/ANNOUNCE [0-9] <pattern>^Set an 'accept' filter line for announce
 Create an 'accept this announce' line for a filter. 
 
 === 0^ACCEPT/ANNOUNCE [0-9] <pattern>^Set an 'accept' filter line for announce
 Create an 'accept this announce' line for a filter. 
 


@@ -914,6 +920,12 @@ message either sent by or sent to your callsign.
 === 5^READ-^
 As a sysop you may read any message on the system
 
 === 5^READ-^
 As a sysop you may read any message on the system
 

+=== 0^REJECT^Set a filter to reject something
+Create a filter to reject something
+
+There are 2 types of filter, accept and reject.  See HELP FILTERING for more
+info.
+

 === 0^REJECT/ANNOUNCE [0-9] <pattern>^Set a 'reject' filter line for announce
 Create an 'reject this announce' line for a filter. 
 
 === 0^REJECT/ANNOUNCE [0-9] <pattern>^Set a 'reject' filter line for announce
 Create an 'reject this announce' line for a filter. 
 

diff --git a/html/adminmanual-4.html b/html/adminmanual-4.html
index 18abec5702c3db8efeb3476be223b9762140aec4..b7227c25e70e3e5e9edbcd67ace4475819f0987b 100644 (file)
--- a/html/adminmanual-4.html
+++ b/html/adminmanual-4.html
@@ -44,7 +44,17 @@ below and is included in the distribution as startup.issue.
 </PRE>
 </CODE></BLOCKQUOTE>
 <P>
 </PRE>
 </CODE></BLOCKQUOTE>
 <P>

-<P>As usual, any text behind a # is treated as a comment and not read.
+<P>As usual, any text behind a # is treated as a comment and not read.  To use
+this file, simply rename it from startup.issue to startup.  In our example
+above there are three options.  The first option is the amount of spots that
+a user can request with the <EM>sh/dx</EM> command.  Normally the default is
+to give 10 spots unless the user specifies more.  Without this line enabled,
+the maximum a user can request is 100 spots.  Depending on your link quality
+you may wish to enable more or less by specifying the number.  If you simply
+uncomment the line, the maximum would be 1 spot!
+<P>
+<P>The other 2 options are dealt with more fully in the security section.
+<P>

 <P>Secondly, it is used to store the login scripts for users and nodes.  Currently
 this can only be done by the sysop but it is envisaged that eventually users will 
 be able to set their own.  An example is included in the distibution but here is 
 <P>Secondly, it is used to store the login scripts for users and nodes.  Currently
 this can only be done by the sysop but it is envisaged that eventually users will 
 be able to set their own.  An example is included in the distibution but here is 

diff --git a/sgml/adminmanual.sgml b/sgml/adminmanual.sgml
index 5fd568c2ef9776974060e893f9b4e33be2cab08e..2dc01d83de453229d416df47f355d7a3549471f6 100644 (file)
--- a/sgml/adminmanual.sgml
+++ b/sgml/adminmanual.sgml
@@ -921,8 +921,19 @@ below and is included in the distribution as startup.issue.
 </verb></tscreen>
 
 <P>
 </verb></tscreen>
 
 <P>

-As usual, any text behind a # is treated as a comment and not read.
+As usual, any text behind a # is treated as a comment and not read.  To use
+this file, simply rename it from startup.issue to startup.  In our example
+above there are three options.  The first option is the amount of spots that
+a user can request with the <em>sh/dx</em> command.  Normally the default is
+to give 10 spots unless the user specifies more.  Without this line enabled,
+the maximum a user can request is 100 spots.  Depending on your link quality
+you may wish to enable more or less by specifying the number.  If you simply
+uncomment the line, the maximum would be 1 spot!

 
 

+<P>
+The other 2 options are dealt with more fully in the security section.
+
+<P>

 Secondly, it is used to store the login scripts for users and nodes.  Currently
 this can only be done by the sysop but it is envisaged that eventually users will 
 be able to set their own.  An example is included in the distibution but here is 
 Secondly, it is used to store the login scripts for users and nodes.  Currently
 this can only be done by the sysop but it is envisaged that eventually users will 
 be able to set their own.  An example is included in the distibution but here is 

diff --git a/txt/adminmanual.txt b/txt/adminmanual.txt
index 2f3a6473a36db7f376c7d85d163a0153f012abdb..1c7eb7121b414043f34f6821234159ca328890ab 100644 (file)
--- a/txt/adminmanual.txt
+++ b/txt/adminmanual.txt
@@ -1378,12 +1378,26 @@
 
 
   As usual, any text behind a # is treated as a comment and not read.
 
 
   As usual, any text behind a # is treated as a comment and not read.

+  To use this file, simply rename it from startup.issue to startup.  In
+  our example above there are three options.  The first option is the
+  amount of spots that a user can request with the sh/dx command.
+  Normally the default is to give 10 spots unless the user specifies
+  more.  Without this line enabled, the maximum a user can request is
+  100 spots.  Depending on your link quality you may wish to enable more
+  or less by specifying the number.  If you simply uncomment the line,
+  the maximum would be 1 spot!
+
+
+  The other 2 options are dealt with more fully in the security section.
+

 
   Secondly, it is used to store the login scripts for users and nodes.
   Currently this can only be done by the sysop but it is envisaged that
   eventually users will be able to set their own.  An example is
   included in the distibution but here is a further example.
 
 
   Secondly, it is used to store the login scripts for users and nodes.
   Currently this can only be done by the sysop but it is envisaged that
   eventually users will be able to set their own.  An example is
   included in the distibution but here is a further example.
 

+
+

        #
        # G0FYD
        #
        #
        # G0FYD
        #


@@ -1436,9 +1450,6 @@
 
        dbcreate <name>
 
 
        dbcreate <name>
 

-
-
-

   To simply create a database locally, you just tell the command the
   name of the database.  This does not create the actual database, it
   simply defines it to say that it exists.
   To simply create a database locally, you just tell the command the
   name of the database.  This does not create the actual database, it
   simply defines it to say that it exists.


@@ -1503,14 +1514,14 @@
 
 
 
 
 
 

-       dbavail
-       DB Name          Location   Chain
-       qsl              Local
-       buck             GB7ADX
-       hftest           GB7DXM
-       G0VGS de GB7MBC  3-Feb-2001 1925Z >

 
 
 
 

+  dbavail
+  DB Name          Location   Chain
+  qsl              Local
+  buck             GB7ADX
+  hftest           GB7DXM
+  G0VGS de GB7MBC  3-Feb-2001 1925Z >

 
 
 
 
 
 


@@ -1571,8 +1582,6 @@
   /spider/data called motd and edit it to say whatever you want.  It is
   purely a text file and will be sent automatically to anyone logging in
   to the cluster.
   /spider/data called motd and edit it to say whatever you want.  It is
   purely a text file and will be sent automatically to anyone logging in
   to the cluster.

-
-

   6.2.  MOTD_NOR
 
   This message of the day file lives in the same directory as the
   6.2.  MOTD_NOR
 
   This message of the day file lives in the same directory as the


@@ -1580,8 +1589,6 @@
   registered they will receive the same message as any other user.
 
 
   registered they will receive the same message as any other user.
 
 

-
-

   6.3.  Downtime message
 
   If for any reason the cluster is down, maybe for upgrade or
   6.3.  Downtime message
 
   If for any reason the cluster is down, maybe for upgrade or


@@ -1641,13 +1648,12 @@
 
   An example would look like this ....
 
 
   An example would look like this ....
 

-
-

        sh/files
        bulletin      DIR 20-Dec-1999 1715Z news          1602 14-Dec-1999 1330Z
 
 
 
        sh/files
        bulletin      DIR 20-Dec-1999 1715Z news          1602 14-Dec-1999 1330Z
 
 
 

+

   You can see that in the files area (basically the packclus directory)
   there is a file called news and a directory called bulletin.  You can
   also see that dates they were created.  In the case of the file news,
   You can see that in the files area (basically the packclus directory)
   there is a file called news and a directory called bulletin.  You can
   also see that dates they were created.  In the case of the file news,


@@ -1707,6 +1713,7 @@
 
 
 
 
 
 

+

   The page length will of course depend on what you have it set to!
 
 
   The page length will of course depend on what you have it set to!
 
 


@@ -1839,8 +1846,7 @@
 
 
 
 
 
 

-       load/keps
-
+  load/keps

 
 
 
 
 
 


@@ -1906,12 +1912,10 @@
   /spider/scripts/startup.  To read more on the startup file, see the
   section on Information, files and useful programs.
 
   /spider/scripts/startup.  To read more on the startup file, see the
   section on Information, files and useful programs.
 

-

   To unregister a user use unset/register and to show the list of
   registered users, use the command show/register.
 
 
   To unregister a user use unset/register and to show the list of
   registered users, use the command show/register.
 
 

-

   7.2.  Passwords
 
   At the moment, passwords only affect users who login to a DXSpider
   7.2.  Passwords
 
   At the moment, passwords only affect users who login to a DXSpider


@@ -1978,6 +1982,7 @@
   CVS repository and then update your Spider source.  There are several
   steps which are listed below ...
 
   CVS repository and then update your Spider source.  There are several
   steps which are listed below ...
 

+

   First login as the user sysop.  Next you need to connect to the CVS
   repository.  You do this with the command below ...
 
   First login as the user sysop.  Next you need to connect to the CVS
   repository.  You do this with the command below ...
 


@@ -2096,18 +2101,29 @@
 
 
 
 
 
 

-         info <string>            eg: iota or qsl
-         by <prefixes>            eg: G,M,2
-         origin <prefixes>
-         origin_dxcc <numbers>    eg: 61,62 (from eg: sh/pre G)
-         origin_itu <numbers>
-         origin_zone <numbers>
-         by_dxcc <numbers>
-         by_itu <numbers>
-         by_zone <numbers>
-         channel <prefixes>
-         wx 1                     filter WX announces
-         dest <prefixes>          eg: 6MUK,WDX      (distros)
+
+
+
+
+
+
+
+
+
+    info <string>            eg: iota or qsl
+    by <prefixes>            eg: G,M,2
+    origin <prefixes>
+    origin_dxcc <numbers>    eg: 61,62 (from eg: sh/pre G)
+    origin_itu <numbers>
+    origin_zone <numbers>
+    by_dxcc <numbers>
+    by_itu <numbers>
+    by_zone <numbers>
+    channel <prefixes>
+    wx 1                     filter WX announces
+    dest <prefixes>          eg: 6MUK,WDX      (distros)
+
+

 
 
   some examples:-
 
 
   some examples:-


@@ -2160,8 +2176,6 @@
 
 
 
 
 
 

-
-

   9.3.  accept/route (8)
 
   accept/route <call> [0-9] <pattern> Set an 'accept' filter line for
   9.3.  accept/route (8)
 
   accept/route <call> [0-9] <pattern> Set an 'accept' filter line for


@@ -2176,6 +2190,7 @@
   more info. Please read this to understand how filters work - it will
   save a lot of grief later on.
 
   more info. Please read this to understand how filters work - it will
   save a lot of grief later on.
 

+

   You can use any of the following things in this line:-
 
 
   You can use any of the following things in this line:-
 
 


@@ -2226,35 +2241,24 @@
   passed onto the user. See HELP FILTERS for more info. Please read this
   to understand how filters work - it will save a lot of grief later on.
 
   passed onto the user. See HELP FILTERS for more info. Please read this
   to understand how filters work - it will save a lot of grief later on.
 

-  You can use any of the following things in this line:-
-
-
-
-
-
-
-
-
-
-
-

 
 

+  You can use any of the following things in this line:-

 
 
 
 
 
 

-    freq <range>           eg: 0/30000 or hf or hf/cw or 6m,4m,2m
-    on <range>             same as 'freq'
-    call <prefixes>        eg: G,PA,HB9
-    info <string>          eg: iota or qsl
-    by <prefixes>
-    call_dxcc <numbers>    eg: 61,62 (from eg: sh/pre G)
-    call_itu <numbers>
-    call_zone <numbers>
-    by_dxcc <numbers>
-    by_itu <numbers>
-    by_zone <numbers>
-    origin <prefixes>
-    channel <prefixes>
+         freq <range>           eg: 0/30000 or hf or hf/cw or 6m,4m,2m
+         on <range>             same as 'freq'
+         call <prefixes>        eg: G,PA,HB9
+         info <string>          eg: iota or qsl
+         by <prefixes>
+         call_dxcc <numbers>    eg: 61,62 (from eg: sh/pre G)
+         call_itu <numbers>
+         call_zone <numbers>
+         by_dxcc <numbers>
+         by_itu <numbers>
+         by_zone <numbers>
+         origin <prefixes>
+         channel <prefixes>

 
 
 
 
 
 


@@ -2304,10 +2308,6 @@
 
          accept/spot user_default by G,M,2
 
 
          accept/spot user_default by G,M,2
 

-
-
-
-

   9.6.  accept/wcy (0)
 
   accept/wcy [0-9] <pattern> set an accept WCY filter
   9.6.  accept/wcy (0)
 
   accept/wcy [0-9] <pattern> set an accept WCY filter