Manual: Generate more pretty titles/ids for key binding tables

diff --git a/doc/gen-map-doc b/doc/gen-map-doc
index 1a99cf8f2ffcd034621860de553196a8bceadd28..ad7dd68315bbdee47dd7f0c37e0530aa77733561 100644 (file)
--- a/doc/gen-map-doc
+++ b/doc/gen-map-doc
@@ -55,13 +55,15 @@ while (<XML>) {
       warn "map $map undefined";
       next;
     }
+    my $title = $map;
+    $title =~ s/(.)(.+)/\U$1\E$2/;
     print <<EOT;
 <sect2 id="${map}-map">
 <title>$maptitle Menu</title>
 $DOC{$map}
 
-<table id="${map}-table">
-<title>Default $map Function Bindings</title>
+<table id="tab-${map}-bindings">
+<title>Default $title Menu Bindings</title>
 <tgroup cols="3">
 <thead>
 <row><entry>Function</entry><entry>Default key</entry><entry>Description</entry></row>

diff --git a/doc/manual.xml.tail b/doc/manual.xml.tail
index c2c955fc50905134f1d5a1e88bebf97268463f60..c2aaad320019ba878c9b6c7825640555edc1915c 100644 (file)
--- a/doc/manual.xml.tail
+++ b/doc/manual.xml.tail
@@ -16,13 +16,13 @@ __print_map(index)
 __print_map(pager)
 __print_map(alias)
 __print_map(query)
-__print_map(attach)
+__print_map(attachment)
 __print_map(compose)
 __print_map(postpone)
 __print_map(browser)
 __print_map(pgp)
 __print_map(smime)
-__print_map(mix)
+__print_map(mixmaster)
 __print_map(editor)
 
 </sect1>

diff --git a/functions.h b/functions.h
index 552a0a3f402d2434765af98e4ed7b3ee86be05f9..854bb92c51a62c23c023990e2717421d1c6dc53c 100644 (file)
--- a/functions.h
+++ b/functions.h
@@ -271,7 +271,7 @@ struct binding_t OpPager[] = { /* map: pager */
   { NULL,              0,                              NULL }
 };
 
-struct binding_t OpAttach[] = { /* map: attach */
+struct binding_t OpAttach[] = { /* map: attachment */
   { "bounce-message",  OP_BOUNCE_MESSAGE,              "b" },
   { "display-toggle-weed",     OP_DISPLAY_HEADERS,     "h" },
   { "edit-type",       OP_EDIT_TYPE,                   "\005" },
@@ -441,7 +441,7 @@ struct binding_t OpSmime[] = { /* map: smime */
 
 
 #ifdef MIXMASTER
-struct binding_t OpMix[] = { /* map: mix */
+struct binding_t OpMix[] = { /* map: mixmaster */
   { "accept",          OP_MIX_USE,     M_ENTER_S },
   { "append",          OP_MIX_APPEND,  "a"       },
   { "insert",          OP_MIX_INSERT,  "i"       },