--- a/man/xemacs/custom.texi	Mon Aug 13 11:12:06 2007 +0200
+++ b/man/xemacs/custom.texi	Mon Aug 13 11:13:30 2007 +0200
@@ -30,7 +30,7 @@
                      file.
 * Audible Bell::    Changing how Emacs sounds the bell. 
 * Faces::           Changing the fonts and colors of a region of text. 
-* X Resources::	    X resources controlling various aspects of the
+* X Resources::     X resources controlling various aspects of the
                      behavior of XEmacs.
 @end menu
 
@@ -761,16 +761,16 @@
 mode and variable settings should be.  For example, these are all legal:
 
 @example
-	;;; -*- mode: emacs-lisp -*-
-	;;; -*- mode: postscript; version-control: never -*-
-	;;; -*- tags-file-name: "/foo/bar/TAGS" -*-
+        ;;; -*- mode: emacs-lisp -*-
+        ;;; -*- mode: postscript; version-control: never -*-
+        ;;; -*- tags-file-name: "/foo/bar/TAGS" -*-
 @end example
 
 For historical reasons, the syntax @code{`-*- modename -*-'} is allowed
 as well; for example, you can use:
 
 @example
-	;;; -*- emacs-lisp -*-
+        ;;; -*- emacs-lisp -*-
 @end example
 
 @vindex enable-local-variables
@@ -1093,9 +1093,9 @@
 local map, which affects all buffers using the same major mode.
 
 @menu
-* Interactive Rebinding::     Changing Key Bindings Interactively   
-* Programmatic Rebinding::    Changing Key Bindings Programmatically
-* Key Bindings Using Strings::Using Strings for Changing Key Bindings 
+* Interactive Rebinding::      Changing Key Bindings Interactively   
+* Programmatic Rebinding::     Changing Key Bindings Programmatically
+* Key Bindings Using Strings:: Using Strings for Changing Key Bindings 
 @end menu
 
 @node Interactive Rebinding
@@ -1232,13 +1232,13 @@
 @example
 
 ;;;  Bind @code{my-command} to @key{f1}
-(global-set-key 'f1 'my-command)		
+(global-set-key 'f1 'my-command)                
 
 ;;;  Bind @code{my-command} to @kbd{Shift-f1}
 (global-set-key '(shift f1) 'my-command)
 
 ;;; Bind @code{my-command} to @kbd{C-c Shift-f1}
-(global-set-key '[(control c) (shift f1)] 'my-command)	
+(global-set-key '[(control c) (shift f1)] 'my-command)  
 
 ;;; Bind @code{my-command} to the middle mouse button.
 (global-set-key 'button2 'my-command)
@@ -1288,14 +1288,14 @@
 After binding a command to two key sequences with a form like:
 
 @example
-	(define-key global-map "\^X\^I" 'command-1)
+        (define-key global-map "\^X\^I" 'command-1)
 @end example
 
 it is possible to redefine only one of those sequences like so:
 
 @example
-	(define-key global-map [(control x) (control i)] 'command-2)
-	(define-key global-map [(control x) tab] 'command-3)
+        (define-key global-map [(control x) (control i)] 'command-2)
+        (define-key global-map [(control x) tab] 'command-3)
 @end example
 
 This applies only when running under a window system.  If you are
@@ -1539,18 +1539,13 @@
   When you start Emacs, it normally loads the file @file{.emacs} in your
 home directory.  This file, if it exists, should contain Lisp code.  It
 is called your initialization file or @dfn{init file}.  Use the command
-line switches @samp{-q} and @samp{-u} to tell Emacs whether to load an
-init file (@pxref{Entering Emacs}).
-
-@vindex init-file-user
-When the @file{.emacs} file is read, the variable @code{init-file-user}
-says which user's init file it is.  The value may be the null string or a
-string containing a user's name.  If the value is a null string, it means
-that the init file was taken from the user that originally logged in.
-
-In all cases, @code{(concat "~" init-file-user "/")} evaluates to the
-directory name of the directory where the @file{.emacs} file was looked
-for.
+line switch @samp{-q} to tell Emacs whether to load an
+init file (@pxref{Entering Emacs}).  Use the command line switch
+@samp{-user-init-file} (@pxref{Command Switches}) to tell Emacs to load
+a different file instead of @file{~/.emacs}.
+
+When the @file{.emacs} file is read, the variable @code{user-init-file}
+says which init file was loaded.
 
   At some sites there is a @dfn{default init file}, which is the
 library named @file{default.el}, found via the standard search path for
@@ -1923,16 +1918,16 @@
 @item undefined-key
 You type a key that is undefined
 
-@item undefined-click	
+@item undefined-click
 You use an undefined mouse-click combination
 
-@item no-completion	
+@item no-completion
 Completion was not possible
 
-@item y-or-n-p		
+@item y-or-n-p
 You type something other than the required @code{y} or @code{n}
 
-@item yes-or-no-p  	
+@item yes-or-no-p       
 You type something other than @code{yes} or @code{no}
 @end table
 
@@ -2071,7 +2066,7 @@
 Starting with XEmacs 21, XEmacs uses the class @samp{XEmacs} if it finds
 any XEmacs resources in the resource database when the X connection is
 initialized.  Otherwise, it will use the class @samp{Emacs} for
-backwards compatability.  The variable @var{x-emacs-application-class}
+backwards compatibility.  The variable @var{x-emacs-application-class}
 may be consulted to determine the application class being used.
 
 The examples in this section assume the application class is @samp{Emacs}.
@@ -2103,11 +2098,11 @@
 
 @menu
 * Geometry Resources::     Controlling the size and position of frames.
-* Iconic Resources::	   Controlling whether frames come up iconic.
-* Resource List::	   List of resources settable on a frame or device.
-* Face Resources::	   Controlling faces using resources.
-* Widgets::		   The widget hierarchy for XEmacs.
-* Menubar Resources::	   Specifying resources for the menubar.
+* Iconic Resources::       Controlling whether frames come up iconic.
+* Resource List::          List of resources settable on a frame or device.
+* Face Resources::         Controlling faces using resources.
+* Widgets::                The widget hierarchy for XEmacs.
+* Menubar Resources::      Specifying resources for the menubar.
 @end menu
 
 @node Geometry Resources
@@ -2364,8 +2359,8 @@
 The foreground and background colors of this face.
 
 @item @code{attributeBackgroundPixmap} (class @code{AttributeBackgroundPixmap}): file-name
-The name of an @sc{XBM} file (or @sc{XPM} file, if your version of Emacs
-supports @sc{XPM}), to use as a background stipple.
+The name of an @sc{xbm} file (or @sc{xpm} file, if your version of Emacs
+supports @sc{xpm}), to use as a background stipple.
 
 @item @code{attributeUnderline} (class @code{AttributeUnderline}): boolean
 Whether text in this face should be underlined.