11 files changed, 62 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog
index 4274d7735..1efea7add 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sat Mar  3 16:59:16 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/gdkpango.h gdk/x11/gdkwindow-x11.c: Doc fixes
+
+	* gdk/win32/gdkinput.c (gdk_device_get_axis): Remove doc
+	comment. Won't do to have duplicated doc comments between
+	the platform subdirs.
+
 Sat Mar  3 16:26:33 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/x11/gdkmain-x11.c gdk/x11/gdkkeys-x11.c 
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 4274d7735..1efea7add 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+Sat Mar  3 16:59:16 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/gdkpango.h gdk/x11/gdkwindow-x11.c: Doc fixes
+
+	* gdk/win32/gdkinput.c (gdk_device_get_axis): Remove doc
+	comment. Won't do to have duplicated doc comments between
+	the platform subdirs.
+
 Sat Mar  3 16:26:33 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/x11/gdkmain-x11.c gdk/x11/gdkkeys-x11.c 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 4274d7735..1efea7add 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+Sat Mar  3 16:59:16 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/gdkpango.h gdk/x11/gdkwindow-x11.c: Doc fixes
+
+	* gdk/win32/gdkinput.c (gdk_device_get_axis): Remove doc
+	comment. Won't do to have duplicated doc comments between
+	the platform subdirs.
+
 Sat Mar  3 16:26:33 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/x11/gdkmain-x11.c gdk/x11/gdkkeys-x11.c 
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 4274d7735..1efea7add 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+Sat Mar  3 16:59:16 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/gdkpango.h gdk/x11/gdkwindow-x11.c: Doc fixes
+
+	* gdk/win32/gdkinput.c (gdk_device_get_axis): Remove doc
+	comment. Won't do to have duplicated doc comments between
+	the platform subdirs.
+
 Sat Mar  3 16:26:33 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/x11/gdkmain-x11.c gdk/x11/gdkkeys-x11.c 
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 4274d7735..1efea7add 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+Sat Mar  3 16:59:16 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/gdkpango.h gdk/x11/gdkwindow-x11.c: Doc fixes
+
+	* gdk/win32/gdkinput.c (gdk_device_get_axis): Remove doc
+	comment. Won't do to have duplicated doc comments between
+	the platform subdirs.
+
 Sat Mar  3 16:26:33 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/x11/gdkmain-x11.c gdk/x11/gdkkeys-x11.c 
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 4274d7735..1efea7add 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+Sat Mar  3 16:59:16 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/gdkpango.h gdk/x11/gdkwindow-x11.c: Doc fixes
+
+	* gdk/win32/gdkinput.c (gdk_device_get_axis): Remove doc
+	comment. Won't do to have duplicated doc comments between
+	the platform subdirs.
+
 Sat Mar  3 16:26:33 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/x11/gdkmain-x11.c gdk/x11/gdkkeys-x11.c 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 4274d7735..1efea7add 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+Sat Mar  3 16:59:16 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/gdkpango.h gdk/x11/gdkwindow-x11.c: Doc fixes
+
+	* gdk/win32/gdkinput.c (gdk_device_get_axis): Remove doc
+	comment. Won't do to have duplicated doc comments between
+	the platform subdirs.
+
 Sat Mar  3 16:26:33 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/x11/gdkmain-x11.c gdk/x11/gdkkeys-x11.c 
diff --git a/gdk/gdkpango.h b/gdk/gdkpango.h
index efecac2e4..f6019d426 100644
--- a/gdk/gdkpango.h
+++ b/gdk/gdkpango.h
@@ -75,7 +75,7 @@ struct _GdkPangoAttrEmbossed
   gboolean embossed;
 };
 
-PangoAttribute *gdk_pango_attr_stipple_new  (GdkBitmap *bitmap);
+PangoAttribute *gdk_pango_attr_stipple_new  (GdkBitmap *stipple);
 PangoAttribute *gdk_pango_attr_embossed_new (gboolean embossed);
 
 #ifdef __cplusplus
diff --git a/gdk/win32/gdkinput.c b/gdk/win32/gdkinput.c
index 093439962..d3629c444 100644
--- a/gdk/win32/gdkinput.c
+++ b/gdk/win32/gdkinput.c
@@ -280,18 +280,6 @@ gdk_input_exit (void)
   g_list_free(gdk_input_windows);
 }
 
-/**
- * gdk_device_get_axis:
- * @axis: a #GdkDevice
- * @axes: pointer to an array of axes
- * @use: the use to look for
- * @value: location to store the found value.
- * 
- * Interprets an array of double as axis values for a given device,
- * and locates the value in the array for a given axis use.
- * 
- * Return value: %TRUE if the given axis use was found, otherwies %FALSE
- **/
 gboolean
 gdk_device_get_axis (GdkDevice *device, gdouble *axes, GdkAxisUse use, gdouble *value)
 {
diff --git a/gdk/x11/gdkinput.c b/gdk/x11/gdkinput.c
index de2749cf9..b4525987c 100644
--- a/gdk/x11/gdkinput.c
+++ b/gdk/x11/gdkinput.c
@@ -338,7 +338,10 @@ gdk_input_exit (void)
  * Return value: %TRUE if the given axis use was found, otherwies %FALSE
  **/
 gboolean
-gdk_device_get_axis (GdkDevice *device, gdouble *axes, GdkAxisUse use, gdouble *value)
+gdk_device_get_axis (GdkDevice  *device,
+		     gdouble    *axes,
+		     GdkAxisUse  use,
+		     gdouble    *value)
 {
   gint i;
   
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 077880fc1..c59d43bdb 100644
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -2401,10 +2401,9 @@ gdk_window_set_decorations (GdkWindow      *window,
  * gdk_window_get_decorations:
  * @window: The #GdkWindow to get the decorations from
  * @decorations: The window decorations will be written here
- * @Returns: TRUE if the window has decorations set, FALSE otherwise.
  *
  * Returns the decorations set on the GdkWindow with #gdk_window_set_decorations
- * 
+ * Returns: TRUE if the window has decorations set, FALSE otherwise.
  **/
 gboolean
 gdk_window_get_decorations(GdkWindow *window,