*** empty log message ***

1 files changed, 45 insertions, 53 deletions

diff --git a/admin/notes/bugtracker b/admin/notes/bugtracker
index 23a00c49594..f404a20a2f2 100644
--- a/admin/notes/bugtracker
+++ b/admin/notes/bugtracker
@@ -2,12 +2,12 @@ NOTES ON THE EMACS BUG TRACKER   -*- outline -*-
 
 The Emacs Bug Tracker can be found at http://emacsbugs.donarmstrong.com/
 
-For a list of all bugs, see           http://emacsbugs.donarmstrong.com/emacs
+For a list of all bugs, see http://emacsbugs.donarmstrong.com/emacs
 
 
-** When reporting a bug, to send a Cc to another address (e.g.
-bug-cc-mode@gnu.org), do not just use a Cc: header.
-Instead, use "X-Debbugs-CC:". This ensures the Cc address will get a
+** When reporting a bug, to send a Cc to another address
+(e.g. bug-cc-mode@gnu.org), do not just use a Cc: header.
+Instead, use "X-Debbugs-CC:".  This ensures the Cc address will get a
 mail with the bug report number in.
 
 ** To not get acknowledgement mail from the tracker,
@@ -43,77 +43,69 @@ reporting a new bug.
 
 ** To close bug #123 (for example), send mail
 
-  To: 123-done@emacsbugs.donarmstrong.com
+To: 123-done@emacsbugs.donarmstrong.com
 
 with a brief explanation in the body as to why the bug was closed.
 
+** Setting bug parameters.
+There are two ways to set the parameters of bugs in the database
+(tags, severity level, etc).  When you report a new bug, you can
+provide a "pseudo-header" at the start of the report, eg:
 
-** To reopen a closed bug #123:
-
-  To: control@emacsbugs.donarmstrong.com
-
-  reopen 123
-  thanks
-
-** quit|stop|thank|thanks|thankyou|thank you
-On a line by itself, this tells the control server to ignore the rest of
-the message.
-
-** Bugs can be tagged in various ways (eg wontfix, patch, etc).
-For a list of available tags, see:
-http://emacsbugs.donarmstrong.com/Developer#tags
-
-** To tag bug #123 (for example), send a mail of the form:
-
-  To: control@emacsbugs.donarmstrong.com
+Package: emacs
+Version: 23.0.60
+Severity: minor
 
-  tags 123 wontfix
-  thanks
+Otherwise, send mail to the control server, control@emacsbugs.donarmstrong.com.
+At the start of the message body, supply the desired commands, one per
+line:
 
-Or just add the
+command bug-number [arguments]
+...
+quit|stop|thank|thanks|thankyou|thank you
 
-  tags 123 wontfix
-  thanks
+The control server ignores anything after the last line above.  So you
+can place control commands at the beginning of a reply to a bug
+report, and Cc: the control server (note the commands have no effect
+if you just send them to the bug-report number).
 
-at the beginning of a reply.  The tag can be prefixed with +, - or =,
-meaning to add (the default), remove, or reset the tags.
+Some useful control commands:
 
-** To remove spam from the tracker, move it to the `spam' pseudo-package:
+*** To reopen a closed bug:
+reopen 123
 
-  To: control@emacsbugs.donarmstrong.com
+*** Bugs can be tagged in various ways (eg wontfix, patch, etc).
+For a list of available tags, see:
+http://emacsbugs.donarmstrong.com/Developer#tags
+The tag can be prefixed with +, - or =, meaning to add (the default),
+remove, or reset the tags.  E.g.:
 
-  reassign 123 spam
-  thanks
+tags 123 +wontfix
 
-** To merge bugs:
+*** To merge bugs:
 Eg when bad replies create a bunch of new bugs for the same report.
-Bugs must all be in the same state, but need not have the same tags.
+Bugs must all be in the same state, but need not have the same tags.  E.g.:
 
-  To: control@emacsbugs.donarmstrong.com
-  merge 123 124 125 ...
+merge 123 124 125 ...
 
-** Forcing a merge:
+*** Forcing a merge:
 Like `merge', but bugs need not be in the same state.  The first one
-listed is the master.
-
-  To: control@emacsbugs.donarmstrong.com
-  forcemerge 123 124 125 ...
+listed is the master.  E.g.:
 
-** To set severity:
+forcemerge 123 124 125 ...
 
-  To: control@emacsbugs.donarmstrong.com
-  severity 123 critical|grave|serious|important|normal|minor|wishlist
+*** To set severity:
+severity 123 critical|grave|serious|important|normal|minor|wishlist
 
 See http://emacsbugs.donarmstrong.com/Developer#severities for the meanings.
 
-** To set the onwer of a bug:
-
-  To: control@emacsbugs.donarmstrong.com
-  owner 123 A Hacker <none@example.com>
+*** To set the onwer of a bug:
+owner 123 A Hacker <none@example.com>
 
 The shorthand `!' means your own address.
 
-** To mark a bug as fixed in a particular version:
+*** To mark a bug as fixed in a particular version:
+fixed 123 23.0.60
 
-  To: control@emacsbugs.donarmstrong.com
-  fixed 123 23.0.60
+** To remove spam from the tracker, move it to the `spam' pseudo-package:
+reassign 123 spam