diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index d1169f6fd7..1ffdb23535 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-06  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk/tmpl/general.sgml: Point to GdkEventGrabBroken
+	from the gdk_pointer_grab and gdk_keyboard_grab docs.
+
 2005-07-05  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/building.sgml: Document Cairo as a 
diff --git a/docs/reference/gdk/tmpl/general.sgml b/docs/reference/gdk/tmpl/general.sgml
index c2ebc20997..84f880f00b 100644
--- a/docs/reference/gdk/tmpl/general.sgml
+++ b/docs/reference/gdk/tmpl/general.sgml
@@ -215,6 +215,11 @@ press and release events in pairs.
 It is equivalent to a pointer grab on the window with @owner_events set to
 %TRUE.
 </para>
+<para>
+If you set up anything at the time you take the grab that needs to be cleaned
+up when the grab ends, you should handle the #GdkEventGrabBroken events that
+are emitted when the grab ends unvoluntarily.
+</para>
 
 @window: the #GdkWindow which will own the grab (the grab window).
 @owner_events: if %FALSE then all pointer events are reported with respect to
@@ -283,6 +288,11 @@ Grabs the keyboard so that all events are passed to this
 application until the keyboard is ungrabbed with gdk_keyboard_ungrab().
 This overrides any previous keyboard grab by this client.
 </para>
+<para>
+If you set up anything at the time you take the grab that needs to be cleaned
+up when the grab ends, you should handle the #GdkEventGrabBroken events that
+are emitted when the grab ends unvoluntarily.
+</para>
 
 @window: the #GdkWindow which will own the grab (the grab window).
 @owner_events: if %FALSE then all keyboard events are reported with respect to