--- a/lisp/ChangeLog	Tue Apr 30 15:33:42 2002 +0000
+++ b/lisp/ChangeLog	Wed May 01 08:25:52 2002 +0000
@@ -1,3 +1,16 @@
+2002-05-01  Steve Youngs  <youngs@xemacs.org>
+
+	* package-get.el (package-get-update-base-entry): Remove code to
+	add package entries into custom.
+	(package-get-custom-groups): Remove.
+	(package-get-custom): Ditto.
+	(package-get-custom-add-entry): Ditto.
+
+2002-04-29  Steve Youngs  <youngs@xemacs.org>
+
+	* menubar-items.el (default-menubar): Remove entry for managing
+	packages via custom.
+
 2002-04-24  Mats Lidell  <matsl@contactor.se>
 
 	* mule/european.el (language-info-alist): Add TUTORIAL & greeting for Swedish.

--- a/lisp/menubar-items.el	Tue Apr 30 15:33:42 2002 +0000
+++ b/lisp/menubar-items.el	Wed May 01 08:25:52 2002 +0000
@@ -576,16 +576,6 @@
        ["%_Update Package Index" package-get-update-base]
        ["%_List and Install" pui-list-packages]
        ["U%_pdate Installed Packages" package-get-update-all]
-       ;; hack-o-matic, we can't force a load of package-base here
-       ;; since it triggers dialog box interactions which we can't
-       ;; deal with while using a menu
-       ("Using %_Custom"
-	:filter (lambda (&rest junk)
-		  (if package-get-base
-		      (submenu-generate-accelerator-spec
-		       (cdr (custom-menu-create 'packages)))
-		    '("Please load Package Index"))))
-
        ["%_Help" (Info-goto-node "(xemacs)Packages")])
       ("%_Internet"
        ["Read Mail %_1 (VM)..." vm

--- a/lisp/package-get.el	Tue Apr 30 15:33:42 2002 +0000
+++ b/lisp/package-get.el	Wed May 01 08:25:52 2002 +0000
@@ -337,8 +337,7 @@
   (let ((existing (assq (car entry) package-get-base)))
     (if existing
         (setcdr existing (cdr entry))
-      (setq package-get-base (cons entry package-get-base))
-      (package-get-custom-add-entry (car entry) (car (cdr entry))))))
+      (setq package-get-base (cons entry package-get-base)))))
 
 (defun package-get-locate-file (file &optional nil-if-not-found no-remote)
   "Locate an existing FILE with respect to `package-get-remote'.
@@ -1044,26 +1043,6 @@
         (message "No appropriate package found")))
     found))
 
-;;
-;; customize interfaces.
-;; The group is in this file so that custom loads includes this file.
-;;
-(defgroup packages nil
-  "Configure XEmacs packages."
-  :group 'emacs)
-
-;;;###autoload
-(defun package-get-custom ()
-  "Fetch and install the latest versions of all customized packages."
-  (interactive)
-  (package-get-require-base t)
-  (mapcar (lambda (pkg)
-	    (if (eval (intern (concat (symbol-name (car pkg)) "-package")))
-		(package-get (car pkg) nil))
-	    t)
-	  package-get-base)
-  (package-net-update-installed-db))
-
 (defun package-get-ever-installed-p (pkg &optional notused)
   (string-match "-package$" (symbol-name pkg))
   (custom-initialize-set
@@ -1073,26 +1052,6 @@
 	(intern (substring (symbol-name pkg) 0 (match-beginning 0))))
        t)))
 
-(defvar package-get-custom-groups nil
-  "List of package-get-custom groups")
-
-(defun package-get-custom-add-entry (package props)
-  (let* ((category (plist-get props 'category))
-         (group (intern (concat category "-packages")))
-         (custom-var (intern (concat (symbol-name package) "-package")))
-         (description (plist-get props 'description)))
-    (when (not (memq group package-get-custom-groups))
-      (setq package-get-custom-groups (cons group
-                                            package-get-custom-groups))
-      (eval `(defgroup ,group nil
-               ,(concat category " package group")
-               :group 'packages)))
-    (eval `(defcustom ,custom-var nil
-             ,description
-             :group ',group
-             :initialize 'package-get-ever-installed-p
-             :type 'boolean))))
-
 
 (provide 'package-get)
 ;;; package-get.el ends here

--- a/man/ChangeLog	Tue Apr 30 15:33:42 2002 +0000
+++ b/man/ChangeLog	Wed May 01 08:25:52 2002 +0000
@@ -1,3 +1,10 @@
+2002-05-01  Steve Youngs  <youngs@xemacs.org>
+
+	* xemacs/packages.texi (Automatically): Don't mention "Options"
+	menu.
+	(Installing Packages): Don't mention getting list of packages via
+	customize. 
+
 2002-04-05  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.5.6 "bok choi" is released.

--- a/man/xemacs/packages.texi	Tue Apr 30 15:33:42 2002 +0000
+++ b/man/xemacs/packages.texi	Wed May 01 08:25:52 2002 +0000
@@ -100,23 +100,14 @@
 install packages from a local disk or CDROM.
 
 The file @file{etc/PACKAGES} in the core distribution contains a list of
-the @ref{Available Packages} at the time of the XEmacs release.  Packages are
-also listed on the @code{Options} menu under:
-
-@example
-        Options->Customize->Emacs->Packages
-@end example
-
-However, don't select any of these menu picks unless you actually want 
-to install the given package (and have properly configured your system 
-to do so).
+the @ref{Available Packages} at the time of the XEmacs release.
 
 You can also get a list of available packages, and whether or not they
 are installed, using the visual package browser and installer.  You can
 access it via the menus:
 
 @example
-        Options->Manage Packages->List & Install
+        Tools -> Packages -> List and Install
 @end example
 
 Or, you can get to it via the keyboard:
@@ -244,14 +235,10 @@
 After installing these by hand, fire up XEmacs and follow these
 steps.
 
-Note: The menus in XEmacs 21.2.x and up have changed slightly, so
-where I mention "Options -> Manage Packages", substitute "Tools ->
-Packages".
-
 @enumerate 1
 @item 
 Choose a download site.
-via menu: Options -> Manages Packages -> Add Download Site 
+via menu: Tools -> Packages -> Add Download Site 
 via keyb: @code{M-x customize-variable RET package-get-remote RET}
 (put in the details of remote host and directory)
 
@@ -261,7 +248,7 @@
 @item 
 Obtain a list of packages and display the list in a buffer named
 @file{*Packages*}.
-menu: Options -> Manage Packages -> List & Install
+menu: Tools -> Packages -> List & Install
 keyb: @code{M-x pui-list-packages RET}
 
 XEmacs will now connect to the remote site and download the