diff --git a/clutter/clutter-behaviour-scale.c b/clutter/clutter-behaviour-scale.c
index a77b033e2..5b1679bda 100644
--- a/clutter/clutter-behaviour-scale.c
+++ b/clutter/clutter-behaviour-scale.c
@@ -25,8 +25,8 @@
  * SECTION:clutter-behaviour-scale
  * @Title: ClutterBehaviourScale
  * @short_description: A behaviour controlling scale
- * @Deprecated: 1.6: Use clutter_actor_animate() with #ClutterActor:x-scale
- *   and #ClutterActor:y-scale instead.
+ * @Deprecated: 1.6: Use clutter_actor_animate() with #ClutterActor:scale-x
+ *   and #ClutterActor:scale-y instead.
  *
  * A #ClutterBehaviourScale interpolates actors size between two values.
  */
diff --git a/clutter/clutter-behaviour.h b/clutter/clutter-behaviour.h
index c350ebafd..4d250da15 100644
--- a/clutter/clutter-behaviour.h
+++ b/clutter/clutter-behaviour.h
@@ -70,7 +70,7 @@ typedef struct _ClutterBehaviourClass   ClutterBehaviourClass;
  * @actor: an actor driven by @behaviour
  * @data: optional data passed to the function
  *
- * This function is passed to clutter_behaviour_foreach_actor() and
+ * This function is passed to clutter_behaviour_actors_foreach() and
  * will be called for each actor driven by @behaviour.
  *
  * Since: 0.2
diff --git a/clutter/clutter-constraint.c b/clutter/clutter-constraint.c
index 4e7e55db0..1b093d47b 100644
--- a/clutter/clutter-constraint.c
+++ b/clutter/clutter-constraint.c
@@ -91,11 +91,11 @@
  *       <graphic fileref="constraints-example.png" format="PNG"/>
  *     </figure>
  *     <programlisting>
- *       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../../../../tests/interactive/test-snap-constraint.c" parse="text"><xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback></xi:include>
+ *<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../../../../tests/interactive/test-snap-constraint.c" parse="text"><xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback></xi:include>
  *     </programlisting>
  *     <para>You can try resizing interactively the #ClutterStage and verify
  *     that the three #ClutterActor<!-- -->s maintain the same position and
- *     size relative to each other, and to the #CLutterStage.</para>
+ *     size relative to each other, and to the #ClutterStage.</para>
  *   </example>
  *   <warning><para>It's important to note that Clutter does not avoid loops
  *   or competing constraints; if two or more #ClutterConstraint<!-- -->s
