Docs: QTMOBILITY-967 Change references to 'Qt Mobility'

54 files changed, 450 insertions, 451 deletions

diff --git a/doc/src/bearermanagement.qdoc b/doc/src/bearermanagement.qdoc
index d3af7b7cb6..0e29db3042 100644
--- a/doc/src/bearermanagement.qdoc
+++ b/doc/src/bearermanagement.qdoc
@@ -48,7 +48,7 @@ access points.
 \section1 Namespace
 
 The QtMobility APIs are placed into the \i{QtMobility} namespace. This is done
-to facilitate the future migration of Mobility APIs into Qt. See the
+to facilitate the future migration of QtMobility APIs into Qt. See the
 \l {Quickstart Example}{Quickstart guide} for an example on how the
 namespace impacts on application development.
 
@@ -70,25 +70,25 @@ enables to user to create, edit or delete network configurations.
 
 The Bearer API has been migrated to the Qt 4.7 QtNetwork library. This enables
 connection manager and roaming support for \l QNetworkAccessManager.
-Starting with Qt 4.7 the Mobility version has been deprecated in favor of
-Qt's Bearer API. Furthermore the roaming enabled QNetworkAccessManager cannot be used in connection with Mobility's Bearer API.
+Starting with Qt 4.7 the QtMobility version has been deprecated in favor of
+Qt's Bearer API. Furthermore the roaming enabled QNetworkAccessManager cannot be used in connection with QtMobility's Bearer API.
 
-The porting effort from Mobility Bearer to Qt Bearer is minimal as
+The porting effort from QtMobility Bearer to Qt Bearer is minimal as
 the relevant classes are source compatible. The only exception is the
 removal of the QtMobility namespace. Already deployed applications will continue
 to work but cannot make use of the new features in Qt 4.7 and QNetworkAccessManager.
 
 An application can select the Bearer API to be used via its project file.
 As long as the MOBILITY variable contains the \c bearer string the project
-will link Mobility's bearer library (even if the project links against QtNetwork at the same time).
+will link QtMobility's bearer library (even if the project links against QtNetwork at the same time).
 
 \code
-    MOBILITY+=bearer   #choose Mobility bearer
+    MOBILITY+=bearer   #choose QtMobility bearer
 \endcode
 
-Note that Harmattan based devices do not have Mobility Bearer anymore. Qt Bearer is the only
+Note that Harmattan based devices do not have QtMobility Bearer anymore. Qt Bearer is the only
 option to write Bearer enabled applications. The following Qt project file magic may be used to
-implement applications which utilize Qt 4.7 Bearer and only fall back to Mobility Bearer if the Qt
+implement applications which utilize Qt 4.7 Bearer and only fall back to QtMobility Bearer if the Qt
 version is not available:
 
 \code
diff --git a/doc/src/camera.qdoc b/doc/src/camera.qdoc
index d650955a83..b50938ae30 100644
--- a/doc/src/camera.qdoc
+++ b/doc/src/camera.qdoc
@@ -45,7 +45,7 @@ for still or video image capture with sound support.
 \section1 Namespace
 
 The QtMobility APIs are placed into the \i{QtMobility} namespace. This is done
-to facilitate the future migration of Mobility APIs into Qt. See the
+to facilitate the future migration of QtMobility APIs into Qt. See the
 \l {Quickstart Example}{Quickstart guide} for an example on how the
 namespace impacts on application development.
 
diff --git a/doc/src/classes.qdoc b/doc/src/classes.qdoc
index d3934fc6ea..6fef61a300 100644
--- a/doc/src/classes.qdoc
+++ b/doc/src/classes.qdoc
@@ -46,12 +46,12 @@
 
 /*!
     \page classes.html
-    \title All Qt Mobility Classes
+    \title All QtMobility Classes
     \ingroup classlists
 
     \brief If you know the name of the class you want, find it here.
 
-    This is a list of all Mobility classes. 
+    This is a list of all QtMobility classes.
 
     \generatelist classes
 
@@ -65,7 +65,7 @@
     \brief If you don't know the name of the class you want, but you
     know what the class should do, you might try looking here.
 
-    Qt Mobility Project classes with brief descriptions:
+    QtMobility Project classes with brief descriptions:
 
     \generatelist annotatedclasses
 */
@@ -78,7 +78,7 @@
     \ingroup classlists
 
     \brief The C++ class inheritance hierarchy for all classes in the
-    Mobility API.
+    QtMobility API.
 
     \generatelist classhierarchy
 */
@@ -87,14 +87,14 @@
 
 /*!
     \page functions.html
-    \title All Functions 
+    \title All Functions
     \ingroup funclists
 
-    \brief All documented Mobility functions listed alphabetically with a
+    \brief All documented QtMobility functions listed alphabetically with a
     link to where each one is declared.
 
     This is the list of all documented member functions and global
-    functions in the Qt Mobility Project API.  Each function has a link to the class or
+    functions in the QtMobility Project API.  Each function has a link to the class or
     header file where it is declared and documented.
 
     \generatelist functionindex
diff --git a/doc/src/connectivity.qdoc b/doc/src/connectivity.qdoc
index 0971455e36..5b2f80f9cd 100644
--- a/doc/src/connectivity.qdoc
+++ b/doc/src/connectivity.qdoc
@@ -44,14 +44,14 @@ This section describes the functionality of the Connectivity module that is expe
 technology preview and the functionality that is known not to work.
 
 The APIs are under development and subject to change between the technology preview release and
-their official release with Qt Mobility 1.2.
+their official release with QtMobility 1.2.
 
 \section2 NFC
 
 Unfortunately there currently are no functional backends for real hardware. An emulator backend is
 available, however, which is used by both the unit tests and the Qt Simulator backend. Use the \i {master} branch of Qt Simulator at \l {http://qt.gitorious.org/qt-labs/simulator}.
 
-The \l {Qt Mobility Examples#Connectivity}{Connectivity examples} demonstrate how to use NFC
+The \l {QtMobility Examples#Connectivity}{Connectivity examples} demonstrate how to use NFC
 functionality in your application.
 
 What should work:
@@ -87,7 +87,7 @@ What is known \bold NOT to work:
 \section2 Bluetooth
 
 The Bluetooth API is under development and subject to change between the tech
-preview and its official release with Qt Mobility 1.2. For the technology
+preview and its official release with QtMobility 1.2. For the technology
 preview the only functional backend is bluez.
 
 What should work:
diff --git a/doc/src/contacts.qdoc b/doc/src/contacts.qdoc
index b9901585f2..592580b63f 100644
--- a/doc/src/contacts.qdoc
+++ b/doc/src/contacts.qdoc
@@ -39,14 +39,14 @@ remote backends.
 \ingroup mobility
 
 The Contacts API enables a client to request contact data from local or
-remote backends. This is part of the Qt Mobility Project.
+remote backends. This is part of the QtMobility Project.
 
 \tableofcontents
 
 \section1 Namespace
 
 The QtMobility APIs are placed into the \i{QtMobility} namespace. This is done
-to facilitate the future migration of Mobility APIs into Qt. See the
+to facilitate the future migration of QtMobility APIs into Qt. See the
 \l {Quickstart Example}{Quickstart guide} for an example on how the
 namespace impacts on application development.
 
@@ -66,7 +66,7 @@ applications.
 \section1 Overview
 
 The QtMobility APIs are placed into the \i{QtMobility} namespace. This is done
-to facilitate the future migration of Mobility APIs into Qt. See the
+to facilitate the future migration of QtMobility APIs into Qt. See the
 \l {Quickstart Example}{Quickstart guide} for an example on how the
 namespace impacts on application development.
 
@@ -267,7 +267,7 @@ For more detailed documentation on the synchronous API, see the \l{Contacts Sync
 
 Clients can perform \l{QContactAction}{actions} on contacts which support
 them.  Actions are things like "Send Email" or "Dial", and can be provided
-from various sources including Qt Plugins or the Qt Mobility Service
+from various sources including Qt Plugins or the QtMobility Service
 Framework. Every action implementation is uniquely identified by a
 combination of its name, the name of the service which provided the
 implementation, and the version of the implementation.  These pieces of data
@@ -311,7 +311,7 @@ Some examples of common usage of the API may be found
 
 \section1 Building and compiling
 
-To build the library, see the Qt Mobility installation instructions.
+To build the library, see the QtMobility installation instructions.
 
 \section1 Reference documentation
 
@@ -322,7 +322,7 @@ To build the library, see the Qt Mobility installation instructions.
 \section2 "Contact Details" Leaf Classes
 
 Several subclasses of \l{QContactDetail} are provided as part of the
-Qt Mobility Project Contacts API.  They are general in design but are intended
+QtMobility Project Contacts API.  They are general in design but are intended
 to fulfill specific use-cases.  Please note that certain backends may
 choose not to support one or more of these subclasses as they appear here;
 they may offer their own which provide similar functionality.
@@ -373,7 +373,7 @@ For more information on this topic, see please see the documentation on
 
 \section2 Synchronization and Serialization
 
-The contacts API is used by another Qt Mobility module: the \l {Versit} {Versit}* module.  It allows
+The contacts API is used by another QtMobility module: the \l {Versit} {Versit}* module.  It allows
 serialization of a QContact into a vCard document, and vice versa.
 
 [*] Versit \reg is a trademark of the Internet Mail Consortium.
diff --git a/doc/src/contactsactions.qdoc b/doc/src/contactsactions.qdoc
index 8ab8004e6f..90393b4eb7 100644
--- a/doc/src/contactsactions.qdoc
+++ b/doc/src/contactsactions.qdoc
@@ -35,7 +35,7 @@
 
 \section1 Introduction
 
-The Qt Mobility Contacts API supports the concept of a generic action which may be invoked
+The QtMobility Contacts API supports the concept of a generic action which may be invoked
 upon an \l{QContactActionTarget}{action target} (e.g., a contact) or list thereof.
 The API allows clients to invoke an action upon a target (for example, to send an email
 to a contact) in a cross-platform manner, and allows third-party developers to provide
@@ -84,10 +84,10 @@ you must do four things:
 \endlist
 
 For more information on the QServicePluginInterface and the format of the service description
-xml, please see the \l{Qt Service Framework}{Qt Mobility Service Framework} documentation.
+xml, please see the \l{Qt Service Framework}{QtMobility Service Framework} documentation.
 An example action plugin is provided later in this document.
 
-Note that while the plugins are loaded by the \l{Qt Service Framework}{Qt Mobility Service Framework},
+Note that while the plugins are loaded by the \l{Qt Service Framework}{QtMobility Service Framework},
 clients of the Qt Contacts Action API are entirely shielded from this implementation detail.
 
 The QContactActionDescriptor class is actually a client-facing interface to an action factory,
@@ -101,7 +101,7 @@ icons and labels) documented in QContactActionDescriptor, to allow client applic
 provide meaningful user interface elements to represent the action.
 
 We recommend that action implementors read the documentation of the
-\l{Qt Service Framework}{Qt Mobility Service Framework} carefully, to better understand
+\l{Qt Service Framework}{QtMobility Service Framework} carefully, to better understand
 how their implementation plugin may be updated with patch releases or major releases,
 and how these considerations affect the implementation of the plugin.
 
@@ -145,7 +145,7 @@ deployed in a certain way.
 
 \section3 Deployment on Maemo5
 
-The Qt Mobility Service Framework provides the "servicefw" tool which allows
+The QtMobility Service Framework provides the "servicefw" tool which allows
 third parties to register their service with the system at installation time
 on the Maemo5 platform.  In order to register their service, the plugin and
 service description xml file should both be deployed to the installation
@@ -166,7 +166,7 @@ will ensure that your service is removed from the service framework database
 
 \section3 Deployment on Symbian
 
-The Qt Mobility Service Framework will automatically check a particular
+The QtMobility Service Framework will automatically check a particular
 directory on Symbian for new or updated service description xmls.
 That is, any service described by an xml file in that location will
 automatically be registered in the system scope on that device.
@@ -192,6 +192,6 @@ simply insert the following (or something similar) into the .pro
 
 Note that the UID in the xmlautoimport.path statement is the pre-assigned
 UID of the "other components" directory.  For more information on the topic,
-please see the documentation for the Qt Mobility Service Framework.
+please see the documentation for the QtMobility Service Framework.
 
 */
diff --git a/doc/src/contactsengines.qdoc b/doc/src/contactsengines.qdoc
index fae6096685..253a51ffbd 100644
--- a/doc/src/contactsengines.qdoc
+++ b/doc/src/contactsengines.qdoc
@@ -74,16 +74,16 @@ supported by an engine by calling QContactManager::supportedContactTypes().
 
 \section2 Provided Engines
 
-The Contacts module of the Qt Mobility project includes several backends already, some of which
+The Contacts module of the QtMobility project includes several backends already, some of which
 are designed to interface with the default addressbook on their particular platform.
 
 \section3 \bold{In-Memory Example Engine}
 
 The in-memory engine identifies itself as the "memory" engine.  It is available on all platforms
-which are supported by the Qt Mobility project.
+which are supported by the QtMobility project.
 
 The in-memory engine supports the default schema, and provides all functionality available through
-the Qt Mobility Contacts API; however, all data is stored in-memory and is not persisted in any
+the QtMobility Contacts API; however, all data is stored in-memory and is not persisted in any
 way.
 
 \section3 \bold{Symbian Engine}
@@ -352,7 +352,7 @@ implemented in a similar manner to the (provided) memory engine's naive implemen
 
 \section2 Example Implementation
 
-There are several implementations of QContactManagerEngine available in the Qt Mobility
+There are several implementations of QContactManagerEngine available in the QtMobility
 source code repository.  In particular, the "memory" engine provides an implementation of
 an in-memory, anonymous datastore which supports every feature in the API, and therefore
 is useful for demonstration purposes.  Be aware, however, that the implementation of all
diff --git a/doc/src/contactsschema.qdoc b/doc/src/contactsschema.qdoc
index 17543dc306..e8123c90f6 100644
--- a/doc/src/contactsschema.qdoc
+++ b/doc/src/contactsschema.qdoc
@@ -40,7 +40,7 @@ The \l{Contacts}{Qt Contacts API} makes use of detail leaf classes
 which provide certain well-known functionality.  In order to develop a backend engine which
 can service clients or provide synchronization to other backends, the schema must be
 known.  The schema provided by the \l{Contacts}{Qt Contacts API} is updated with every
