--- doc/sharutils.texi.orig	Fri Nov 24 21:42:52 1995
+++ doc/sharutils.texi	Tue Dec 14 22:37:13 1999
@@ -2,6 +2,16 @@
 @c %**start of header
 @setfilename sharutils.info
 @settitle GNU @code{shar} utilities
+@dircategory File transfer and archiving tools
+@direntry
+* Shar utilities: (sharutils).                  GNU shar utilities.
+* mail-files: (sharutils)mail-files invocation. Send files to remote site.
+* mailshar: (sharutils)mailshar invocation.     Make and send a shell archive.
+* shar: (sharutils)shar invocation.             Make a shell archive.
+* unshar: (sharutils)unshar invocation.         Explode a shell archive.
+* uudecode: (sharutils)uudecode invocation.     Restore file from 7-bits.
+* uuencode: (sharutils)uuencode invocation.     Force binary file to 7-bits.
+@end direntry
 @finalout
 @c %**end of header
 
@@ -15,21 +25,6 @@
 @end tex
 
 @ifinfo
-@format
-START-INFO-DIR-ENTRY
-* Shar utilities: (sharutils).          GNU shar utilities.
-* mail-files: (sharutils)mail-files invocation. Send files to remote site.
-* mailshar: (sharutils)mailshar invocation.     Make and send a shell archive.
-* remsync: (sharutils)remsync invocation.       Synchronize remote files.
-* shar: (sharutils)shar invocation.             Make a shell archive.
-* unshar: (sharutils)unshar invocation.         Explode a shell archive.
-* uudecode: (sharutils)uudecode invocation.     Restore file from 7-bits.
-* uuencode: (sharutils)uuencode invocation.     Force binary file to 7-bits.
-END-INFO-DIR-ENTRY
-@end format
-@end ifinfo
-
-@ifinfo
 This file documents the GNU set of shar utilities.
 
 Copyright (C) 1994 Free Software Foundation, Inc.
@@ -157,8 +152,8 @@
 The format of the @code{shar} command is one of:
 
 @example
-shar [ @var{option} ] @dots{} @var{file} @dots{}
-shar -S [ @var{option} ] @dots{}
+gshar [ @var{option} ] @dots{} @var{file} @dots{}
+gshar -S [ @var{option} ] @dots{}
 @end example
 
 In the first form, the file list is given as command arguments.  In the
@@ -548,7 +543,7 @@
 The format of the @code{unshar} command is:
 
 @example
-unshar [ @var{option} ] @dots{} [ @var{file} @dots{} ]
+gunshar [ @var{option} ] @dots{} [ @var{file} @dots{} ]
 @end example
 
 Each @var{file} is processed in turn, as a shell archive or a
@@ -635,10 +630,10 @@
 Let us conclude by a showing a few examples of @code{shar} usage:
 
 @example
-shar *.c > cprog.shar
-shar -Q *.[ch] > cprog.shar
-shar -B -l28 -oarc.sh. *.arc
-shar -f /lcl/src/u*.c > u.sh
+gshar *.c > cprog.shar
+gshar -Q *.[ch] > cprog.shar
+gshar -B -l28 -oarc.sh. *.arc
+gshar -f /lcl/src/u*.c > u.sh
 @end example
 
 @noindent