--- a/man/xemacs/startup.texi	Mon Aug 13 11:19:22 2007 +0200
+++ b/man/xemacs/startup.texi	Mon Aug 13 11:20:41 2007 +0200
@@ -63,9 +63,8 @@
 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
-subdirectory @file{.xemacs/xemacs-packages} of the user's home
-directory.
+By default, XEmacs expects an early package hierarchy in the a
+subdirectory @file{.xemacs} of the user's home directory.
 
 Moreover, XEmacs expects late hierarchies in the subdirectories
 @file{site-packages}, @file{mule-packages}, and @file{xemacs-packages}
@@ -78,7 +77,7 @@
 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 with the 20.4 package hierarchy as a last
+possible to run XEmacs 21.0 with the 20.4 package hierarchy as a last
 hierarchy.
 
 It is possible to specify at configure-time the location of the various
@@ -90,7 +89,7 @@
 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.
+@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
@@ -159,6 +158,16 @@
 @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,