diff --git a/ChangeLog b/ChangeLog
index 0dbeedc000..de5de47a54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-2r76  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktoolshell.c:
+	* gtk/gtktoolitem.c: Remove markup from short descriptions.
+
 2008-10-26  Matthias Clasen  <mclasen@redhat.com>
 
 	* gdk/keyname-table.h:
diff --git a/gtk/gtktoolitem.c b/gtk/gtktoolitem.c
index 2d73c228e0..8e3aff7d7a 100644
--- a/gtk/gtktoolitem.c
+++ b/gtk/gtktoolitem.c
@@ -37,7 +37,7 @@
 
 /**
  * SECTION:gtktoolitem
- * @short_description: The base class of widgets that can be added to #GtkToolShell
+ * @short_description: The base class of widgets that can be added to GtkToolShell
  *
  * #GtkToolItem<!-- -->s are widgets that can appear on a toolbar. To
  * create a toolbar item that contain something else than a button, use
diff --git a/gtk/gtktoolshell.c b/gtk/gtktoolshell.c
index 90b3842eab..e3e71c5086 100644
--- a/gtk/gtktoolshell.c
+++ b/gtk/gtktoolshell.c
@@ -28,7 +28,7 @@
 
 /**
  * SECTION:gtktoolshell
- * @short_description: Interface for containers containing #GtkToolItem widgets.
+ * @short_description: Interface for containers containing GtkToolItem widgets.
  *
  * The #GtkToolShell interface allows container widgets to provide additional
  * information when embedding #GtkToolItem widgets.