diff --git a/ChangeLog b/ChangeLog
index e1026178f..929d23451 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-22  Iain Holmes  <iain@openedhand.com>
+
+	* clutter/clutter-texture.c: Fix typos.
+
+	* clutter/clutter-timeline.c: Fix typos.
+
 2006-06-22  Iain Holmes  <iain@openedhand.com>
 
 	* clutter/clutter-video-texture.c: Docs.
diff --git a/clutter/clutter-texture.c b/clutter/clutter-texture.c
index 35766707a..053bf69c4 100644
--- a/clutter/clutter-texture.c
+++ b/clutter/clutter-texture.c
@@ -1205,7 +1205,7 @@ clutter_texture_has_generated_tiles (ClutterTexture *texture)
 }
 
 /**
- * clutter_texture_has_generated_tiles:
+ * clutter_texture_is_tiled:
  * @texture: A #ClutterTexture
  *
  * Checks if #ClutterTexture is tiled.
diff --git a/clutter/clutter-timeline.c b/clutter/clutter-timeline.c
index 78964cc1f..2449263ed 100644
--- a/clutter/clutter-timeline.c
+++ b/clutter/clutter-timeline.c
@@ -428,7 +428,7 @@ clutter_timeline_rewind (ClutterTimeline *timeline)
 }
 
 /**
- * clutter_timeline_advance:
+ * clutter_timeline_skip:
  * @timeline: A #ClutterTimeline
  * @nframes: Number of frames to skip
  *
diff --git a/doc/reference/tmpl/clutter-group.sgml b/doc/reference/tmpl/clutter-group.sgml
index cd261c181..8e8ea1bcb 100644
--- a/doc/reference/tmpl/clutter-group.sgml
+++ b/doc/reference/tmpl/clutter-group.sgml
@@ -80,7 +80,7 @@ The #ClutterActor @arg1 was removed from the group.
 
 </para>
 
-@group: 
+@self: 
 @first_actor: 
 @args: 
 
diff --git a/doc/reference/tmpl/clutter-main.sgml b/doc/reference/tmpl/clutter-main.sgml
index 3e539ac66..26975bdc7 100644
--- a/doc/reference/tmpl/clutter-main.sgml
+++ b/doc/reference/tmpl/clutter-main.sgml
@@ -69,6 +69,7 @@ clutter-main
 @a...:
 @a...:
 @a...:
+@a...:
 @a...: 
 
 
diff --git a/doc/reference/tmpl/clutter-util.sgml b/doc/reference/tmpl/clutter-util.sgml
index 9604fccc6..a92d0f194 100644
--- a/doc/reference/tmpl/clutter-util.sgml
+++ b/doc/reference/tmpl/clutter-util.sgml
@@ -41,13 +41,3 @@ clutter-util
 @Returns: 
 
 
-<!-- ##### FUNCTION clutter_util_can_create_texture ##### -->
-<para>
-
-</para>
-
-@width: 
-@height: 
-@Returns: 
-
-