Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

1 files changed, 6 insertions, 11 deletions

diff --git a/doc/src/declarative/animation.qdoc b/doc/src/declarative/animation.qdoc
index f7e03ee..f17f5c9 100644
--- a/doc/src/declarative/animation.qdoc
+++ b/doc/src/declarative/animation.qdoc
@@ -25,7 +25,7 @@ Other Features:
 \o Animation synchronization
 \endlist
 
-The simplest form of animation is using \c NumericAnimation
+The simplest form of animation is using \l NumericAnimation
 
 The following example creates a bouncing effect:
 \code
@@ -34,20 +34,15 @@ Rect {
     width: 120; height: 200; color: "white"
     Image {
         id: img
-        source: "pics/qtlogo.png"
+        source: "qt-logo.png"
         x: 60-img.width/2
-        y: 200-img.height
+        y: 0
         y: SequentialAnimation {
             running: true
             repeat: true
-            NumericAnimation {
-                to: 200-img.height
-                easing: "easeOutBounce(amplitude:100)"
-                duration: 2000
-            }
-            PauseAnimation {
-                duration: 1000
-            }
+            NumericAnimation { to: 200-img.height; easing: "easeOutBounce"; duration: 2000 }
+            PauseAnimation { duration: 1000 }
+            NumericAnimation { to: 0; easing: "easeOutQuad"; duration: 1000 }
         }
     }
 }