Doc: Updated links in qt-webpages.qdoc to Digia equivalent.

Change-Id: I7b46898ae6ccc08d96095f1658f87c063aa6b487
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>

2 files changed, 20 insertions, 24 deletions

diff --git a/doc/src/getting-started/how-to-learn-qt.qdoc b/doc/src/getting-started/how-to-learn-qt.qdoc
index 9c78ee7..b49ed98 100644
--- a/doc/src/getting-started/how-to-learn-qt.qdoc
+++ b/doc/src/getting-started/how-to-learn-qt.qdoc
@@ -160,10 +160,6 @@
 
     In addition, many Qt developers are active members of the \l{KDE}{KDE community}.
 
-    \section1 Books about Qt
-
-    There is a growing number of books about Qt programming. The Qt team maintains a list of books on the Qt Developer Network site. See \l{Books about Qt Programming} for a complete list of Qt books including translations to various languages.
-
     \section1 Training
 
     In many cases people prefer attending professional training courses to boost their learning progress. A training course has two unique benefits: Its scope can be adapted to your needs and you will get helped on the spot by Qt trainers who are also experienced Qt developers. \l{Qt Training Partners} offer a wide range of courses. Most courses are based on materials developed by the Qt team.
diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index 07188b9..7949659 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -143,7 +143,7 @@ for your platform from the following list.
     \o \l{Configuring Qt}
     \o \l{How to Learn Qt}
     \o \l{Tutorials}
-    \o \l{Developer Zone}
+    \o \l{Developer Network}
     \o \l{Deploying Qt Applications}
     \endlist
 
@@ -263,7 +263,7 @@ for your platform from the following list.
     \list
     \o \l{How to Learn Qt}
     \o \l{Tutorials}
-    \o \l{Developer Zone}
+    \o \l{Developer Network}
     \o \l{Deploying Qt Applications}
     \endlist
 
@@ -386,7 +386,7 @@ must be run as root.
     \list
     \o \l{How to Learn Qt}
     \o \l{Tutorials}
-    \o \l{Developer Zone}
+    \o \l{Developer Network}
     \o \l{Deploying Qt Applications}
     \endlist
 
@@ -474,7 +474,7 @@ in the \l{Qt for Windows CE Requirements} document.
     \list
     \o \l{How to Learn Qt}
     \o \l{Tutorials}
-    \o \l{Developer Zone}
+    \o \l{Developer Network}
     \o \l{Deploying Qt Applications}
     \endlist
 
@@ -504,7 +504,7 @@ in the \l{Qt for Windows CE Requirements} document.
 
 \tableofcontents
 
-    Qt for Symbian binary packages (SIS files) are available from the \l 
+    Qt for Symbian binary packages (SIS files) are available from the \l
     {http://qt.nokia.com/downloads}{Qt SDK}.
 
 */
@@ -516,8 +516,8 @@ in the \l{Qt for Windows CE Requirements} document.
 \previouspage Installation
 \tableofcontents
 
-    \l {http://qt.nokia.com/downloads}{Qt SDK} provides all the necessary tools 
-    and libraries for developing Qt applications. However, if you want to build 
+    \l {http://qt.nokia.com/downloads}{Qt SDK} provides all the necessary tools
+    and libraries for developing Qt applications. However, if you want to build
     Qt itself for Symbian, follow the instructions below.
 
 Qt for the Symbian platform has some requirements that are given in more detail
@@ -607,31 +607,31 @@ the Symbian platform from scratch.
     Congratulations, Qt is now ready to use.
 
 \section1 Step 7: Installing Qt Libraries on the Device
-    
+
     To run a Qt application on a device, it must have Qt libraries installed.
-    
+
     Symbian devices have a pre-installed Qt as follows:
     \list
     \o Symbian Anna devices have the pre-installed Qt, Qt Mobility, and Qt Webkit.
     \o Symbian Belle and later devices have the pre-installed Qt on the device firmware.
     \endlist
-    
+
     \l {http://www.developer.nokia.com/Community/Wiki/Nokia_Smart_Installer_for_Symbian}
-    {Nokia Smart Installer for Symbian} deploys the required Qt libraries to supported S60 
+    {Nokia Smart Installer for Symbian} deploys the required Qt libraries to supported S60
     and Symbian devices if the libraries are not pre-installed.
-    
+
     Nokia Developer site's \l {http://www.developer.nokia.com/Devices/Device_specifications/?filter1=qt}
     {Device specifications} provide information on which devices have a
     pre-installed Qt and the used Qt version.
-    
+
     To create your own Qt installation package, do as follows:
 
     \snippet doc/src/snippets/code/doc_src_installation.qdoc 29
 
-    The Qt libraries are built with "All -Tcb" capability, so they can support 
-    all types of applications. If you don't have a suitable certificate, you can 
+    The Qt libraries are built with "All -Tcb" capability, so they can support
+    all types of applications. If you don't have a suitable certificate, you can
     patch the binaries in either of the following ways:
-    
+
     \list
     \o If you have no certificate, build a self-signed Qt:
     \snippet doc/src/snippets/code/doc_src_installation.qdoc 34
@@ -1286,11 +1286,11 @@ We hope you will enjoy using Qt.
     \brief Setting up the Symbian platform environment for Qt.
     \previouspage General Qt Requirements
 
-    \l {http://qt.nokia.com/downloads}{Qt SDK} provides all the necessary tools 
-    and libraries for developing Qt applications. However, if you want to build 
+    \l {http://qt.nokia.com/downloads}{Qt SDK} provides all the necessary tools
+    and libraries for developing Qt applications. However, if you want to build
     Qt itself for Symbian, follow the instructions below.
-    
-    Qt for the Symbian platform requires the following software installed on 
+
+    Qt for the Symbian platform requires the following software installed on
     your development PC:
     \list
         \o \l{http://www.forum.nokia.com/Library/Tools_and_downloads/Other/Carbide.c++/}{Carbide.c++ v2.3.0 or higher recommended}.