--- a/man/xemacs/xemacs.texi	Mon Aug 13 11:01:58 2007 +0200
+++ b/man/xemacs/xemacs.texi	Mon Aug 13 11:03:08 2007 +0200
@@ -5,11 +5,6 @@
 
 
 @ifinfo
-@dircategory XEmacs Editor
-@direntry
-* XEmacs: (xemacs).		XEmacs Editor.
-@end direntry
-
 This file documents the XEmacs editor.
 
 Copyright (C) 1985, 1986, 1988 Richard M. Stallman.
@@ -91,13 +86,14 @@
 @page
 @ifinfo
 @node Top, License,, (dir)
-@top The XEmacs Editor
 
+The XEmacs Editor
+*****************
 
 XEmacs is the extensible, customizable, self-documenting real-time
 display editor.  This Info file describes how to edit with Emacs
 and some of how to customize it, but not how to extend it.  It
-corresponds to XEmacs version 21.
+corresponds to XEmacs version 20.0.
 
 This manual is intended as a detailed reference to XEmacs.  If
 you are looking for an introductory manual, see the New User's
@@ -130,8 +126,7 @@
 * Command Switches::  
                 Hairy startup options.
 * Startup Paths::
-                How XEmacs finds Directories and Files.
-* Packages::    How XEmacs organizes its high-level functionality.
+                How XEmacs finds Directories and Files
 
 Fundamental Editing Commands
 * Basic::       The most basic editing commands.
@@ -170,6 +165,7 @@
 * Text::        Commands and modes for editing English.
 * Programs::    Commands and modes for editing programs.
 * Running::     Compiling, running and debugging programs.
+* Packages::    How to add new packages to XEmacs.
 * Abbrevs::     How to define text abbreviations to reduce
                  the number of characters you must type.
 * Picture::     Editing pictures made up of characters
@@ -235,13 +231,6 @@
 * Menu Customization::  Adding and removing menu items and related
                         operations.
 
-Packages
-
-* Packages::            Introduction to XEmacs Packages.
-* Package Terminology:: Understanding different kinds of packages.
-* Using Packages::      How to install and use packages.
-* Building Packages::   Building packages from sources.
-
 Basic Editing Commands
 
 * Blank Lines::        Commands to make or delete blank lines.
@@ -507,6 +496,9 @@
 * Compiling Libraries:: Compiling a library makes it load and run faster.
 * Mocklisp::		Converting Mocklisp to Lisp so XEmacs can run it.
 
+Packages
+* Packages::            Introduction to XEmacs Packages.
+
 Abbrevs
 
 * Defining Abbrevs::  Defining an abbrev, so it will expand when typed.