JK: the docs were wrongly referring to html_message_(deleted,spam, etc). It should be htmlmessage_(deleted,spam, etc).

Author: Jose Kahan

Changelog

@@ -73,9 +73,9 @@ Jose Kahan (Feb 26, 2013)
  - New configuration directive "annotated" which allows a mailing
    list archive editor to annotate a given message before converting
    it into HTML. Associated additional new directives are
-   "html_message_deleted_spam", "html_message_deleted_other",
-   ""html_message_edited". Consult docs/hmrc.html for more info.
- - "html_message_deleted" is deprecated in favor of "html_message_deleted_spam"
+   "htmlmessage_deleted_spam", "htmlmessage_deleted_other",
+   "htmlmessage_edited". Consult docs/hmrc.html for more info.
+ - "htmlmessage_deleted" is deprecated in favor of "htmlmessage_deleted_spam"
  - "deleted" is superseded by "annotated", although it will be supported
    to take into account legacy archives.
  - Regenerated the dependencies for the src/Makefile.in file.

docs/hmrc.4

@@ -534,10 +534,10 @@ original received message was manually edited.
 If a message specifies more than one content annotation, only the first one
 will be taken into account. You can customize the markup that\'s shown for
 content annotations by means of the
-.I "html_message_deleted_other,"
-.I "html_message_deleted_spam,"
+.I "htmlmessage_deleted_other,"
+.I "htmlmessage_deleted_spam,"
 and 
-.I "html_message_edited"
+.I "htmlmessage_edited"
 directives.
 
 .B Robot annotations

src/setup.c

@@ -1,5 +1,5 @@
 /*
-** $Id: setup.c,v 1.21 2013-02-27 15:45:02 kahan Exp $
+** $Id: setup.c,v 1.23 2013-06-11 18:55:44 kahan Exp $
 */
 
 #include "hypermail.h"
@@ -725,8 +725,8 @@ struct Config cfg[] = {
      "#   deleted : message deleted, other reasons;\n"
      "#    edited : original received message was manually edited.\n"
      "# You can customize the markup that\'s shown for content annotations\n"
-     "# by means of the html_message_deleted_other, html_message_deleted_spam\n,"
-     "# html_message_edited directives.\n\n"
+     "# by means of the htmlmessage_deleted_other, htmlmessage_deleted_spam\n,"
+     "# htmlmessage_edited directives.\n\n"
      "# robot annotations can have either one or both of the following values:\n"
      "#  nofollow : do not follow the links on this page;\n"
      "#   noindex : prevent search engines from indexing the contents of this message.\n"