Doc: First update of the documentation about learning Qt.

Reviewed-by: Trust Me

3 files changed, 42 insertions, 22 deletions

diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc
index cc5a24fd06..ad6731bd4f 100644
--- a/doc/src/external-resources.qdoc
+++ b/doc/src/external-resources.qdoc
@@ -357,3 +357,13 @@
     \externalpage http://developers.sun.com/sunstudio/downloads/patches/index.jsp
     \title Sun Studio Patches
 */
+
+/*!
+    \externalpage http://www.qtcentre.org
+    \title Qt Centre
+*/
+
+/*!
+    \externalpage http://www.kde.org
+    \title KDE
+*/
diff --git a/doc/src/getting-started/how-to-learn-qt.qdoc b/doc/src/getting-started/how-to-learn-qt.qdoc
index 5a839751c4..9df6f1fe8c 100644
--- a/doc/src/getting-started/how-to-learn-qt.qdoc
+++ b/doc/src/getting-started/how-to-learn-qt.qdoc
@@ -43,22 +43,14 @@
     \page how-to-learn-qt.html
     \title How to Learn Qt
     \brief Links to guides and resources for learning Qt.
-
     \nextpage Tutorials
 
+    \section1 Getting Started
+
     We assume that you already know C++ and will be using it for Qt
     development. See the \l{Qt website} for more information about
     using other programming languages with Qt.
 
-    The best way to learn Qt is to read the official Qt book,
-    \l{http://www.amazon.com/gp/product/0132354160/ref=ase_trolltech/}{C++
-    GUI Programming with Qt 4, Second Edition} (ISBN 0-13-235416-0). This book
-    provides comprehensive coverage of Qt programming all the way
-    from "Hello Qt" to advanced features such as multithreading, 2D and
-    3D graphics, networking, item view classes, and XML. (The first edition,
-    which is based on Qt 4.1, is available
-    \l{http://www.qtrac.eu/C++-GUI-Programming-with-Qt-4-1st-ed.zip}{online}.)
-
     If you want to program purely in C++, designing your interfaces
     in code without the aid of any design tools, take a look at the
     \l{Tutorials}. These are designed to get you into Qt programming,
@@ -73,6 +65,12 @@
     overviews to deepen your understanding of Qt: \l{Qt Object Model}
     and \l{Signals and Slots}.
 
+    \beginfloatleft
+    \inlineimage qtdemo-small.png
+    \endfloat
+
+    \section1 Getting an Overview
+
     At this point, we recommend looking at the
     \l{All Overviews and HOWTOs}{overviews} and reading those that are
     relevant to your projects. You may also find it useful to browse the
@@ -80,18 +78,14 @@
     common with your projects. You can also read Qt's source code since
     this is supplied.
 
-    \table 50%
-    \header
-    \o {2,1} Getting an Overview
-    \row
-    \o \inlineimage qtdemo-small.png
-    \o
     If you run the \l{Examples and Demos Launcher}, you'll see many of Qt's
     widgets in action.
 
     The \l{Qt Widget Gallery} also provides overviews of selected Qt
     widgets in each of the styles used on various supported platforms.
-    \endtable
+    \clearfloat
+
+    \section1 Books and Learning Materials
 
     Qt comes with extensive documentation, with hypertext
     cross-references throughout, so you can easily click your way to
@@ -103,16 +97,32 @@
     this tool is supplied with Qt and provides access to the entire
     Qt API, and it provides a full text search facility.
 
-    There are also a growing number of books about Qt programming; see
-    \l{Books about Qt Programming} for a complete list of Qt books,
+    There are also a growing number of books about Qt programming.
+    We recommend the official Qt book,
+    \l{http://www.amazon.com/gp/product/0132354160/ref=ase_trolltech/}{C++
+    GUI Programming with Qt 4, Second Edition} (ISBN 0-13-235416-0). This book
+    provides comprehensive coverage of Qt programming all the way
+    from "Hello Qt" to advanced features such as multithreading, 2D and
+    3D graphics, networking, item view classes, and XML. (The first edition,
+    which is based on Qt 4.1, is available
+    \l{http://www.qtrac.eu/C++-GUI-Programming-with-Qt-4-1st-ed.zip}{online}.)
+
+    See \l{Books about Qt Programming} for a complete list of Qt books,
     including translations to various languages.
 
     Another valuable source of example code and explanations of Qt
-    features is the archive of articles from \l {http://qt.nokia.com/doc/qq}
-    {Qt Quarterly}, a quarterly newsletter for users of Qt.
+    features is the archive of articles from \l{Qt Quarterly}, a quarterly newsletter for users of Qt.
 
     For documentation on specific Qt modules and other guides, refer to
     \l{All Overviews and HOWTOs}.
 
+    \section1 Further Reading
+
+    Qt has an active and helpful user community who communicate using
+    the \l{Qt Mailing Lists}{qt-interest} mailing list, the \l{Qt Centre}
+    Web site, and a number of other community Web sites and Weblogs.
+    In addition, many Qt developers are active members of the
+    \l{KDE}{KDE community}.
+
     Good luck, and have fun!
 */
diff --git a/doc/src/qt-webpages.qdoc b/doc/src/qt-webpages.qdoc
index 68658aee0f..e02cd19960 100644
--- a/doc/src/qt-webpages.qdoc
+++ b/doc/src/qt-webpages.qdoc
@@ -180,7 +180,7 @@
 */
 
 /*!
-    \externalpage http://qt.nokia.com/lists
+    \externalpage http://lists.trolltech.com
     \title Qt Mailing Lists
 */