diff --git a/ChangeLog b/ChangeLog
index b6035ff49f..a3b1ac76bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-07-15  Matthias Clasen  <maclas@gmx.de>
+
+	* gdk/x11/gdkcursor-x11.c (gdk_display_get_maximal_cursor_size): Fight against gtk-doc stupidity.
+
 2003-07-13  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtkdnd.c (gtk_drag_begin): Rename parameter target_list back to targets, to pacify gtk-doc.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b6035ff49f..a3b1ac76bf 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+2003-07-15  Matthias Clasen  <maclas@gmx.de>
+
+	* gdk/x11/gdkcursor-x11.c (gdk_display_get_maximal_cursor_size): Fight against gtk-doc stupidity.
+
 2003-07-13  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtkdnd.c (gtk_drag_begin): Rename parameter target_list back to targets, to pacify gtk-doc.
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index b6035ff49f..a3b1ac76bf 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+2003-07-15  Matthias Clasen  <maclas@gmx.de>
+
+	* gdk/x11/gdkcursor-x11.c (gdk_display_get_maximal_cursor_size): Fight against gtk-doc stupidity.
+
 2003-07-13  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtkdnd.c (gtk_drag_begin): Rename parameter target_list back to targets, to pacify gtk-doc.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index b6035ff49f..a3b1ac76bf 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+2003-07-15  Matthias Clasen  <maclas@gmx.de>
+
+	* gdk/x11/gdkcursor-x11.c (gdk_display_get_maximal_cursor_size): Fight against gtk-doc stupidity.
+
 2003-07-13  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtkdnd.c (gtk_drag_begin): Rename parameter target_list back to targets, to pacify gtk-doc.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b6035ff49f..a3b1ac76bf 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+2003-07-15  Matthias Clasen  <maclas@gmx.de>
+
+	* gdk/x11/gdkcursor-x11.c (gdk_display_get_maximal_cursor_size): Fight against gtk-doc stupidity.
+
 2003-07-13  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtkdnd.c (gtk_drag_begin): Rename parameter target_list back to targets, to pacify gtk-doc.
diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 0824fcfa7f..3b73245617 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,9 @@
+2003-07-15  Matthias Clasen  <maclas@gmx.de>
+
+	* gdk/tmpl/input_devices.sgml: Remove docs for gdk_device_get_history() which are now inline.
+
+	* gdk/gdk-sections.txt: Add gdk_display_flush.
+
 2003-07-13  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtk.types: Add gtk_tool_button_get_type and gtk_tool_item_get_type.
diff --git a/docs/reference/gdk/gdk-sections.txt b/docs/reference/gdk/gdk-sections.txt
index 9c96b6d23e..e3a6c7eed2 100644
--- a/docs/reference/gdk/gdk-sections.txt
+++ b/docs/reference/gdk/gdk-sections.txt
@@ -127,6 +127,7 @@ gdk_display_keyboard_ungrab
 gdk_display_pointer_is_grabbed
 gdk_display_beep
 gdk_display_sync
+gdk_display_flush
 gdk_display_close
 gdk_display_list_devices
 gdk_display_get_event
diff --git a/docs/reference/gdk/tmpl/input_devices.sgml b/docs/reference/gdk/tmpl/input_devices.sgml
index c4e248623c..1702785de2 100644
--- a/docs/reference/gdk/tmpl/input_devices.sgml
+++ b/docs/reference/gdk/tmpl/input_devices.sgml
@@ -243,16 +243,16 @@ Gets the current state of a device.
 
 <!-- ##### FUNCTION gdk_device_get_history ##### -->
 <para>
-Obtains the motion history for a device.
+
 </para>
 
-@device: a #GdkDevice.
-@window: the window wrt. which the event coordinates will be translated.
-@start: only return events newer than this timestamp.
-@stop: only return events older than this timestamp.
-@events: location to return a newly-allocated array of #GdkTimeCoord.
-@n_events: location to return the length of @events.
-@Returns: %TRUE if the @events were successfully filled.
+@device: 
+@window: 
+@start: 
+@stop: 
+@events: 
+@n_events: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gdk_device_free_history ##### -->
diff --git a/gdk/x11/gdkcursor-x11.c b/gdk/x11/gdkcursor-x11.c
index db41e3bedb..46307436f8 100644
--- a/gdk/x11/gdkcursor-x11.c
+++ b/gdk/x11/gdkcursor-x11.c
@@ -575,7 +575,7 @@ gdk_display_default_cursor_size (GdkDisplay    *display)
  * @width: the return location for the maximal cursor width
  * @height: the return location for the maximal cursor height
  *
- * Returns the maximal size to use for cursors on @display.
+ * Gets the maximal size to use for cursors on @display.
  *
  * Since: 2.4
  */