Index: sup-20100519/sup.1
===================================================================
--- sup-20100519.orig/sup.1	2010-05-25 16:32:30.000000000 +0200
+++ sup-20100519/sup.1	2010-05-25 16:32:34.000000000 +0200
@@ -46,7 +46,6 @@
 .\" 	Created.
 .\"
 .TH SUP 1 10/01/08
-.CM 4
 .SH "NAME"
 sup \- software upgrade protocol
 .SH "SYNOPSIS"
@@ -370,7 +369,7 @@
 .I base directory.
 If it exists it may contain any of the following files:
 .TP
-.B when.\*[Lt]rel-suffix\*[Gt]
+.B when.<rel-suffix>
 This file is automatically updated by
 .I sup
 when a collection is successfully upgraded and contains the
@@ -396,7 +395,7 @@
 .I sup
 from upgrading the same collection at the same time.
 .TP
-.B last.\*[Lt]rel-suffix\*[Gt]
+.B last.<rel-suffix>
 This file contains a list of files and directories, one per line, that
 have been upgraded by
 .I sup
@@ -627,16 +626,16 @@
 This file describes any releases that the collection may have. Each
 line starts with the release name and then may specify any of the following
 files:
-.I prefix=\*[Lt]dirname\*[Gt]
+.I prefix=<dirname>
 to use a different parent directory for the files in this release.
-.I list=\*[Lt]listname\*[Gt]
+.I list=<listname>
 to specify the list of files in the release.
-.I scan=\*[Lt]scanfile\*[Gt]
+.I scan=<scanfile>
 must be used in multi-release collections that are scanned to keep
 the scan files for the different releases separate.
-.I host=\*[Lt]hostfile\*[Gt]
+.I host=<hostfile>
 to allow different host restrictions for this release.
-.I next=\*[Lt]release\*[Gt]
+.I next=<release>
 used to chain releases together. This has the effect of making one release
 be a combination of several other releases. If the same file appears in
 more than one chained release, the first one found will be used.
@@ -670,7 +669,7 @@
 allows several different named collections to use the same base
 directory.  Separate encryption, remote host access, and file lists
 are used for each collection, since these files reside in subdirectories
-.I \*[Lt]basedir\*[Gt]/sup/\*[Lt]coll.name\*[Gt].
+.I <basedir>/sup/<coll.name>.
 
 The list file is a text file with one command on each line.
 Each command
@@ -790,19 +789,19 @@
 .B /etc/supfiles/coll.host
 host name list for system collections
 .TP
-\*[Lt]\fIbase-directory\fR\*[Gt]\fB/sup/\fR\*[Lt]\fIcollection\fR\*[Gt]\fB/last\fR\*[Lt]\fI.release\fR\*[Gt]
+<\fIbase-directory\fR>\fB/sup/\fR<\fIcollection\fR>\fB/last\fR<\fI.release\fR>
 recorded list of files in collection as of last upgrade
 .TP
-\*[Lt]\fIbase-directory\fR\*[Gt]\fB/sup/\fR\*[Lt]\fIcollection\fR\*[Gt]\fB/lock
+<\fIbase-directory\fR>\fB/sup/\fR<\fIcollection\fR>\fB/lock
 file used to lock collection
 .TP
-\*[Lt]\fIbase-directory\fR\*[Gt]\fB/sup/\fR\*[Lt]\fIcollection\fR\*[Gt]\fB/refuse
+<\fIbase-directory\fR>\fB/sup/\fR<\fIcollection\fR>\fB/refuse
 list of files to refuse in collection
 .TP
-\*[Lt]\fIbase-directory\fR\*[Gt]\fB/sup/\fR\*[Lt]\fIcollection\fR\*[Gt]\fB/when\fR\*[Lt]\fI.release\fR\*[Gt]
+<\fIbase-directory\fR>\fB/sup/\fR<\fIcollection\fR>\fB/when\fR<\fI.release\fR>
 recorded time of last upgrade
 .TP
