diff -up ./elisp/emacs-goodies-el/emacs-goodies-el.texi.fix ./elisp/emacs-goodies-el/emacs-goodies-el.texi
--- ./elisp/emacs-goodies-el/emacs-goodies-el.texi.fix	2009-12-04 08:05:29.000000000 +0530
+++ ./elisp/emacs-goodies-el/emacs-goodies-el.texi	2009-12-04 09:03:31.000000000 +0530
@@ -3,14 +3,14 @@
 
 @c $Id: emacs-goodies-el.texi,v 1.85 2009-12-03 03:55:59 psg Exp $
 @c %**start of header
-@setfilename info/emacs-goodies-el
-@settitle Emacs-Goodies-el
+@setfilename info/emacs-goodies
+@settitle Emacs-Goodies
 @documentencoding ISO-8859-1
 @c %**end of header
 
 @dircategory Emacs
 @direntry
-* Emacs-Goodies-el: (emacs-goodies-el). Miscellaneous add-ons for Emacs
+* Emacs-Goodies: (emacs-goodies). Miscellaneous add-ons for Emacs
 @end direntry
 
 @c Version variables.
@@ -19,27 +19,25 @@
 
 @ifinfo
 This is Edition @value{EDITION}, last updated @value{UPDATED}, of
-@cite{Emacs-Goodies-el}.
+@cite{Emacs-Goodies}.
 @end ifinfo
 
 @titlepage
-@title Emacs-Goodies-el: Miscellaneous add-ons for Emacs
+@title Emacs-Goodies: Miscellaneous add-ons for Emacs
 @subtitle A manual for what's in this package.
 @author Peter S. Galbraith
 @end titlepage
 
 @node Top, align-string, (dir), (dir)
-@top The Emacs-Goodies-el Package Setup
+@top The Emacs-Goodies Package Setup
 
-This manual describes the Emacs-Goodies-el package and its setup.  A
-quick descriptions of elisp files contained in this package can be found
-in the file @file{/usr/share/doc/emacs-goodies-el/README.Debian.gz}.
+This manual describes the emacs-goodies package and its setup.
 
 All packaged files are installed, setup and ready to use if they don't
 override standard Emacs commands, modes, or settings.
 
 Some extra package installation and setup is done if you customize the
-variable @code{emacs-goodies-el-defaults} to t (its aggressive state).
+variable @code{emacs-goodies-defaults} to t (its aggressive state).
 These will override standard Emacs defaults, but in a good
 (uncontroversial) way.  The affected packages are currently only:
 @ref{ff-paths}, @ref{home-end} and @ref{ibuffer}.  Packages which
@@ -49,7 +47,7 @@ require activation in order to function 
 To customize setup of all customizable packages on a finer-grain
 basis, do:
 @example
-@kbd{M-x} customize-group @key{RET} emacs-goodies-el @key{RET}
+@kbd{M-x} customize-group @key{RET} emacs-goodies @key{RET}
 @end example
 
 In the following document, when we speak of customizing a variable, we
@@ -58,7 +56,7 @@ mean to use the Emacs custom interface, 
 @kbd{M-x} customize-variable @key{RET} some-variable @key{RET}
 @end example
 When we speak of customizing a group, it's as the example above for the
-group @code{emacs-goodies-el}.
+group @code{emacs-goodies}.
 
 The following files are documented so far.  Eventually, all files will
 be documented.
@@ -190,7 +188,7 @@ table - Create and edit WYSIWYG text bas
 @end menu
 
 This work compiles GPL'ed documentation from the various elisp files
-in /usr/share/emacs/site-lisp/emacs-goodies-el/.  As a derived work
+in /usr/share/emacs/site-lisp/emacs-goodies/.  As a derived work
 from GPL'ed works, this text is also licensed under the GPL V2 (See
 /usr/share/common-licenses/GPL-2) and is edited by Peter S. Galbraith
 @email{psg@@debian.org}.
@@ -200,7 +198,7 @@ section for usage, but be advised that I
 because I intend to change it.
 
 @table @samp
-@item /usr/share/emacs/site-lisp/emacs-goodies-el/initsplit.el
+@item /usr/share/emacs/site-lisp/emacs-goodies/initsplit.el
 code to split customizations into different files
 @end table
 
