Docs: Bug-5818 fixes.

Change-Id: I25e95e07ecaf1c368029741a81f7385eed801316
Reviewed-by: Peter Yard <peter.yard@nokia.com>
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>

14 files changed, 48 insertions, 43 deletions

diff --git a/src/location/maps/qgeocodereply.cpp b/src/location/maps/qgeocodereply.cpp
index 9fa6dfea..f8b1fb23 100644
--- a/src/location/maps/qgeocodereply.cpp
+++ b/src/location/maps/qgeocodereply.cpp
@@ -292,7 +292,7 @@ void QGeocodeReply::setOffset(int offset)
     This signal and QGeocodingManager::finished() will be
     emitted at the same time.
 
-    \note Do no delete this reply object in the slot connected to this
+    \note Do not delete this reply object in the slot connected to this
     signal. Use deleteLater() instead.
 */
 /*!
@@ -306,7 +306,7 @@ void QGeocodeReply::setOffset(int offset)
 
     This signal and QGeocodingManager::error() will be emitted at the same time.
 
-    \note Do no delete this reply object in the slot connected to this
+    \note Do not delete this reply object in the slot connected to this
     signal. Use deleteLater() instead.
 */
 
diff --git a/src/location/maps/qgeocodingmanager.cpp b/src/location/maps/qgeocodingmanager.cpp
index 2d881d7f..3208bf44 100644
--- a/src/location/maps/qgeocodingmanager.cpp
+++ b/src/location/maps/qgeocodingmanager.cpp
@@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
     \brief The QGeocodingManager class provides support for geocoding
     operations.
 
-    The geocode(), reverseGeocode() and search() functions return
+    The geocode() and reverseGeocode() functions return
     QGeocodeReply objects, which manage these operations and report on the
     result of the operations and any errors which may have occurred.
 
@@ -303,7 +303,7 @@ QLocale QGeocodingManager::locale() const
     This signal and QGeocodeReply::finished() will be emitted at the same
     time.
 
-    \note Do no delete the \a reply object in the slot connected to this
+    \note Do not delete the \a reply object in the slot connected to this
     signal. Use deleteLater() instead.
 */
 
@@ -318,7 +318,7 @@ QLocale QGeocodingManager::locale() const
 
     This signal and QGeocodeReply::error() will be emitted at the same time.
 
-    \note Do no delete the \a reply object in the slot connected to this
+    \note Do not delete the \a reply object in the slot connected to this
     signal. Use deleteLater() instead.
 */
 
diff --git a/src/location/maps/qgeocodingmanagerengine.cpp b/src/location/maps/qgeocodingmanagerengine.cpp
index 471f971b..eef080cb 100644
--- a/src/location/maps/qgeocodingmanagerengine.cpp
+++ b/src/location/maps/qgeocodingmanagerengine.cpp
@@ -63,12 +63,12 @@ QT_BEGIN_NAMESPACE
 
     If the service provider supports geocoding the subclass should provide an
     implementation of geocode() and call setSupportsGeocoding(true) at
-    some point in time before geoocode() is called.
+    some point in time before geocode() is called.
 
     Similarly, if the service provider supports reverse geocoding the subclass
     should provide an implementation reverseGeocode() and call
     setSupportsReverseGeocoding(true) at some point in time before
-    reverseGeoocode() is called.
+    reverseGeocode() is called.
 
     A subclass of QGeocodingManagerEngine will often make use of a subclass
     fo QGeocodeReply internally, in order to add any engine-specific
@@ -304,7 +304,7 @@ QLocale QGeocodingManagerEngine::locale() const
     This signal and QGeocodeReply::finished() will be emitted at the same
     time.
 
-    \note Do no delete the \a reply object in the slot connected to this
+    \note Do not delete the \a reply object in the slot connected to this
     signal. Use deleteLater() instead.
 */
 
@@ -319,7 +319,7 @@ QLocale QGeocodingManagerEngine::locale() const
 
     This signal and QGeocodeReply::error() will be emitted at the same time.
 
-    \note Do no delete the \a reply object in the slot connected to this
+    \note Do not delete the \a reply object in the slot connected to this
     signal. Use deleteLater() instead.
 */
 
