# HG changeset patch
# User Jan D. <jan.h.d@swipnet.se>
# Date 1271867115 -7200
# Node ID 7b45a10725ef5be5210b9a8e9546313779c8930c
# Parent  4d8277a44bb4daa14ebd1759d4d7a4ee4dc6f911
Document tool-bar-style

diff -r 4d8277a44bb4 -r 7b45a10725ef doc/emacs/ChangeLog
--- a/doc/emacs/ChangeLog	Tue Apr 20 20:52:07 2010 +0200
+++ b/doc/emacs/ChangeLog	Wed Apr 21 18:25:15 2010 +0200
@@ -1,3 +1,7 @@
+2010-04-21  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* frames.texi (Tool Bars): Add tool-bar-style.
+
 2010-04-21  Glenn Morris  <rgm@gnu.org>
 
 	* ack.texi, emacs.texi (Acknowledgments): Add SELinux support.
diff -r 4d8277a44bb4 -r 7b45a10725ef doc/emacs/frames.texi
--- a/doc/emacs/frames.texi	Tue Apr 20 20:52:07 2010 +0200
+++ b/doc/emacs/frames.texi	Wed Apr 21 18:25:15 2010 +0200
@@ -1262,6 +1262,13 @@
   You can turn display of tool bars on or off with @kbd{M-x
 tool-bar-mode} or by customizing the option @code{tool-bar-mode}.
 
+@vindex tool-bar-style
+@cindex Tool Bar style
+  When Emacs is compiled with GTK+ support, tool bars can have text and images.
+Customize @code{tool-bar-style} to select style.  The default style is
+the same as for the desktop in the Gnome case.  If no default is found,
+the tool bar uses just images.
+
 @node Dialog Boxes
 @section Using Dialog Boxes
 @cindex dialog boxes
diff -r 4d8277a44bb4 -r 7b45a10725ef etc/NEWS
--- a/etc/NEWS	Tue Apr 20 20:52:07 2010 +0200
+++ b/etc/NEWS	Wed Apr 21 18:25:15 2010 +0200
@@ -68,6 +68,10 @@
 ** GTK scroll-bars are now placed on the right by default.
 Use `set-scroll-bar-mode' to change this.
 
+** GTK tool bars can have just text, just images or images and text.
+Customize `tool-bar-style´ to choose style.  On a Gnome desktop, the default
+is taken from the desktop settings.
+
 ** Lucid menus and dialogs can display antialiased fonts if Emacs is built
 with Xft.