Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I7dc36a224702721b67ffa2cf7f9ce2a6b047f88e

2 files changed, 2 insertions, 2 deletions

diff --git a/src/multimedia/doc/src/blackberry.qdoc b/src/multimedia/doc/src/blackberry.qdoc
index 4b494cb65..5af063651 100644
--- a/src/multimedia/doc/src/blackberry.qdoc
+++ b/src/multimedia/doc/src/blackberry.qdoc
@@ -59,7 +59,7 @@ supported in QMediaPlayer as well. Playlists as sources are also supported.
 mmrenderer does not allow access to the pixel data of video frames, hence Qt Multimedia
 classes like QVideoFrame and QAbstractVideoSurface will not work since they require access
 to the image data. QVideoWidget and the VideoOutput QML element are implemented with an overlay window;
-mmrenderer creates a seperate window displaying a video and puts that on top of the Qt application.
+mmrenderer creates a separate window displaying a video and puts that on top of the Qt application.
 As a consequence, no other widget or QML element can be put on top of the video, and QML shaders have
 no effect.
 
diff --git a/src/multimedia/doc/src/changes.qdoc b/src/multimedia/doc/src/changes.qdoc
index 10e9d92b8..d517ef41c 100644
--- a/src/multimedia/doc/src/changes.qdoc
+++ b/src/multimedia/doc/src/changes.qdoc
@@ -125,7 +125,7 @@ changed in ways that may affect previously written code. This table highlights s
            you will probably need to remove them.
     \row
         \li QSoundEffect availability
-        \li The SoundEffect QML type was publically accessible in Qt Multimeda Kit,
+        \li The SoundEffect QML type was publicly accessible in Qt Multimeda Kit,
            and now the C++ version is officially public too. If your code contains the
            previously undocumented QSoundEffect, you may need to update it.
     \row