diff --git a/src/location/maps/qgeomappingmanagerengine.cpp b/src/location/maps/qgeomappingmanagerengine.cpp
index d476c835..52a0329f 100644
--- a/src/location/maps/qgeomappingmanagerengine.cpp
+++ b/src/location/maps/qgeomappingmanagerengine.cpp
@@ -55,9 +55,11 @@ QT_BEGIN_NAMESPACE
     \ingroup QtLocation-impl
     \since Qt Location 5.0
 
-    \brief The QGeoMappingManagerEngine class provides an interface and convenience methods
-    to implementors of QGeoServiceProvider plugins who want to provide support for displaying
-    and interacting with maps.
+    \brief Provides support functionality for map display with QGeoServiceProvider.
+
+    The QGeoMappingManagerEngine class provides an interface and convenience
+    methods to implementors of QGeoServiceProvider plugins who want to
+    provide support for displaying and interacting with maps.
 */
 
 /*!
diff --git a/src/location/maps/qgeoroutereply.cpp b/src/location/maps/qgeoroutereply.cpp
index 730100cd..97e91765 100644
--- a/src/location/maps/qgeoroutereply.cpp
+++ b/src/location/maps/qgeoroutereply.cpp
@@ -230,7 +230,7 @@ void QGeoRouteReply::abort()
     This signal and QGeoRoutingManager::finished() will be
     emitted at the same time.
 
-    \note Do no delete this reply object in the slot connected to this
+    \note Do not delete this reply object in the slot connected to this
     signal. Use deleteLater() instead.
 */
 /*!
@@ -244,7 +244,7 @@ void QGeoRouteReply::abort()
 
     This signal and QGeoRoutingManager::error() will be emitted at the same time.
 
-    \note Do no delete this reply object in the slot connected to this
+    \note Do not delete this reply object in the slot connected to this
     signal. Use deleteLater() instead.
 */
 
diff --git a/src/location/maps/qgeoroutingmanager.cpp b/src/location/maps/qgeoroutingmanager.cpp
index 4e279f6a..0e6147a3 100644
--- a/src/location/maps/qgeoroutingmanager.cpp
+++ b/src/location/maps/qgeoroutingmanager.cpp
@@ -356,7 +356,7 @@ finished successfully.
 
 This signal and QGeoRouteReply::finished() will be emitted at the same time.
 
-\note Do no delete the \a reply object in the slot connected to this signal.
+\note Do not delete the \a reply object in the slot connected to this signal.
 Use deleteLater() instead.
 */
 
@@ -371,7 +371,7 @@ not empty it will contain a textual description of the error.
 
 This signal and QGeoRouteReply::error() will be emitted at the same time.
 
-\note Do no delete the \a reply object in the slot connected to this signal.
+\note Do not delete the \a reply object in the slot connected to this signal.
 Use deleteLater() instead.
 */
 
diff --git a/src/location/maps/qgeoroutingmanagerengine.cpp b/src/location/maps/qgeoroutingmanagerengine.cpp
index 9a6f7bc6..a848cf03 100644
--- a/src/location/maps/qgeoroutingmanagerengine.cpp
+++ b/src/location/maps/qgeoroutingmanagerengine.cpp
@@ -368,7 +368,7 @@ finished successfully.
 
 This signal and QGeoRouteReply::finished() will be emitted at the same time.
 
-\note Do no delete the \a reply object in the slot connected to this signal.
+\note Do not delete the \a reply object in the slot connected to this signal.
 Use deleteLater() instead.
 */
 
@@ -383,7 +383,7 @@ not empty it will contain a textual description of the error.
 
 This signal and QGeoRouteReply::error() will be emitted at the same time.
 
-\note Do no delete the \a reply object in the slot connected to this signal.
+\note Do not delete the \a reply object in the slot connected to this signal.
 Use deleteLater() instead.
 */
 
diff --git a/src/location/maps/qgeotiledmapreply.cpp b/src/location/maps/qgeotiledmapreply.cpp
index 736648dd..56e7ad91 100644
--- a/src/location/maps/qgeotiledmapreply.cpp
+++ b/src/location/maps/qgeotiledmapreply.cpp
@@ -70,8 +70,8 @@ QT_BEGIN_NAMESPACE
     important to check the result of isFinished() before making the connections
     to the signals.
 
