--- ../doc/hp2xxinf.tex.orig	Sun Dec 30 20:18:00 2001
+++ ../doc/hp2xxinf.tex	Wed Jan 30 20:01:28 2002
@@ -5,6 +5,11 @@
 @setfilename hp2xx.info
 @settitle HP2XX, A HP-GL Converter
 @setchapternewpage odd
+@dircategory Miscellaneous
+@direntry
+* HP2XX:(hp2xx).		Conversion of HP-GL graphics into raster and
+				vector graphics formats
+@end direntry
 @c @smallbook
 @c @cropmarks
 @c %**end of header
@@ -36,14 +41,6 @@
 @c 03/06/21  V 1.4   MK   updates and fixes for 3.4.4
 @c THIS MANUAL REQUIRES TEXINFO-2 macros and info-makers to format properly.
 
-@ifinfo
-@format
-START-INFO-DIR-ENTRY
-* HP2XX:(hp2xx).  Conversion of HP-GL graphics into raster and
-                  vector graphics formats
-END-INFO-DIR-ENTRY
-@end format
-@end ifinfo
 @c
 @ifinfo
 This file documents the HP-GL converter HP2XX
@@ -92,7 +89,7 @@
 @page
 @tex
 {\parskip=0pt
-\hfill mk\@daveg.com\par
+\hfill mk@@daveg.com\par
 \hfill {\it Using HP2XX}, \manvers\par
 \hfill \TeX{}info \texinfoversion\par
 }