2008-02-08 Emmanuele Bassi <ebassi@openedhand.com>

	* clutter/clutter-actor.c: Reference the newly added event-flow.png

	* clutter/clutter-alpha.c: Ditto, with alpha-func.png

	* clutter/clutter-texture.c: Fix the XML.

diff --git a/ChangeLog b/ChangeLog
index a5e616c..854293c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2008-02-08  Emmanuele Bassi  <ebassi@openedhand.com>
 
+       * clutter/clutter-actor.c: Reference the newly added event-flow.png
+
+       * clutter/clutter-alpha.c: Ditto, with alpha-func.png
+
+       * clutter/clutter-texture.c: Fix the XML.
+
+2008-02-08  Emmanuele Bassi  <ebassi@openedhand.com>
+
        * clutter/clutter-behaviour-path.c: Reference the newly
        added image showing the effects of different alpha functions
        on the same path behaviour.

diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c
index 2dcad53..1c65764 100644 (file)
--- a/clutter/clutter-actor.c
+++ b/clutter/clutter-actor.c
@@ -78,6 +78,12 @@
  *   <listitem><para>Pointer events will 'pass through' non reactive
  *   overlapping actors.</para></listitem>
  * </orderedlist>
+ *
+ * <figure id="event-flow">
+ *   <title>Event flow in Clutter</title>
+ *   <graphic fileref="event-flow.png" format="PNG"/>
+ * </figure>
+ *
  */
 
 /**

diff --git a/clutter/clutter-alpha.c b/clutter/clutter-alpha.c
index 7147128..1b5fe1f 100644 (file)
--- a/clutter/clutter-alpha.c
+++ b/clutter/clutter-alpha.c
@@ -43,6 +43,11 @@
  *
  * #ClutterAlpha is used to "drive" a #ClutterBehaviour instance.
  *
+ * <figure id="alpha-functions">
+ *   <title>Graphic representation of some alpha functions</title>
+ *   <graphic fileref="alpha-func.png" format="PNG"/>
+ * </figure>
+ *
  * Since: 0.2
  */
 

diff --git a/clutter/clutter-texture.c b/clutter/clutter-texture.c
index 5612314..c6db5e2 100644 (file)
--- a/clutter/clutter-texture.c
+++ b/clutter/clutter-texture.c
@@ -2265,9 +2265,9 @@ on_fbo_parent_change (ClutterActor        *actor,
  * 'live' redirected output of the actors scene. 
  *
  * Note this function is intented as a utility call for uniformly applying
- * shaders to groups and other potentail visual effects. It requires the
- * #CLUTTER_FEATURE_TEXTURE_RECTANGLE & #CLUTTER_FEATURE_OFFSCREEN features
- * are supported by both the current backend and target system.
+ * shaders to groups and other potentail visual effects. It requires that
+ * both %CLUTTER_FEATURE_TEXTURE_RECTANGLE and %CLUTTER_FEATURE_OFFSCREEN
+ * features are supported by the current backend and the target system.
  *
  * Some tips on usage:
  *
@@ -2276,7 +2276,7 @@ on_fbo_parent_change (ClutterActor        *actor,
  *     <para>The source actor must be made visible (i.e by calling 
  *     #clutter_actor_show). The source actor does not however have to 
  *     have a parent.</para>
- *   <listitem>
+ *   </listitem>
  *   <listitem>
  *     <para>Avoid reparenting the source with the created texture.</para>
  *   </listitem>
@@ -2293,7 +2293,7 @@ on_fbo_parent_change (ClutterActor        *actor,
  *   </listitem>
  *   <listitem>
  *     <para>Uploading pixel data to the text (e.g by #clutter_actor_set_pixbuf
- *     will destroy the offscreen texture data and end redirection.
+ *     will destroy the offscreen texture data and end redirection.</para>
  *   </listitem>
  *   <listitem>
  *     <para>#clutter_texture_get_pixbuf can used to read the offscreen
@@ -2301,8 +2301,10 @@ on_fbo_parent_change (ClutterActor        *actor,
  *   </listitem>
  * </itemizedlist>
  *
- * Return value: A newly created #ClutterTexture object or NULL on fail.
- **/
+ * Return value: A newly created #ClutterTexture object or %NULL on fail.
+ *
+ * Since: 0.6
+ */
 ClutterActor *
 clutter_texture_new_from_actor (ClutterActor *actor)
 {