11 files changed, 18 insertions, 20 deletions

diff --git a/doc/src/snippets/qprocess-environment/main.cpp b/doc/src/snippets/qprocess-environment/main.cpp
index 148518b..c8681e7 100644
--- a/doc/src/snippets/qprocess-environment/main.cpp
+++ b/doc/src/snippets/qprocess-environment/main.cpp
@@ -62,7 +62,7 @@ env.insert("TMPDIR", "C:\\MyApp\\temp"); // Add an environment variable
 env["PATH"] += ";C:\\Bin";
 process.setEnvironment(env);
 process.start("myapp");
-//! [0]
+//! [1]
     }
 }
 
diff --git a/src/3rdparty/easing/legal.qdoc b/src/3rdparty/easing/legal.qdoc
index 25f67e1..1be5f66 100644
--- a/src/3rdparty/easing/legal.qdoc
+++ b/src/3rdparty/easing/legal.qdoc
@@ -1,7 +1,7 @@
 /*!
 \page legal-easing.html
 \title Easing Equations by Robert Penner
-\ingroup animation
+\ingroup group_animation
 
 \legalese
 \code
diff --git a/src/corelib/animation/qabstractanimation.cpp b/src/corelib/animation/qabstractanimation.cpp
index 6c55a77..f2d8668 100644
--- a/src/corelib/animation/qabstractanimation.cpp
+++ b/src/corelib/animation/qabstractanimation.cpp
@@ -41,7 +41,7 @@
 
 /*!
     \class QAbstractAnimation
-    \ingroup animation
+    \ingroup group_animation
     \brief The QAbstractAnimation class provides an abstract base class for animations.
     \since 4.5
     \preliminary
diff --git a/src/corelib/animation/qanimationgroup.cpp b/src/corelib/animation/qanimationgroup.cpp
index c4066ce..8c9f358 100644
--- a/src/corelib/animation/qanimationgroup.cpp
+++ b/src/corelib/animation/qanimationgroup.cpp
@@ -43,7 +43,7 @@
     \class QAnimationGroup
     \brief The QAnimationGroup class is an abstract base class for group of animations.
     \since 4.5
-    \ingroup animation
+    \ingroup group_animation
     \preliminary
 
     QAnimationGroup represents a group of animations, such as parallel or sequential,
diff --git a/src/corelib/animation/qparallelanimationgroup.cpp b/src/corelib/animation/qparallelanimationgroup.cpp
index 407ffde..a75f85c 100644
--- a/src/corelib/animation/qparallelanimationgroup.cpp
+++ b/src/corelib/animation/qparallelanimationgroup.cpp
@@ -43,7 +43,7 @@
     \class QParallelAnimationGroup
     \brief The QParallelAnimationGroup class provides a parallel group of animations.
     \since 4.5
-    \ingroup animation
+    \ingroup group_animation
     \preliminary
 
     The animations are all started at the same time, and run in parallel. The animation group
diff --git a/src/corelib/animation/qpauseanimation.cpp b/src/corelib/animation/qpauseanimation.cpp
index 30ea92c..86c3049 100644
--- a/src/corelib/animation/qpauseanimation.cpp
+++ b/src/corelib/animation/qpauseanimation.cpp
@@ -43,7 +43,7 @@
     \class QPauseAnimation
     \brief The QPauseAnimation class provides a pause for QSequentialAnimationGroup.
     \since 4.5
-    \ingroup animation
+    \ingroup group_animation
     \preliminary
 */
 
