--- a/man/xemacs/startup.texi	Mon Aug 13 11:33:40 2007 +0200
+++ b/man/xemacs/startup.texi	Mon Aug 13 11:35:02 2007 +0200
@@ -39,7 +39,7 @@
 @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 under all hierarchies XEmacs was able to scrounge up.  In a
+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
@@ -63,8 +63,9 @@
 very front, late ones somewhere in the middle, and last hierarchies are
 (you guessed it) last.
 
-By default, XEmacs expects an early package hierarchy in the a
-subdirectory @file{.xemacs} of the user's home directory.
+By default, XEmacs expects an early package hierarchy in the
+subdirectory @file{.xemacs/xemacs-packages} of the user's home
+directory.
 
 Moreover, XEmacs expects late hierarchies in the subdirectories
 @file{site-packages}, @file{mule-packages}, and @file{xemacs-packages}
@@ -77,19 +78,19 @@
 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
+possible to run XEmacs 21 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 three components are present,
-they are locate the early, late, and last package hierarchies
+by double instead of single colons.  If all three components are
+present, they 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{EMACSPACKAGEPATH} 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
@@ -158,16 +159,6 @@
 @vindex INFOPATH
 to @code{Info-directory-list}.
 
-@item lock-directory
-@itemx superlock-file
-@vindex lock-directory
-@vindex superlock-file
-Are the site-specific locations of the lock directory and the superlock
-file, respectively.  The @code{lock-directory} variable may also be
-initialized from the @code{EMACSLOCKDIR}
-@vindex EMACSLOCKDIR
-environment variable.
-
 @item exec-directory
 @vindex exec-directory
 Is the directory of architecture-dependent files that come with XEmacs,