--- units.1-orig	2007-01-02 16:04:09.000000000 -0500
+++ units.1	2007-01-02 16:05:34.000000000 -0500
@@ -566,10 +566,9 @@
 metric prefixes.  It also includes many obscure or archaic units.  
 .PP
 Many constants of nature are defined, including these:
-.in +4m
-.ta 10m 
-.nf
-
+.RS
+.TS
+l l.
 pi	ratio of circumference to diameter
 c	speed of light
 e	charge on an electron
@@ -583,9 +582,8 @@
 epsilon0	permitivity of vacuum
 G	gravitational constant
 mach	speed of sound
-
-.fi
-.in -4m
+.TE
+.RE
 The database includes atomic masses for all of the elements and numerous
 other constants.  Also included are the densities of various ingredients
 used in baking so that `2 cups flour_sifted' can be converted 
@@ -671,10 +669,9 @@
 .PP
 Here is an example of a short units file that defines some basic
 units:  
-.in +2m
-.ta 9m +10m
-.nf
-
+.RS
+.TS
+l l l.
 m	!	# The meter is a primitive unit
 sec	!	# The second is a primitive unit
 rad	!dimensionless	# The second is a primitive unit
@@ -684,9 +681,8 @@
 inch	0.0254 m	# Inch defined in terms of meters
 ft	12 inches	# The foot defined in terms of inches
 mile	5280 ft	# And the mile
-
-.fi
-.in -2m
+.TE
+.RS
 .PP
 A unit which ends with a `-' character is a prefix.  If a prefix
 definition contains any `/' characters, be sure they are protected
@@ -813,18 +809,16 @@
 we define `zincgauge' at five points.  For example, we set
 `zincgauge(1)' equal to `0.002 in'.  Definitions like this
 may be  more readable  if written using  continuation characters as
-.in +5m
-.ta 3m +3m 
+.RS
 .nf
-
-zincgauge[in]	 \\
-	1	0.002 \\
-	10	0.02 \\
-	15	0.04 \\
-	19	0.06 \\
-	23	0.1
+zincgauge[in]         \\
+        1        0.002 \\
+        10        0.02 \\
+        15        0.04 \\
+        19        0.06 \\
+        23        0.1
 .fi
-.in -2m
+.RE
 .PP
 With the preceeding definition, the following conversion can be
 performed: