diff --git a/clutter/clutter-content.c b/clutter/clutter-content.c
index d14a5ce63..b1db4a282 100644
--- a/clutter/clutter-content.c
+++ b/clutter/clutter-content.c
@@ -25,7 +25,7 @@
 /**
  * SECTION:clutter-content
  * @Title: ClutterContent
- * @short_desc: Delegate for painting the content of an actor
+ * @Short_Description: Delegate for painting the content of an actor
  *
  * #ClutterContent is an interface to implement types responsible for
  * painting the content of a #ClutterActor.
diff --git a/doc/reference/clutter/Makefile.am b/doc/reference/clutter/Makefile.am
index 0275ba5d3..49888d771 100644
--- a/doc/reference/clutter/Makefile.am
+++ b/doc/reference/clutter/Makefile.am
@@ -82,6 +82,7 @@ IGNORE_HFILES = \
 	clutter-marshal.h 		\
 	clutter-master-clock.h 		\
 	clutter-model-private.h 	\
+	clutter-paint-node-private.h	\
 	clutter-paint-volume-private.h	\
 	clutter-private.h 		\
 	clutter-profile.h		\
diff --git a/doc/reference/clutter/clutter-docs.xml.in b/doc/reference/clutter/clutter-docs.xml.in
index afa69256c..bc5a7fc26 100644
--- a/doc/reference/clutter/clutter-docs.xml.in
+++ b/doc/reference/clutter/clutter-docs.xml.in
@@ -19,6 +19,8 @@
     <copyright>
       <year>2009</year>
       <year>2010</year>
+      <year>2011</year>
+      <year>2012</year>
       <holder>Intel Corporation</holder>
     </copyright>
 
@@ -64,6 +66,7 @@
       <xi:include href="xml/clutter-action.xml"/>
       <xi:include href="xml/clutter-constraint.xml"/>
       <xi:include href="xml/clutter-effect.xml"/>
+      <xi:include href="xml/clutter-content.xml"/>
     </chapter>
 
     <chapter>
@@ -118,6 +121,13 @@
       <xi:include href="xml/clutter-page-turn-effect.xml"/>
     </chapter>
 
+    <chapter>
+      <title>Paint Objects</title>
+
+      <xi:include href="xml/clutter-paint-node.xml"/>
+      <xi:include href="xml/clutter-paint-nodes.xml"/>
+    </chapter>
+
   </part>
 
   <part id="clutteranimation">
diff --git a/doc/reference/clutter/clutter-sections.txt b/doc/reference/clutter/clutter-sections.txt
index 26ebb2a67..77ae59b1c 100644
--- a/doc/reference/clutter/clutter-sections.txt
+++ b/doc/reference/clutter/clutter-sections.txt
@@ -279,9 +279,13 @@ CLUTTER_CALLBACK
 ClutterCallback
 ClutterActor
 ClutterActorClass
+clutter_actor_new
 clutter_actor_set_flags
 clutter_actor_unset_flags
 clutter_actor_get_flags
+clutter_actor_set_name
+clutter_actor_get_name
+clutter_actor_get_gid
 
 <SUBSECTION>
 clutter_actor_show
@@ -319,36 +323,6 @@ clutter_actor_get_fixed_position_set
 clutter_actor_set_request_mode
 clutter_actor_get_request_mode
 clutter_actor_has_allocation
-
-<SUBSECTION>
-clutter_actor_set_geometry
-clutter_actor_get_geometry
-clutter_actor_set_size
-clutter_actor_get_size
-clutter_actor_set_position
-clutter_actor_get_position
-clutter_actor_set_width
-clutter_actor_get_width
-clutter_actor_set_height
-clutter_actor_get_height
-clutter_actor_set_x
-clutter_actor_get_x
-clutter_actor_set_y
-clutter_actor_get_y
-clutter_actor_move_by
-clutter_actor_set_rotation
-clutter_actor_set_z_rotation_from_gravity
-clutter_actor_get_rotation
-clutter_actor_get_z_rotation_gravity
-clutter_actor_is_rotated
-clutter_actor_set_opacity
-clutter_actor_get_opacity
-ClutterOffscreenRedirect
-clutter_actor_set_offscreen_redirect
-clutter_actor_get_offscreen_redirect
-clutter_actor_set_name
-clutter_actor_get_name
-clutter_actor_get_gid
 ClutterActorAlign
 clutter_actor_set_x_align
 clutter_actor_get_x_align
@@ -374,15 +348,78 @@ clutter_actor_set_background_color
 clutter_actor_get_background_color
 
 <SUBSECTION>
+clutter_actor_set_geometry
+clutter_actor_get_geometry
+clutter_actor_set_size
+clutter_actor_get_size
+clutter_actor_set_position
+clutter_actor_get_position
+clutter_actor_set_width
+clutter_actor_get_width
+clutter_actor_set_height
+clutter_actor_get_height
+clutter_actor_set_x
+clutter_actor_get_x
+clutter_actor_set_y
+clutter_actor_get_y
+clutter_actor_move_by
+
+<SUBSECTION>
+clutter_actor_set_depth
+clutter_actor_get_depth
+clutter_actor_set_scale
+clutter_actor_set_scale_full
+clutter_actor_set_scale_with_gravity
+clutter_actor_get_scale
+clutter_actor_get_scale_center
+clutter_actor_get_scale_gravity
+clutter_actor_is_scaled
+clutter_actor_set_rotation
+clutter_actor_set_z_rotation_from_gravity
+clutter_actor_get_rotation
+clutter_actor_get_z_rotation_gravity
+clutter_actor_is_rotated
+clutter_actor_set_anchor_point
+clutter_actor_get_anchor_point
+clutter_actor_set_anchor_point_from_gravity
+clutter_actor_get_anchor_point_gravity
+clutter_actor_move_anchor_point
+clutter_actor_move_anchor_point_from_gravity
+clutter_actor_apply_transform_to_point
+clutter_actor_transform_stage_point
+clutter_actor_apply_relative_transform_to_point
+clutter_actor_get_transformed_position
+clutter_actor_get_transformed_size
+clutter_actor_get_paint_opacity
+clutter_actor_get_paint_visibility
+clutter_actor_get_abs_allocation_vertices
+clutter_actor_get_transformation_matrix
+clutter_actor_get_paint_volume
+clutter_actor_get_paint_box
+clutter_actor_get_transformed_paint_volume
+clutter_actor_get_default_paint_volume
+
+<SUBSECTION>
+clutter_actor_set_content
+clutter_actor_get_content
+ClutterContentGravity
+clutter_actor_set_content_gravity
+clutter_actor_get_content_gravity
+clutter_actor_get_content_box
 clutter_actor_set_clip
 clutter_actor_remove_clip
 clutter_actor_has_clip
 clutter_actor_get_clip
 clutter_actor_set_clip_to_allocation
 clutter_actor_get_clip_to_allocation
+clutter_actor_set_opacity
+clutter_actor_get_opacity
+ClutterOffscreenRedirect
+clutter_actor_set_offscreen_redirect
+clutter_actor_get_offscreen_redirect
+clutter_actor_is_in_clone_paint
 
 <SUBSECTION>
-clutter_actor_new
 clutter_actor_add_child
 clutter_actor_insert_child_above
 clutter_actor_insert_child_at_index
@@ -411,41 +448,6 @@ clutter_actor_iter_prev
 clutter_actor_iter_remove
 clutter_actor_iter_destroy
 
-<SUBSECTION>
-clutter_actor_push_internal
-clutter_actor_pop_internal
-clutter_actor_set_parent
-clutter_actor_reparent
-clutter_actor_unparent
-clutter_actor_raise
-clutter_actor_lower
-clutter_actor_raise_top
-clutter_actor_lower_bottom
-
-<SUBSECTION>
-clutter_actor_set_depth
-clutter_actor_get_depth
-clutter_actor_set_scale
-clutter_actor_set_scale_full
-clutter_actor_set_scale_with_gravity
-clutter_actor_get_scale
-clutter_actor_get_scale_center
-clutter_actor_get_scale_gravity
-clutter_actor_is_scaled
-clutter_actor_apply_transform_to_point
-clutter_actor_transform_stage_point
-clutter_actor_apply_relative_transform_to_point
-clutter_actor_get_transformed_position
-clutter_actor_get_transformed_size
-clutter_actor_get_paint_opacity
-clutter_actor_get_paint_visibility
-clutter_actor_get_abs_allocation_vertices
-clutter_actor_get_transformation_matrix
-clutter_actor_get_paint_volume
-clutter_actor_get_paint_box
-clutter_actor_get_transformed_paint_volume
-clutter_actor_get_default_paint_volume
-
 <SUBSECTION>
 clutter_actor_set_anchor_point
 clutter_actor_get_anchor_point
@@ -471,22 +473,14 @@ clutter_actor_remove_all_transitions
 <SUBSECTION>
 clutter_actor_set_reactive
 clutter_actor_get_reactive
-clutter_actor_set_shader
-clutter_actor_get_shader
-clutter_actor_set_shader_param
-clutter_actor_set_shader_param_float
-clutter_actor_set_shader_param_int
-
-<SUBSECTION>
 clutter_actor_has_key_focus
 clutter_actor_grab_key_focus
+clutter_actor_has_pointer
 clutter_actor_get_pango_context
 clutter_actor_create_pango_context
 clutter_actor_create_pango_layout
-clutter_actor_is_in_clone_paint
 clutter_actor_set_text_direction
 clutter_actor_get_text_direction
-clutter_actor_has_pointer
 clutter_actor_get_accessible
 
 <SUBSECTION>
@@ -515,6 +509,22 @@ clutter_actor_get_effects
 clutter_actor_get_effect
 clutter_actor_clear_effects
 
+<SUBSECTION>
+clutter_actor_push_internal
+clutter_actor_pop_internal
+clutter_actor_set_parent
+clutter_actor_reparent
+clutter_actor_unparent
+clutter_actor_raise
+clutter_actor_lower
+clutter_actor_raise_top
+clutter_actor_lower_bottom
+clutter_actor_set_shader
+clutter_actor_get_shader
+clutter_actor_set_shader_param
+clutter_actor_set_shader_param_float
+clutter_actor_set_shader_param_int
+
 <SUBSECTION>
 ClutterActorBox
 clutter_actor_box_new
@@ -3016,3 +3026,109 @@ CLUTTER_TEXT_BUFFER_GET_CLASS
 ClutterTextBufferPrivate
 clutter_text_buffer_get_type
 </SECTION>
+
+<SECTION>
+<FILE>clutter-content</FILE>
+ClutterContent
+ClutterContentIface
+clutter_content_invalidate
+<SUBSECTION Standard>
+CLUTTER_TYPE_CONTENT
+CLUTTER_CONTENT
+CLUTTER_CONTENT_GET_IFACE
+CLUTTER_IS_CONTENT
+<SUBSECTION Private>
+clutter_content_get_type
+</SECTION>
+
+<SECTION>
+<FILE>clutter-paint-node</FILE>
+ClutterPaintNode
+ClutterPaintNodeClass
+clutter_paint_node_ref
+clutter_paint_node_unref
+clutter_paint_node_set_name
+<SUBSECTION>
+clutter_paint_node_add_child
+clutter_paint_node_remove_child
+clutter_paint_node_replace_child
+clutter_paint_node_remove_all
+clutter_paint_node_get_n_children
+<SUBSECTION>
+clutter_paint_node_get_first_child
+clutter_paint_node_get_next_sibling
+clutter_paint_node_get_previous_sibling
+clutter_paint_node_get_last_child
+clutter_paint_node_get_parent
+<SUBSECTION>
+clutter_paint_node_add_rectangle
+clutter_paint_node_add_texture_rectangle
+clutter_paint_node_add_path
+clutter_paint_node_add_primitive
+<SUBSECTION>
+CLUTTER_VALUE_HOLDS_PAINT_NODE
+clutter_value_set_paint_node
+clutter_value_take_paint_node
+clutter_value_get_paint_node
+clutter_value_dup_paint_node
+<SUBSECTION Standard>
+CLUTTER_TYPE_PAINT_NODE
+CLUTTER_PAINT_NODE
+CLUTTER_IS_PAINT_NODE
+<SUBSECTION Private>
+ClutterPaintNodePrivate
+clutter_paint_node_get_type
+</SECTION>
+
+<SECTION>
+<FILE>clutter-paint-nodes</FILE>
+ClutterColorNode
+ClutterColorNodeClass
+clutter_color_node_new
+<SUBSECTION>
+ClutterTextureNode
+ClutterTextureNodeClass
+clutter_texture_node_new
+<SUBSECTION>
+ClutterPipelineNode
+ClutterPipelineNodeClass
+clutter_pipeline_node_new
+<SUBSECTION>
+ClutterTextNode
+ClutterTextNodeClass
+clutter_text_node_new
+<SUBSECTION>
+ClutterClipNode
+ClutterClipNodeClass
+clutter_clip_node_new
+<SUBSECTION>
+ClutterLayerNode
+ClutterLayerNodeClass
+clutter_layer_node_new
+<SUBSECTION Standard>
+CLUTTER_TYPE_COLOR_NODE
+CLUTTER_TYPE_TEXTURE_NODE
+CLUTTER_TYPE_PIPELINE_NODE
+CLUTTER_TYPE_TEXT_NODE
+CLUTTER_TYPE_CLIP_NODE
+CLUTTER_TYPE_LAYER_NODE
+CLUTTER_COLOR_NODE
+CLUTTER_TEXTURE_NODE
+CLUTTER_PIPELINE_NODE
+CLUTTER_TEXT_NODE
+CLUTTER_CLIP_NODE
+CLUTTER_LAYER_NODE
+CLUTTER_IS_COLOR_NODE
+CLUTTER_IS_TEXTURE_NODE
+CLUTTER_IS_PIPELINE_NODE
+CLUTTER_IS_TEXT_NODE
+CLUTTER_IS_CLIP_NODE
+CLUTTER_IS_LAYER_NODE
+<SUBSECTION Private>
+clutter_color_node_get_type
+clutter_texture_node_get_type
+clutter_pipeline_node_get_type
+clutter_text_node_get_type
+clutter_clip_node_get_type
+clutter_layer_node_get_type
+</SECTION>
diff --git a/doc/reference/clutter/clutter.types b/doc/reference/clutter/clutter.types
index 7bb72e8e8..58d5b5f85 100644
--- a/doc/reference/clutter/clutter.types
+++ b/doc/reference/clutter/clutter.types
@@ -28,6 +28,8 @@ clutter_click_action_get_type
 clutter_clone_get_type
 clutter_colorize_effect_get_type
 clutter_constraint_get_type
+clutter_container_get_type
+clutter_content_get_type
 clutter_deform_effect_get_type
 clutter_desaturate_effect_get_type
 clutter_device_manager_get_type