-release of Qt Mobility, so the function which returns the default schema definitions can
+release of QtMobility, so the function which returns the default schema definitions can
 take an integer which identifies the schema version which the engine writer developed against.
 Engine writers should call \l{QContactManagerEngine::schemaDefinitions()}{schemaDefinitions()}
 in their code which generates the manager-specific schema (which is returned to clients when
@@ -73,7 +73,7 @@ The leaf details that form the current version of the default schema are as foll
 \annotatedlist contacts-details
 
 Note that the following leaf details were added to the default schema in version 1.1 of the
-Qt Mobility project:
+QtMobility project:
 \list
   \o QContactFamily
   \o QContactFavorite
diff --git a/doc/src/contactssync.qdoc b/doc/src/contactssync.qdoc
index ea66576ec1..e37e7768c1 100644
--- a/doc/src/contactssync.qdoc
+++ b/doc/src/contactssync.qdoc
@@ -180,7 +180,7 @@ a particular detail definition might be declared to be unique per-contact in a p
 
 Every plugin will support a slightly different schema, as the schema which can be supported will depend
 on the semantics and limitations of the underlying storage platform on which the plugin is based.
-The default schema is described in the \l {Qt Contacts Schema}{Qt Mobility Contacts schema documentation},
+The default schema is described in the \l {Qt Contacts Schema}{QtMobility Contacts schema documentation},
 and plugins should attempt to implement that schema; however no guarantees are given to clients as to
 the conformance of the schemas supported by various plugins to the default schema.
 
diff --git a/doc/src/examples.qdoc b/doc/src/examples.qdoc
index b97e301fdc..a5262c6888 100644
--- a/doc/src/examples.qdoc
+++ b/doc/src/examples.qdoc
@@ -27,9 +27,9 @@
 
 /*!
     \page all-examples.html
-    \title Qt Mobility Examples
+    \title QtMobility Examples
 
-    Qt Mobility comes with a variety of examples that cover the entire range of the Qt Mobility
+    QtMobility comes with a variety of examples that cover the entire range of the QtMobility
     APIs. Note that some examples require Qt declarative which can by obtain via \l {http://qt.gitorious.org/qt}.
 
     \section2 Bearer Management
diff --git a/doc/src/examples/audiodevices.qdoc b/doc/src/examples/audiodevices.qdoc
index 57dd948f9f..e629c5bd11 100644
--- a/doc/src/examples/audiodevices.qdoc
+++ b/doc/src/examples/audiodevices.qdoc
@@ -33,7 +33,7 @@
 
     This example shows how to create a simple application to list and test
     the configuration for the various audio devices available on the device
-    or machine. This is done using the Qt Mobility Multimedia API.
+    or machine. This is done using the QtMobility Multimedia API.
 
     \image audiodevices.png
 
diff --git a/doc/src/examples/audiorecorder.qdoc b/doc/src/examples/audiorecorder.qdoc
index fab306c734..cc518c9272 100644
--- a/doc/src/examples/audiorecorder.qdoc
+++ b/doc/src/examples/audiorecorder.qdoc
@@ -31,8 +31,8 @@
 
 
 
-    This example shows how to create a simple audio recorder using the Qt
-    Mobility Multimedia API. 
+    This example shows how to create a simple audio recorder using the QtMobility
+    Multimedia API.
 
     We can easily setup the capture when we create the objects using a
     QMediaRecorder initialized with a QAudioCaptureSource object.
diff --git a/doc/src/examples/btchat.qdoc b/doc/src/examples/btchat.qdoc
index 0eaf154d3f..d4ed216fea 100644
--- a/doc/src/examples/btchat.qdoc
+++ b/doc/src/examples/btchat.qdoc
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the Qt Mobility Components.
+** This file is part of the QtMobility Components.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/doc/src/examples/calendardemo.qdoc b/doc/src/examples/calendardemo.qdoc
index 60c288b200..a54d2bd020 100644
--- a/doc/src/examples/calendardemo.qdoc
+++ b/doc/src/examples/calendardemo.qdoc
@@ -34,7 +34,7 @@
     \section1 Overview
 
     This example shows how to write a simple calendar application using
-    the \l{Organizer}{Qt Mobility Organizer API}.
+    the \l{Organizer}{QtMobility Organizer API}.
 
     \section2 Use Case
 
diff --git a/doc/src/examples/declarative-sfw-dialer.qdoc b/doc/src/examples/declarative-sfw-dialer.qdoc
index 675f677253..10e655899c 100644
--- a/doc/src/examples/declarative-sfw-dialer.qdoc
+++ b/doc/src/examples/declarative-sfw-dialer.qdoc
@@ -32,8 +32,8 @@
 
 \bold {Execution}
 
-This example requires the example dialer services to be pre-registered in order 
-for the application to discover and load the services. This can be done by using the 
+This example requires the example dialer services to be pre-registered in order
+for the application to discover and load the services. This can be done by using the
 service framework command line tool to add the corresponding service XML file:
 
 \list
@@ -56,7 +56,7 @@ There are 2 ways to run the example:
 The XML files for all example services can be found in the QtMobility build directory
 under install/bin/xmldata.
 
-For Maemo and Linux platforms using D-Bus as the underlying IPC mechanism, the 
+For Maemo and Linux platforms using D-Bus as the underlying IPC mechanism, the
 autostart feature can be initialised by running the service framework tool:
 \code
     servicefw dbusservice xmldata/remotedialerservice.xml dialer_service
@@ -64,12 +64,12 @@ autostart feature can be initialised by running the service framework tool:
 
 \bold {Explanation}
 
-This example should demonstrate how to use the Service Framework to 
+This example should demonstrate how to use the Service Framework to
 access a list of services in a QML context. A library plugin provides QML with elements
 that can reference a single service or a list of services, called 'Service' and
-'ServiceList' respectively. 
+'ServiceList' respectively.
 
-An example that demonstrates how to connect to a single service object to 
+An example that demonstrates how to connect to a single service object to
 implement a simple note taking application can be found \l{declarative-sfw-notes}{here}.
 
 \target guidesign
@@ -79,7 +79,7 @@ The GUI looks like following picture:
 \image DialerServiceGUI.png "GUI"
 
 The following steps outline how to make a QML based application using the Service Framework technology.
-It is assumed that Qt Mobility has been successfully built and environment variables have been set 
+It is assumed that QtMobility has been successfully built and environment variables have been set
 as per \l {Installation Guide}.
 
 \bold {Service Framework in QML:}
@@ -106,15 +106,15 @@ Those projects will create a shared library in each case.
 
 If the library needs to be available over the Service Framework,
 we need to register the library.
-In our example this will be done manually by using the servicefw tool. Refer to the project 
+In our example this will be done manually by using the servicefw tool. Refer to the project
 README for further details.
 
 As you can see we register the services using a xml file.
-This xml file basically contains all information to register the shared library in the 
+This xml file basically contains all information to register the shared library in the
 Service Framework environment.
-For more information please read more about the Qt Service Framework 
+For more information please read more about the Qt Service Framework
 \l {service-frameworks.html#adding-and-removing-of-services}{XML Format}
- 
+
 The QServiceManager creates an instance of a services over a QServicePluginInterface.
 For each services we provide a Plugin.
 
@@ -149,7 +149,7 @@ context, which will produce a list of ServiceWrapper objects.
 
 \snippet declarative-sfw-dialer/declarative-sfw-dialer/content-sfw-dialer/DialerList.qml 5
 
-In the DialerList.qml file the services property is assigned to the ListView model property. 
+In the DialerList.qml file the services property is assigned to the ListView model property.
 
 \snippet declarative-sfw-dialer/declarative-sfw-dialer/content-sfw-dialer/DialerList.qml 0
 
diff --git a/doc/src/examples/hapticsplayer.qdoc b/doc/src/examples/hapticsplayer.qdoc
index 1e7822a0d7..e3743ba6f1 100644
--- a/doc/src/examples/hapticsplayer.qdoc
+++ b/doc/src/examples/hapticsplayer.qdoc
@@ -34,9 +34,9 @@
     \section1 Overview
 
     This example shows how to use various haptic effects in an application via
-    the \l{Feedback}{Qt Mobility Feedback API}.
+    the \l{Feedback}{QtMobility Feedback API}.
 
-    It provides an example of how to use the Qt Mobility libraries to:
+    It provides an example of how to use the QtMobility libraries to:
     \list
     \o play "system theme" haptic effects corresponding to certain predefined events
     \o play a dynamic custom effect, single or repeating
diff --git a/doc/src/examples/hapticsquare.qdoc b/doc/src/examples/hapticsquare.qdoc
index f3ca4ea55c..54526dda19 100644
--- a/doc/src/examples/hapticsquare.qdoc
+++ b/doc/src/examples/hapticsquare.qdoc
@@ -32,9 +32,9 @@
     \section1 Overview
 
     This example shows how to use simple haptic effects in an application via
-    the \l{Feedback}{Qt Mobility Feedback API}.
+    the \l{Feedback}{QtMobility Feedback API}.
 
-    It provides an example of how to use the Qt Mobility libraries to:
+    It provides an example of how to use the QtMobility libraries to:
     \list
     \o play "system theme" haptic effects corresponding to certain predefined events
     \o play a custom effect, single or repeating
@@ -48,7 +48,7 @@
     informative sound design, and intuitive program flow.  Another important
     aspect of immersive applications in tactile feedback and haptic effects.
 
-    The \l{Feedback}{Qt Mobility Feedback API} allows application developers to
+    The \l{Feedback}{QtMobility Feedback API} allows application developers to
     include tactile feedback into their application via a simple to use and
     extensible API.  Some common uses for tactile feedback are:
 
@@ -89,7 +89,7 @@
             \c{HapticButton}s mentioned above,
             connects them to its slots, and implements the functionality to
             play the haptic effects.
-    \endlist    
+    \endlist
 
     \section2 The Dialog Class
 
diff --git a/doc/src/examples/keepintouch.qdoc b/doc/src/examples/keepintouch.qdoc
index 2a75baca9b..47757172d4 100644
--- a/doc/src/examples/keepintouch.qdoc
+++ b/doc/src/examples/keepintouch.qdoc
@@ -31,31 +31,31 @@
 
 
 
-    This example demonstrates using the Qt Mobility Messaging API to 
+    This example demonstrates using the QtMobility Messaging API to
     extract useful information from the messages stored by the system.
 
     \image keepintouch-example.png
 
     The 'Keep in Touch' application locates people you have sent messages
     to in the past, but with whom you have not communicated recently.  It
-    defines a user-selected date range in the past, beginning a certain 
-    amount of time ago and finishing more recently.  Any address that you 
-    sent a message to in this period is located.  Any address that you 
+    defines a user-selected date range in the past, beginning a certain
+    amount of time ago and finishing more recently.  Any address that you
+    sent a message to in this period is located.  Any address that you
     sent a message to more recently than this period will not be displayed.
-    So, now might be a good time to say hello to the people whose addresses 
+    So, now might be a good time to say hello to the people whose addresses
     are reported!
 
-    We find addresses when the user clicks the Search button.  First of all 
+    We find addresses when the user clicks the Search button.  First of all
     we find the dates that define the period that the user has selected.
 
     \snippet    ../../examples/keepintouch/addressfinder.cpp create-date-range
 
-    We create filter objects that will constrain our message search to 
+    We create filter objects that will constrain our message search to
     the date range that the user has selected:
 
     \snippet    ../../examples/keepintouch/addressfinder.cpp create-simple-filters
 
-    Now we combine our filters to precisely specify the messages that we 
+    Now we combine our filters to precisely specify the messages that we
     would like to inspect to perform our address search:
 
     \snippet    ../../examples/keepintouch/addressfinder.cpp create-composite-filters
@@ -69,24 +69,24 @@
     \l{QMessageManager::queryMessages()}{queryMessages} function, but that
     would keep our UI thread busy, and we wouldn't be able to keep our UI
     functioning at the same time.  Using the QMessageService interface
-    allows us to process the search asynchronously.  
-    
+    allows us to process the search asynchronously.
+
     We receive the notification of matching messages by responding to the
     QMessageService::messagesFound() signal:
 
     \snippet    ../../examples/keepintouch/addressfinder.cpp accumulate-matches
 
     When the search is completed, the QMessageService::stateChanged()
-    signal is emitted.  If the user specified an exclusion period then we have 
-    to perform two searches, so when the first finishes our handler initiates 
+    signal is emitted.  If the user specified an exclusion period then we have
+    to perform two searches, so when the first finishes our handler initiates
     the second; when the second finishes, we begin processing the results:
 
     \snippet    ../../examples/keepintouch/addressfinder.cpp handle-search-result
 
     The \c continueSearch function processes the results of our searches, one
-    message at a time.  Each address we sent a message to in the excluded 
+    message at a time.  Each address we sent a message to in the excluded
     time period is added to our exclusion list.  For each address we sent a
-    message to in our included time period, and which is not in the exclusion 
+    message to in our included time period, and which is not in the exclusion
     list, we create a set of the messages that we sent to that address.
 
     \snippet    ../../examples/keepintouch/addressfinder.cpp continue-search
@@ -94,13 +94,13 @@
     We will display the resulting list of contacts in our Contacts pane.  If the
     system contains a contact definition that matches the address information
     we extracted, we will display the label for that contact - this matching
-    process can be accomplished using the Qt Mobility Contacts API.  If we can't
-    find a matching contact, we fall back to using the raw address information 
+    process can be accomplished using the QtMobility Contacts API.  If we can't
+    find a matching contact, we fall back to using the raw address information
     for display:
-    
+
     \snippet    ../../examples/keepintouch/addressfinder.cpp contact-lookup
 
-    If the user selects one of these contact addresses, we fill the Messages 
+    If the user selects one of these contact addresses, we fill the Messages
     combo box with the list of messages that were previously sent to that contact:
 
     \snippet    ../../examples/keepintouch/addressfinder.cpp address-selected
diff --git a/doc/src/examples/querymessages.qdoc b/doc/src/examples/querymessages.qdoc
index dcfe06dccc..e97f0e6f01 100644
--- a/doc/src/examples/querymessages.qdoc
+++ b/doc/src/examples/querymessages.qdoc
@@ -31,15 +31,15 @@
 
 
 
-    This simple example shows how to query messages stored in the system, 
-    using the Qt Mobility Messaging API. 
+    This simple example shows how to query messages stored in the system,
+    using the QtMobility Messaging API.
 
-    Messages are queried by using the QMessageManager interface which 
+    Messages are queried by using the QMessageManager interface which
     provides access to the message data stored in the system.  We will
-    use the \l{QMessageManager::queryMessages()}{queryMessages} function to 
-    locate messages that match a filter object which defines the 
-    properties of the messages we would like to find.  
-    
+    use the \l{QMessageManager::queryMessages()}{queryMessages} function to
+    locate messages that match a filter object which defines the
+    properties of the messages we would like to find.
+
     We define our query properties like this:
 
     \snippet    ../../examples/querymessages/main.cpp setup-query
@@ -54,7 +54,7 @@
 
     \snippet    ../../examples/querymessages/main.cpp iterate-results
 
-    For each message we located, we now generate an output element 
+    For each message we located, we now generate an output element
     corresponding to each data item requested at the command line:
 
     \snippet    ../../examples/querymessages/main.cpp generate-output
diff --git a/doc/src/examples/quickstart.qdoc b/doc/src/examples/quickstart.qdoc
index 3d427b767a..c085e9ca59 100644
--- a/doc/src/examples/quickstart.qdoc
+++ b/doc/src/examples/quickstart.qdoc
@@ -30,26 +30,26 @@
 
 \title Quickstart Example
 
-The following steps outline how to make a simple 
-"hello world" like application that uses Qt Mobility.
-It is assumed that Qt Mobility has been
-successfully built and environment variables have been set 
+The following steps outline how to make a simple
+"hello world" like application that uses QtMobility.
+It is assumed that QtMobility has been
+successfully built and environment variables have been set
 as per \l {Installation Guide}.
 
-One can start using Qt Mobility with 3 simple steps.
+One can start using QtMobility with 3 simple steps.
 \list 1
     \o Include the appropriate headers
-    \o Use the QTM_USE_NAMESPACE macro (defined in qmobilityglobal.h but implicitly included from any Qt Mobility header)
-    \o Declare the usage of Qt Mobility
+    \o Use the QTM_USE_NAMESPACE macro (defined in qmobilityglobal.h but implicitly included from any QtMobility header)
+    \o Declare the usage of QtMobility
        and appropriate API(s) in the project(.pro) file
 \endlist
 
 Steps 1 and 2 are shown in the example below:
 \snippet quickstart/main.cpp 0
 
-This example uses the QSystemInfo headers to print out the 
+This example uses the QSystemInfo headers to print out the
 system's current country code.  All the domain APIs are wrapped
-within a Qt Mobility namespace and thus developers 
+within a QtMobility namespace and thus developers
 need to use the QTM_USE_NAMESPACE macro.
 
 In step 3, to specify that our project is using
@@ -57,15 +57,15 @@ System Information we declare in the project file:
 
 \snippet quickstart/quickstart.pro 0
 
-The project file states that the application uses Qt Mobility and that it requires the 
+The project file states that the application uses QtMobility and that it requires the
 System Information API. By adding \c mobility to \c CONFIG qmake finds
 the \c {mobility.prf} file in \c{$QTDIR/mkspecs/features} and includes it when
-processing the current project file. \c{mobility.prf} is generated when running 
+processing the current project file. \c{mobility.prf} is generated when running
 the QtMobility configure script and points qmake to the relevant include and prefix
 paths and ensures that deployment and package dependencies are set. The \c MOBILITY variable itself is part of \c {mobility.prf} and is used to
 determine the QtMobility library the current project should link to (in this example the SystemInfo library).
 
-Each QtMobility API has its corresponding value which has to be added to \c MOBILITY. The subsequent table lists the APIs and the 
+Each QtMobility API has its corresponding value which has to be added to \c MOBILITY. The subsequent table lists the APIs and the
 corresponding values that can be assigned to \c MOBILITY.
 
 \table
@@ -121,14 +121,14 @@ This can be achieved with a line such as the following:
 \endcode
 
 CAPABILITY_A and CAPABILITY_B are place holders for the appropriate Symbian capabilities. A complete list of all Symbian
-capabilities and their availability to application developers can be found in the 
+capabilities and their availability to application developers can be found in the
 \l {http://developer.symbian.org/wiki/index.php/Capabilities_(Symbian_Signed)}{Symbian capability documentation}.
 
-The subsequent table provides an overview of possibily required capabilities for each Mobility library.
+The subsequent table provides an overview of possibily required capabilities for each QtMobility library.
 Note that not all capabilities are always required when using a particular API. The exact list depends
 on which parts of an API is utilized by an application.
 
-\table 
+\table
 \header
     \o Domain
     \o Symbian Capabilities
@@ -173,7 +173,7 @@ on which parts of an API is utilized by an application.
     \o No capabilities at this stage.
 \endtable
 
-The complete list of all Symbian capabilities and how they can be obtained can be found in the \l {http://developer.symbian.org/wiki/index.php/Capabilities_(Symbian_Signed)#Which_capabilities_can_I_access.3F}{Symbian developer documentation}. 
+The complete list of all Symbian capabilities and how they can be obtained can be found in the \l {http://developer.symbian.org/wiki/index.php/Capabilities_(Symbian_Signed)#Which_capabilities_can_I_access.3F}{Symbian developer documentation}.
 
 And we're done.  If you are using the command line simply
 enter:
@@ -200,7 +200,7 @@ To make a release build and SIS package for a device run:
 \endcode
 
 For further details on how to build applications for
-Symbian see \l {http://qt.nokia.com/doc/4.6/symbian-with-qt-introduction.html} 
+Symbian see \l {http://qt.nokia.com/doc/4.6/symbian-with-qt-introduction.html}
 {The Symbian Platform - Introduction to Qt} and \l {http://developer.symbian.org/wiki/index.php/Qt_Quick_Start}
 {Qt Quick Start}
 */
diff --git a/doc/src/examples/serviceactions.qdoc b/doc/src/examples/serviceactions.qdoc
index 167be12f3f..d8c78affbe 100644
--- a/doc/src/examples/serviceactions.qdoc
+++ b/doc/src/examples/serviceactions.qdoc
@@ -26,37 +26,37 @@
 ****************************************************************************/
 
 /*!
-    \example serviceactions 
-    \title Service Actions Example 
+    \example serviceactions
+    \title Service Actions Example
 
     This simple example demonstrates how to compose, send, show, query and retrieve messages,
-    and also react to message store events using the Qt Mobility Messaging API.
+    and also react to message store events using the QtMobility Messaging API.
 
-    Each of these actions is demonstrated in a separate sub example accessible from 
+    Each of these actions is demonstrated in a separate sub example accessible from
     the "File" menu of each platform.
 
 \section1 Send and Compose
- 
-    Messages are sent and composed from a composition widget under the "Compose/Send" 
-    menu. Relevant message details such as sending account, recipients and 
-    message bodies (attachments for email accounts) can be entered by the user 
+
+    Messages are sent and composed from a composition widget under the "Compose/Send"
+    menu. Relevant message details such as sending account, recipients and
+    message bodies (attachments for email accounts) can be entered by the user
     via corresponding UI elements. A QMessage is constructed using these details:
 
-    \snippet    ../../demos/serviceactions/mainwindow.cpp construct-message 
+    \snippet    ../../demos/serviceactions/mainwindow.cpp construct-message
 
     The message is then passed to the QMessageService::compose() or QMessageService::send()
-    service actions to initiate sending of the message by the platform, or trigger 
+    service actions to initiate sending of the message by the platform, or trigger
     display by the platforms' message composer with the QMessage contents:
 
     \snippet    ../../demos/serviceactions/mainwindow.cpp send-compose-message
-    
-\section1 Show 
+
+\section1 Show
 
     Messages are displayed by a show widget under the "Show" menu. This widget
-    displays the users last 50 messages. (Ensure the platform has one or more messages 
+    displays the users last 50 messages. (Ensure the platform has one or more messages
     in its mail accounts).
 
-    The last 50 messages (incoming/outgoing) are queried from the store using 
+    The last 50 messages (incoming/outgoing) are queried from the store using
     the QMessageService::queryMessages() service request:
 
     \snippet    ../../demos/serviceactions/mainwindow.cpp load-message
@@ -69,29 +69,29 @@
 
     \snippet    ../../demos/serviceactions/mainwindow.cpp process-results2
 
-    Selecting "Show" from the action menu will display the selected message using the 
+    Selecting "Show" from the action menu will display the selected message using the
     platforms' message viewer via the QMessageService::show() service action.
 
     \snippet    ../../demos/serviceactions/mainwindow.cpp show-message
 
-\section1 Query and Retrieve 
+\section1 Query and Retrieve
 
     Message contents are displayed/retrieved by a retrieve widget under the "Query/Retrieve" menu.
     This example displays the last 50 messages, as in the "Show" example, but also displays
     message content in a QTextBrowser widget and provides the option to download messages that are incomplete.
 
-    After the message list is populated, the message display widget will attempt to load 
-    and display the currently selected message. The completeness of the message body is checked using the 
+    After the message list is populated, the message display widget will attempt to load
+    and display the currently selected message. The completeness of the message body is checked using the
     QMessageContentContainer::isContentAvailable function. If the message body is partially downloaded, a download link
     is displayed.
 
     \snippet    ../../demos/serviceactions/mainwindow.cpp partial-message-check
 
-    When the download link is clicked, the message body is retrieved using the QMessageService::retrieveBody() service action.     
-     
+    When the download link is clicked, the message body is retrieved using the QMessageService::retrieveBody() service action.
+
     \snippet    ../../demos/serviceactions/mainwindow.cpp retrieve-message-body
 
-\section1 Store Signals 
+\section1 Store Signals
 
     This example displays the activities of the QMessageManager in a QListWidget by connecting to QMessageManager::message(Added/Updated/Removed) signals.
 
diff --git a/doc/src/examples/todo.qdoc b/doc/src/examples/todo.qdoc
index 3e92092184..28f6f33283 100644
--- a/doc/src/examples/todo.qdoc
+++ b/doc/src/examples/todo.qdoc
@@ -30,7 +30,7 @@
     \title ToDo Example
 
     The ToDo example shows how to organize todo items using the
-    Qt Mobility Organizer framework. 
+    QtMobility Organizer framework.
 
     \image todoexample.png
 
@@ -105,7 +105,7 @@
 
     The constructor creates the QOrganizerManager instance:
 
-    \snippet examples/todo/window.cpp 0 
+    \snippet examples/todo/window.cpp 0
 
     We here instruct that the manger should use the \c memory backend.
     This backend implements the default schema and uses the computers
diff --git a/doc/src/examples/writemessage.qdoc b/doc/src/examples/writemessage.qdoc
index ab97de71ec..bd3badb3e1 100644
--- a/doc/src/examples/writemessage.qdoc
+++ b/doc/src/examples/writemessage.qdoc
@@ -31,17 +31,17 @@
 
 
 
-    This example demonstrates using the Qt Mobility Messaging API to 
+    This example demonstrates using the QtMobility Messaging API to
     create and send a simple message.
 
     \image writemessage-example.png
 
-    The writemessage application provides an interface allowing the user to 
+    The writemessage application provides an interface allowing the user to
     compose a simple message and send that message to one or more
-    recipients.  The type of message that is sent will depend on the 
+    recipients.  The type of message that is sent will depend on the
     messaging account that the user selects for transmission.
 
-    In order to know what type of message to create, our application 
+    In order to know what type of message to create, our application
     requires that the user select an account to transmit with.  We create
     a listing to present the user a choice, by populating a combo box
     with the names of the available accounts:
diff --git a/doc/src/feedback.qdoc b/doc/src/feedback.qdoc
index 5f8be9de04..2fadf88ba6 100644
--- a/doc/src/feedback.qdoc
+++ b/doc/src/feedback.qdoc
@@ -39,14 +39,14 @@ user in response to their actions (for example, touching an onscreen button), an
 control the vibration of the device (when a vibrator is used) or the piezo feedback
 from the screen.
 
-This is part of the Qt Mobility Project.
+This is part of the QtMobility Project.
 
 \tableofcontents
 
 \section1 Namespace
 
 The QtMobility APIs are placed into the \i{QtMobility} namespace. This is done
-to facilitate the future migration of Mobility APIs into Qt. See the
+to facilitate the future migration of QtMobility APIs into Qt. See the
 \l {Quickstart Example}{Quickstart guide} for an example on how the
 namespace impacts on application development.
 
@@ -76,7 +76,7 @@ check what formats are supported by the system by calling QFeedbackFileEffect::s
 For the vast majority of use cases, the QFeedbackEffect, QFeedbackHapticsEffect
 and QFeedbackFileEffect classes are the only classes which developers will use
 in their programs.  There are some special cases, however, where they may wish
-to implement their own feedback plugin.  The Qt Mobility Feedback API allows
+to implement their own feedback plugin.  The QtMobility Feedback API allows
 third party developers to implement QFeedbackInterface in a plugin which may be
 loaded by the plugin loading mechanism to play feedback effects.
 
@@ -172,7 +172,7 @@ application.
 
 For details on the QML support provided for the Feedback API see the documentation for the \l {Feedback QML Plugin}.
 
-\note At the time of the Qt Mobility 1.1 release the QML support for the Feedback API is incomplete and likely to be refined and improved in the next patch release.
+\note At the time of the QtMobility 1.1 release the QML support for the Feedback API is incomplete and likely to be refined and improved in the next patch release.
 
 
 */
diff --git a/doc/src/gallery.qdoc b/doc/src/gallery.qdoc
index bce61ee219..8052da74c9 100644
--- a/doc/src/gallery.qdoc
+++ b/doc/src/gallery.qdoc
@@ -65,7 +65,7 @@
     \section1 Namespace
 
     The QtMobility APIs are placed into the \i{QtMobility} namespace. This
-    is done to facilitate the future migration of Mobility APIs into Qt. See
+    is done to facilitate the future migration of QtMobility APIs into Qt. See
     the \l {Quickstart Example}{Quickstart guide} for an example on how the
     namespace impacts on application development.
 
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index 836fb4e3ee..2d90dfe500 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -27,9 +27,9 @@
 
 /*!
     \group mobility
-    \title Qt Mobility Project APIs
+    \title QtMobility Project APIs
 
-    Qt Mobility Project supplies a set of new APIs for Qt enabling a range of
+    QtMobility Project supplies a set of new APIs for Qt enabling a range of
     mobile-centric technologies and features on mobile and non-mobile platforms.
 
 */
@@ -40,7 +40,7 @@
     \page index.html
     \startpage index.html  Qt Reference Documentation
 
-    \brief An overview of the Qt Mobility Project APIs.
+    \brief An overview of the QtMobility Project APIs.
 
     \tableofcontents
 
@@ -52,9 +52,9 @@
 
     \section1 Overview
 
-    \section2 Introducing the Qt Mobility Project APIs
+    \section2 Introducing the QtMobility Project APIs
 
-    The Qt Mobility project covers a diverse range of features and technologies.
+    The QtMobility project covers a diverse range of features and technologies.
     It is not a single API but a collection of APIs and frameworks.
 
     This release contains the following APIs:
@@ -64,7 +64,7 @@
     These APIs give the developer a range of desirable functions for a
     mobile platform, but now these functions become possible on platforms not
     traditionally associated with some of the features. A mobile device
-    using the Qt Mobility Project API would be able to
+    using the QtMobility Project API would be able to
         \list
         \o Locate services on-board or remotely. Find an optimal
     connection to the network for the particular service.
@@ -84,24 +84,24 @@
     irrespective of whether the platform is mobile or not. This means that
     there is the possibility of easy transfer of user experience from PC to
     phone or vice versa.
-    
+
     \section1 Namespace
 
-    The Qt Mobility project APIs are placed into the \i{QtMobility} namespace, with
+    The QtMobility project APIs are placed into the \i{QtMobility} namespace, with
     the important exception of Multimedia. This is done to facilitate the
-    future migration of Mobility APIs into Qt.
-    
+    future migration of QtMobility APIs into Qt.
+
     See the \l {Quickstart Example}{Quickstart guide} for an example on how
     the  namespace impacts on application development.
 
     \section1 Getting Started
-    To get started with Qt Mobility see the
+    To get started with QtMobility see the
     \list
         \o \l {Installation Guide}
         \o \l {Quickstart Example}
-        \o \l {Qt Mobility Examples}{List of all examples.}
+        \o \l {QtMobility Examples}{List of all examples.}
     \endlist
-    
+
     For users on the supported Symbian platforms, shown at the bottom of this
     page, see the instructions at the
     \l{http://library.forum.nokia.com/topic/Qt_for_Symbian_Developers_Library/GUID-7E53D0F7-72CB-41C4-8807-FE7A772B0DB4.html}{Qt For Symbian Developer's Library}
@@ -110,13 +110,13 @@
     See \l {Release Notes of the QtMobility Project release}{Release Notes}.
 
     For an overview of Platform Compatibility see \l {Platform Compatibility}.
-    
-    \section1 The Qt Mobility APIs
-    
+
+    \section1 The QtMobility APIs
+
     \section2 Service Framework
 
     A platform independent method of finding Services. A 'service' is an
-    independent component that allows a client to perform a well-defined 
+    independent component that allows a client to perform a well-defined
     operation.
 
     The services are implemented as plugins installed on the device and can
@@ -127,16 +127,16 @@
     Since this is an abstraction layer then the app does not need to be
     concerned with the underlying protocol, where the servers are, the
     hardware peculiarities with networking and other low level details.
-    
+
     For more details see the \l {Qt Service Framework} {Service Framework API overview}.
 
     \section2 Messaging
 
-    A common interface for handling SMS, MMS, MIME Email and TNEF Email 
-    messages. Enables access to messaging services to search and sort 
-    messages, notify of changes to messages stored, send messages 
-    with or without attachments, retrieve message data, and launch the 
-    preferred messaging client to either display an existing message, 
+    A common interface for handling SMS, MMS, MIME Email and TNEF Email
+    messages. Enables access to messaging services to search and sort
+    messages, notify of changes to messages stored, send messages
+    with or without attachments, retrieve message data, and launch the
+    preferred messaging client to either display an existing message,
     or compose a message.
 
     For more details see the \l {Messaging} {Messaging API overview}.
@@ -152,7 +152,7 @@
 
     Some platforms can have a set of grouped access points perhaps based on a
     common purpose. Bearer Management allows comparison and prioritization
-    of the access and use of these points. 
+    of the access and use of these points.
 
     The aim of Bearer Management is to reduce the need for the developer to be
     concerned about trying to locate the best connection from a list of
@@ -176,7 +176,7 @@
     application enumerates available connections, shows counters, and allows
     the user to connect or disconnect
         \endlist
-    
+
     For more details, see the \l {Bearer management} {Bearer Management API overview}.
 
     \section2 Publish and Subscribe
@@ -191,7 +191,7 @@
 
     At this stage the API is intended to act as a common communications
     method between applications, whether local or remote.
-    
+
     For more details, see the \l {Publish and Subscribe} {Publish and Subscribe API overview}.
 
     \section2 Contacts
@@ -204,14 +204,14 @@
 
     \section2 Location
 
-    The location API is composed of 3 components. Location positioning, 
-    landmarks, and mapping and navigation.  The location positioning API provides an easy to 
+    The location API is composed of 3 components. Location positioning,
+    landmarks, and mapping and navigation.  The location positioning API provides an easy to
     use interface that encapsulates basic geographical information obtained
     from satellite or other sources about the user, including latitude and
-    longitude, bearing, speed and altitude.  The Landmarks API allows storage and 
+    longitude, bearing, speed and altitude.  The Landmarks API allows storage and
     retrieval of points of interests while the Maps and Navigation API provides
     mapping, geocoding and routing functionality.
-    
+
     For more details, see the \l {Location} {Location API overview}.
 
     \section2 Multimedia
@@ -221,14 +221,14 @@
     would find on a music and video player, combined with an FM radio.
 
     For more details see the \l {Multimedia} {Multimedia API overview}.
-    
+
     \section2 System Information
 
     An API to discover system related information and capabilities. Information
     available will cover software version numbers, hardware features,
     network connection types and status, display, data storage devices,
     device information and the screensaver.
-    
+
     For more details see the \l {System Information} {System Information API overview}.
 
     \section2 Sensors
@@ -266,7 +266,7 @@
     is part of the Multimedia API.
 
     For more details, see the \l {Multimedia} {Multimedia API overview}.
-    
+
     \section2 Landmarks
 
     The Landmarks portion of the Location API facilitates the creation,
@@ -283,7 +283,7 @@
     of documents, or to discover documents with desired meta-data.
 
     For more details, see the \l {Document Gallery}{Document Gallery overview}.
-    
+
     \section2 Feedback
 
     The Feedback API enables a client to control the vibration of the device
@@ -291,10 +291,10 @@
 
     For more details, see the \l {Feedback}{Feedback API Overview}.
 
-    \section1 The QtMobility Namespace 
+    \section1 The QtMobility Namespace
 
     The QtMobility APIs are placed into the QtMobility namespace. This is
-    done to facilitate the future migration of Mobility APIs into Qt. See
+    done to facilitate the future migration of QtMobility APIs into Qt. See
     the \l {Quickstart Example}{Quickstart guide} for an example on how
     the namespace impacts on application development.
 
@@ -623,7 +623,7 @@
 
     \raw HTML
 
-    
+
 
     \endraw
 
@@ -634,10 +634,10 @@
     1) The document gallery backend for S60 3.1, 3.2, and 5.0 is not enabled
     in pre-built packages due to library dependency issues on some devices.
 
-    2.) Mobility Bearer does not support MeeGo. Use Qt 4.7 based Bearer API instead.
+    2.) QtMobility Bearer does not support MeeGo. Use Qt 4.7 based Bearer API instead.
 
     \section1 Feedback and bug reports
