--- a/man/xemacs/packages.texi	Mon Aug 13 11:12:06 2007 +0200
+++ b/man/xemacs/packages.texi	Mon Aug 13 11:13:30 2007 +0200
@@ -6,8 +6,8 @@
 
 The XEmacs 21 distribution comes only with a very basic set of
 built-in modes and packages.  Most of the packages that were part of
-the distribution of earlier versions of XEmacs are now separately
-available.  The installer as well as the user can choose which
+the distribution of earlier versions of XEmacs are now available
+separately.  The installer as well as the user can choose which
 packages to install; the actual installation process is easy.
 This gives an installer the ability to tailor an XEmacs installation for
 local needs with safe removal of unnecessary code.
@@ -91,7 +91,7 @@
 also listed on the @code{Options} menu under:
 
 @example
-	Options->Customize->Emacs->Packages
+        Options->Customize->Emacs->Packages
 @end example
 
 However, don't select any of these menu picks unless you actually want 
@@ -103,7 +103,7 @@
 access it via the menus:
 
 @example
-	Options->Manage Packages->List & Install
+        Options->Manage Packages->List & Install
 @end example
 
 Or, you can get to it via the keyboard:
@@ -116,6 +116,17 @@
 idea to install all packages and not interfere with the wishes of your
 users.
 
+If you can't find which package provides the feature you require, try
+using the @code{package-get-package-provider} function. Eg., if you know 
+that you need @code{thingatpt}, type:
+
+@example
+M-x package-get-package-provider RET thingatpt
+@end example
+
+which will return something like (fsf-compat "1.06"). You can the use
+one of the methods above for installing the package you want.
+
 @subsection XEmacs and Installing Packages
 
 Normally, packages are installed over the network, using EFS
@@ -138,7 +149,7 @@
 add these directory names to @code{package-get-remote} using:
 
 @example
-	M-x pui-add-install-directory
+        M-x pui-add-install-directory
 @end example
 
 Note, however, that any directories added using this function are not
@@ -154,11 +165,11 @@
 browser and installer, using the menu pick:
 
 @example
-	Options->Manage Packages->List & Install
+        Options->Manage Packages->List & Install
 @end example
 or
 @example
-	Options->Manage Packages->Using Custom->Select-> ...
+        Options->Manage Packages->Using Custom->Select-> ...
 @end example
 
 You can also access it using the keyboard:
@@ -225,17 +236,17 @@
 customize menus, under:
 
 @example
-	Options->Customize->Emacs->Packages-> ...
+        Options->Customize->Emacs->Packages-> ...
 @end example
 or
 @example
-	Options->Manage Packages->Using Custom->Select-> ...
+        Options->Manage Packages->Using Custom->Select-> ...
 @end example
 
 Set their state to on, and then do:
 
 @example
-	Options->Manage Packages->Using Custom->Update Packages
+        Options->Manage Packages->Using Custom->Update Packages
 @end example
 
 This will automatically retrieve the packages you have selected from the
@@ -258,13 +269,18 @@
 @subsection Manual Binary Package Installation
 
 Pre-compiled, binary packages can be installed in either a system
-package directory (this is determined when XEmacs is compiled), or in a
-subdirectory of your @file{$HOME} directory:
+package directory (this is determined when XEmacs is compiled), or in
+one of the following
+subdirectories of your @file{$HOME} directory:
 
 @example
-~/.xemacs/packages
+~/.xemacs/mule-packages
+~/.xemacs/xemacs-packages
 @end example
 
+Packages in the former directory will only be found by a Mule-enabled
+XEmacs.
+
 XEmacs does not have to be running to install binary packages, although
 XEmacs will not know about any newly-installed packages until you
 restart XEmacs.  Note, however, that installing a newer version of a
@@ -279,11 +295,13 @@
 will typically be a gzip'd tarball.
 
 @item
-Decide where to install the packages: in the system package directory,
-or in @file{~/.xemacs/packages}.  If you want to install the
-packages in the system package directory, make sure you can write into
-that directory.  If you want to install in your @file{$HOME} directory,
-create the directory, @file{~/.xemacs/packages}.
+Decide where to install the packages: in the system package
+directory, or in @file{~/.xemacs/mule-packages} or
+@file{~/.xemacs/xemacs-packages}, respectively.  If you want to install
+the packages in the system package directory, make sure you can write
+into that directory.  If you want to install in your @file{$HOME}
+directory, create the directory, @file{~/.xemacs/mule-packages} or
+@file{~/.xemacs/xemacs-packages}, respectively.
 
 @item
 Next, @code{cd} to the directory under which you want to install the
@@ -295,7 +313,7 @@
 typically do this using the commands:
 
 @example
-	gunzip < package.tar.gz | tar xvf -
+        gunzip < package.tar.gz | tar xvf -
 @end example
 
 Above, replace @file{package.tar.gz} with the filename of the
@@ -304,7 +322,7 @@
 Of course, if you use GNU @code{tar}, you could also use:
 
 @example
-	tar xvzf package.tar.gz
+        tar xvzf package.tar.gz
 @end example
 
 @comment What about native MS Windows users???