Install muttbug(1) as flea(1), and adjust the documentation

accordingly.  Note: Typing muttbug will still work.

diff --git a/Makefile.am b/Makefile.am
index 41a3b95c9a675d0aacd7a5adb0f5fbf050c1215a..727bb997de6634e71b4bea994da706c42c08ccd0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,9 +12,9 @@ endif
 SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR)
 
 if NEEDS_PGPEWRAP
-bin_SCRIPTS = pgpewrap muttbug
+bin_SCRIPTS = pgpewrap muttbug flea
 else
-bin_SCRIPTS = muttbug
+bin_SCRIPTS = muttbug flea
 endif
 
 BUILT_SOURCES = keymap_defs.h types.h
@@ -92,9 +92,9 @@ LDADD = @LIBOBJS@ @INTLLIBS@
 
 OPS=@OPS@
 
-muttbug: muttbug.sh
-       cp muttbug.sh muttbug
-       chmod +x muttbug
+flea:  muttbug.sh
+       cp muttbug.sh flea
+       chmod +x flea
 
 Makefile: $(BUILT_SOURCES)
 

diff --git a/doc/mutt.man b/doc/mutt.man
index 858b7c9d41bacea3b88c1f49ce9cc6042fc78bcd..49225aeb4be81f1ce16dbb32c2b22506402d508a 100644 (file)
--- a/doc/mutt.man
+++ b/doc/mutt.man
@@ -133,6 +133,9 @@ System mapping between MIME types and file extensions.
 The privileged dotlocking program.
 .SH BUGS
 .PP
+None.  Mutts have fleas, not bugs.
+.SH FLEAS
+.PP
 Suspend/resume while editing a file with an external editor does not work
 under SunOS 4.x if you use the curses lib in /usr/5lib.  It \fIdoes\fP work
 with the S-Lang library, however.
@@ -145,11 +148,11 @@ suspend/resume does not work under Ultrix.
 The help line for the index menu is not updated if you change the bindings
 for one of the functions listed while Mutt is running.
 .PP
-For a more up-to-date list of bugs, please visit the mutt project's
-bug tracking system under http://bugs.guug.de/.  To report a bug,
-please use the
-.BR muttbug (1)
-program.
+For a more up-to-date list of bugs, errm, fleas, please visit the
+mutt project's bug tracking system under http://bugs.guug.de/.  To
+report a bug, please use the
+.BR flea (1)
+program.  (Mutts tend to have fleas rather than bugs.)
 .SH NO WARRANTIES
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -157,7 +160,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 .SH SEE ALSO
 .PP
-.BR muttbug (1),
+.BR flea (1),
 .BR muttrc (5),
 .BR curses (3),
 .BR mutt_dotlock (1),

diff --git a/doc/muttbug.man b/doc/muttbug.man
index c282ec6d552d74bac7dee90b41bd36e450b3609c..aaa0a4f40d8d2b7129b9e08063ab24b47b2e1c4d 100644 (file)
--- a/doc/muttbug.man
+++ b/doc/muttbug.man
@@ -20,33 +20,36 @@
 .TH mutt 1 "July 2000" Unix "User Manuals"
 .SH NAME
 .PP
-muttbug \- Report a bug in mutt.
+flea \- Report a bug (or rather a flea) in mutt.
 .SH SYNOPSIS
 .PP
-.B muttbug
+.B flea
 .SH DESCRIPTION
 .PP
-.B muttbug
+.B flea
 is a shell script which helps you to submit a bug report against the 
 .BR mutt (1)
 mail user agent.
 .PP
-If you invoke muttbug, you'll first be prompted for a short
+If you invoke 
+.BR flea , 
+you'll first be prompted for a short
 description of the problem you experience.  This will be used as the
 bug report's subject line, so it should be concise, but informative.
 .PP
 You are then asked to assign an initial severity level to the
 problem you observe; 
-.B muttbug
+.B flea
 will give you a description which severity level is appropriate or
 not.
 .PP
 Then, you are asked for the location of a core dump (normally named
 .BR core )
-which may have been left over by a crash of your mutt.
+which may have been left over by a crash of your 
+.BR mutt (1).
 You can just type \(lqno\(rq here, or you can enter the path leading 
 to a core dump.
-.B muttbug
+.B flea
 will try to use either
 .BR sdb (1),
 .BR dbx (1),
@@ -64,8 +67,10 @@ reference configuration makes it incredibly easier to track down a
 problem.
 .PP
 If you are using Debian GNU/Linux,
-.B muttbug
-will now check whether or not mutt has been installed as a Debian
+.B flea
+will now check whether or not 
+.B mutt
+has been installed as a Debian
 package on your system, and suggest to file the bug against the
 .BR mutt (1)
 and Debian bug tracking systems.  This option was added since the 
@@ -95,21 +100,24 @@ command, output from
 .BR mutt (1)
 itself, and your system's 
 .BR mutt (1)
-configuration files.  Yoy may wish to browse through this part of
+configuration files.  You may wish to browse through this part of
 the bug report form in order to avoid leaking confidential
 information to the public.
 .PP
 If you leave the editor, 
-.B muttbug
-will give you the option to view, re-edit, submit, or abandon your
-bug report.
-.PP
-While your bug report is being processed, you will receive various
-e-mail messages from the bug tracking system informing you about
-what's going on: Once your bug report has been entered into the bug
-tracking system, it will be assigned a unique serial number about
-which you are informed via e-mail.  If you wish to submit additional
-information about the bug, you can just send it to the address
+.B flea
+will give you the option to review, re-edit, submit, or abandon your
+bug report.  If you decide to submit it, a mail message containing
+your report will be sent to <submit@bugs.guug.de>.  You'll receive a
+copy of this message.
+.PP
+While your bug report is being processed by the bug tracking system,
+you will receive various e-mail messages from the bug tracking
+system informing you about what's going on: Once your bug report has
+been entered into the bug tracking system, it will be assigned a
+unique serial number about which you are informed via e-mail.  If
+you wish to submit additional information about the bug, you can
+just send it to the address
 .BR \fIserial\fP@bugs.guug.de .
 .PP
 Later, you will most likely receive questions from the developers
@@ -128,7 +136,7 @@ http://bugs.guug.de/
 .SH
 ENVIRONMENT
 .PP
-.B muttbug
+.B flea
 will use the following environment variables:
 .IP "EMAIL"
 Your electronic mail address.  Will be used to set the bug report's
@@ -187,6 +195,6 @@ The mutt bug tracking system: http://bugs.guug.de/
 .SH
 AUTHOR
 .PP
-.B muttbug
+.B flea
 and this manual page were written by Thomas Roessler
 <roessler@guug.de>.

diff --git a/main.c b/main.c
index b310102ab79714deed81765fb457966220008c07..44d681939c8bd05b4816dfc6985b3d3ef2cedb1a 100644 (file)
--- a/main.c
+++ b/main.c
@@ -39,7 +39,7 @@
 
 static const char *ReachingUs = N_("\
 To contact the developers, please mail to <mutt-dev@mutt.org>.\n\
-To report a bug, please use the muttbug utility.\n");
+To report a bug, please use the flea(1) utility.\n");
 
 static const char *Notice = N_("\
 Copyright (C) 1996-2000 Michael R. Elkins and others.\n\

diff --git a/muttbug b/muttbug
new file mode 100755 (executable)
index 0000000..e94d8cd
--- /dev/null
+++ b/muttbug
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec flea "$@"