--- a/discussion.roff	Wed Jul 11 09:24:47 2012 +0200
+++ b/discussion.roff	Wed Jul 11 09:58:18 2012 +0200
@@ -1063,10 +1063,13 @@
 Rose and Romine counted 24 visible and 9 more hidden switches for
 .Pn send .
 In nmh, they increased up to 32 visible and 12 hidden ones.
-At the time of writing, no more than 7 visible switches and 1 hidden switch
+At the time of writing, no more than 4 visible switches and 1 hidden switch
 have remained in mmh's
 .Pn send .
-(These numbers include two generic switches, help and version.)
+(These numbers include two generic switches,
+.Sw -help
+and
+.Sw -Version .)
 .P
 The figure displays the number of switches for each of the tools
 that is available in both nmh and mmh.
@@ -1079,7 +1082,7 @@
 their counter-parts, the average tool had 8 switches in pre-mmh times and
 has 4 now.
 The total number of functional switches in mmh dropped from 465
-to 234.
+to 233.
 
 .KS
 .in 1c

--- a/input/src/switches	Wed Jul 11 09:24:47 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-ali	10	4	10	4
-anno	15	10	12	8
-ap	7	4	5	2
-burst	8	3	4	1
-comp	13	7	7	4
-dist	15	8	7	4
-dp	5	3	3	1
-flist	15	7	13	6
-fmtdump	4	2	3	1
-folder	24	12	22	11
-forw	26	16	11	8
-inc	23	16	11	8
-mark	11	7	11	7
-mhbuild	21	11	5	2
-mhlist	15	9	6	5
-mhmail	8	6	6	4
-mhparam	6	3	6	3
-mhpath	2	0	2	0
-mhshow	21	14	9	6
-mhstore	14	9	8	5
-mhtest	13	9	9	6
-new	4	2	4	2
-packf	5	2	2	0
-pick	24	17	24	17
-spost	26	15	11	6
-prompter	12	6	7	3
-rcvdist	3	1	3	1
-rcvpack	4	1	2	0
-rcvstore	11	5	11	5
-refile	13	7	6	3
-repl	29	17	19	11
-rmf	4	1	4	1
-rmm	4	1	4	1
-scan	12	7	5	3
-send	44	31	8	4
-slocal	15	11	13	10
-sortm	10	5	9	4
-whom	17	12	0	0
-mhl	23	16	8	6
-whatnow	9	5	4	2

--- a/input/switches.data	Wed Jul 11 09:24:47 2012 +0200
+++ b/input/switches.data	Wed Jul 11 09:58:18 2012 +0200
@@ -1,6 +1,6 @@
-1 44 31 8 4 # send
+1 44 31 5 2 # send
 2 29 17 19 11 # repl
-3 26 15 11 6 # spost
+3 26 15 6 3 # spost
 4 26 16 11 8 # forw
 5 24 17 24 17 # pick
 6 24 12 22 11 # folder
@@ -8,7 +8,7 @@
 8 23 16 11 8 # inc
 9 21 14 9 6 # mhshow
 10 21 11 5 2 # mhbuild
-11 17 12 0 0 # whom
+11 17 12 8 3 # whom
 12 15 11 13 10 # slocal
 13 15 9 6 5 # mhlist
 14 15 7 13 6 # flist
@@ -23,7 +23,7 @@
 23 11 5 11 5 # rcvstore
 24 11 7 11 7 # mark
 25 10 5 9 4 # sortm
-26 10 4 10 4 # ali
+26 10 4 9 4 # ali
 27 9 5 4 2 # whatnow
 28 8 6 6 4 # mhmail
 29 8 3 4 1 # burst

--- a/input/switches.grap	Wed Jul 11 09:24:47 2012 +0200
+++ b/input/switches.grap	Wed Jul 11 09:58:18 2012 +0200
@@ -1,7 +1,7 @@
 .G1 
 frame invis bot solid left solid
 label left "number" "of" "switches" left .1
-label bot "40 tools" up .2
+label bot "40 tools" "\s-1(\fLsend\fP, \fLrepl\fP, \fLspost\fP, \fLforw\fP, \fLpick\fP, \fLfolder\fP, \fLmhl\fP, ...)\s0" up .2
 ticks bot off
 copy "input/switches.data" thru {
 	"\(ci" size -7 at $1+.45, $2