# HG changeset patch
# User Jan Dj¸«£rv <jan.h.d@swipnet.se>
# Date 1128841161 0
# Node ID ba4c1a7f880b748dc5091c18f36e1734f1bfdff4
# Parent  64dda345009b7f9ed840cb84d70a1a0e7ef5141a
* cmdargs.texi (Icons X): Removed options -i, -itype, --icon-type,
added -nb, --no-bitmap-icon.

diff -r 64dda345009b -r ba4c1a7f880b man/ChangeLog
--- a/man/ChangeLog	Sun Oct 09 06:58:13 2005 +0000
+++ b/man/ChangeLog	Sun Oct 09 06:59:21 2005 +0000
@@ -1,3 +1,8 @@
+2005-10-09  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+	* cmdargs.texi (Icons X): Removed options -i, -itype, --icon-type, 
+	added -nb, --no-bitmap-icon.
+
 2005-10-08  Michael Albinus  <michael.albinus@gmx.de>
 
 	Sync with Tramp 2.0.51.
diff -r 64dda345009b -r ba4c1a7f880b man/cmdargs.texi
--- a/man/cmdargs.texi	Sun Oct 09 06:58:13 2005 +0000
+++ b/man/cmdargs.texi	Sun Oct 09 06:59:21 2005 +0000
@@ -1173,12 +1173,12 @@
 the screen by iconifying most of the clients.
 
 @table @samp
-@item -i
-@opindex -i
-@itemx --icon-type
-@opindex --icon-type
+@item -nb
+@opindex -nb
+@itemx --no-bitmap-icon
+@opindex --no-bitmap-icon
 @cindex Emacs icon, a gnu
-Use a picture of a gnu as the Emacs icon.
+Do not use a picture of a gnu as the Emacs icon.
 
 @item -iconic
 @opindex --iconic
@@ -1187,8 +1187,8 @@
 Start Emacs in iconified state.
 @end table
 
-  The @samp{-i} or @samp{--icon-type} option tells Emacs to use an icon
-window containing a picture of the GNU gnu.  If omitted, Emacs lets the
+  By default Emacs uses an icon window containing a picture of the GNU gnu.
+The @samp{-np} or @samp{--no-bitmap-icon} option tells Emacs to let the
 window manager choose what sort of icon to use---usually just a small
 rectangle containing the frame's title.