Merge branch 'release' into old/5.0old/5.0

Change-Id: I6e6f2ed367f89bab2114025478c873cfb132fe02

5 files changed, 6 insertions, 7 deletions

diff --git a/examples/quick/particles/affectors/doc/src/affectors.qdoc b/examples/quick/particles/affectors/doc/src/affectors.qdoc
index 977eb8ea95..75bdea8f14 100644
--- a/examples/quick/particles/affectors/doc/src/affectors.qdoc
+++ b/examples/quick/particles/affectors/doc/src/affectors.qdoc
@@ -27,7 +27,7 @@
 
 /*!
     \title QtQuick.Particles Examples - Affectors
-    \example quick/particles/affectors
+    \example particles/affectors
     \brief This is a collection of examples using Affectors in the QML particle system.
     \image qml-affectors-example.png
 
diff --git a/examples/quick/particles/customparticle/doc/src/customparticle.qdoc b/examples/quick/particles/customparticle/doc/src/customparticle.qdoc
index 341484d9ab..a7ab4c51b8 100644
--- a/examples/quick/particles/customparticle/doc/src/customparticle.qdoc
+++ b/examples/quick/particles/customparticle/doc/src/customparticle.qdoc
@@ -27,7 +27,7 @@
 
 /*!
     \title QtQuick.Particles Examples - CustomParticle
-    \example quick/particles/customparticle
+    \example particles/customparticle
     \brief This is a collection of examples using CustomParticle in the QML particle system.
     \image qml-customparticle-example.png
 
diff --git a/examples/quick/particles/emitters/doc/src/emitters.qdoc b/examples/quick/particles/emitters/doc/src/emitters.qdoc
index 5644ab1af3..39e1fdd13c 100644
--- a/examples/quick/particles/emitters/doc/src/emitters.qdoc
+++ b/examples/quick/particles/emitters/doc/src/emitters.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 /*!
     \title QtQuick.Particles Examples - Emitters
-    \example quick/particles/emitters
+    \example particles/emitters
     \brief This is a collection of examples using Emitters in the QML particle system.
     \image qml-emitters-example.png
 
diff --git a/examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc b/examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc
index 1de194b962..2c355d78b5 100644
--- a/examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc
+++ b/examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc
@@ -27,7 +27,7 @@
 
 /*!
     \title QtQuick.Particles Examples - Affectors
-    \example quick/particles/imageparticle
+    \example particles/imageparticle
     \brief This is a collection of examples using Affectors in the QML particle system.
     \image qml-imageparticle-example.png
 
diff --git a/examples/quick/particles/system/doc/src/system.qdoc b/examples/quick/particles/system/doc/src/system.qdoc
index a01b014f4b..f65ff130cc 100644
--- a/examples/quick/particles/system/doc/src/system.qdoc
+++ b/examples/quick/particles/system/doc/src/system.qdoc
@@ -27,7 +27,7 @@
 
 /*!
     \title QtQuick.Particles Examples - Affectors
-    \example quick/particles/system
+    \example particles/system
     \brief This is a collection of examples using Affectors in the QML particle system.
     \image qml-system-example.png
 
@@ -40,7 +40,7 @@
 
     Start and Stop simply sets the running and paused states of a ParticleSystem. While the system does not perform any simulation when stopped or paused, a restart restarts the simulation from the beginning, while unpausing resumes the simulation from where it was.
 
-    Timed group changes is an example that highlights the ParticleGroup element. While normally referring to groups with a string name is sufficent, additional effects can be
+    Timed group changes is an example that highlights the ParticleGroup element. While normally referring to groups with a string name is sufficient, additional effects can be
     done by setting properties on groups.
     The first group has a variable duration on it, but always transitions to the second group.
     \snippet quick/particles/system/content/timedgroupchanges.qml 0
@@ -56,4 +56,3 @@
     Multiple Painters shows how to control paint ordering of individual particles. While the paint ordering of particles within one ImagePainter is not strictly defined, ImageParticle elements follow the normal Z-ordering rules for QtQuick items. This example allow you to paint the inside of the particles above the black borders using a pair of ImageParticles each painting different parts of the same logical particle.
 
 */
-