--- a/man/xemacs/startup.texi	Mon Aug 13 11:01:58 2007 +0200
+++ b/man/xemacs/startup.texi	Mon Aug 13 11:03:08 2007 +0200
@@ -1,4 +1,4 @@
-@node Startup Paths, Packages, Command Switches, Top
+@node Startup Paths, Basic, Command Switches, Top
 @comment  node-name,  next,  previous,  up
 @section How XEmacs finds Directories and Files
 
@@ -8,7 +8,7 @@
 XEmacs deals with a multitude of files during operation.  These files
 are spread over many directories, and XEmacs determines the location of
 most of these directories at startup and organizes them into various
-paths.  (A @dfn{path},
+paths.  (A @emph{path},
 @cindex path
 for the purposes of this section, is simply a list of directories which
 XEmacs searches successively in order to locate a file.)
@@ -30,16 +30,16 @@
 XEmacs will always respect directory options passed to @code{configure}.
 However, if it cannot locate a directory at the configured place, it
 will initiate a search for the directory in any of a number of
-@dfn{hierachies} rooted under a directory which XEmacs assumes contain
+@emph{hierachies} rooted under a directory which XEmacs assumes contain
 parts of the XEmacs installation; it may locate several such hierarchies
 and search across them.  (Typically, there are just one or two
 hierarchies: the hierarchy where XEmacs was or will be installed, and
 the one where it is being built.)  Such a directory containing a
-hierarchy is called a @dfn{root}.
+hierarchy is called a @emph{root}.
 @cindex root of a hierarchy
 Whenever this section refers to a directory using the shorthand
 @code{<root>}, it means that XEmacs searches for it under all
-hierarchies XEmacs was able to scrounge up.  In a
+hierarchies under all hierarchies XEmacs was able to scrounge up.  In a
 running XEmacs, the hierarchy roots are stored in the variable
 @code{emacs-roots}.
 @vindex emacs-roots
@@ -53,8 +53,8 @@
 Hence, they play a prominent role in the various paths XEmacs sets up.
 
 XEmacs locates packages in any of a number of package hierarchies.
-Package hierarchies fall into three groups: @dfn{early}, @dfn{late},
-and @dfn{last},
+Package hierarchies fall into three groups: @emph{early}, @emph{late},
+and @emph{last},
 @cindex early package hierarchies
 @cindex late package hierarchies
 @cindex last package hierarchies
@@ -69,27 +69,27 @@
 Moreover, XEmacs expects late hierarchies in the subdirectories
 @file{site-packages}, @file{mule-packages}, and @file{xemacs-packages}
 (in that order) of the @file{<root>/lib/xemacs} subdirectory of one of
-the installation hierarchies.  (If you run in-place, these are direct
+the installation hierarchies.  (If you run in-place, these are directr
 subdirectories of the build directory.)  Furthermore, XEmacs will also
 search these subdirectories in the @file{<root>/lib/xemacs-<VERSION>}
 subdirectory and prefer directories found there.
 
 By default, XEmacs does not have a pre-configured last package
-hierarchy.  Last hierarchies are primarily for using package hierarchies
-of outdated versions of XEmacs as a fallback option.  For example, it is
-possible to run XEmacs 21.0 with the 20.4 package hierarchy as a last
-hierarchy.
+hierarchy.  Last hierarchies are primarily for using package
+hierarchies of outdated versions of XEmacs as a fallback option.  For
+example, it is possible to run XEmacs with the 20.4 package hierarchy
+as a last hierarchy.
 
 It is possible to specify at configure-time the location of the various
 package hierarchies with the @code{--package-path} option to configure.
 @cindex package path
 The early, late, and last components of the package path are separated
-by double instead of single colons.  If all three components are
-present, they locate the early, late, and last package hierarchies
+by double instead of single colons.  If three components are present,
+they are locate the early, late, and last package hierarchies
 respectively.  If two components are present, they locate the early and
-late hierarchies.  If only one component is present, it locates the
-late hierarchy.  At run time, the package path may also be specified via
-the @code{EMACSPACKAGEPATH} environment variable.
+late hierarchies.  If only one component is present, it locates the late
+hierarchy.  At run time, the package path may also be specified via the
+@code{PACKAGEPATH} environment variable.
 
 An XEmacs package is laid out just like a normal installed XEmacs lisp
 directory.  It may have @file{lisp}, @file{etc}, @file{info}, and
@@ -103,20 +103,17 @@
 
 Here is a list of the various directories and paths XEmacs tries to
 locate during startup.  XEmacs distinguishes between directories and
-paths specific to @dfn{version}, @dfn{site}, and @dfn{architecture}
+paths specific to @emph{version}, @emph{site}, and @emph{architecture}
 when looking for them.
 
 @table @code
 @item version-specific
-@cindex version-specific directories
 directories are specific to the version of XEmacs they belong to and
 typically reside under @file{<root>/lib/xemacs-<VERSION>}.
 @item site-specific
-@cindex site-specific directories
 directories are independent of the version of XEmacs they belong to and
 typically reside under @file{<root>/lib/xemacs}
 @item architecture-specific
-@cindex architecture-specific directories
 directories are specific both to the version of XEmacs and the
 architecture it runs on and typically reside under
 @file{<root>/lib/xemacs-<VERSION>/<ARCHITECTURE>}.
@@ -125,7 +122,7 @@
 During installation, all of these directories may also reside directly
 under @file{<root>}, because that is where they are in the XEmacs tarball.
 
-If XEmacs runs with the @code{-debug-paths} option (@pxref{Command
+If XEmacs runs with the @code{-debug-paths} option (@xref{Command
 Switches}), it will print the values of these variables, hopefully
 aiding in debugging any problems which come up.
 
@@ -180,7 +177,7 @@
 directories of the environment variables @code{PATH}
 @vindex PATH
 and @code{EMACSPATH}.
-@vindex EMACSPATH
+@vindex EMCSPATH
 
 @item doc-directory
 @vindex doc-directory