diff --git a/ChangeLog b/ChangeLog
index 469688e242..ddcbe22df9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-12-25  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk/gdkapplaunchcontext.c:
+	* gdk/gdkkeys.c:
+	* gdk/x11/gdkdnd-x11.c:
+	* gdk/x11/gdkkeyx-x11.c:
+	* gdk/x11/gdktestutils-x11.c: Typo fixes and other small
+	doc improvements.
+
 2008-12-23  Li Yuan  <li.yuan@sun.com>
 
 	* gtk/gtkiconview.c: (gtk_icon_view_accessible_model_row_changed):
diff --git a/gdk/gdkapplaunchcontext.c b/gdk/gdkapplaunchcontext.c
index a7bab50b10..7c19770c79 100644
--- a/gdk/gdkapplaunchcontext.c
+++ b/gdk/gdkapplaunchcontext.c
@@ -221,7 +221,12 @@ gdk_app_launch_context_set_timestamp (GdkAppLaunchContext *context,
  * @icon: a #GIcon, or %NULL
  *
  * Sets the icon for applications that are launched with this
- * context. See also gdk_app_launch_context_set_icon_name().
+ * context.
+ *
+ * Window Managers can use this information when displaying startup
+ * notification.
+ *
+ * See also gdk_app_launch_context_set_icon_name().
  *
  * Since: 2.14
  */
diff --git a/gdk/gdkkeys.c b/gdk/gdkkeys.c
index d3e4d1b8f3..130dbac608 100644
--- a/gdk/gdkkeys.c
+++ b/gdk/gdkkeys.c
@@ -88,8 +88,8 @@ gdk_keymap_class_init (GdkKeymapClass *klass)
    * @keymap: the object on which the signal is emitted
    *
    * The ::state-changed signal is emitted when the state of the
-   * keyboard changes, e.g when the Caps Lock is turned on or off.
-   * See gdk_keyboard_get_caps_lock_state().
+   * keyboard changes, e.g when Caps Lock is turned on or off.
+   * See gdk_keymap_get_caps_lock_state().
    *
    * Since: 2.16
    */
diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c
index 4ff2276782..942ad91eb9 100644
--- a/gdk/x11/gdkdnd-x11.c
+++ b/gdk/x11/gdkdnd-x11.c
@@ -3807,7 +3807,7 @@ gdk_drag_get_selection (GdkDragContext *context)
  * gdk_drag_drop_succeeded:
  * @context: a #GdkDragContext
  * 
- * Returns wether the dropped data has been successfully 
+ * Returns whether the dropped data has been successfully 
  * transferred. This function is intended to be used while 
  * handling a %GDK_DROP_FINISHED event, its return value is
  * meaningless at other times.
diff --git a/gdk/x11/gdkkeys-x11.c b/gdk/x11/gdkkeys-x11.c
index c08baf370e..002341be6c 100644
--- a/gdk/x11/gdkkeys-x11.c
+++ b/gdk/x11/gdkkeys-x11.c
@@ -813,7 +813,7 @@ gdk_keymap_have_bidi_layouts (GdkKeymap *keymap)
  * gdk_keymap_get_caps_lock_state:
  * @keymap: a #GdkKeymap
  *
- * Returns wether the Caps Lock modifer is locked. 
+ * Returns whether the Caps Lock modifer is locked. 
  *
  * Returns: %TRUE if Caps Lock is on
  *
diff --git a/gdk/x11/gdktestutils-x11.c b/gdk/x11/gdktestutils-x11.c
index 2c9223cf3c..480da4d909 100644
--- a/gdk/x11/gdktestutils-x11.c
+++ b/gdk/x11/gdktestutils-x11.c
@@ -71,7 +71,7 @@ gdk_test_render_sync (GdkWindow *window)
  * right function to call which will generate a key press event
  * followed by its accompanying key release event.
  *
- * Returns: wether all actions neccessary for a key event simulation 
+ * Returns: whether all actions neccessary for a key event simulation 
  *     were carried out successfully.
  *
  * Since: 2.14
@@ -170,7 +170,7 @@ gdk_test_simulate_key (GdkWindow      *window,
  * function to call which will generate a button press event followed
  * by its accompanying button release event.
  *
- * Returns: wether all actions neccessary for a button event simulation 
+ * Returns: whether all actions neccessary for a button event simulation 
  *     were carried out successfully.
  *
  * Since: 2.14