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

* origin/stable:
  Doc: Bump version to 4.2.0
  Doc: ChangeLog for release 4.2.0
  doc: simpler uboot command for colibri vf
  doc: Update colibri vf instructions
  b2qt-flashing-wizard: Remove unused variables
  b2qt-flashing-wizard: Files are now located at a different location
  b2qt-flashing-wizard: Script standard error in red color
  b2qt-flashing-wizard: Hints for users to find error messages more easily
  Doc: ChangeLog: Update 4.1.0 release date
  Doc: Update minimal hardware requirements
  Doc: Fix issues in Wifi module documentation
  Doc: Bump version to 4.1.0
  Doc: Update the list of required packages for BYOS
  Doc: Rename instances of 'Digia' to 'The Qt Company'
  Doc: Move Toradex Colibri VF61 to Supported Device Group 1
  Doc: Updated copyright license holder in documentation footer
  Doc: Add table of contents in the sidebar
  Doc: Move 'Value-Add Components' list to the overview page
  Doc: ChangeLog for 4.1.0 release
  b2qt-flashing-wizard: Disable next page when no platforms found

Conflicts:
	src/doc/config/b2qt.qdocconf
	src/doc/src/devices/qtee-supported-devices.qdoc
	src/doc/src/qtee-changelog.qdoc
	src/doc/src/qtee-index.qdoc
	src/wifi/qwifimanager.cpp

Change-Id: I00ecc61a1e9eea6dd26ecc9a568f07cd64a6296a

1 files changed, 9 insertions, 7 deletions

diff --git a/src/doc/src/qtee-index.qdoc b/src/doc/src/qtee-index.qdoc
index 7deac5e..64635d7 100644
--- a/src/doc/src/qtee-index.qdoc
+++ b/src/doc/src/qtee-index.qdoc
@@ -99,24 +99,26 @@
 
     For overview about Qt libraries see the \l {Qt reference documentation}.
 
-    \section1 Additional Embedded Libraries and Value-Adds
+    \section1 Additional Embedded Libraries and Value-Add Components
 
     In addition to the Boot to Qt stack and a comprehensive development
-    environment, \SDK comes with a set of components that speed up the creation
-    of responsive embedded applications with modern UI:
+    environment, \SDK comes with a set of components that bring new features and
+    speed up the creation of high-performing, modern UI embedded applications:
 
     \list
         \li \l {Qt Virtual Keyboard} - complete virtual keyboard solution with
-            word-prediction and multiple languages support.
+            word-prediction and multiple languages supported.
         \li \l {Qt Quick Enterprise Controls} - a set of advanced UI controls
             with an industry-specific look-and-feel.
-        \li \l {Qt Quick Compiler} - a QML complier that helps in securing the
-            code assets, and enables improved load time.
+        \li \l {Qt Quick Compiler} - enables compiling .qml source files into
+            application binaries, improving load times and security for code
+            assets.
         \li \l {Qt Charts} - UI Components for displaying visually pleasing
             charts, driven by static or dynamic data models.
         \li \l {Qt Data Visualization} - UI Components for creating stunning 3D
             data visualizations.
-        \li \l {Qt Quick 2D Renderer} - Qt Quick renderer for GPU-less devices.
+        \li \l {Qt Quick 2D Renderer} - enables Qt Quick UIs on GPU-less
+            devices.
     \endlist
 
     \section1 About the Development Environment