-\fB/usr/sup/\fR\*[Lt]\fIcollection\fR\*[Gt]
+\fB/usr/sup/\fR<\fIcollection\fR>
 default base directory for file collection
 .DT
 .PP
@@ -813,32 +812,32 @@
 base directory list for system
 collections
 .TP
-\*[Lt]\fIbase-directory\fR\*[Gt]\fB/sup/\fR\*[Lt]\fIcollection\fR\*[Gt]\fB/crypt
+<\fIbase-directory\fR>\fB/sup/\fR<\fIcollection\fR>\fB/crypt
 data encryption key for a
 collection. the owner of this file is the
 default account used when data encryption is specified
 .TP
-\*[Lt]\fIbase-directory\fR\*[Gt]\fB/sup/\fR\*[Lt]\fIcollection\fR\*[Gt]\fB/host
+<\fIbase-directory\fR>\fB/sup/\fR<\fIcollection\fR>\fB/host
 list of remote hosts allowed to
 upgrade a collection
 .TP
-\*[Lt]\fIbase-directory\fR\*[Gt]\fB/sup/\fR\*[Lt]\fIcollection\fR\*[Gt]\fB/list
+<\fIbase-directory\fR>\fB/sup/\fR<\fIcollection\fR>\fB/list
 list file for a collection
 .TP
-\*[Lt]\fIbase-directory\fR\*[Gt]\fB/sup/\fR\*[Lt]\fIcollection\fR\*[Gt]\fB/lock
+<\fIbase-directory\fR>\fB/sup/\fR<\fIcollection\fR>\fB/lock
 lock file for a collection
 .TP
-\*[Lt]\fIbase-directory\fR\*[Gt]\fB/sup/\fR\*[Lt]\fIcollection\fR\*[Gt]\fB/logfile
+<\fIbase-directory\fR>\fB/sup/\fR<\fIcollection\fR>\fB/logfile
 log file for a collection
 .TP
-\*[Lt]\fIbase-directory\fR\*[Gt]\fB/sup/\fR\*[Lt]\fIcollection\fR\*[Gt]\fB/prefix
+<\fIbase-directory\fR>\fB/sup/\fR<\fIcollection\fR>\fB/prefix
 file containing the name of the prefix directory
 for a collection
 .TP
-\*[Lt]\fIbase-directory\fR\*[Gt]\fB/sup/\fR\*[Lt]\fIcollection\fR\*[Gt]\fB/scan
+<\fIbase-directory\fR>\fB/sup/\fR<\fIcollection\fR>\fB/scan
 scan file for a collection
 .TP
-\fB/usr/\fR\*[Lt]\fIcollection\fR\*[Gt]
+\fB/usr/\fR<\fIcollection\fR>
 default base directory for a file collection
 .DT
 .PP
@@ -848,7 +847,7 @@
 \fIThe SUP Software Upgrade Protocol\fR, S. A. Shafer,
 CMU Computer Science Department, 1985.
 .SH "EXAMPLE"
-\*[Lt]example\*[Gt]
+<example>
 .SH "BUGS"
 The encryption mechanism should be strengthened, although it's
 not trivial.
Index: sup-20100519/supservers.8
===================================================================
--- sup-20100519.orig/supservers.8	2010-05-25 16:34:37.000000000 +0200
+++ sup-20100519/supservers.8	2010-05-25 16:38:12.000000000 +0200
@@ -203,18 +203,18 @@
 /etc/supfiles/coll.host
 host name list for system collections
 .TP
-\*[Lt]base-directory\*[Gt]/sup/\*[Lt]collection\*[Gt]/*
+<base-directory>/sup/<collection>/*
 files used by file server (see
 .I
 sup(1))
 .TP
-\*[Lt]base-directory\*[Gt]/sup/\*[Lt]collection\*[Gt]/list
+<base-directory>/sup/<collection>/list
 list file used by
 .I
 supscan
 to create file list
 .TP
-\*[Lt]base-directory\*[Gt]/sup/\*[Lt]collection\*[Gt]/scan
+<base-directory>/sup/<collection>/scan
 file list created by
 .I
 supscan