diff --git a/ChangeLog b/ChangeLog
index 83c527bceb..bcf6d47170 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Aug 12 00:07:15 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtkaction.c (gtk_action_new):  Link to information about
+	allowed action names.  (#149620, David Malcolm)
+
 2004-08-11  Federico Mena Quintero  <federico@ximian.com>
 
 	Merged from HEAD:
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 83c527bceb..bcf6d47170 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Thu Aug 12 00:07:15 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtkaction.c (gtk_action_new):  Link to information about
+	allowed action names.  (#149620, David Malcolm)
+
 2004-08-11  Federico Mena Quintero  <federico@ximian.com>
 
 	Merged from HEAD:
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 83c527bceb..bcf6d47170 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Thu Aug 12 00:07:15 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtkaction.c (gtk_action_new):  Link to information about
+	allowed action names.  (#149620, David Malcolm)
+
 2004-08-11  Federico Mena Quintero  <federico@ximian.com>
 
 	Merged from HEAD:
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 83c527bceb..bcf6d47170 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Thu Aug 12 00:07:15 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtkaction.c (gtk_action_new):  Link to information about
+	allowed action names.  (#149620, David Malcolm)
+
 2004-08-11  Federico Mena Quintero  <federico@ximian.com>
 
 	Merged from HEAD:
diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 2452491d23..56396066e7 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,8 @@
+Thu Aug 12 00:06:20 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/tmpl/gtkuimanager.sgml: Add some information about
+	allowed values for the name and action attributes.
+
 2004-08-07  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/tmpl/gtkrc.sgml: Fix a typo.  (#149470, Mariano
diff --git a/docs/reference/gtk/tmpl/gtkuimanager.sgml b/docs/reference/gtk/tmpl/gtkuimanager.sgml
index ad93c51b20..b4462ce7d7 100644
--- a/docs/reference/gtk/tmpl/gtkuimanager.sgml
+++ b/docs/reference/gtk/tmpl/gtkuimanager.sgml
@@ -1,4 +1,5 @@
 <!-- ##### SECTION Title ##### -->
+ 
 GtkUIManager
 
 <!-- ##### SECTION Short_Description ##### -->
@@ -51,9 +52,15 @@ There are some additional restrictions beyond those specified in the
 DTD, e.g. every toolitem must have a toolbar in its anchestry and
 every menuitem must have a menubar or popup in its anchestry. Since
 a #GMarkup parser is used to parse the UI description, it must not only
-be valid XML, but valid #GMarkup. If a name is not specified, it defaults 
-to the action. If an action is not specified either, the element name is 
-used.  
+be valid XML, but valid #GMarkup. 
+</para>
+<para>
+If a name is not specified, it defaults to the action. If an action is 
+not specified either, the element name is used. The name and action 
+attributes must not contain '/' characters after parsing (since that 
+would mess up path lookup) and must be usable as XML attributes when 
+enclosed in doublequotes, thus they must not '"' characters or references 
+to the &amp;quot; entity.
 </para>
 <example>
 <title>A UI definition</title>
diff --git a/gtk/gtkaction.c b/gtk/gtkaction.c
index 0bdc4b811c..0ddf62c91d 100644
--- a/gtk/gtkaction.c
+++ b/gtk/gtkaction.c
@@ -339,6 +339,8 @@ gtk_action_init (GtkAction *action)
  * Creates a new #GtkAction object. To add the action to a
  * #GtkActionGroup and set the accelerator for the action,
  * call gtk_action_group_add_action_with_accel().
+ * See <xref linkend="XML-UI"> for information on allowed action
+ * names.
  *
  * Return value: a new #GtkAction
  *