--- dictionary.5-orig	2006-12-22 11:07:08.000000000 -0500
+++ dictionary.5	2006-12-22 11:08:34.000000000 -0500
@@ -47,29 +47,22 @@
 given, the attribute is defined to be a vendor specific attribute.
 Alternately, the options may be the a comma-separated list of the
 following options:
-
-.TP 0.5i
-.DS
-	encrypt=[1-3]
-.DE
 .RS
+.TP
+encrypt=[1-3]
 Mark the attribute as being encrypted with one of three methods.  "1"
 means that the attribute is encrypted with the method as defined in
 \fIRFC2865\fP for the User-Password attribute.  "2" means that the
 password is encrypted with the method as defined in \fIRFC2868\fP for
 the Tunnel-Password attribute.  "3" means that the attribute is
 encrypted as per Ascend's definitions for the Ascend-Send-Secret attribute.
-.RE
-
-.DS
-	has_tag
-.DE
-.RS
+.TP
+has_tag
 Mark the attribute as being permitted to have a tag, as defined in
 \fIRFC2868\fP.  The purpose of the tag is to allow grouping of
 attributes for tunnelled users.  See \fIRFC2868\fP for more details.
 .RE
-
+.sp
 When the server receives an encoded attribute in a RADIUS packet, it
 looks up that attribute by number in the dictionary, and uses the name
 found there for printing diagnostic and log messages.
@@ -82,7 +75,7 @@
 be any non-space text, but is usually taken from \fIRFC2865\fP, or
 other documents..  The \fInumber\fP field is also taken from the
 relevant documents, for that name.
-
+.sp
 When the server receives an encoded value in a RADIUS packet, it looks
 up the value of that attribute by number in the dictionary, and uses
 the name found there for printing diagnostic and log messages.
@@ -92,13 +85,13 @@
 Define a Vendor Specific Attribute encapsulation for \fIvendor-name\fP
 to \fInumber\fP.  For a list of vendor names and numbers, see
 http://www.iana.org/enterprise-numbers.txt.
-.PP
+.sp
 The "format=t,l" statement tells the server how many octets to use to
 encode/decode the vendor "type" and "length" fields in the attributes.
 The default is "format=1,1", which does not have to be specified.  For
 USR VSA's, the format is "format=4,0", for Lucent VSA's it's
 "format=2,1", and for Starent VSA's it's "format=2,2".
-.PP
+.sp
 The supported values for the number of type octets (i.e. the first
 digit) are 1, 2, and 4.  The support values for the number of length
 octets (i.e. the second digit) are 0, 1, and 2.  Any combination of