diff --git a/clutter/clutter-drag-action.c b/clutter/clutter-drag-action.c
index d682be132..0b1dce2c4 100644
--- a/clutter/clutter-drag-action.c
+++ b/clutter/clutter-drag-action.c
@@ -750,7 +750,7 @@ clutter_drag_action_get_drag_threshold (ClutterDragAction *action,
 
 /**
  * clutter_drag_action_set_drag_handle:
- * @action: a #ClutterDragHandle
+ * @action: a #ClutterDragAction
  * @handle: a #ClutterActor
  *
  * Sets the actor to be used as the drag handle
diff --git a/clutter/clutter-script.c b/clutter/clutter-script.c
index dc2b1883d..282c85034 100644
--- a/clutter/clutter-script.c
+++ b/clutter/clutter-script.c
@@ -512,7 +512,7 @@ clutter_script_load_from_file (ClutterScript  *script,
  *
  * Return value: on error, zero is returned and @error is set
  *   accordingly. On success, the merge id for the UI definitions is
- *   returned. You can use the merge id with clutter_script_unmerge().
+ *   returned. You can use the merge id with clutter_script_unmerge_objects().
  *
  * Since: 0.6
  */
diff --git a/clutter/clutter-stage.c b/clutter/clutter-stage.c
index e15aa7ca8..ebc94e982 100644
--- a/clutter/clutter-stage.c
+++ b/clutter/clutter-stage.c
@@ -2586,7 +2586,7 @@ G_DEFINE_BOXED_TYPE (ClutterFog, clutter_fog, clutter_fog_copy, clutter_fog_free
  * top-level actor which can be used as another container. It works
  * exactly like the default stage, but while clutter_stage_get_default()
  * will always return the same instance, you will have to keep a pointer
- * to any #ClutterStage returned by clutter_stage_create().
+ * to any #ClutterStage returned by clutter_stage_new().
  *
  * The ability to support multiple stages depends on the current
  * backend. Use clutter_feature_available() and
diff --git a/clutter/clutter-stage.h b/clutter/clutter-stage.h
index 622a5053e..9f0de489f 100644
--- a/clutter/clutter-stage.h
+++ b/clutter/clutter-stage.h
@@ -113,7 +113,7 @@ struct _ClutterStage
  * @fullscreen: handler for the #ClutterStage::fullscreen signal
  * @unfullscreen: handler for the #ClutterStage::unfullscreen signal
  * @activate: handler for the #ClutterStage::activate signal
- * @deactivate: handler for the #ClutterStage::deactive signal
+ * @deactivate: handler for the #ClutterStage::deactivate signal
  * @delete_event: handler for the #ClutterStage::delete-event signal
  *
  * The #ClutterStageClass structure contains only private data
diff --git a/clutter/clutter-texture.c b/clutter/clutter-texture.c
index 87c3cf901..dbae49b4c 100644
--- a/clutter/clutter-texture.c
+++ b/clutter/clutter-texture.c
@@ -2520,8 +2520,8 @@ fbo_source_queue_relayout_cb (ClutterActor *source,
  *   </listitem>
  *   <listitem>
  *     <para>Uploading pixel data to the texture (e.g by using
- *     clutter_actor_set_from_file()) will destroy the offscreen texture data
- *     and end redirection.</para>
+ *     clutter_texture_set_from_file()) will destroy the offscreen texture
+ *     data and end redirection.</para>
  *   </listitem>
  *   <listitem>
  *     <para>cogl_texture_get_data() with the handle returned by
diff --git a/clutter/clutter-units.c b/clutter/clutter-units.c
index 1e88ff707..5fdc1ac60 100644
--- a/clutter/clutter-units.c
+++ b/clutter/clutter-units.c
@@ -767,7 +767,7 @@ clutter_value_set_units (GValue             *value,
  * clutter_value_get_units:
  * @value: a #GValue initialized to #CLUTTER_TYPE_UNIT
  *
- * Gets the #ClutterUnit<!-- -->s contained in @value.
+ * Gets the #ClutterUnits contained in @value.
  *
  * Return value: the units inside the passed #GValue
  *
diff --git a/doc/cookbook/animations.xml b/doc/cookbook/animations.xml
index 6eb84d7ea..ffcaa649d 100644
--- a/doc/cookbook/animations.xml
+++ b/doc/cookbook/animations.xml
@@ -1069,7 +1069,7 @@ clutter_actor_set_z_rotation_from_gravity (actor,
 
       <note>
         <para>The core to understanding this example is understanding
-        how to define keys for a <type>CutterAnimator</type>. As
+        how to define keys for a <type>ClutterAnimator</type>. As
         this is an involved topic, further explanation
         is given in <link linkend="animations-complex-discussion-keys">the
         Discussion section</link>.</para>
diff --git a/doc/reference/clutter/clutter-overview.xml b/doc/reference/clutter/clutter-overview.xml
index 5a2fc9c0b..c14d02b42 100644
--- a/doc/reference/clutter/clutter-overview.xml
+++ b/doc/reference/clutter/clutter-overview.xml
@@ -35,7 +35,7 @@
     <para>#ClutterStage is the top level #ClutterActor - it's the
     representation of a window, or framebuffer. It is created automatically
     when Clutter is initialised. #ClutterStage is a #ClutterGroup, a class
-    implementing the #ClutterCointainer interface.</para>
+    implementing the #ClutterContainer interface.</para>
 
     <para>Clutter allows explicit positioning and sizing through the
     #ClutterFixedLayout layout manager; and implicit positioning and sizing
diff --git a/doc/reference/clutter/migrating-ClutterPath.xml b/doc/reference/clutter/migrating-ClutterPath.xml
index 8323d5863..4273fa3b6 100644
--- a/doc/reference/clutter/migrating-ClutterPath.xml
+++ b/doc/reference/clutter/migrating-ClutterPath.xml
@@ -26,7 +26,7 @@
 
   <para>The class that replaced the path description and manipulation
   functionality is called #ClutterPath. A #ClutterPath allows
-  describing a path using a sequence of #ClutterPahtNode<!-- -->s or
+  describing a path using a sequence of #ClutterPathNode<!-- -->s or
   using a subset of the SVG path description syntax. A Path instance
   also allows describing complex paths, with linear and Bezier segments
   and with gaps.</para>