Index: modules/system/system.api.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.api.php,v
retrieving revision 1.41
diff -u -r1.41 system.api.php
--- modules/system/system.api.php	8 Jun 2009 09:23:54 -0000	1.41
+++ modules/system/system.api.php	15 Jun 2009 19:25:30 -0000
@@ -500,26 +500,24 @@
  * @param $message
  *   A structured array containing the message to be altered. Keys in this
  *   array include:
- *   mail_id
- *     An id to identify the mail sent. Look into the module source codes
- *     for possible mail_id values.
- *   to
+ *  - 'id':
+ *     An id to identify the mail sent. Look into the module source code
+ *     or drupal_mail() for possible id values.
+ *   - to
  *     The mail address or addresses where the message will be send to. The
  *     formatting of this string must comply with RFC 2822.
- *   subject
+ *   - subject
  *     Subject of the e-mail to be sent. This must not contain any newline
  *     characters, or the mail may not be sent properly.
- *   body
+ *   - body
  *     An array of lines containing the message to be sent. Drupal will format
  *     the correct line endings for you.
- *   from
+ *   - from
  *     The From, Reply-To, Return-Path and Error-To headers in $headers
  *     are already set to this value (if given).
- *   headers
+ *   - headers
  *     Associative array containing the headers to add. This is typically
  *     used to add extra headers (From, Cc, and Bcc).
- * @return
- *   None.
  */
 function hook_mail_alter(&$message) {
   if ($message['mail_id'] == 'my_message') {
@@ -854,9 +852,9 @@
  *   An identifier of the mail.
  * @param $message
  *  An array to be filled in. Keys in this array include:
- *  - 'mail_id':
- *     An id to identify the mail sent. Look into the module source codes
- *     for possible mail_id values.
+ *  - 'id':
+ *     An id to identify the mail sent. Look into the module source code
+ *     or drupal_mail() for possible id values.
  *  - 'to':
  *     The mail address or addresses where the message will be send to. The
  *     formatting of this string must comply with RFC 2822.