* cmdargs.texi (Icons X): Removed options -i, -itype, --icon-type,

added -nb, --no-bitmap-icon.

diff --git a/man/ChangeLog b/man/ChangeLog
index f4e10d85e115d08f8ffe4d0d65ad7c77fdfcb8b6..a4040eb5a53c48896c7af60f6de3c34427a54b28 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-09  Jan Dj\e,Ad\e(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 --git a/man/cmdargs.texi b/man/cmdargs.texi
index dad7e61dbf280bac8cfeccf7919906bcac8595fd..d0ab8788150f9b86c6e93a64e57b4c8f6178afd2 100644 (file)
--- a/man/cmdargs.texi
+++ b/man/cmdargs.texi
@@ -1173,12 +1173,12 @@ If you have many clients running at once, you can avoid cluttering up
 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 @@ Use a picture of a gnu as the Emacs icon.
 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.