10 files changed, 22 insertions, 22 deletions
diff --git a/src/doc/src/devices/qtee-architech-tibidabo.qdoc b/src/doc/src/devices/qtee-architech-tibidabo.qdoc
index a94f04d..4663195 100644
--- a/src/doc/src/devices/qtee-architech-tibidabo.qdoc
+++ b/src/doc/src/devices/qtee-architech-tibidabo.qdoc
@@ -17,7 +17,7 @@
 **
 ****************************************************************************/
 /*!
-    \target ArchiTech Tibidabo (embedded Linux)
+    \keyword ArchiTech Tibidabo
     \page qtee-preparing-hardware-tibidabo.html
     \title Preparing ArchiTech Tibidabo
     \previouspage qtee-installation-guide.html
diff --git a/src/doc/src/devices/qtee-beaglebone-black.qdoc b/src/doc/src/devices/qtee-beaglebone-black.qdoc
index cbc8887..e3a1469 100644
--- a/src/doc/src/devices/qtee-beaglebone-black.qdoc
+++ b/src/doc/src/devices/qtee-beaglebone-black.qdoc
@@ -17,7 +17,7 @@
 **
 ****************************************************************************/
 /*!
-    \target BeagleBone Black (embedded Linux)
+    \keyword BeagleBone Black
     \page qtee-preparing-hardware-beaglebone.html
     \title Preparing BeagleBone Black
     \previouspage qtee-installation-guide.html
diff --git a/src/doc/src/devices/qtee-imx53.qdoc b/src/doc/src/devices/qtee-imx53.qdoc
index d732656..a6108cf 100644
--- a/src/doc/src/devices/qtee-imx53.qdoc
+++ b/src/doc/src/devices/qtee-imx53.qdoc
@@ -17,7 +17,7 @@
 **
 ****************************************************************************/
 /*!
-    \target i.MX53 Quick Start Board (embedded Linux)
+    \keyword i.MX53 Quick Start Board
     \page qtee-preparing-hardware-imx53qsb.html
     \title Preparing i.MX53 Quick Start Board
     \previouspage qtee-installation-guide.html
diff --git a/src/doc/src/devices/qtee-raspberry-pi.qdoc b/src/doc/src/devices/qtee-raspberry-pi.qdoc
index c99c472..9e58089 100644
--- a/src/doc/src/devices/qtee-raspberry-pi.qdoc
+++ b/src/doc/src/devices/qtee-raspberry-pi.qdoc
@@ -17,7 +17,7 @@
 **
 ****************************************************************************/
 /*!
-    \target Raspberry Pi 2 Model B (embedded Linux)
+    \keyword Raspberry Pi 2 Model B
     \page qtee-preparing-hardware-rasberrypi.html
     \title Preparing Raspberry Pi 2
     \previouspage qtee-installation-guide.html
diff --git a/src/doc/src/devices/qtee-sabre-sd-imx6.qdoc b/src/doc/src/devices/qtee-sabre-sd-imx6.qdoc
index 72a88e8..86f696f 100644
--- a/src/doc/src/devices/qtee-sabre-sd-imx6.qdoc
+++ b/src/doc/src/devices/qtee-sabre-sd-imx6.qdoc
@@ -17,7 +17,7 @@
 **
 ****************************************************************************/
 /*!
-    \target SABRE SD i.MX6Quad (embedded Linux)
+    \keyword SABRE SD i.MX6Quad
     \page qtee-preparing-hardware-imx6sabresd.html
     \title Preparing SABRE SD i.MX6Quad
     \previouspage qtee-installation-guide.html
diff --git a/src/doc/src/devices/qtee-supported-devices.qdoc b/src/doc/src/devices/qtee-supported-devices.qdoc
index 086aa8a..04d6203 100644
--- a/src/doc/src/devices/qtee-supported-devices.qdoc
+++ b/src/doc/src/devices/qtee-supported-devices.qdoc
@@ -29,13 +29,13 @@
 
     \list
         \li \l{Boundary Devices i.MX6 Boards}
-        \li \l{SABRE SD i.MX6Quad (embedded Linux)}
-        \li \l{Toradex Apalis iMX6 (embedded Linux)}
-        \li \l{Toradex Colibri iMX6 (embedded Linux)}
-        \li \l{Toradex Colibri VF50 and VF61 (embedded Linux)}
-        \li \l{ArchiTech Tibidabo (embedded Linux)}
-        \li \l{BeagleBone Black (embedded Linux)}
-        \li \l{Raspberry Pi 2 Model B (embedded Linux)}
+        \li \l{SABRE SD i.MX6Quad}
+        \li \l{Toradex Apalis iMX6}
+        \li \l{Toradex Colibri iMX6}
+        \li \l{Toradex Colibri VF50 and VF61}
+        \li \l{ArchiTech Tibidabo}
+        \li \l{BeagleBone Black}
+        \li \l{Raspberry Pi 2 Model B}
     \endlist
 
     If you use only the emulator, you can skip this step
diff --git a/src/doc/src/devices/qtee-toradex-apalis.qdoc b/src/doc/src/devices/qtee-toradex-apalis.qdoc
index 220d5e5..b6acc6e 100644
--- a/src/doc/src/devices/qtee-toradex-apalis.qdoc
+++ b/src/doc/src/devices/qtee-toradex-apalis.qdoc
@@ -17,7 +17,7 @@
 **
 ****************************************************************************/
 /*!
-    \target Toradex Apalis iMX6 (embedded Linux)
+    \keyword Toradex Apalis iMX6
     \page qtee-preparing-hardware-apalis-imx6.html
     \title Preparing Toradex Apalis iMX6
     \previouspage qtee-installation-guide.html
diff --git a/src/doc/src/devices/qtee-toradex-colibri-imx6.qdoc b/src/doc/src/devices/qtee-toradex-colibri-imx6.qdoc
index 5b28425..6b96c09 100644
--- a/src/doc/src/devices/qtee-toradex-colibri-imx6.qdoc
+++ b/src/doc/src/devices/qtee-toradex-colibri-imx6.qdoc
@@ -17,7 +17,7 @@
 **
 ****************************************************************************/
 /*!
-    \target Toradex Colibri iMX6 (embedded Linux)
+    \keyword Toradex Colibri iMX6
     \page qtee-preparing-hardware-colibri-imx6.html
     \title Preparing Toradex Colibri iMX6
     \previouspage qtee-installation-guide.html
diff --git a/src/doc/src/devices/qtee-toradex-colibri-vf.qdoc b/src/doc/src/devices/qtee-toradex-colibri-vf.qdoc
index d27030c..fbf1f37 100644
--- a/src/doc/src/devices/qtee-toradex-colibri-vf.qdoc
+++ b/src/doc/src/devices/qtee-toradex-colibri-vf.qdoc
@@ -17,7 +17,7 @@
 **
 ****************************************************************************/
 /*!
-    \target Toradex Colibri VF50 and VF61 (embedded Linux)
+    \keyword Toradex Colibri VF50 and VF61
     \page qtee-preparing-hardware-colibri-vf.html
     \title Preparing Toradex Colibri VF50 and VF61
     \previouspage qtee-installation-guide.html
diff --git a/src/doc/src/qtee-index.qdoc b/src/doc/src/qtee-index.qdoc
index b20fe65..2f9f9e8 100644
--- a/src/doc/src/qtee-index.qdoc
+++ b/src/doc/src/qtee-index.qdoc
@@ -44,13 +44,13 @@
         \li \l{Preparing Hardware}
         \list
             \li \l{Boundary Devices i.MX6 Boards}
-            \li \l{Preparing SABRE SD i.MX6Quad}{SABRE SD i.MX6Quad (embedded Linux)}
-            \li \l{Preparing Toradex Apalis iMX6}{Toradex Apalis iMX6 (embedded Linux)}
-            \li \l{Preparing Toradex Colibri iMX6}{Toradex Colibri iMX6 (embedded Linux)}
-            \li \l{Preparing Toradex Colibri VF50 and VF61}{Toradex Colibri VF50 and VF61 (embedded Linux)}
-            \li \l{Preparing ArchiTech Tibidabo}{ArchiTech Tibidabo (embedded Linux)}
-            \li \l{Preparing BeagleBone Black}{BeagleBone Black (embedded Linux)}
-            \li \l{Preparing Raspberry Pi 2}{Raspberry Pi 2 Model B (embedded Linux)}
+            \li \l{Preparing SABRE SD i.MX6Quad}{SABRE SD i.MX6Quad}
+            \li \l{Preparing Toradex Apalis iMX6}{Toradex Apalis iMX6}
+            \li \l{Preparing Toradex Colibri iMX6}{Toradex Colibri iMX6}
+            \li \l{Preparing Toradex Colibri VF50 and VF61}{Toradex Colibri VF50 and VF61}
+            \li \l{Preparing ArchiTech Tibidabo}{ArchiTech Tibidabo}
+            \li \l{Preparing BeagleBone Black}{BeagleBone Black}
+            \li \l{Preparing Raspberry Pi 2}{Raspberry Pi 2 Model B}
         \endlist
         \li \l{Building and Running Embedded Applications}
         \list