[cvs] bogofilter main.c,1.11,1.12 bogofilter.xml,1.5,1.6

[<re...@us...>]

Update of /cvsroot/bogofilter/bogofilter
In directory usw-pr-cvs1:/tmp/cvs-serv847

Modified Files:
	main.c bogofilter.xml 
Log Message:
Renamed '-h' and '-H' options to '-n' and '-N' in main.c.
Modified documentation to show the new names.


Index: main.c
===================================================================
RCS file: /cvsroot/bogofilter/bogofilter/main.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** main.c	24 Sep 2002 04:34:19 -0000	1.11
--- main.c	25 Sep 2002 18:15:19 -0000	1.12
***************
*** 2,5 ****
--- 2,9 ----
  /*
   * $Log$
+  * Revision 1.12  2002/09/25 18:15:19  relson
+  * Renamed '-h' and '-H' options to '-n' and '-N' in main.c.
+  * Modified documentation to show the new names.
+  *
   * Revision 1.11  2002/09/24 04:34:19  gyepi
   *
***************
*** 100,110 ****
      strcat(directory, BOGODIR);
  
!     while ((ch = getopt(argc, argv, "d:shSHvVp")) != EOF)
  	switch(ch)
  	{
  	case 'd':
  	    strcpy(directory, optarg);
! 	   if (directory[strlen(directory)-1] != '/')
!                strcat(directory, "/" );
  	    break;
  
--- 104,114 ----
      strcat(directory, BOGODIR);
  
!     while ((ch = getopt(argc, argv, "d:snSNvVp")) != EOF)
  	switch(ch)
  	{
  	case 'd':
  	    strcpy(directory, optarg);
! 	    if (directory[strlen(directory)-1] != '/')
! 		strcat(directory, "/" );
  	    break;
  
***************
*** 113,117 ****
  	    break;
  
! 	case 'h':
  	    register_ham = 1;
  	    break;
--- 117,121 ----
  	    break;
  
! 	case 'n':
  	    register_ham = 1;
  	    break;
***************
*** 121,125 ****
  	    break;
  
! 	case 'H':
  	    spam_to_ham = 1;
  	    break;
--- 125,129 ----
  	    break;
  
! 	case 'N':
  	    spam_to_ham = 1;
  	    break;

Index: bogofilter.xml
===================================================================
RCS file: /cvsroot/bogofilter/bogofilter/bogofilter.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** bogofilter.xml	21 Sep 2002 09:22:21 -0000	1.5
--- bogofilter.xml	25 Sep 2002 18:15:20 -0000	1.6
***************
*** 16,22 ****
    <command>bogofilter</command>
    <arg choice='opt'>-s</arg>
!   <arg choice='opt'>-h</arg>
    <arg choice='opt'>-S</arg>
!   <arg choice='opt'>-H</arg>
    <arg choice='opt'>-p</arg>
    <arg choice='opt'>-d</arg>
--- 16,22 ----
    <command>bogofilter</command>
    <arg choice='opt'>-s</arg>
!   <arg choice='opt'>-n</arg>
    <arg choice='opt'>-S</arg>
!   <arg choice='opt'>-N</arg>
    <arg choice='opt'>-p</arg>
    <arg choice='opt'>-d</arg>
***************
*** 81,85 ****
  wordfile is created if absent.</para>
  
! <para>The <option>-h</option> tells
  <application>bogofilter</application> to register the text presented
  on standard input as non-spam.</para>
--- 81,85 ----
  wordfile is created if absent.</para>
  
! <para>The <option>-n</option> tells
  <application>bogofilter</application> to register the text presented
  on standard input as non-spam.</para>
***************
*** 90,94 ****
  same message as non-spam.</para>
  
! <para>The <option>-H</option> tells
  <application>bogofilter</application> to register the text presented
  on standard input as non-spam and to undo a prior registration of the
--- 90,94 ----
  same message as non-spam.</para>
  
! <para>The <option>-N</option> tells
  <application>bogofilter</application> to register the text presented
  on standard input as non-spam and to undo a prior registration of the
***************
*** 100,104 ****
  
  <para>The <option>-l</option> lists wordlists. Used with
! <option>-h</option>, it lists the ham list; used with
  <option>-s</option>, it lists the spam list.</para>
  
--- 100,104 ----
  
  <para>The <option>-l</option> lists wordlists. Used with
! <option>-n</option>, it lists the ham list; used with
  <option>-s</option>, it lists the spam list.</para>
  
***************
*** 136,140 ****
  words in messages rated as non-spam to the non-spam wordlist.  With
  this in place, it will normally only be necessary for the user to
! intervene (with <option>-H</option> or <option>-S</option>) when
  <application>bogofilter</application> miscategorizes something.</para>
  <programlisting class="procmail">
--- 136,140 ----
  words in messages rated as non-spam to the non-spam wordlist.  With
  this in place, it will normally only be necessary for the user to
! intervene (with <option>-N</option> or <option>-S</option>) when
  <application>bogofilter</application> miscategorizes something.</para>
  <programlisting class="procmail">
***************
*** 150,154 ****
  
      :0EHBc
!     | bogofilter -h
  </programlisting>
  <para> There have been numerous requests for a
--- 150,154 ----
  
      :0EHBc
!     | bogofilter -n
  </programlisting>
  <para> There have been numerous requests for a
***************
*** 161,165 ****
  <application>bogofilter</application>.</para>
  <programlisting>
! macro index d "&lt;enter-command&gt;unset wait_key\n&lt;pipe-entry&gt;bogofilter -h\n&lt;enter-command&gt;set wait_key\n&lt;delete-message&gt;" "delete message as non-spam"
  macro index \ed "&lt;enter-command&gt;unset wait_key\n&lt;pipe-entry&gt;bogofilter -s\n&lt;enter-command&gt;set wait_key\n&lt;delete-message&gt;" "delete message as spam"
  </programlisting>
--- 161,165 ----
  <application>bogofilter</application>.</para>
  <programlisting>
! macro index d "&lt;enter-command&gt;unset wait_key\n&lt;pipe-entry&gt;bogofilter -n\n&lt;enter-command&gt;set wait_key\n&lt;delete-message&gt;" "delete message as non-spam"
  macro index \ed "&lt;enter-command&gt;unset wait_key\n&lt;pipe-entry&gt;bogofilter -s\n&lt;enter-command&gt;set wait_key\n&lt;delete-message&gt;" "delete message as spam"
  </programlisting>