--- a/discussion.roff	Fri Jul 06 15:04:04 2012 +0200
+++ b/discussion.roff	Fri Jul 06 15:59:04 2012 +0200
@@ -55,6 +55,7 @@
 
 
 .H2 "Mail Transfer Facilities
+.Id mail-transfer-facilities
 .P
 In contrast to nmh, which also provides mail submission and mail retrieval
 agents, mmh is a MUA only.
@@ -392,7 +393,9 @@
 Although
 .Pn slocal
 does neither pull in dependencies nor does it include a separate
-technical area (cf. Sec. XXX), still,
+technical area (cf. Sec.
+.Cf mail-transfer-facilities ),
+still,
 it accounts for about 1\|000 lines of code that need to be maintained.
 As
 .Pn slocal
@@ -426,6 +429,7 @@
 
 
 .H2 "Displaying Messages
+.id mhshow
 .P
 Since the very beginning, already in the first concept paper,
 .Pn show
@@ -544,7 +548,8 @@
 was reworked to behave more like
 .Pn show
 first.
-(cf. Sec. XXX)
+(cf. Sec.
+.Cf mhshow )
 Once the tools behaved more alike, the replacing appeared to be
 even more natural.
 Today, mmh's new
@@ -685,7 +690,8 @@
 it suited better.
 .P
 Eventually, however, the new trash folder concept
-.Cf "Sec. XXX
+(cf. Sec.
+.Cf trash-folder )
 obsoleted the concept of the backup prefix completely.
 .Ci 8edc5aaf86f9f77124664f6801bc6c6cdf258173
 .Ci ca0b3e830b86700d9e5e31b1784de2bdcaf58fc5
@@ -1043,10 +1049,8 @@
 .Pn send .
 (These numbers include two generic switches, help and version.)
 .P
-Fig. XXX
-.\" XXX Ref
-displays the number of switches for each of the tools that is available
-in both, nmh and mmh.
+The figure displays the number of switches for each of the tools
+that is available in both, nmh and mmh.
 The tools are sorted by the number of switches they had in nmh.
 Visible and hidden switches were counted,
 but not the generic help and version switches.
@@ -1114,7 +1118,8 @@
 was removed.
 The special-casing of `the' draft message became irrelevant after
 the rework of the draft system.
-(See Sec. XXX.)
+(df. Sec.
+.Cf draft-folder )
 Equally,
 .Pn comp
 lost its
@@ -1278,7 +1283,8 @@
 rfc 1864
 .]
 .Ci 31dc797eb5178970d68962ca8939da3fd9a8efda
-(See Sec. XXX)
+(cf. Sec.
+.Cf content-md5 )
 .P
 The
 .Sw -[no]ebcdicsafe
@@ -1420,13 +1426,13 @@
 .Sw -mmdf
 switches.
 .Sw -mbox
-is the sole  behavior now.
+is the sole behavior now.
 .Ci 3916ab66ad5d183705ac12357621ea8661afd3c0
 In the same go,
 .Pn packf
 and
 .Pn rcvpack
-were reworked (see Sec. XXX) and their
+were reworked and their
 .Sw -file
 switch became unnecessary.
 .Ci ca1023716d4c2ab890696f3e41fa0d94267a940e
@@ -1566,9 +1572,8 @@
 This section describes the removing of old code
 and the modernizing of the default setup.
 It focuses on the functional aspect only;
-the non-functional aspects of code style are discussed in
-.\" FIXME REF
-Sec. XXX.
+the non-functional aspects of code style are discussed in Sec.
+.Cf code-style .
 
 
 .H2 "Code Relicts
@@ -1711,6 +1716,7 @@
 None of the Face systems described here is popular today.
 Hence, mmh has no direct support for them.
 .BU
+.Id content-md5
 The
 .Hd Content-MD5
 header field was introduced by RFC\|1864.
@@ -2305,6 +2311,7 @@
 .P
 
 .U3 "Draft Folder
+.Id draft-folder
 .P
 In the beginning, MH had the concept of a draft message.
 This is the file
@@ -2416,6 +2423,7 @@
 
 
 .U3 "Trash Folder
+.Id trash-folder
 .P
 Similar to the situation for drafts is the situation for removed messages.
 Historically, a message was ``deleted'' by prepending a specific
@@ -2689,6 +2697,7 @@
 
 
 .H2 "Code Style
+.Id code-style
 .P
 .U3 "Indentation Style
 .P