-    If the operation completes successfully the results will be able to be
-    accessed with mapImageData() and mapImageFormat().
+    If the operation completes successfully the results are accessed by
+    mapImageData() and mapImageFormat().
 */
 
 /*!
@@ -121,8 +121,7 @@ QGeoTiledMapReply::~QGeoTiledMapReply()
     emitted.
 
     If the operation completed successfully,
-    QGeoTiledMapReply::setMapImageData() and
-    QGeoTiledMapReply::setTiledMapFormat() should be called before this
+    QGeoTiledMapReply::setMapImageData() should be called before this
     function. If an error occurred, QGeoTiledMapReply::setError() should be used
     instead.
 */
@@ -260,7 +259,7 @@ void QGeoTiledMapReply::abort()
     This signal and QGeoRoutingManager::finished() will be
     emitted at the same time.
 
-    \note Do no delete this reply object in the slot connected to this
+    \note Do not delete this reply object in the slot connected to this
     signal. Use deleteLater() instead.
 
     \fn void QGeoTiledMapReply::error(QGeoTiledMapReply::Error error, const QString &errorString)
@@ -273,7 +272,7 @@ void QGeoTiledMapReply::abort()
 
     This signal and QGeoRoutingManager::error() will be emitted at the same time.
 
-    \note Do no delete this reply object in the slot connected to this
+    \note Do not delete this reply object in the slot connected to this
     signal. Use deleteLater() instead.
 */
 
@@ -285,7 +284,7 @@ void QGeoTiledMapReply::abort()
     If error() equals QGeoTiledMapReply::NoError then the processing
     finished successfully.
 
-    \note Do no delete this reply object in the slot connected to this
+    \note Do not delete this reply object in the slot connected to this
     signal. Use deleteLater() instead.
 */
 /*!
@@ -297,7 +296,7 @@ void QGeoTiledMapReply::abort()
     The error will be described by the error code \a error. If \a errorString is
     not empty it will contain a textual description of the error.
 
-    \note Do no delete this reply object in the slot connected to this
+    \note Do not delete this reply object in the slot connected to this
     signal. Use deleteLater() instead.
 */
 
diff --git a/src/location/places/qplaceattribute.cpp b/src/location/places/qplaceattribute.cpp
index a0eff84e..6a7f5b87 100644
--- a/src/location/places/qplaceattribute.cpp
+++ b/src/location/places/qplaceattribute.cpp
@@ -82,7 +82,7 @@ bool QPlaceAttributePrivate::isEmpty() const
     \brief The QPlaceAttribute class represents generic attribute information about a place.
 
     A QPlaceAttribute instance stores an additional piece of information about a place that is not
-    otherwise exposed though the QPlace class.  A QPlaceAttribute encapsulates a
+    otherwise exposed through the QPlace class.  A QPlaceAttribute encapsulates a
     localized label which describes the attribute and rich text string representing the attribute's value.
     Generally, both are intended to be displayed to the end-user as is.
 
@@ -110,7 +110,7 @@ bool QPlaceAttributePrivate::isEmpty() const
     new attributes as necessary.  Custom attribute types should always be prefixed
     by a qualifier in order to avoid conflicts.
 
-    \section3 User Readable vs Non-User Readable Attributes
+    \section3 User Readable and Non-User Readable Attributes
     Some attributes may not be intended to be readable by end users, the label field
     of such attributes are empty to indicate this fact.
 */