diff --git a/src/corelib/animation/qpropertyanimation.cpp b/src/corelib/animation/qpropertyanimation.cpp
index 9a0c5bc..6b03c33 100644
--- a/src/corelib/animation/qpropertyanimation.cpp
+++ b/src/corelib/animation/qpropertyanimation.cpp
@@ -42,7 +42,7 @@
 /*!
     \class QPropertyAnimation
     \brief The QPropertyAnimation class animates properties for QObject(and QWidget)
-    \ingroup animation
+    \ingroup group_animation
     \preliminary
 
     This class is part of {The Animation Framework}.  You can use QPropertyAnimation
diff --git a/src/corelib/animation/qsequentialanimationgroup.cpp b/src/corelib/animation/qsequentialanimationgroup.cpp
index 61ff98d..45673c2 100644
--- a/src/corelib/animation/qsequentialanimationgroup.cpp
+++ b/src/corelib/animation/qsequentialanimationgroup.cpp
@@ -43,7 +43,7 @@
     \class QSequentialAnimationGroup
     \brief The QSequentialAnimationGroup class provides a sequential group of animations.
     \since 4.5
-    \ingroup animation
+    \ingroup group_animation
     \preliminary
 
     The first animation in the group is started first, and when it finishes, the next animation
diff --git a/src/corelib/animation/qvariantanimation.cpp b/src/corelib/animation/qvariantanimation.cpp
index 9f8cbf0..29819e5 100644
--- a/src/corelib/animation/qvariantanimation.cpp
+++ b/src/corelib/animation/qvariantanimation.cpp
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QVariantAnimation
-    \ingroup animation
+    \ingroup group_animation
     \brief The QVariantAnimation class provides an abstract base class for animations.
     \since 4.5
     \preliminary
diff --git a/src/corelib/kernel/qcoreevent.cpp b/src/corelib/kernel/qcoreevent.cpp
index 4b4dfe5..efd0938 100644
--- a/src/corelib/kernel/qcoreevent.cpp
+++ b/src/corelib/kernel/qcoreevent.cpp
@@ -291,7 +291,7 @@ QEvent::~QEvent()
 
 /*!
     \property  QEvent::accepted
-    the accept flag of the event object
+    \brief The accept flag of the event object
 
     Setting the accept parameter indicates that the event receiver
     wants the event. Unwanted events might be propagated to the parent
diff --git a/src/declarative/qml/qmlcontext.cpp b/src/declarative/qml/qmlcontext.cpp
index c1acdc7..30857ad 100644
--- a/src/declarative/qml/qmlcontext.cpp
+++ b/src/declarative/qml/qmlcontext.cpp
@@ -261,10 +261,10 @@ QmlContext *QmlContext::parentContext() const
     Add a default \a object to this context.  The object will be added after
     any existing default objects.
 */
-void QmlContext::addDefaultObject(QObject *defaultObject)
+void QmlContext::addDefaultObject(QObject *object)
 {
     Q_D(QmlContext);
-    d->addDefaultObject(defaultObject, QmlContextPrivate::NormalPriority);
+    d->addDefaultObject(object, QmlContextPrivate::NormalPriority);
 }
 
 /*!
@@ -340,13 +340,11 @@ QmlContext *QmlContext::activeContext()
 
 /*!
     Resolves the URL \a src relative to the URL of the
-    containing component.
+    containing component. If \a src is absolute, it is
+    simply returned. If there is no containing component,
+    an empty URL is returned.
 
-    If \a src is absolute, it is simply returned.
-
-    If there is no containing component, an empty URL is returned.
-
-    \sa componentUrl
+    \sa QmlEngine::componentUrl()
 */
 QUrl QmlContext::resolvedUrl(const QUrl &src)
 {
@@ -372,10 +370,10 @@ QUrl QmlContext::resolvedUrl(const QUrl &src)
 /*!
     Resolves the component URI \a src relative to the URL of the
     containing component, and according to the
-    \link QmlEngine::nameSpacePaths() namespace paths\endlink of the
+    \l {QmlEngine::nameSpacePaths()} {namespace paths} of the
     context's engine, returning the resolved URL.
 
-    \sa componentUrl
+    \sa QmlEngine::componentUrl()
 */
 QUrl QmlContext::resolvedUri(const QUrl &src)
 {