-    Email any inquiries and feedback about Qt Mobility to qt-mobility-feedback@trolltech.com
+    Email any inquiries and feedback about QtMobility to qt-mobility-feedback@trolltech.com
 
     And please report any bugs you may find to \l {http://bugreports.qt.nokia.com}
 
diff --git a/doc/src/installation.qdoc b/doc/src/installation.qdoc
index 9b15f48fa1..79f38164a3 100644
--- a/doc/src/installation.qdoc
+++ b/doc/src/installation.qdoc
@@ -31,14 +31,14 @@
 \title Installation Guide
 \tableofcontents
 
-\section1 Get the Qt Mobility API Package
+\section1 Get the QtMobility API Package
 To begin, obtain the most recent distribution package from
 \l {http://get.qt.nokia.com}
 
 \section1 Pre-requisites & Dependencies
-To install Qt Mobility you must already have installed
+To install QtMobility you must already have installed
 Qt 4.6 or higher, visit \l {http://get.qt.nokia.com} to obtain
-a copy. However Mobility's QML components are not enabled unless Qt 4.7 or higher is used.
+a copy. However, QtMobility's QML components are not enabled unless Qt 4.7 or higher is used.
 Furthermore perl must be installed and available in the environment path.
 Windows environments may require the installation of a perl interpreter such as
 \l {http://www.activestate.com/activeperl} {ActivePerl}. On the Maemo 5 (Fremantle)
@@ -46,7 +46,7 @@ platform PR1.2 firmware release or newer is required, and the Qt 4.7 packages
 are required.
 
 
-Qt Mobility Project APIs are comprised of a number of domains. Some of
+QtMobility Project APIs are comprised of a number of domains. Some of
 these domains have dependencies and these are outlined below:
 
 \table 80%
@@ -164,7 +164,7 @@ For landmark functionality on Harmattan, QtLocation depends on QtSparql, \l {htt
 \endtable
 
 \section1 Unpacking
-Unpack the Qt Mobility archive if you have not done so already,
+Unpack the QtMobility archive if you have not done so already,
 on Unix (X11 and Mac):
 \code
         cd /tmp
@@ -177,7 +177,7 @@ from the archive.  We only support the GNU version of the tar
 archiving utility.  Note on some systems it is called gtar.
 
 On windows, uncompress the zip file into the directory you want
-Qt Mobility Project installed, extracting to \c {C:\QtMobility}
+QtMobility Project installed, extracting to \c {C:\QtMobility}
 will create the directory \c {C:\QtMobility\%DISTNAME%}
 
 NOTE: The install path(prefix) must not contain any spaces.
@@ -189,11 +189,11 @@ platform have been met before building.
 If Qt is installed for multiple platforms it is also important
 to ensure that the correct version of \c{qmake} is being used.
 
-\bold{Note:} Static builds of Qt are not supported by Qt Mobility.
+\bold{Note:} Static builds of Qt are not supported by QtMobility.
 
 \section2 Building On Unix
 
-To configure the Qt Mobility libraries for your machine, run the
+To configure the QtMobility libraries for your machine, run the
 \c./configure script in the package directory.
 
 To specify the installation directory you may use the -prefix
@@ -234,7 +234,7 @@ mobility libraries into $PWD/install.
     use.
 
 \section2 Building On Windows
-    To configure the Qt Mobility libraries for your machine, run
+    To configure the QtMobility libraries for your machine, run
     configure in the package directory.
 
     To specify the installation directory you may use the -prefix
@@ -249,7 +249,7 @@ mobility libraries into $PWD/install.
 
     Type \c {configure -help} to get a list of all available options.
 
-    The actual commands needed to build and install Qt Mobility depends on your
+    The actual commands needed to build and install QtMobility depends on your
     development system.  To create and install the  libraries and tools from a
     Microsoft Visual Studio command prompt, type:
 \code
@@ -265,7 +265,7 @@ mobility libraries into $PWD/install.
     the correct headers and libraries are used.
 
 \section2 Building For Symbian On Windows
-    Building Qt Mobility for Symbian is not necessary as the
+    Building QtMobility for Symbian is not necessary as the
     package contains pre-built binaries for the SDK and
     SIS file for the device.  See the \c {INSTALL.symbian}
     file on how to deploy these. The file is located in the root directory
@@ -311,9 +311,9 @@ mobility libraries into $PWD/install.
     Note: QtMobility will be built using the same frameworks configuration option
     that Qt was built with.
 
-\section2 Building Individual Qt Mobility Modules
+\section2 Building Individual QtMobility Modules
 
-    Qt Mobility is comprised of several modules but all of
+    QtMobility is comprised of several modules but all of
     these may not need to be built.  To specify which modules
     should be built, use the \c{-modules} switch with the configure
     script when performing the configure step as outlined above.
@@ -372,19 +372,19 @@ editing \c{C:\autoexec.bat}
 \section2 Making the libraries available on Windows CE
 
 Environment variables do not exist on Windows CE, and so users
-of Qt Mobility for Windows CE have to do things slightly differently.
-A pre-requisite for Qt Mobility applications is that the Qt libraries and plugins have been deployed as per Qt's documentation.
+of QtMobility for Windows CE have to do things slightly differently.
+A pre-requisite for QtMobility applications is that the Qt libraries and plugins have been deployed as per Qt's documentation.
 
 The deployment of the libraries to the device is normally done
 with Microsoft Visual Studio or Microsoft ActiveSync.
 
 The libraries can be made globally available by deploying them
 to \c{C:\Windows} on the device, or can be deployed once per
-application by copying them into the same directory as the executable. Mobility
+application by copying them into the same directory as the executable. QtMobility
 expects plug-ins in the subdirecty \c {plugins/<APIname>} in one of
 the locations specified by \l QCoreApplication::libraryPaths() which includes
 \c{C:\Windows} and the Mobility application's directory.
 
 And now the installation is complete, we hope you enjoy
-using Qt Mobility.
+using QtMobility.
 */
diff --git a/doc/src/location.qdoc b/doc/src/location.qdoc
index 2999faa03f..8c60956268 100644
--- a/doc/src/location.qdoc
+++ b/doc/src/location.qdoc
@@ -53,7 +53,7 @@ and mapping and navigation.
 \section1 Namespace
 
 The QtMobility APIs are placed into the \i{QtMobility} namespace. This is done
-to facilitate the future migration of Mobility APIs into Qt. See the
+to facilitate the future migration of QtMobility APIs into Qt. See the
 \l {Quickstart Example}{Quickstart guide} for an example on how the
 namespace impacts on application development.
 
@@ -435,7 +435,7 @@ other services, the plugins are used to group the functionality per
 service provider.
 
 The plugins are accessed via QGeoServiceProvider, and a Nokia based plugin
-is part of Qt Mobility.  See the section \l{The Nokia plugin} for more details.
+is part of QtMobility.  See the section \l{The Nokia plugin} for more details.
 
 \code
     QGeoMappingManager *mappingManager = 0;
@@ -518,14 +518,14 @@ their personal offline landmarks store.
 
 \section2 The Nokia plugin
 
-Qt Mobility ships with a Maps and Navigation API plugin which accesses
+QtMobility ships with a Maps and Navigation API plugin which accesses
 the relevant Ovi services provided Nokia.  The use of these services
 is governed by the terms and conditions available in the file
 plugins/geoservices/nokia/OVI_SERVICES_TERMS_AND_CONDITIONS.txt.
 
 The Ovi services plugin can be loaded by using the plugin key "nokia".
 
-Note that accepting the terms and conditions only applies those terms and conditions to the use of the Ovi Maps Services plugin and does not limit the use of the other maps and navigation API plugins that may be included with the Qt Mobility package.
+Note that accepting the terms and conditions only applies those terms and conditions to the use of the Ovi Maps Services plugin and does not limit the use of the other maps and navigation API plugins that may be included with the QtMobility package.
 
 \section2 Implementing plugins
 
@@ -555,6 +555,6 @@ If the Mercator projection and the most common tile addressing scheme is used th
 
 For details on the QML support provided for the Location API see the documentation for the \l {Location QML Plugin}.
 
-\note At the time of the Qt Mobility 1.1.0 release the QML support for the Maps and Navigation API is incomplete and likely to be refined and improved in the next patch release.
+\note At the time of the QtMobility 1.1.0 release the QML support for the Maps and Navigation API was incomplete and likely to be refined and improved in the next patch release.
 */
 
diff --git a/doc/src/messaging-installation-on-windows-mobile.qdoc b/doc/src/messaging-installation-on-windows-mobile.qdoc
index 857fa4626a..0308ab3728 100644
--- a/doc/src/messaging-installation-on-windows-mobile.qdoc
+++ b/doc/src/messaging-installation-on-windows-mobile.qdoc
@@ -31,15 +31,15 @@
 \title Messaging Installation On Windows Mobile
 \tableofcontents
 
-\section1 Get Qt Mobility and Qt packages
+\section1 Get QtMobility and Qt packages
 
-Get the Qt Mobility Package from \l {http://get.qt.nokia.com}
+Get the QtMobility Package from \l {http://get.qt.nokia.com}
 
 Get Qt 4.5.2 (or newer) Embedded for Windows Mobile package \l {http://get.qt.nokia.com/qt/source/qt-embedded-wince-opensource-src-4.5.3.zip} {download here}.
 
 \section1 Install pre-requisites
 
-A perl interpreter such as \l {http://www.activestate.com/activeperl} {ActivePerl} must be installed and available in the environment path. 
+A perl interpreter such as \l {http://www.activestate.com/activeperl} {ActivePerl} must be installed and available in the environment path.
 
 Visual Studio 2009 or newer must be installed.
 
@@ -82,7 +82,7 @@ Windows Mobile 6 Standard SDK (including ActiveSync) must be installed \l {http:
         nmake
  \endcode
 
-\section1 Build Mobility Messaging
+\section1 Build QtMobility Messaging
 
  Open a new Visual Studio cmd shell
 
@@ -135,7 +135,7 @@ Windows Mobile 6 Standard SDK (including ActiveSync) must be installed \l {http:
 \section1 Deploy
 
  Before running a debug instance, ensure that the QtMessaging.dll is a deployment dependency for the examples and tests.
- 
+
  Right click properties on project e.g. serviceactions. Under deployment->addition files add:
  \code
         "QtMessaging.dll|$(TargetDir)|%CSIDL_PROGRAM_FILES%\serviceactions|0"
diff --git a/doc/src/messaging.qdoc b/doc/src/messaging.qdoc
index 5c49116c9b..7418c47ddc 100644
--- a/doc/src/messaging.qdoc
+++ b/doc/src/messaging.qdoc
@@ -46,18 +46,18 @@
 
 \brief The Messaging API enables access to messaging services.
 
-The Qt Messaging API enables access to messaging services to 
-search and sort messages, send messages, retrieve message 
-data, and launch the preferred messaging client on the system 
-to either display an existing message, compose a new message, 
-or respond to an existing message. 
+The Qt Messaging API enables access to messaging services to
+search and sort messages, send messages, retrieve message
+data, and launch the preferred messaging client on the system
+to either display an existing message, compose a new message,
+or respond to an existing message.
 
 \tableofcontents
 
 \section1 Namespace
 
 The QtMobility APIs are placed into the \i{QtMobility} namespace. This is done
-to facilitate the future migration of Mobility APIs into Qt. See the
+to facilitate the future migration of QtMobility APIs into Qt. See the
 \l {Quickstart Example}{Quickstart guide} for an example on how the
 namespace impacts on application development.
 
@@ -85,8 +85,8 @@ the device.
 On Microsoft Windows, MAPI header files are required to be installed,
 we recommend installing Visual Studio Express for this purpose.
 
-On Linux QMF 2010W41 or newer is required to be installed and the QMF_INCLUDEDIR and 
-QMF_LIBDIR environment variables set to the 
+On Linux QMF 2010W41 or newer is required to be installed and the QMF_INCLUDEDIR and
+QMF_LIBDIR environment variables set to the
 messagingframework/src/libraries/qmfclient
 and build/messagingframework/image/lib directories respectively.
 
@@ -202,9 +202,9 @@ showing a message using a native application.
 
 Service actions communciate their operational status by emitting signals.
 
-Functions outside the QMessageService class should not invoke network activity. 
-That is, only QMessageService functions should be responsible for initiating 
-network activity (Note: this is not true for the Windows desktop and mobile 
+Functions outside the QMessageService class should not invoke network activity.
+That is, only QMessageService functions should be responsible for initiating
+network activity (Note: this is not true for the Windows desktop and mobile
 platforms, where network activity can occur outside the client's control).
 
 \section1 Concurrent Access to Messaging Data
@@ -217,7 +217,7 @@ concurrent access, however it does not give any guarantees as to
 performance of messaging data access if accessed concurrently by
 multiple clients.
 
-A single client may access the messaging data from multiple threads, but 
+A single client may access the messaging data from multiple threads, but
 only one thread may access the data concurrently.
 
 \section1 Abstraction of Messaging Data Storage Mechanism
@@ -245,7 +245,7 @@ information from the messages stored by the system.
 
 The \l {serviceactions}{Service Actions} example is a program to demonstrate
 how to compose, send, show, query and retrieve messages, and also react to
-message store events using the Qt Mobility Messaging API.
+message store events using the QtMobility Messaging API.
 
 */
 
diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc
index 3d11503939..c0f8cb2e70 100644
--- a/doc/src/modules.qdoc
+++ b/doc/src/modules.qdoc
@@ -29,15 +29,15 @@
 /*!
     \group modules
     \title All Modules
-    \startpage index.html Qt Mobility Reference Documentation
+    \startpage index.html QtMobility Reference Documentation
     \nextpage QtServiceFramework
-    
+
     \ingroup classlists
 
-    \brief Qt Mobility comprises several modules.
+    \brief QtMobility comprises several modules.
 
     \table 80%
-    \header \o {2,1} \bold{Modules for Mobility software development}
+    \header \o {2,1} \bold{Modules for QtMobility software development}
     \row \o \l{QtNetwork} \o Network, including Bearer Management
     \row \o \l{QtServiceFramework} \o Classes for discovery and implementation of services.
     \row \o \l{QtLocation} \o Classes for geographical information support.
@@ -64,7 +64,7 @@
     \module QtNetwork
     \title QtNetwork Module
     \ingroup modules
-    
+
     \brief The QtNetwork module controls the system's connectivity state.
 */
 
@@ -149,8 +149,7 @@
     variety of formats.
 
     QtMultimediaKit contains both the low level APIs previously found in Qt 4.6
-    and also the High level Multimedia APIs that were introduced earlier in Qt
-    Mobility.
+    and also the High level Multimedia APIs that were introduced earlier in QtMobility.
 
     \section2 Namespace
     \table 80%
diff --git a/doc/src/multimedia.qdoc b/doc/src/multimedia.qdoc
index ed4663c4d9..3a75cdb311 100644
--- a/doc/src/multimedia.qdoc
+++ b/doc/src/multimedia.qdoc
@@ -28,7 +28,7 @@
 
 /*!
     \group multimedia
-    \title Mobility Multimedia
+    \title QtMobility Multimedia
     APIs to play and record media, and manage a collection of media content.
 */
 
@@ -48,7 +48,7 @@ QtMultimediaKit module. This API is planned to replace Phonon at a later stage.
 
 \section1 No Special Namespace
 
-Unlike the other APIs in Qt Mobility, the Multimedia API is \i not in the
+Unlike the other APIs in QtMobility, the Multimedia API is \i not in the
 \i QtMobility namespace.
 
 \section1 Overview
@@ -160,7 +160,7 @@ To manipulate the playlist there are the usual management functions (which are i
 Continuing with the example discussed for an Audio recorder/player, we can use this to show how to play video files with little change to the code.
 
 Moving from audio to video requires few changes in the sample code. To play a
-video playlist the code can be changed to include another new Mobility
+video playlist the code can be changed to include another new QtMobility
 Project class: \l{QVideoWidget}. This class enables control of a video
 resource with signals and slots for the control of brightness, contrast,
 hue, saturation and full screen mode.
diff --git a/doc/src/organizer.qdoc b/doc/src/organizer.qdoc
index aba27f95a4..0104c9add3 100644
--- a/doc/src/organizer.qdoc
+++ b/doc/src/organizer.qdoc
@@ -39,7 +39,7 @@ from local or remote backends.
 \ingroup mobility
 
 The Organizer API enables a client to request calendar, schedule and personal
-data from local or remote backends. This is part of the Qt Mobility Project.
+data from local or remote backends. This is part of the QtMobility Project.
 
 \tableofcontents
 
@@ -47,7 +47,7 @@ data from local or remote backends. This is part of the Qt Mobility Project.
 \section1 Namespace
 
 The QtMobility APIs are placed into the \i{QtMobility} namespace. This is done
-to facilitate the future migration of Mobility APIs into Qt. See the
+to facilitate the future migration of QtMobility APIs into Qt. See the
 \l {Quickstart Example}{Quickstart guide} for an example on how the
 namespace impacts on application development.
 
@@ -288,7 +288,7 @@ example, if you intend to implement a manager backend) please see
 \section2 QOrganizerItemDetail Leaf Classes
 
 Several subclasses of \l{QOrganizerItemDetail} are provided as part of the
-Qt Mobility Organizer API.  They are general in design but are intended
+QtMobility Organizer API.  They are general in design but are intended
 to fulfill specific use-cases.  Please note that certain backends may
 choose not to support one or more of these subclasses as they appear here;
 they may offer their own which provide similar functionality.
@@ -334,7 +334,7 @@ For more information on this topic, see please see the documentation on
 
 \section2 Synchronization and Serialization
 
-The organizer API is used by another Qt Mobility module: the
+The organizer API is used by another QtMobility module: the
 \l {Versit} {Versit}* module.  It allows
 serialization of a QOrganizerItem into an iCalendar document, and vice versa.
 
@@ -351,6 +351,6 @@ The following sample applications show examples of API usage:
 
 For details on the QML support provided for the Organizer API see the documentation for the \l {Organizer QML Plugin}.
 
-\note At the time of the Qt Mobility 1.1 release the QML support for the Organizer API is incomplete and likely to be refined and improved in the next patch release.
+\note At the time of the QtMobility 1.1 release the QML support for the Organizer API is incomplete and likely to be refined and improved in the next patch release.
 
 */
diff --git a/doc/src/organizeradvanced.qdoc b/doc/src/organizeradvanced.qdoc
index f3568ae710..6cfe57d5bb 100644
--- a/doc/src/organizeradvanced.qdoc
+++ b/doc/src/organizeradvanced.qdoc
@@ -156,17 +156,17 @@ QOrganizerManager::supportedItemTypes().
 
 \section2 Provided Engines
 
-The Organizer module of the Qt Mobility project includes several backends
+The Organizer module of the QtMobility project includes several backends
 already, some of which are designed to interface with the default calendar on
 their particular platform.
 
 \section3 In-Memory Example Engine
 
 The in-memory engine identifies itself as the "memory" engine. It is available
-on all platforms which are supported by the Qt Mobility project.
+on all platforms which are supported by the QtMobility project.
 
 The in-memory engine supports the default schema, and provides almost all
-functionality available through the Qt Mobility Organizer API; however, all data
+functionality available through the QtMobility Organizer API; however, all data
 is stored in-memory and is not persisted in any way.
 
 \section3 Symbian Engine
diff --git a/doc/src/organizerengines.qdoc b/doc/src/organizerengines.qdoc
index 2dd43a8a8b..0c86d1b2f6 100644
--- a/doc/src/organizerengines.qdoc
+++ b/doc/src/organizerengines.qdoc
@@ -74,7 +74,7 @@ refer to the main \l{Qt Organizer Schema} page.
 
 Each engine interfaces with a particular datastore, and that datastore may
 have its own particular way of identifying items stored in it.  The
-Qt Mobility Organizer API allows engine implementers to define their own
+QtMobility Organizer API allows engine implementers to define their own
 id format.
 
 Engine implementers must implement their own id classes derived from
@@ -260,7 +260,7 @@ implemented in a similar manner to the (provided) memory engine's naive implemen
 
 \section2 Example Implementation
 
-There are several implementations of QOrganizerManagerEngine available in the Qt Mobility
+There are several implementations of QOrganizerManagerEngine available in the QtMobility
 source code repository.  In particular, the "memory" engine provides an implementation of
 an in-memory, anonymous datastore which supports almost every feature in the API, and therefore
 is useful for demonstration purposes.  Be aware, however, that the implementation of all
diff --git a/doc/src/plugins/qml-contacts.qdoc b/doc/src/plugins/qml-contacts.qdoc
index bddaca6f67..5378a26405 100644
--- a/doc/src/plugins/qml-contacts.qdoc
+++ b/doc/src/plugins/qml-contacts.qdoc
@@ -28,7 +28,7 @@
 /*!
     \group qml-contacts
     \title QML Contacts
-    QML Support for the Mobility Project Contacts API.
+    QML Support for the QtMobility Project Contacts API.
 
 */
 
@@ -38,9 +38,9 @@
 
     \title Contacts QML Plugin
 
-    \brief A QML plugin for the Mobility Project Contacts API.
+    \brief A QML plugin for the QtMobility Project Contacts API.
+
 
-    
 
     \section1 Overview
 
@@ -65,7 +65,7 @@
     the contact address detail's \l {Address::country} is "Australia" AND an union
     of (\l {Birthday::birthday} is between '1970-01-01' and '1984-12-31' OR this contact is a lady
     ({Gender::gender} is Gender.Male).
-    
+
     The list of contacts in this ContactModel will firstly sort on the contacts' organization name
     and then sort on the contacts' first name.
 
diff --git a/doc/src/plugins/qml-feedback.qdoc b/doc/src/plugins/qml-feedback.qdoc
index 70fdc8cd45..89958b0ab4 100644
--- a/doc/src/plugins/qml-feedback.qdoc
+++ b/doc/src/plugins/qml-feedback.qdoc
@@ -28,7 +28,7 @@
 /*!
     \group qml-feedback
     \title QML Feedback Plugin
-    QML Support for the Mobility Project Feedback API.
+    QML Support for the QtMobility Project Feedback API.
 
 */
 
@@ -38,9 +38,9 @@
 
     \title Feedback QML Plugin
 
-    \brief A QML plugin for the Mobility Project Feedback API.
+    \brief A QML plugin for the QtMobility Project Feedback API.
+
 
-    
 
     \section1 Overview
 
@@ -51,7 +51,7 @@
     The Feedback API allows application developers to implement feedback and programmatic vibration in their applications.
     Use this in the QML \i {import} statement.
 
-    \note At the time of the Qt Mobility 1.1 release the QML support for the Feedback API is incomplete and likely to be refined
+    \note At the time of the QtMobility 1.1 release the QML support for the Feedback API is incomplete and likely to be refined
           and improved in the next patch release.
 
 
diff --git a/doc/src/plugins/qml-gallery.qdoc b/doc/src/plugins/qml-gallery.qdoc
index 0abc06f1ba..76ea8c42d6 100644
--- a/doc/src/plugins/qml-gallery.qdoc
+++ b/doc/src/plugins/qml-gallery.qdoc
@@ -28,7 +28,7 @@
 /*!
     \group qml-gallery
     \title QML Document Gallery
-    QML Support for the Mobility Project Document Gallery API.
+    QML Support for the QtMobility Project Document Gallery API.
 
 */
 
@@ -43,7 +43,7 @@
 
     \title Gallery QML Plugin
 
-    \brief A QML plugin for the Mobility Document Gallery API.
+    \brief A QML plugin for the QtMobility Document Gallery API.
 
 
     \section1 Overview
@@ -85,7 +85,7 @@
     number) item property \l {DocumentGalleryItem::progress}{progress}.
 
 
-    
+
     \section2 Query Requests
 
     The \l DocumentGalleryModel element is used to perform the requests on a
diff --git a/doc/src/plugins/qml-location.qdoc b/doc/src/plugins/qml-location.qdoc
index 26528066e4..a8529cbb8e 100644
--- a/doc/src/plugins/qml-location.qdoc
+++ b/doc/src/plugins/qml-location.qdoc
@@ -28,7 +28,7 @@
 /*!
     \group qml-location
     \title QML Location Plugin
-    QML Support for the Mobility Project Location API.
+    QML Support for the QtMobility Project Location API.
 
 */
 
@@ -37,12 +37,12 @@
 
     \title Location QML Plugin
 
-    \brief A QML plugin for the Mobility Project Location API.
+    \brief A QML plugin for the QtMobility Project Location API.
 
 
     \section1 Overview
 
-    The Location API gives users of the Qt Mobility Project the capability to write applications that understand a geographical location and movement of the position coordinates. Backend services can be called by the API to detect landmarks and display appropriate information. The QML Location Plugin delivers these capabilities in an easy to use form.
+    The Location API gives users of the QtMobility Project the capability to write applications that understand a geographical location and movement of the position coordinates. Backend services can be called by the API to detect landmarks and display appropriate information. The QML Location Plugin delivers these capabilities in an easy to use form.
 
     \section1 Positioning
 
@@ -84,7 +84,7 @@
     Various map objects can be added to the map.  These map objects are
     specified in terms of coordinates and metres.
 
-    \note At the time of the Qt Mobility 1.1 release the QML support for
+    \note At the time of the QtMobility 1.1 release the QML support for
     the Maps and Navigation API is incomplete and likely to be refined and
     improved in the next patch release.
 
diff --git a/doc/src/plugins/qml-messaging.qdoc b/doc/src/plugins/qml-messaging.qdoc
index b5d9174de7..7a4c67a991 100644
--- a/doc/src/plugins/qml-messaging.qdoc
+++ b/doc/src/plugins/qml-messaging.qdoc
@@ -28,7 +28,7 @@
 /*!
     \group qml-messaging
     \title QML Messaging
-    QML Support for the Mobility Project Messaging API.
+    QML Support for the QtMobility Project Messaging API.
 
 */
 
@@ -38,9 +38,9 @@
 
     \title Messaging QML Plugin
 
-    \brief A QML plugin for the Mobility Project Messaging API.
+    \brief A QML plugin for the QtMobility Project Messaging API.
+
 
-    
 
     \section1 Overview
 
@@ -94,7 +94,7 @@
     the message \l {MessageModel::sortBy}{Size} less than 1024 AND a union
     of (\l {MessageModel::sortBy}{Sender} is "martin" AND \l {MessageModel::sortBy}{Subject}
     does not include "re:") OR \l {MessageModel::sortBy}{Sender} includes "don".
-    
+
     Notice the use of the property \l {MessageFilter::value}{value} which
     contains the tested value. The \l {MessageModel} sets the
     \l {MessageModel::sortBy}{sortBy}
@@ -103,7 +103,7 @@
 
     \code
         import QtMobility.messaging 1.1
-        
+
         model: MessageModel {
             sortBy: MessageModel.Timestamp
             sortOrder: MessageModel.DescendingOrder
@@ -137,7 +137,7 @@
         }
     \endcode
 
-    
+
 
     \section2 The MessageModel Element
 
@@ -150,7 +150,7 @@
     a meaningful list of message items.
 
     \code
-    
+
         model: MessageModel {
             sortBy: MessageModel.Timestamp
             sortOrder: MessageModel.DescendingOrder
@@ -171,7 +171,7 @@
                 anchors.top: subjText.bottom; anchors.topMargin: 3
             }
         }
-            
+
     \endcode
 
     The code displays a list of messages showing the \i {sender} and
diff --git a/doc/src/plugins/qml-multimedia.qdoc b/doc/src/plugins/qml-multimedia.qdoc
index 5ca7046573..0043e923f4 100644
--- a/doc/src/plugins/qml-multimedia.qdoc
+++ b/doc/src/plugins/qml-multimedia.qdoc
@@ -28,7 +28,7 @@
 /*!
     \group qml-multimedia
     \title QML Multimedia Plugin
-    QML Support for the Mobility Project Multimedia API.
+    QML Support for the QtMobility Project Multimedia API.
 
 */
 
@@ -37,19 +37,19 @@
 
     \title Multimedia QML Plugin
 
-    \brief A QML plugin for the Mobility Project Multimedia API.
+    \brief A QML plugin for the QtMobility Project Multimedia API.
 
 
     \section1 Overview
 
-    The Multimedia API in the Mobility Project gives developers a simplified way to use audio and video playback. The Multimedia QML Plugin provides a QML friendly interface to these features. 
+    The Multimedia API in the QtMobility Project gives developers a simplified way to use audio and video playback. The Multimedia QML Plugin provides a QML friendly interface to these features.
 
     \section1 Elements
 
     \section2 Audio
 
     The \l {Audio}{audio} element is an easy way to add audio playback to a Qt Quick
-    scene. Mobility provides properties for control, methods (functions) and signals.
+    scene. QtMobility provides properties for control, methods (functions) and signals.
 
     The code extract below shows the creation and use of an audio element.
 
@@ -119,7 +119,7 @@
             \o \l{Audio::errorString}{errorString}
             \o A description of the current error condition.
     \endtable
-            
+
     The set of signals available allow the developer to create custom behavior when the following events occur,
 
     \table 70%
@@ -177,8 +177,8 @@
     In the above sample when the parent of MouseArea is clicked, an area of 800x600 pixels with an id of 'video', the source "video.avi" will play in that area. Notice also that signals for the Keys element have been defined so that a spacebar will toggle the pause button; the left arrow will move the current position in the video to 5 seconds previously; and the right arrow will advance the current position in the video by 5 seconds.
 
     Most of the differences will obviously be about video control and information. There are many properties associated with the \l {Video} element, most of them deal with meta-data, control of the video media and aspects of presentation.
-    
-   
+
+
     \annotatedlist qml-multimedia
 
 */
diff --git a/doc/src/plugins/qml-organizer.qdoc b/doc/src/plugins/qml-organizer.qdoc
index 6a456b2db9..7f6b33706e 100644
--- a/doc/src/plugins/qml-organizer.qdoc
+++ b/doc/src/plugins/qml-organizer.qdoc
@@ -28,7 +28,7 @@
 /*!
     \group qml-organizer
     \title QML Organizer Plugin
-    QML Support for the Mobility Project Organizer API.
+    QML Support for the QtMobility Project Organizer API.
 
 */
 
@@ -37,7 +37,7 @@
 
     \title Organizer QML Plugin
 
-    \brief A QML plugin for the Mobility Project Organizer API.
+    \brief A QML plugin for the QtMobility Project Organizer API.
 
 
     \section1 Overview
@@ -72,7 +72,7 @@
 
     \section2 Organizer Item Details
     Several sub elements of ItemDetail are provided as part of the
-    Qt Mobility Organizer API. They are general in design but are intended
+    QtMobility Organizer API. They are general in design but are intended
     to fulfill specific use-cases. Please note that certain backends may
     choose not to support one or more of these elements as they appear
     here; they may offer their own which provide similar functionality.
@@ -82,8 +82,8 @@
     with particular values for various properties in the organizer item details.
 
     \section2 Organizer Elements
-    \note At the time of the Qt Mobility 1.1 release the QML support for the Organizer API is incomplete and likely to be refined and improved in the next patch release.
-    
+    \note At the time of the QtMobility 1.1 release the QML support for the Organizer API is incomplete and likely to be refined and improved in the next patch release.
+
     \annotatedlist qml-organizer
 */
 
diff --git a/doc/src/plugins/qml-serviceframework.qdoc b/doc/src/plugins/qml-serviceframework.qdoc
index 08b2132abd..03f0ce1356 100644
--- a/doc/src/plugins/qml-serviceframework.qdoc
+++ b/doc/src/plugins/qml-serviceframework.qdoc
@@ -28,7 +28,7 @@
 /*!
     \group qml-serviceframework
     \title QML Service Framework Plugin
-    QML Support for the Mobility Project Service Framework API.
+    QML Support for the QtMobility Project Service Framework API.
 */
 
 /*!
@@ -36,17 +36,17 @@
 
     \title Service Framework QML Plugin
 
-    \brief A QML plugin for the Mobility Project Service Framework API.
+    \brief A QML plugin for the QtMobility Project Service Framework API.
 
     \section1 Overview
 
-    The Service Framework API in the Mobility Project gives developers a mechanism for
+    The Service Framework API in the QtMobility Project gives developers a mechanism for
     discovering and instantiating arbitrary services. The QML Service Framework Plugin
     enables accessing services in a very easy and simple manner by allowing users to
     declare a service or find a list of services using QML.
 
     \section1 Elements
-    The service framework QML plugin provides two elements that allow access to 
+    The service framework QML plugin provides two elements that allow access to
     registered services via QML script. In general, the QML plugin can only discover
     and load pre-registered services and does not support any run-time registration or
     unregistration of services. The servicefw tool can be used to register services
@@ -54,12 +54,12 @@
     plugin. The two available elements are in the subsequent sections.
 
     \section2 Service
-    The \l Service element provides QML with functionality reflecting the 
-    QServiceInterfaceDescriptor class which represents the details of a single service 
+    The \l Service element provides QML with functionality reflecting the
+    QServiceInterfaceDescriptor class which represents the details of a single service
     registered on the service framework system. This element also allows the service to
-    be loaded so that it will return a QObject reference of the instantiated service 
+    be loaded so that it will return a QObject reference of the instantiated service
     object. If this element is used on its own and not in conjunction to the ServiceList
-    element below, it will represent the default interface at the specified interface 
+    element below, it will represent the default interface at the specified interface
     name, which is the most convenient use-case of the QML plugin. The code snippet below
     demonstrates a typical way to load an interface in QML.
 
@@ -68,7 +68,7 @@
     import QtMobility.serviceframework 1.1
     ...
     property variant myObject: 0
-    
+
     Service {
         id: myService
         interfaceName: "com.nokia.qt.examples.ExampleService"
@@ -81,16 +81,16 @@
 
     In the above code we use a variant to store the QObject reference provided by the
     Service::serviceObject. In this case it will be an instance of the default service
-    found at the interface address "com.nokia.qt.examples.ExampleService". The code 
-    inside the QML component element is recommended so that the variable \i myObject 
+    found at the interface address "com.nokia.qt.examples.ExampleService". The code
+    inside the QML component element is recommended so that the variable \i myObject
     holds a valid object instance which can be used throughout the entire QML script.
 
     This element also provides several readable properties about the service interface.
     A useful one is the Service::valid property which will help debug if the system
-    has found a valid default interface descriptor at the specified interface name. The 
-    plugin also allows connecting to signals provided by the service. Here is a typical 
+    has found a valid default interface descriptor at the specified interface name. The
+    plugin also allows connecting to signals provided by the service. Here is a typical
     example of receiving service signals within QML for the above code.
-    
+
     \code
     Connections {
         target: myObject
@@ -107,12 +107,12 @@
     called yet or provides an invalid interface.
 
     Once a valid service instance has been obtained its methods and properties can be
-    called and accessed as if it were normal QObject in QML. The service framework 
+    called and accessed as if it were normal QObject in QML. The service framework
     example \l{declarative-sfw-notes}{Declarative Notes Manager} demonstrates the use
     of the QML plugin.
 
     \section2 ServiceList
-    The \l ServiceList element provides QML with functionality reflecting the 
+    The \l ServiceList element provides QML with functionality reflecting the
     QServiceFilter class which provides a list of \l Service elements. A very specific
     service list element can be defined by using the following code.
 
@@ -124,14 +124,14 @@
         versionMatch: ServiceList.Exact
         majorVersion: 1
         minorVersion: 3
-    } 
+    }
     \endcode
-    
+
     If the ServiceList::serviceName is not supplied the filter will search with a default
     empty string as the service name, meaning all interfaces will be returned regardless
     of the service name. Similarly if no ServiceList::versionMatch is provided the filter
     will search with a minimum version match rule.
-   
+
     The actual QDeclarativeListProperty of \l Service elements can be obtained by reading
     the ServiceList::services property which searches based on the filter values. This
     list model can then be used in a list view element.
@@ -146,16 +146,16 @@
     \endcode
 
     The service framework example \l{declarative-sfw-dialer}{Declarative Dialer} better
-    demonstrates the use of ServiceList coupled with the \l Service element to search 
+    demonstrates the use of ServiceList coupled with the \l Service element to search
     and select a service instance to implement the QML dialer application.
 
     \section1 Examples
     \list
-        \o \l{declarative-sfw-notes}{Declarative Notes Manager} 
-        \o \l{declarative-sfw-dialer}{Declarative Serviceframework Dialer} 
+        \o \l{declarative-sfw-notes}{Declarative Notes Manager}
+        \o \l{declarative-sfw-dialer}{Declarative Serviceframework Dialer}
     \endlist
 
-    \section1 QML Elements 
+    \section1 QML Elements
     \annotatedlist qml-serviceframework
 */
 
diff --git a/doc/src/publ-subs.qdoc b/doc/src/publ-subs.qdoc
index 1f60c43f07..3b06843934 100644
--- a/doc/src/publ-subs.qdoc
+++ b/doc/src/publ-subs.qdoc
@@ -56,7 +56,7 @@ navigate through and subscribe to change notifications.
 \section1 Namespace
 
 The QtMobility APIs are placed into the \i{QtMobility} namespace. This is done
-to facilitate the future migration of Mobility APIs into Qt. See the
+to facilitate the future migration of QtMobility APIs into Qt. See the
 \l {Quickstart Example}{Quickstart guide} for an example on how the
 namespace impacts on application development.
 
@@ -272,8 +272,8 @@ and QValueSpacePublisher along with the path name.
 \section3 \bold{Organization and application name}
 
 ContextKit requires providers to register with a valid DBus service name in order to publish values.
-The ContextKit Layer automatically builds this name from QCoreApplication::organizationDomain() and 
-QCoreApplication::applicationName(). In order to publish, you will need to set these 
+The ContextKit Layer automatically builds this name from QCoreApplication::organizationDomain() and
+QCoreApplication::applicationName(). In order to publish, you will need to set these
 values in your application. They are not necessary if your application only subscribes and does not
 publish.
 
diff --git a/doc/src/qlandmarks.qdoc b/doc/src/qlandmarks.qdoc
index 11116e5b09..61cebb5117 100644
--- a/doc/src/qlandmarks.qdoc
+++ b/doc/src/qlandmarks.qdoc
@@ -42,7 +42,7 @@ The following page demonstrates how to perform these operations.
 \section1 Namespace
 
 The QtMobility APIs are placed into the \i{QtMobility} namespace. This is done
-to facilitate the future migration of Mobility APIs into Qt. See the
+to facilitate the future migration of QtMobility APIs into Qt. See the
 \l {Quickstart Example}{Quickstart guide} for an example on how the
 namespace impacts on application development.
 
diff --git a/doc/src/qml-plugins.qdoc b/doc/src/qml-plugins.qdoc
index 66d5668fa6..46632c011a 100644
--- a/doc/src/qml-plugins.qdoc
+++ b/doc/src/qml-plugins.qdoc
@@ -29,20 +29,20 @@
     \page qml-plugins.html
     \group plugins
 
-    \title Mobility QML Plugins
+    \title QtMobility QML Plugins
 
     \ingroup mobility
 
-    \brief A set of QML compatible plugins for the Mobility Project.
+    \brief A set of QML compatible plugins for the QtMobility Project.
 
 
 
-    \section1 List of QML Plugins for Mobility
+    \section1 List of QML Plugins for QtMobility
     \table 80%
     \header
         \o Plugin
         \o Description
- 
+
     \row
         \o \l {Contacts QML Plugin}{Contacts}
         \o A QML plugin for the Contacts API.
@@ -66,7 +66,7 @@
         \o A QML plugin for the Publish and Subscribe API.
     \row
         \o \l {Service Framework QML Plugin}{Service Framework}
-        \o A QML plugin for the Service Framework API for 
+        \o A QML plugin for the Service Framework API for
            discovering and connecting to services.
     \row
         \o \l {Messaging QML Plugin}{Messaging}
diff --git a/doc/src/qtmobility-release-notes.qdoc b/doc/src/qtmobility-release-notes.qdoc
index 6bcbcd018a..517bcdeff9 100644
--- a/doc/src/qtmobility-release-notes.qdoc
+++ b/doc/src/qtmobility-release-notes.qdoc
@@ -39,17 +39,17 @@
     \raw HTML
     <body>
     <table border="0" cellpadding="0" cellspacing="0" width="100%">
-    
+
 
 
     <p>These Release Notes cover what's new, download and installation instructions and known issues for QtMobility 1.1.0 final release. An up-to-date list of known issues with the release can be found via the <a href="http://bugreports.qt.nokia.com"> Qt Bug Tracker</a>  which provides additional information about known issues and tasks related to Qt and the QtMobility Projects. The new Qt APIs are typically supported by backends for each platform. For overall summary of the completeness/compatibility of support for a given API see <a href="index.html#platform-compatibility">Platform Compatibility</a>.</p>
 
     <a name="What's New in QtMobility 1.1.0"></a>
     <h2>What's New in QtMobility 1.1.0</h2>
-    <p>Qt Mobility 1.1.0 final is part of our ongoing program providing new Qt APIs for mobile application development. This release contains a number of new APIs and also improvements and bug fixes since the Qt Mobility 1.0.2 release. For more details, please refer to the <a href="http://qt.nokia.com/doc/qtmobility-1.1.0"> online documentation </a> included in this distribution and the change log file.</p>
+    <p>QtMobility 1.1.0 final is part of our ongoing program providing new Qt APIs for mobile application development. This release contains a number of new APIs and also improvements and bug fixes since the QtMobility 1.0.2 release. For more details, please refer to the <a href="http://qt.nokia.com/doc/qtmobility-1.1.0"> online documentation </a> included in this distribution and the change log file.</p>
 
     <a name="contacts-api"></a>
-  
+
     <h2>Downloading and Installing</h2>
     <h3>System Requirements</h3>
     <p>Qt 4.7.0 should be used.</p>
@@ -80,7 +80,7 @@
     </ul>
     <h3>Maps and Navigation</h3>
     <ul>
-    <li>At the time of the Qt Mobility 1.1.0 release the QML support for the Maps and Navigation API is incomplete and will be improved in the next patch release. Therefore the QML API will be subject to potentially incompatible changes. </li>
+    <li>At the time of the QtMobility 1.1.0 release the QML support for the Maps and Navigation API is incomplete and will be improved in the next patch release. Therefore the QML API will be subject to potentially incompatible changes. </li>
     </ul>
     <h3>Feedback</h3>
     <ul>
diff --git a/doc/src/sensors.qdoc b/doc/src/sensors.qdoc
index cc137940e2..2ad6b7e993 100644
--- a/doc/src/sensors.qdoc
+++ b/doc/src/sensors.qdoc
@@ -38,7 +38,7 @@ and low-level, real-time sensors such as accelerometer data.
 
 \section1 Namespace
 The QtMobility APIs are placed into the \i{QtMobility} namespace. This is done
-to facilitate the future migration of Mobility APIs into Qt. See the
+to facilitate the future migration of QtMobility APIs into Qt. See the
 \l {Quickstart Example}{Quickstart guide} for an example on how the
 namespace impacts on application development.
 
@@ -327,7 +327,7 @@ handle the situation gracefully.
 /*!
 \page qml-sensors.html
 \title Sensors QML Plugin
-\brief A QML plugin for the Mobility Project Sensors API.
+\brief A QML plugin for the QtMobility Project Sensors API.
 
 \section1 Overview
 
diff --git a/doc/src/sf.qdoc b/doc/src/sf.qdoc
index 191ef79a98..1a2735caf8 100644
--- a/doc/src/sf.qdoc
+++ b/doc/src/sf.qdoc
@@ -54,7 +54,7 @@ arbitrary services.
 \section1 Namespace
 
 The QtMobility APIs are placed into the \i{QtMobility} namespace. This is done
-to facilitate the future migration of Mobility APIs into Qt. See the
+to facilitate the future migration of QtMobility APIs into Qt. See the
 \l {Quickstart Example}{Quickstart guide} for an example on how the
 namespace impacts on application development.
 
diff --git a/doc/src/si.qdoc b/doc/src/si.qdoc
index 34d9bb8546..865038c9f9 100644
--- a/doc/src/si.qdoc
+++ b/doc/src/si.qdoc
@@ -45,7 +45,7 @@
 \section1 Namespace
 
 The QtMobility APIs are placed into the \i{QtMobility} namespace. This is done
-to facilitate the future migration of Mobility APIs into Qt. See the
+to facilitate the future migration of QtMobility APIs into Qt. See the
 \l {Quickstart Example}{Quickstart guide} for an example on how the
 namespace impacts on application development.
 
diff --git a/doc/src/tutorials.qdoc b/doc/src/tutorials.qdoc
index 8f10073072..90ba702fa9 100644
--- a/doc/src/tutorials.qdoc
+++ b/doc/src/tutorials.qdoc
@@ -27,8 +27,8 @@
 
 /*!
     \page tutorials.html
-     \title Qt Mobility Tutorials
-     
+     \title QtMobility Tutorials
+
      \section2 Location
      \list
      \o \l{Maps Navigator Tutorial}{Maps Navigator}
diff --git a/doc/src/tutorials/mapsnavigator.qdoc b/doc/src/tutorials/mapsnavigator.qdoc
index 9ab9e973d8..dfbe40d064 100644
--- a/doc/src/tutorials/mapsnavigator.qdoc
+++ b/doc/src/tutorials/mapsnavigator.qdoc
@@ -28,24 +28,24 @@
 /*!
     \page tutorials-mapsnavigator.html
     \title Maps Navigator Tutorial
-    
+
     \brief An introduction to the Location API, showing how to develop a simple
            map search and navigation application.
-    
+
     In this tutorial, you will learn about the basic components of the Location
     API, including
-    
+
     \list
     \o items
     \o here...
     \endlist
-    
+
     We will be developing the map search and navigation application shown below:
-    
+
     \image mapsnavigator-finished.png
-    
+
     Tutorial contents:
-    
+
     \list 1
     \o \l{tutorials/mapsnavigator/part1}{The Map Widget}
     \o \l{tutorials/mapsnavigator/part2}{Searching for locations}
@@ -53,7 +53,7 @@
     \o \l{tutorials/mapsnavigator/part4}{Stopping for directions}
     \o \l{tutorials/mapsnavigator/part5}{Kinetic panning and tuning for mobile}
     \endlist
-    
+
     Some more text goes here.
 */
 
@@ -61,23 +61,23 @@
     \page tutorials-mapsnavigator-part1.html
     \example tutorials/mapsnavigator/part1
     \title Part 1 - The Map Widget
-    
+
     To begin with, we will start defining the map widget, which is the central part of
     the application's user interface. Enough of the map widget will be defined here to
     work satisfactorily on most desktop platforms -- full consideration for mobile use
     will be made later along with other parts of the application.
-    
+
     \section2 The very basics
-    
+
     The Location module provides the QGraphicsGeoMap which is a simple, easy way to insert
     maps into a QGraphicsScene. Since we're going to be extending the map later, we'll
     create a subclass of QGraphicsGeoMap called \c GeoMap, as below:
-    
+
     \code
 class GeoMap : public QGraphicsGeoMap
 {
     Q_OBJECT
-    
+
 public:
     GeoMap(QGeoMappingManager *manager, MapsWidget *mapsWidget);
 
@@ -90,10 +90,10 @@ GeoMap::GeoMap(QGeoMappingManager *manager, MapsWidget *mapsWidget) :
 {
 }
     \endcode
-    
+
     And next we define a QWidget subclass, MapsWidget, which handles the creation of
     QGraphicsView and QGraphicsScene to put the GeoMap into:
-    
+
     \code
 class MapsWidget : public QWidget
 {
@@ -111,9 +111,9 @@ private:
     QGraphicsView *graphicsView;
 };
     \endcode
-    
+
     We perform the creation of the QGraphicsScene and GeoMap in the initialize() method:
-    
+
     \code
 void MapsWidget::initialize(QGeoMappingManager *manager)
 {
@@ -132,20 +132,20 @@ void MapsWidget::initialize(QGeoMappingManager *manager)
     geoMap->setZoomLevel(15);
 }
     \endcode
-    
+
     Doing this in the constructor, while possible, is not the preferred approach, as
     the QGeoMappingManager may not be available until the user has chosen it, or until a
     network connection is available. This is especially important in mobile
     environments, as we'll see later.
-    
+
     To get an instance of QGeoMappingManager we use the list of service providers
     available in QGeoServiceProvider::availableServiceProviders(). Service providers
     provide the ability to fetch and draw maps, search for locations, get directions,
     and a variety of other tasks.
-    
+
     To test out the MapsWidget we just wrote, we can simply get the first available
     service provider in the main() function, as follows:
-    
+
     \code
 int main(int argc, char *argv[])
 {
@@ -162,19 +162,19 @@ int main(int argc, char *argv[])
     return a.exec();
 }
     \endcode
-    
+
     If you compile and run the code so far, you should see a window appear containing
     a street map of Eight Mile Plains, in Queensland, Australia, rendered by your
     platform's default geo service provider.
-    
+
     \image mapsnavigator-verybasic.png
-    
+
     \section2 Pan & zoom
-    
+
     Next we'll add some basic pan and zoom capability to the map widget. Like most other
     classes in Qt, QGraphicsGeoMap allows mouse and keyboard events to be handled by
     private methods.
-    
+
     Into the private section of the GeoMap declaration we add:
     \code
 bool panActive;
@@ -183,9 +183,9 @@ void mousePressEvent(QGraphicsSceneMouseEvent *event);
 void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
 void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
     \endcode
-    
+
     And their definitions:
-    
+
     \code
 void GeoMap::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
@@ -208,15 +208,15 @@ void GeoMap::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
     event->accept();
 }
     \endcode
-    
+
     These three short methods are enough to add basic panning support to the map.
     The panning method is a simple mouse-locked one, and moving long distances on
     a touch screen with it can get quite tedious. Many map applications now make
     use of "kinetic" panning for a better user experience, especially on touch
     devices, and we'll implement support for that later.
-    
+
     Next, to add zoom support on the mouse scrollwheel:
-    
+
     \code
 void GeoMap::wheelEvent(QGraphicsSceneWheelEvent *event)
 {
@@ -236,20 +236,20 @@ void GeoMap::wheelEvent(QGraphicsSceneWheelEvent *event)
     event->accept();
 }
     \endcode
-    
+
     This method is a little more complicated. To provide a suitable zoom feel, we
     have to actually combine panning with zooming, so that the user's point of
     interest (the mouse cursor) remains in the same part of the view. So, we
     actually pan the mouse cursor's location into the center, then adjust
     the zoom level, then pan back at the end.
-    
+
     \section2 Map icons
-    
+
     Another important basic feature is the ability to render icons on the map to
-    represent points of interest. The QGeoMapPixmapObject class provides most of 
+    represent points of interest. The QGeoMapPixmapObject class provides most of
     the functionality necessary to achieve this, and we'll use a subclass of it
     in similar vein to our GeoMap, above.
-    
+
     For our application, we need to deal with 6 different kinds of icons:
     \list
     \o A "my location" icon
@@ -259,7 +259,7 @@ void GeoMap::wheelEvent(QGraphicsSceneWheelEvent *event)
     \o End points for directions
     \o "Path" markers for individual steps in the direction route
     \endlist
-    
+
     \code
 class Marker : public QGeoMapPixmapObject
 {
@@ -284,11 +284,11 @@ private:
 
 };
     \endcode
-    
+
     So we can construct Marker instances of different types, but we need QPixmaps
     to represent each one. In our implementation we will simply use a \c switch
     statement to map MarkerTypes to QPixmaps.
-    
+
     \code
 Marker::Marker(MarkerType type) :
     QGeoMapPixmapObject()
@@ -337,30 +337,30 @@ void Marker::setMarkerType(MarkerType type)
     setPixmap(QPixmap(filename).scaledToWidth(scale, Qt::SmoothTransformation));
 }
     \endcode
-    
+
     The icon PNG images can be found in the \c examples/mapsnavigator/icons
-    directory in the Qt Mobility distribution. All we have to do to have this
-    working is simply add the PNG icons to a \c .qrc file and add it to the 
+    directory in the QtMobility distribution. All we have to do to have this
+    working is simply add the PNG icons to a \c .qrc file and add it to the
     project.
-    
+
     The QGraphicsGeoMap::addMapObject method is used to add markers to a map.
-    We can add a call to create a marker at our starting point into 
+    We can add a call to create a marker at our starting point into
     MapsWidget::initialize() as a demonstration:
-    
+
     \code
 // in MapsWidget::initialize()
 Marker *me = new Marker(Marker::MyLocationMarker);
 me->setCoordinate(QGeoCoordinate(-27.5796, 153.1));
 geoMap->addMapObject(me);
     \endcode
-    
+
     Build and start the application, and we now have a "My Location" icon in
     the centre of the initial view.
-    
+
     This now concludes the basic functionality of the map widget. We'll be
     making a few modifications and improvements to it as we go along, but
     the basic skeleton will remain the same.
-    
+
     Next, we'll add a basic GUI around the map widget, and the ability
     to search for locations like addresses.
 */
@@ -369,21 +369,21 @@ geoMap->addMapObject(me);
     \page tutorials-mapsnavigator-part2.html
     \example tutorials/mapsnavigator/part2
     \title Part 2 - Searching for locations
-    
+
     Now that we have a basic map widget, we want to add the capability
     to search for addresses and locations and create markers for them
     on the map.
-    
+
     \section2 Search classes
-    
+
     Searching in the Location API is handled by use of the QGeoSearchManager,
     which we obtain in similar fashion to the MappingManager (in main() in
     part 1). As we want to create markers for search results and then
     be able to remove them for the next search (or perhaps other operations),
     we need some way to organise collections of markers.
-    
+
     To do this, we introduce a new class, MarkerManager:
-    
+
     \code
 class MarkerManager : public QObject
 {
@@ -414,10 +414,10 @@ private slots:
     void replyFinished(QObject *reply);
 };
     \endcode
-    
+
     The MarkerManager tracks both the "My Location" marker and a list of search
     result markers. Implementing the My Location portion is nothing new:
-    
+
     \code
 MarkerManager::MarkerManager(QGeoSearchManager *searchManager, QObject *parent) :
     QObject(parent),
@@ -445,16 +445,16 @@ void MarkerManager::setMyLocation(QGeoCoordinate coord)
     m_myLocation->setCoordinate(coord);
 }
     \endcode
-    
+
     To implement searching, we call the QGeoSearchManager::search method, which
     returns a QGeoSearchReply. This reply object emits a signal finished() when
     the search results are available. It can also be constructed already
     finished, and we need to check for this first before connecting the signals.
-    
+
     Since we'd like to have one general slot that handles both the pre-finished
     and the signal case, we give the slot a QObject* parameter and make use of
     QSignalMapper:
-    
+
     \code
 void MarkerManager::search(QString query)
 {
@@ -473,11 +473,11 @@ void MarkerManager::search(QString query)
     }
 }
     \endcode
-    
+
     The QGeoSearchReply yields its results as a list of QGeoPlace instances.
     While these hold quite a bit of information, for now we'll just be using
     them for their coordinates.
-    
+
     \code
 void MarkerManager::replyFinished(QObject *obj)
 {
@@ -503,10 +503,10 @@ void MarkerManager::replyFinished(QObject *obj)
     emit searchFinished();
 }
     \endcode
-    
+
     Next, we add two methods to MapsWidget to keep track of a MarkerManager
     instance associated with its map:
-    
+
     \code
 class MapsWidget : public QWidget
 {
@@ -521,9 +521,9 @@ private:
     ...
 };
     \endcode
-    
+
     And then add two small sections of code to connect them together:
-    
+
     \code
 void MapsWidget::initialize(QGeoMappingManager *manager)
 {
@@ -540,35 +540,35 @@ void MapsWidget::setMarkerManager(MarkerManager *markerManager)
         markerManager->setMap(geoMap);
 }
     \endcode
-    
+
     Now we have basic search capability added to our code. But we still
     have no GUI to drive it, and so we'll focus on that in the next section.
-    
+
     \section2 GUI with search dialog
-    
+
     Next we'll build a GUI around our map widget and add a search dialog to
     make use of the code we just wrote. Our finished GUI looks like this:
-    
+
     \image mapsnavigator-searchgui.png
-    
+
     We won't cover building the GUI in too much detail (that being the
     subject of other tutorials), but the complete code is in the finished
-    MapsNavigator example in the Qt Mobility distribution.
-    
+    MapsNavigator example in the QtMobility distribution.
+
     Our GUI consists of a QMainWindow containing our MapsWidget and a QMenuBar.
     On the QMenuBar is an option for zooming to the current "My Location", and
     a menu for performing search operations.
-    
+
     Also part of the GUI is the dialog box displayed when selecting "Search
     for address or name" -- this is a simple QDialog subclass with a QFormLayout
     and a QDialogButtonBox.
-    
+
     In the MainWindow constructor, we simply set up the menubar and MapsWidget
     and other UI details. All initialization of Location-based details are in
     the MainWindow::initialize() slot. For the moment, we will simply assume
     that initialize() is called directly from the constructor (the purpose of
     this decoupling will be explained later).
-    
+
     \code
 void MainWindow::initialize()
 {
@@ -601,19 +601,19 @@ void MainWindow::initialize()
     mapsWidget->setMyLocation(QGeoCoordinate(-27.5796, 153.1));
 }
     \endcode
-    
+
     As you can see, this performs more or less the same actions as our old
     code in main() from part 1 of the tutorial did. It fetches the first
     available service provider, then initializes the MapsWidget and
     MarkerManager using the appropriate Manager instances.
-    
+
     Additionally, we've added a setMyLocation() method to MapsWidget which
     simply calls the current MarkerManager's method of the same name, plus
     centreing the view on the marker.
-    
+
     The "Search for address or name" menu item sets off the showSearchDialog()
     slot:
-    
+
     \code
 void MainWindow::showSearchDialog()
 {
@@ -626,7 +626,7 @@ void MainWindow::showSearchDialog()
     }
 }
     \endcode
-    
+
     Which uses the methods on MarkerManager that we defined previously. So now
     we have a basic searchable mapping application. However, there is one big
     piece of functionality missing for a searchable map: consider if we had
@@ -635,15 +635,15 @@ void MainWindow::showSearchDialog()
     with tens or hundreds of businesses that match the name we typed from all
     around the world. Some of these results might not even be the kind of
     business we were looking for (partial text matches etc).
-    
+
     This can be solved with the addition of two key features: viewing the extra
     details about search results that we're currently throwing away; and adding
     the ability to limit the search area.
-    
+
     \section2 Adding details to search markers
-    
+
     First up, we'll add some additional properties to the Marker class:
-    
+
     \code
 class Marker : public QGeoMapPixmapObject
 {
@@ -651,13 +651,13 @@ class Marker : public QGeoMapPixmapObject
 public:
     inline QString name() const { return m_name; }
     inline void setName(QString name) { m_name = name; }
-    
+
     inline QGeoAddress address() const { return m_address; }
     inline void setAddress(QGeoAddress addr) { m_address = addr; }
 
     inline bool moveable() const { return m_moveable; }
     inline void setMoveable(bool moveable) { m_moveable = moveable; }
-    
+
 private:
     ...
     QString m_name;
@@ -665,9 +665,9 @@ private:
     QGeoAddress m_address;
 };
     \endcode
-    
+
     And add code to MarkerManager to set them from search results:
-    
+
     \code
 void MarkerManager::replyFinished(QObject *obj)
 {
@@ -687,24 +687,24 @@ void MarkerManager::replyFinished(QObject *obj)
         m->setMoveable(false);
     ...
     \endcode
-    
+
     So now the data is available from the Marker objects. We want to show
     this to the user somehow, though, and the best means of doing this is
     probably a dialog box. We're going to do a dialog box that appears when
     the user clicks a marker, so we'll have to add click detection to
     MapsWidget and GeoMap, first.
-    
+
     We already have methods for handling mouse presses and releases over
-    the map widget, so we will modify these. Add two private fields and a 
+    the map widget, so we will modify these. Add two private fields and a
     signal to GeoMap:
-    
+
     \code
 class GeoMap : public QGraphicsGeoMap
 {
     ...
 signals:
     void clicked(Marker *marker);
-    
+
 private:
     ...
     bool markerPressed;
@@ -712,10 +712,10 @@ private:
     ...
 };
     \endcode
-    
+
     We set the \c markerPressed flag when the mouse has been pressed over a
     map object, and set \c pressed to the map object in question.
-    
+
     \code
 void GeoMap::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
@@ -750,12 +750,12 @@ void GeoMap::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
     event->accept();
 }
     \endcode
-    
+
     Finally, we need to pass this clicked() signal up through MapsWidget so
     that we can use it from outside. We do this by adding a signal and
     connecting GeoMap's signal to the signal on MapsWidget with the same
     name.
-    
+
     \code
 class MapsWidget : public QWidget
 {
@@ -772,15 +772,15 @@ void MapsWidget::initialize(QGeoMappingManager *manager)
             this, SIGNAL(markerClicked(Marker*)));
 }
     \endcode
-    
+
     Now that's done, creating a dialog box to display the address information
     is relatively trivial. The MarkerDialog class contains a QLineEdit for the
     name field, a readonly QLabel for the address, and two QDoubleSpinBoxes
     for latitude and longitude.
-      
+
     We connect up the MapsWidget's markerClicked() signal to a slot in
     MainWindow:
-    
+
     \code
 void MainWindow::on_markerClicked(Marker *marker)
 {
@@ -792,18 +792,18 @@ void MainWindow::on_markerClicked(Marker *marker)
     }
 }
     \endcode
-    
+
     And now clicking on markers on the map yields a simple editing dialog box, so
     our first task is complete.
-    
+
     \section2 Limiting search area
-    
+
     The QGeoSearchManager's search() method already comes with support for
     limited search areas -- by setting up a QGeoBoundingArea we can take
     advantage of this functionality.
-    
+
     Firstly, we'll modify the MarkerManager's search() method:
-    
+
     \code
 // declaration
 void search(QString query, qreal radius=-1);
@@ -825,13 +825,13 @@ void MarkerManager::search(QString query, qreal radius)
     if (reply->isFinished()) {
       ...
     \endcode
-    
+
     And now we need to modify the UI to expose this to the user. There are
     a few ways of doing this, but the option we'll take is to expose a
     QComboBox with some preset distances. This is easier to use on
     touch screen devices, especially, where entering numbers often takes
     much more effort from the user than selecting an option.
-    
+
     \code
 // in SearchDialog constructor
 whereCombo = new QComboBox();
@@ -842,24 +842,24 @@ whereCombo->addItem(tr("Anywhere in the world"), -1);
 whereCombo->setCurrentIndex(1);
 formLayout->addRow(tr("Where"), whereCombo);
     \endcode
-    
+
     Then to get the radius value to put into search, we simply take the user
     data from the QComboBox, convert it to a qreal and pass it through.
-    
+
     So we now have a searchable map, with clickable markers and the ability
     to limit the search radius. The last feature we'll cover that relates to
     searching is the so-called "reverse geocode" technique.
-    
+
     \section2 Reverse geocode
-    
+
     Currently, if you click the My Location icon on our map application, a
     blank address is displayed. We can add the capability here to turn the
     current coordinates of the marker into an approximate address, and the
     technique is known as "reverse geocode" searching.
-    
+
     To implement this, we'll hook into the coordinateChanged() signal of
     the Marker object:
-    
+
     \code
 MarkerManager::MarkerManager(QGeoSearchManager *searchManager, QObject *parent) :
     QObject(parent),
@@ -873,11 +873,11 @@ MarkerManager::MarkerManager(QGeoSearchManager *searchManager, QObject *parent)
             this, SLOT(myLocationChanged(QGeoCoordinate)));
 }
     \endcode
-    
+
     Then we perform the reverse lookup in the myLocationChanged() slot. This
     looks quite similar to the original search() method, with good reason, as
     the reverse geocode lookup is simply a special kind of search call.
-    
+
     \code
 void MarkerManager::myLocationChanged(QGeoCoordinate location)
 {
@@ -893,11 +893,11 @@ void MarkerManager::myLocationChanged(QGeoCoordinate location)
     }
 }
     \endcode
-    
+
     As before, we use a QSignalMapper and a slot taking a QObject* parameter
-    to handle the replies, but this time we only extract the first result and 
+    to handle the replies, but this time we only extract the first result and
     set the address of the myLocation marker:
-    
+
     \code
 void MarkerManager::reverseReplyFinished(QObject *obj)
 {
@@ -912,13 +912,13 @@ void MarkerManager::reverseReplyFinished(QObject *obj)
     reply->deleteLater();
 }
     \endcode
-    
-    However, this isn't going to work very well with a GPS updating myLocation 
+
+    However, this isn't going to work very well with a GPS updating myLocation
     on a regular basis and a slow network connection, as the requests
     will pile up and the geocoded coordinates will lag behind the reported
     ones by quite a margin. A simple scheme to solve this relies only
     on two boolean flags:
-    
+
     \code
 class MarkerManager : public QObject
 {
@@ -965,22 +965,22 @@ void MarkerManager::reverseReplyFinished(QObject *obj)
     reply->deleteLater();
 }
     \endcode
-    
+
     A reverse geocode request is only sent if the previous one has
     finished -- if it hasn't finished, a flag is set so that the location
     will be refreshed at the conclusion of the previous request. This is
     far from a perfect scheme, but in practise it works quite well.
-    
+
     At the end of part 2 now, we have a searchable map with a simple GUI,
     clickable markers, the ability to limit search radius about our location,
     and reverse geocoding to work out the address of where we are. This is
     already quite a bit of useful functionality, but we will continue to
     extend it further.
-    
+
     In part 3, we will add support for using platform positioning methods such
     as GPS, and in part 4 we will add the ability to fetch directions to a given
-    destination. Finally, in part 5 we will add kinetic scrolling and cover a 
-    number of points about means for achieving better performance on mobile 
+    destination. Finally, in part 5 we will add kinetic scrolling and cover a
+    number of points about means for achieving better performance on mobile
     platforms.
 */
 
@@ -988,16 +988,16 @@ void MarkerManager::reverseReplyFinished(QObject *obj)
     \page tutorials-mapsnavigator-part3.html
     \example tutorials/mapsnavigator/part3
     \title Part 3 - Listening to satellites
-    
-    
+
+
 */
 
 /*!
     \page tutorials-mapsnavigator-part4.html
     \example tutorials/mapsnavigator/part4
     \title Part 4 - Stopping for directions
-    
-    
+
+
 */
 
 /*!
diff --git a/doc/src/versit.qdoc b/doc/src/versit.qdoc
index f9039fd8a3..8cae5f0f38 100644
--- a/doc/src/versit.qdoc
+++ b/doc/src/versit.qdoc
@@ -38,7 +38,7 @@
 \section1 Namespace
 
 The QtMobility APIs are placed into the \i{QtMobility} namespace. This is done
-to facilitate the future migration of Mobility APIs into Qt. See the
+to facilitate the future migration of QtMobility APIs into Qt. See the
 \l {Quickstart Example}{Quickstart guide} for an example on how the
 namespace impacts on application development.
 
@@ -63,8 +63,8 @@ to \l{QVersitDocument}{QVersitDocuments} using QVersitContactExporter and
 QVersitOrganizerExporter, respectively.
 
 Currently \l{QVersitReader} and \l{QVersitWriter} support
-reading and writing vCard 2.1, vCard 3.0 and iCalendar 2.0 format documents.  
-Please note that the Qt Mobility Organizer API is still under development, so
+reading and writing vCard 2.1, vCard 3.0 and iCalendar 2.0 format documents.
+Please note that the QtMobility Organizer API is still under development, so
 the Qt Versit API classes related to importing and exporting organizer items
 is subject to change.
 
@@ -99,7 +99,7 @@ The main classes for a client interested in importing or exporting vCard and
 iCalendar documents are:
 \list
     \o \l{QVersitProperty}
-    \o \l{QVersitDocument}    
+    \o \l{QVersitDocument}
     \o \l{QVersitReader}
     \o \l{QVersitWriter}
     \o \l{QVersitContactImporter}
diff --git a/src/multimedia/qtmedianamespace.qdoc b/src/multimedia/qtmedianamespace.qdoc
index 3f8c3406a5..acf1036036 100644
--- a/src/multimedia/qtmedianamespace.qdoc
+++ b/src/multimedia/qtmedianamespace.qdoc
@@ -34,8 +34,8 @@
 
     QtMultimediaKit is a module containing the low level, low latency,
     Multimedia APIs which were introduced in Qt 4.6 and also includes the
-    high level QtMultimedia APIs which were introduced in Qt Mobility 1.0.
-    
+    high level QtMultimedia APIs which were introduced in QtMobility 1.0.
+
 */
 
 /*!