From 513f218c389ed0b8e47e7cc1442c4f641c685b4b Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon, 20 Jun 2011 18:42:08 +0100
Subject: [PATCH] docs: Add the Deprecate tag to Behaviours

And link the migration guide.
---
 clutter/clutter-behaviour-depth.c   | 4 ++++
 clutter/clutter-behaviour-ellipse.c | 3 +++
 clutter/clutter-behaviour-opacity.c | 4 ++++
 clutter/clutter-behaviour-path.c    | 3 +++
 clutter/clutter-behaviour-rotate.c  | 4 ++++
 clutter/clutter-behaviour-scale.c   | 4 ++++
 clutter/clutter-behaviour.c         | 5 ++++-
 7 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/clutter/clutter-behaviour-depth.c b/clutter/clutter-behaviour-depth.c
index eaf630be4..61512cfda 100644
--- a/clutter/clutter-behaviour-depth.c
+++ b/clutter/clutter-behaviour-depth.c
@@ -44,6 +44,10 @@
  * depth of a set of actors between a start and end depth.
  *
  * #ClutterBehaviourDepth is available since Clutter 0.4.
+ *
+ * Deprecated: 1.6: Use the #ClutterActor:depth property and
+ *   clutter_actor_animate(), or #ClutterAnimator, or #ClutterState
+ *   instead.
  */
 
 G_DEFINE_TYPE (ClutterBehaviourDepth,
diff --git a/clutter/clutter-behaviour-ellipse.c b/clutter/clutter-behaviour-ellipse.c
index 5f2c779c8..126746540 100644
--- a/clutter/clutter-behaviour-ellipse.c
+++ b/clutter/clutter-behaviour-ellipse.c
@@ -37,6 +37,9 @@
  * behaviour will update the actor's position and depth and set them
  * to what is dictated by the ellipses initial position.</para></note>
  *
+ * Deprecated: 1.6: Use clutter_actor_animate(), #ClutterPath and a
+ *   #ClutterPathConstraint instead.
+ *
  * Since: 0.4
  */
 
diff --git a/clutter/clutter-behaviour-opacity.c b/clutter/clutter-behaviour-opacity.c
index e322c67d1..91dbb6b5a 100644
--- a/clutter/clutter-behaviour-opacity.c
+++ b/clutter/clutter-behaviour-opacity.c
@@ -30,6 +30,10 @@
  * #ClutterBehaviourOpacity controls the opacity of a set of actors.
  *
  * Since: 0.2
+ *
+ * Deprecated: 1.6: Use the #ClutterActor:opacity property and
+ *   clutter_actor_animate(), or #ClutterAnimator, or #ClutterState
+ *   instead.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/clutter/clutter-behaviour-path.c b/clutter/clutter-behaviour-path.c
index 4c9214034..f283928ca 100644
--- a/clutter/clutter-behaviour-path.c
+++ b/clutter/clutter-behaviour-path.c
@@ -58,6 +58,9 @@
  * starting #ClutterKnot.</note>
  *
  * #ClutterBehaviourPath is available since Clutter 0.2
+ *
+ * Deprecated: 1.6: Use #ClutterPath and #ClutterPathConstraint with
+ *   clutter_actor_animate() instead.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/clutter/clutter-behaviour-rotate.c b/clutter/clutter-behaviour-rotate.c
index c38dc1800..40ede6bcd 100644
--- a/clutter/clutter-behaviour-rotate.c
+++ b/clutter/clutter-behaviour-rotate.c
@@ -29,6 +29,10 @@
  * angle on a given axis.
  *
  * The #ClutterBehaviourRotate is available since version 0.4.
+ *
+ * Deprecated: 1.6: Use the #ClutterActor rotation properties and
+ *   clutter_actor_animate(), or #ClutterAnimator, or #ClutterState
+ *   instead.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/clutter/clutter-behaviour-scale.c b/clutter/clutter-behaviour-scale.c
index 6d21a3e98..337a4902b 100644
--- a/clutter/clutter-behaviour-scale.c
+++ b/clutter/clutter-behaviour-scale.c
@@ -29,6 +29,10 @@
  *   and #ClutterActor:scale-y instead.
  *
  * A #ClutterBehaviourScale interpolates actors size between two values.
+ *
+ * Deprecated: 1.6: Use the #ClutterActor:scale-x and #ClutterActor:scale-y
+ *   properties, and clutter_actor_animate(), or #ClutterAnimator or
+ *   #ClutterState instead.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/clutter/clutter-behaviour.c b/clutter/clutter-behaviour.c
index 300b3cb09..20fba2a74 100644
--- a/clutter/clutter-behaviour.c
+++ b/clutter/clutter-behaviour.c
@@ -25,7 +25,10 @@
  * SECTION:clutter-behaviour
  * @Title: ClutterBehaviour
  * @short_description: Class for providing behaviours to actors
- * @Deprecated: 1.6: Use the implicit animation API instead.
+ *
+ * Deprecated: 1.6: Use clutter_actor_animate(), #ClutterAnimator and
+ *   #ClutterState instead. See also <link linkend="migrating-ClutterBehaviour">the
+ *   migration guide</link> for more information.
  *
  * #ClutterBehaviour is the base class for implementing behaviours.  A
  * behaviour is a controller object for #ClutterActor<!-- -->s; you can