--- man/vip.texi.orig	Sun May 17 02:48:50 1998
+++ man/vip.texi	Sat Sep 19 10:53:58 1998
@@ -2,10 +2,9 @@
 
 @setfilename ../info/vip
 @settitle VIP
-
-@dircategory Editors
+@dircategory The Emacs editor and associated tools
 @direntry
-* VIP: (vip).		An older VI-emulation for Emacs.
+* VIP: (vip).			A VI-emulation for Emacs.
 @end direntry
 
 @iftex
--- man/emacs.texi.orig	Tue Aug 18 16:45:18 1998
+++ man/emacs.texi	Sat Sep 19 10:54:30 1998
@@ -6,15 +6,14 @@
 @synindex pg cp
 
 @ifinfo
+@dircategory The Emacs editor and associated tools
+@direntry
+* Emacs: (emacs).              The extensible self-documenting text editor.
+@end direntry
 @c The edition number appears in several places in this file
 This is the thirteenth edition of the @cite{GNU Emacs Manual},
 updated for Emacs version 20.3
 @c Please REMEMBER to update edition number in *three* places in this file.
-
-@dircategory Editors
-@direntry
-* Emacs: (emacs).	The extensible self-documenting text editor.
-@end direntry
 
 Published by the Free Software Foundation
 59 Temple Place, Suite 330
--- man/viper.texi.orig	Tue Jun  9 11:19:18 1998
+++ man/viper.texi	Sat Sep 19 10:55:07 1998
@@ -5,12 +5,9 @@
 @comment @setfilename viper
 @comment @setfilename viper.info
 @setfilename ../info/viper
-
-@dircategory Editors
+@dircategory The Emacs editor and associated tools
 @direntry
-* VIPER: (viper).       The newest Emacs VI-emulation mode.
-                          (also, A VI Plan for Emacs Rescue
-                           or the VI PERil.)
+* VIPER: (viper).		The new VI-emulation mode in Emacs-19.29.
 @end direntry
 
 @iftex
--- man/forms.texi.orig	Sun May 17 02:49:28 1998
+++ man/forms.texi	Sat Sep 19 10:55:26 1998
@@ -8,18 +8,17 @@
 @syncodeindex vr cp
 @syncodeindex fn cp
 @syncodeindex ky cp
+@dircategory The Emacs editor and associated tools
+@direntry
+* Forms: (forms).		Emacs package for editing data bases
+				by filling in forms.
+@end direntry
 @iftex
 @finalout
 @setchapternewpage odd
 @end iftex
 @c      @smallbook
 @comment %**end of header (This is for running Texinfo on a region.)
-
-@dircategory Editors
-@direntry
-* Forms: (forms).	Emacs package for editing data bases
-			  by filling in forms.
-@end direntry
 
 @ifinfo
 This file documents Forms mode, a form-editing major mode for GNU Emacs.
--- man/gnus.texi.orig	Sun May 17 02:50:27 1998
+++ man/gnus.texi	Sat Sep 19 10:55:40 1998
@@ -5,15 +5,15 @@
 @synindex fn cp
 @synindex vr cp
 @synindex pg cp
+@dircategory The Emacs editor and associated tools
+@direntry
+* GNUS: (gnus).			The news reader GNUS.
+@end direntry
+
 @iftex
 @finalout
 @end iftex
 @setchapternewpage odd
-
-@dircategory Editors
-@direntry
-* Gnus: (gnus).		The news reader Gnus.
-@end direntry
 
 @ifinfo
 
--- man/mh-e.texi.orig	Sun May 17 02:51:15 1998
+++ man/mh-e.texi	Sat Sep 19 10:55:53 1998
@@ -4,13 +4,12 @@
 @setfilename ../info/mh-e
 @settitle mh-e
 @c %**end of header
-
-@setchapternewpage odd
-
-@dircategory Editors
+@dircategory The Emacs editor and associated tools
 @direntry
-* MH-E: (mh-e).		Emacs interface to the MH mail system.
+* MH-E: (mh-e).			Emacs interface to the MH mail system.
 @end direntry
+
+@setchapternewpage odd
 
 @c Version variables.
 @set EDITION 1.2
--- man/cl.texi.orig	Sun May 17 02:51:46 1998
+++ man/cl.texi	Sat Sep 19 10:56:14 1998
@@ -2,9 +2,9 @@
 @setfilename ../info/cl
 @settitle Common Lisp Extensions
 
-@dircategory Editors
+@dircategory The Emacs editor and associated tools
 @direntry
-* CL: (cl).		Partial Common Lisp support for Emacs Lisp.
+* CL: (cl).			Partial Common Lisp support for Emacs Lisp.
 @end direntry
 
 @iftex
--- man/sc.texi.orig	Fri Jul  3 02:48:27 1998
+++ man/sc.texi	Sat Sep 19 10:56:49 1998
@@ -3,15 +3,15 @@
 @comment %**start of header (This is for running Texinfo on a region.)
 @setfilename ../info/sc
 @settitle Supercite Version 3.1 User's Manual
+@dircategory The Emacs editor and associated tools
+@direntry
+* SC: (sc).			Supercite lets you cite parts of messages
+				you're replying to, in flexible ways.
+@end direntry
+
 @iftex
 @finalout
 @end iftex
-
-@dircategory Editors
-@direntry
-* SC: (sc).		Supercite lets you cite parts of messages you're 
-			  replying to, in flexible ways.
-@end direntry
 
 @c @setchapternewpage odd		% For book style double sided manual.
 @comment %**end of header (This is for running Texinfo on a region.)
--- man/cc-mode.texi.orig	Sun May 17 02:55:23 1998
+++ man/cc-mode.texi	Sat Sep 19 10:57:01 1998
@@ -8,10 +8,10 @@
 @settitle     CC MODE Version 5 Documentation
 @footnotestyle end
 
-@dircategory Editors
-@direntry
-* CC mode: (ccmode).	The GNU Emacs mode for editing C, C++, Objective-C
-			  and Java code.
+@dircategory The Emacs editor and associated tools 
+@direntry 
+* CC mode: (ccmode).		The GNU Emacs mode for editing C, C++,
+				Objective-C and Java code.
 @end direntry
 
 @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
--- Makefile.in.orig	Sun Aug  2 08:21:22 1998
+++ Makefile.in	Sat Sep 19 10:53:17 1998
@@ -188,7 +188,7 @@
 # Subdirectories to make recursively.  `lisp' is not included
 # because the compiled lisp files are part of the distribution
 # and you cannot remake them without installing Emacs first.
-SUBDIR = lib-src src leim
+SUBDIR = lib-src src leim man
 
 # The makefiles of the directories in $SUBDIR.
 SUBDIR_MAKEFILES = lib-src/Makefile man/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile leim/Makefile