@@ -316,7 +314,7 @@ easily though only globally (hence the q
 
 To enable it, customize the variable @code{bar-cursor-mode}.
 
-It is also listed when you customize the group @code{emacs-goodies-el}.
+It is also listed when you customize the group @code{emacs-goodies}.
 
 @node boxquote, browse-huge-tar, bar-cursor, Top
 @chapter boxquote - Quote text with a semi-box.
@@ -399,7 +397,7 @@ Here is code (from him) to do this:
 (ad-activate 'yank-pop)
 @end example
 
-(The emacs-goodies-el package could add a customizable variable to
+(The emacs-goodies package could add a customizable variable to
 set this up.  Ask if this would be useful. - @email{psg@@debian.org})
 
 Note that the command keeps track of the last window displayed to
@@ -474,12 +472,12 @@ You can probably guess how coffee.el cam
 everything but make coffee ...yadda yadda ...
 @end quotation
 
-To do anything at all on emacs21, coffee requires the Debian packages
+To do anything at all on emacs21, coffee requires the packages
 @file{w3-el} and @file{w3-url-e21} to be installed.  Then it will
 prompt for coffee and sweetener type.  Then @code{url-retrieve} will
 fail since it doesn't really support the coffee URL type.  So...
 this package is really an elaborate joke.  Because of this, it's
-longer autoloaded in Debian.  To try, do:
+longer autoloaded.  To try, do:
 
 @example
 M-x load-library coffee
@@ -610,7 +608,7 @@ by default.
 
 @noindent Author: Anders Lindgren <andersl@@andersl.com>
 
-To activate this package in the Debian emacs-goodies-el package,
+To activate this package in emacs-goodies package,
 customize the group @code{ctypes}, toggle on the variable
 @code{ctypes-install} and save for future seesions.  This will enable
 the package.  Then start by using @command{ctypes-buffer} in a C file.
@@ -944,7 +942,7 @@ customisation variables described below.
 @key{C-c d w} for running wordinspect GUI dict client.
 @end itemize
 
-The Debian emacs-goodies-el package doesn't setup these keys by
+The  emacs-goodies package doesn't setup these keys by
 default.  The first time you use @code{dict} in a session you must do
 so manually with @code{M-x dict}.  Thereafter the keybindings will
 work.  If someone requests it, a customization variable could be added
@@ -1192,7 +1190,7 @@ To use it, customize the variable @code{
 To also enable ffap, customize the variable @code{ff-paths-use-ffap}.
 
 Both of the above are enabled if you customize the variable
-@code{emacs-goodies-el-defaults} to t (its aggressive state).
+@code{emacs-goodies-defaults} to t (its aggressive state).
 
 You may alter various settings of @code{ff-paths} using the
 customization group @code{ff-paths}.
@@ -2192,7 +2190,7 @@ configuration:
 Remember, you can switch between formats using
 @code{ibuffer-switch-format}, bound to @key{`} by default.
 
-In emacs-goodies-el, you can use the customize interface to bind
+In emacs-goodies, you can use the customize interface to bind
 @code{ibuffer} to @key{\C-x\C-b} by customizing the variable
 @code{ibuffer-enable}.
 
@@ -2794,7 +2792,7 @@ or insert the following snippet of code 
  (add-to-list 'auto-mode-alist '("\\.m$" . matlab-mode))
 @end example
 
-or, in Debian, customize the variable @code{matlab-auto-mode} to
+or, customize the variable @code{matlab-auto-mode} to
 associated the .m file extention to matlab-mode.
 
 Additional features include auto-fill including auto-additions of
@@ -3259,7 +3257,7 @@ never modified, and you can see the raw 
 You may customize some aspects of this package using @command{M-x
 customize-group rfcview}.
 
-The emacs-goodies-el package sets up Emacs to enter
+The emacs-goodies package sets up Emacs to enter
 @command{rfcview-mode} automatically when reading such a file (as
 recognised by the filename).
 
@@ -3473,10 +3471,6 @@ Or alternatively, customize the group @c
 the variable @code{shell-command-completion-mode} and save the setting
 for future sessions.
 
-Note that setup has changed since Debian sarge for which the function
-to call was @code{shell-command-activate-advices} and the variable to
-customize was @code{shell-command-enable-completions}.
-
 @node show-wspace, slang-mode, shell-command, Top
 @chapter show-wspace - highlight whitespaces of various kinds.