Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7

Conflicts:
	doc/src/index.qdoc
	doc/src/mainpage.qdoc

1 files changed, 9 insertions, 9 deletions

diff --git a/doc/src/mainpage.qdoc b/doc/src/mainpage.qdoc
index bcd4cda..9799247 100644
--- a/doc/src/mainpage.qdoc
+++ b/doc/src/mainpage.qdoc
@@ -26,9 +26,9 @@
 ****************************************************************************/
 
 /*!
-    \page gettingstarted-develop.html
-    \title Develop with Qt
-    \ingroup gettingstarted
+\page gettingstarted-develop.html
+\title Develop with Qt
+\ingroup gettingstarted
 
 \div {indexboxcont indexboxbar}
 Developing a Qt application involves many different steps and stages. From
@@ -68,13 +68,13 @@ Information regarding Qt Support on Different Platforms:
 \o \l{Installing Qt for the Symbian platform}{Symbian and Mobile Development}
 \o \l{Support for Windows}{Microsoft Windows}
 \o \l{Support for Windows CE and Windows Mobile}{Microsoft Windows CE}
-\o \l{Support for Mac}{Apple Mac OS X}
+\o \l{Support for Mac OS X}{Apple Mac OS X}
 \o \l{Support for Linux/X11}{Linux and X11 Platforms}
 \o \l{Support for Embedded Linux}{Qt for Embedded Linux}
 \endlist
 For more information about the platforms supported
 and their installation pages, view the \l {Supported Platforms} and the
-\l {Cross-Platform and Platform-Specific Development} pages.
+\l {Cross-Platform and Platform-Specific Development} pages.
 \enddiv
 
 \div {indexboxcont indexboxbar normallist}
@@ -82,9 +82,9 @@ and their installation pages, view the \l {Supported Platforms} and the
 \section1 Qt Technologies
 
 Qt introduces an innovative alternative for inter-object communication, called
-“signals and slots”, that replaces the old and unsafe callback technique used in
+"signals and slots", that replaces the old and unsafe callback technique used in
 many legacy frameworks. Qt also provides a conventional event model for handling
-mouse clicks, key presses, and other user input. Qt’s cross-platform GUI
+mouse clicks, key presses, and other user input. Qt's cross-platform GUI
 applications can support all the user interface functionality required by modern
 applications, such as menus, context menus, drag and drop, and dockable
 toolbars. Desktop integration features provided by Qt can be used to extend
@@ -159,7 +159,7 @@ Qt supports many utilities that work on multiple platforms.
 \o \l{Container Classes}{Containers} - Qt's implementation of various data structures such as linked lists and hash maps
 \o \l{Rich Text Processing} - for manipulating structured rich text documents
 \o \l{XML Processing} - high level manipulation of XML data using different interfaces
-\o \l{Making Applications Scriptable} - provides Qt applications with ECMAScript processor.
+\o \l{Making Applications Scriptable} - provides Qt applications with ECMAScript processor.
 \o \l{Qt Linguist Manual}{Qt Linguist} - for translating applications into local languages.
 \endlist
 For more information, visit the \l{Qt's Tools}{Qt Tools} page.
@@ -170,7 +170,7 @@ For more information, visit the \l{Qt's Tools}{Qt Tools} page.
 Testing and debugging are part of the development process and Qt offers the
 developer multiple methods of testing their code.
 \list
-\o \l{http://doc.qt.nokia.com/qtcreator-snapshot/creator-debugging.html} {Debugging Applications in Creator} - various debugging options in Creator
+\o \l{http://doc.qt.nokia.com/qtcreator-snapshot/creator-debugging.html} {Debugging Applications in Creator} - various debugging options in Creator
 \o \l {http://doc.qt.nokia.com/qtsimulator/index.html}{Simulator} - testing mobile applications by simulating a mobile environment
 \o \l {QML Viewer} - an executable that is able to run QML files
 \o \l{QTestLib Manual}{QTestLib} - a unit testing framework built into Qt