diff --git a/src/location/places/qplacemanager.cpp b/src/location/places/qplacemanager.cpp
index 0cd9aee7..dc0afed4 100644
--- a/src/location/places/qplacemanager.cpp
+++ b/src/location/places/qplacemanager.cpp
@@ -425,7 +425,7 @@ QPlaceMatchReply *QPlaceManager::matchingPlaces(const QPlaceMatchRequest &reques
 
     This signal and QPlaceReply::finished() will be emitted at the same time.
 
-    \note Do no delete the \a reply object in the slot connected to this signal.
+    \note Do not delete the \a reply object in the slot connected to this signal.
     Use deleteLater() instead.
 */
 
@@ -441,7 +441,7 @@ QPlaceMatchReply *QPlaceManager::matchingPlaces(const QPlaceMatchRequest &reques
 
     This signal and QPlaceReply::error() will be emitted at the same time.
 
-    \note Do no delete the \a reply object in the slot connected to this signal.
+    \note Do not delete the \a reply object in the slot connected to this signal.
     Use deleteLater() instead.
 */
 
diff --git a/src/location/places/qplacemanagerengine.cpp b/src/location/places/qplacemanagerengine.cpp
index f53fd331..4b71f9b4 100644
--- a/src/location/places/qplacemanagerengine.cpp
+++ b/src/location/places/qplacemanagerengine.cpp
@@ -388,7 +388,7 @@ QPlaceManagerEnginePrivate::~QPlaceManagerEnginePrivate()
 
     This signal and QPlaceReply::finished() will be emitted at the same time.
 
-    \note Do no delete the \a reply object in the slot connected to this signal.
+    \note Do not delete the \a reply object in the slot connected to this signal.
     Use deleteLater() instead.
 */
 
@@ -404,7 +404,7 @@ QPlaceManagerEnginePrivate::~QPlaceManagerEnginePrivate()
 
     This signal and QPlaceReply::error() will be emitted at the same time.
 
-    \note Do no delete the \a reply object in the slot connected to this signal.
+    \note Do not delete the \a reply object in the slot connected to this signal.
     Use deleteLater() instead.
 */
 
diff --git a/src/location/places/qplacereply.cpp b/src/location/places/qplacereply.cpp
index 270752e3..4248c90e 100644
--- a/src/location/places/qplacereply.cpp
+++ b/src/location/places/qplacereply.cpp
@@ -217,7 +217,7 @@ void QPlaceReply::abort()
     This signal and QPlaceManager::finished() will be
     emitted at the same time.
 
-    \note Do no delete this reply object in the slot connected to this
+    \note Do not delete this reply object in the slot connected to this
     signal. Use deleteLater() instead.
 */
 
@@ -233,6 +233,6 @@ void QPlaceReply::abort()
 
     This signal and QPlaceManager::error() will be emitted at the same time.
 
-    \note Do no delete this reply object in the slot connected to this
+    \note Do not delete this reply object in the slot connected to this
     signal. Use deleteLater() instead.
 */
diff --git a/src/location/qgeoareamonitor.cpp b/src/location/qgeoareamonitor.cpp
index 6b992dcf..b85153c7 100644
--- a/src/location/qgeoareamonitor.cpp
+++ b/src/location/qgeoareamonitor.cpp
@@ -63,14 +63,18 @@
             MyClass::MyClass()
             {
                 QGeoAreaMonitor *monitor = QGeoAreaMonitor::createDefaultMonitor();
-                connect(monitor, SIGNAL(areaEntered(QGeoPositionInfo)),
-                        this, SLOT(areaEntered(QGeoPositionInfo)));
-                connect(monitor, SIGNAL(areaExited(QGeoPositionInfo)),
-                        this, SLOT(areaExited(QGeoPositionInfo)));
-
-                QGeoCoordinate bigBenLocation(51.50104, -0.124632);
-                monitor->setCenter(bigBenLocation);
-                monitor->setRadius(100);
+                if (monitor) {
+                    connect(monitor, SIGNAL(areaEntered(QGeoPositionInfo)),
+                            this, SLOT(areaEntered(QGeoPositionInfo)));
+                    connect(monitor, SIGNAL(areaExited(QGeoPositionInfo)),
+                            this, SLOT(areaExited(QGeoPositionInfo)));
+
+                    QGeoCoordinate bigBenLocation(51.50104, -0.124632);
+                    monitor->setCenter(bigBenLocation);
+                    monitor->setRadius(100);
+                } else {
+                    qDebug() << "Could not create default area monitor";
+                }
             }
 
         public Q_SLOTS:
diff --git a/src/location/qgeopositioninfosource.cpp b/src/location/qgeopositioninfosource.cpp
index 857c47cf..a7356fbe 100644
--- a/src/location/qgeopositioninfosource.cpp
+++ b/src/location/qgeopositioninfosource.cpp
@@ -404,7 +404,7 @@ QStringList QGeoPositionInfoSource::availableSources()
     it can be called even if startUpdates() has already been called and
     regular updates are in progress.
 
-    If the source uses multiple positioning methods, it tries to gets the
+    If the source uses multiple positioning methods, it tries to get the
     current position from the most accurate positioning method within the
     given timeout.
 */