General doc fixes.

Change-Id: I49a343372fdb0f579dd1849d9bb66bcc8f12db7c
Reviewed-by: Peter Yard <peter.yard@nokia.com>

16 files changed, 114 insertions, 80 deletions

diff --git a/doc/src/qtlocation.qdoc b/doc/src/qtlocation.qdoc
index 18c79a93..3a1f766d 100644
--- a/doc/src/qtlocation.qdoc
+++ b/doc/src/qtlocation.qdoc
@@ -25,9 +25,44 @@
 **
 ****************************************************************************/
 
+
+
+
+/*!
+    \module QtLocation
+    \title Qt Location Module
+    \ingroup modules
+
+    \brief Location module provides positioning, mapping, navigation, and place search
+       via QML and C++ interfaces.
+
+    To load the Qt Location module, add the following statement to your .qml files
+
+    \code
+        import QtLocation 5.0
+    \endcode
+
+    For C++ projects include the header appropriate for the current use case,
+    for example applications using routes may use
+
+    \code #include <QGeoRoute> \endcode
+
+    The .pro file should have the \e location keyword added
+
+    \code
+        QT += location
+    \endcode
+
+
+    See more in the \l{Qt Location}{Qt Location Overview}.
+
+*/
+
+
+
 /*!
 \page index-qtlocation-module.html
-\title Qt Location Module
+\title Qt Location
 \brief The Qt Location API provides positioning, mapping, navigation, and place search
        via QML and C++ interfaces.
 \ingroup technology-apis
@@ -66,32 +101,30 @@ The .pro file should have the \e location keyword added
     QT += location
 \endcode
 
-\section2 Concepts (in a QML Context)
-
-What follows assumes that we are using the Qt Location QML API.
+\section2 Location QML Concepts
 
 Position information can come from a variety of sources including satellites,
-wifi, text files and so on.
-
-The position is described by the usual latitude, longitude, and the altitude
-in meters. For more information see \l {http://en.wikipedia.org/wiki/Geographic_coordinate}{Geographic Coordinate}.
+wifi, text files and so on. The position is described by the usual latitude,
+longitude, and the altitude in meters. For more information see
+\l {http://en.wikipedia.org/wiki/Geographic_coordinate}{Geographic Coordinate}.
 
 The QML position is stored in a \l {QtLocation5::Coordinate}{Coordinate} which
-contains the latitude, longitude and
-altitude of the device. The \l {QtLocation5::Location}{Location} contains this Coordinate and adds an address,
-it also has a bounding box which defines the recommended viewing region when displaying the location.
+contains the latitude, longitude and altitude of the device. The
+\l {QtLocation5::Location}{Location} contains this Coordinate and adds an
+address, it also has a bounding box which defines the recommended viewing
+region when displaying the location.
 
 Now that the device has a position, with regular updates the API can determine
-the speed and heading of the device. It can define a box or a circle that can
+the speed and heading of the device. It can also define a box or a circle that can
 produce a notification when the device either leaves or enters that region.
 
-If we introduce the idea of a \l {QtLocation5::Map}{Map} with positions of interest,
+Adding a \l {QtLocation5::Map}{Map} with positions of interest and
 \l {QtLocation5::Place}{Places}, then the device can be made aware of nearby features and related
 information, displayed graphically. Features on the \l Map may be places of business, entertainment
-and so on.  They may include paths, roads, or forms of transport leading to the idea that
+and so on.  They may include paths, roads, or forms of transport leading so that
 navigation optimization and assistance are possible.
 
-To enable navigation we need \l {Route}s from start to destination. These routes
+To perform navigation we need \l {Route}s from start to destination. These routes
 are made up of segments. Each \l {QtLocation5::RouteSegment}{RouteSegment}
 can be considered a navigation sub-task: drive 100 meters, turn left. The beginning and
 end of each segment is a \e waypoint, that is, one part of our journey.
@@ -120,7 +153,7 @@ with some plugins providing more than one service. One QML \l Plugin should be c
 for each required GeoService plugin. Plugins are required for maps, routing and geocoding,
 however the default plugin handles all three of these services. A plugin may
 require online access or may support on-board maps and data. The default "nokia"
-plugin only supports online use which would be managed by QNetworkInfo and
+plugin only supports online use. The connection would be managed by QNetworkInfo and
 QNetworkConfigurationManager.
 
 \note: Plugins may not provide various features such as paging or relevance hints.
@@ -180,28 +213,6 @@ directions).
     \li \l{Maps and Navigation (C++)}{for C++}
 \endtable
 
-\section1 New Since Qt4
-
-In Qt4 QtMobility provided some location functionality for positioning and Maps.  The new
-Qt Location API has had an extensive reworking of Maps and now provides the Places API.
-
-New features of Qt Location includes
-\list
-    \li Maps are now part of the QML2 scenegraph, and rendered using hardware- accelerated OpenGL
-    \li Arbitrary QML2 items on the map are supported using \l MapQuickItem
-    \li Model-view support for creating map objects from a QML model
-    \li Built-in support for pinch-to-zoom gestures, flicking and "kinetic" panning
-    \li Vast performance improvements over Mobility 1.2, especially for large map polylines and objects in general
-    \li Full QML API now available for routing and geocoding -- compatible with standard QML model-view design
-    \li Service provider feature detection without having to open all the available plugins
-    \li Unified "Plugin" QML element used by routing/geocoding/maps etc with easy-to-set PluginParameters
-    \li A GeoServices plugin backend provided by Nokia which provides mapping, geocoding, routing, and place
-        search functionality.
-    \li A Places API which facilitates searching for places such as restaurants and businesses.
-    \li The Places API supports viewing of rich content such as images, reviews, and editorials.
-        It also supports locale handling, sponsored search results and supplier attributions
-\endlist
-
 \section1 API References and Examples
 
 Alphabetized lists of all classes and user interface components in the API, as well as detailed
@@ -239,4 +250,28 @@ Qt Location available for a new platform.
         \li \l {Places Backend} {Places}
         \li Information for places backend implementors
 \endtable
+
+\section1 New Since Qt 4
+
+In Qt 4 Qt Mobility provided some location functionality for Positioning and Maps
+with Landmarks support. The new Qt Location API has had an extensive reworking
+of \l {Map}s and \l Places (formerly Landmarks). Also both C++ and QML APIs have
+been reworked to be simpler to use.
+
+New features of Qt Location includes
+\list
+    \li Maps are now part of the Qt Quick scenegraph, and rendered using hardware-accelerated OpenGL
+    \li Arbitrary Qt Quick items on the map are supported using \l MapQuickItem
+    \li Now possible to create map overlays with a model
+    \li Built-in support for pinch-to-zoom gestures (\l MapPinchArea), flicking (\l MapFlickable), and panning
+    \li Vast performance improvements over Qt Mobility 1.2, especially for large map polylines and objects in general
+    \li Full QML API now available for routing and geocoding -- compatible with standard QML model-view design
+    \li Service provider feature detection without having to open all the available plugins
+    \li Unified "Plugin" QML type used by routing/geocoding/maps etc with easy-to-set PluginParameters
+    \li Two plugins are supplied with Qt. The Nokia plugin for GeoServices and the JsonDb plugin for storing locally created places. The JsonDb plugin can also be used to save Favorite places linked to another plugin.
+    \li Landmarks API is replaced by the Places API
+    \li \l Places supports viewing of richer content such as reviews, images, and editorials
+    \li \l Places supports locale handling, sponsored search results, and supplier attribution
+\endlist
+
 */
diff --git a/src/imports/location/declarativeplaces/qdeclarativeplace.cpp b/src/imports/location/declarativeplaces/qdeclarativeplace.cpp
index a2199483..6a0a0115 100644
--- a/src/imports/location/declarativeplaces/qdeclarativeplace.cpp
+++ b/src/imports/location/declarativeplaces/qdeclarativeplace.cpp
@@ -718,9 +718,9 @@ void QDeclarativePlace::finished()
 void QDeclarativePlace::contactsModified(const QString &key, const QVariant &value)
 {
     //TODO: This is a workaround to allow an assignment of a single contact detail
-    //      to be treated as an asignment of a list with a single element.
+    //      to be treated as an assignment of a list with a single object.
     //      A proper solution is to inherit off QQmlPropertyMap
-    //      and override the write behaviour but this can only be done
+    //      and override the write behavior but this can only be done
     //      when QTBUG-23183 is complete.
     if (value.userType() == QMetaType::QObjectStar) {
         QDeclarativeContactDetail *detail = qobject_cast<QDeclarativeContactDetail *>(value.value<QObject *>());
diff --git a/src/imports/location/declarativeplaces/qdeclarativereviewmodel.cpp b/src/imports/location/declarativeplaces/qdeclarativereviewmodel.cpp
index 6621b13a..bfbc8fce 100644
--- a/src/imports/location/declarativeplaces/qdeclarativereviewmodel.cpp
+++ b/src/imports/location/declarativeplaces/qdeclarativereviewmodel.cpp
@@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE
     \ingroup qml-QtLocation5-places-models
     \since Qt Location 5.0
 
-    \brief The ReviewModel element provides access to reviews of a \l Place.
+    \brief Provides access to reviews of a \l Place.
 
     The ReviewModel is a read-only model used to fetch reviews about a \l Place.  The model
     incrementally fetches. The number of reviews which are fetched at a time is specified
diff --git a/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel.cpp b/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel.cpp
index 1b92d39b..a06b56fe 100644
--- a/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel.cpp
+++ b/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel.cpp
@@ -62,7 +62,7 @@ QT_USE_NAMESPACE
     \ingroup qml-QtLocation5-places-models
     \since Qt Location 5.0
 
-    \brief The PlaceSearchModel element provides access to place search results.
+    \brief Provides access to place search results.
 
     PlaceSearchModel provides a model of place search results within the \l searchArea.  The
     \l searchTerm and \l categories properties can be set to restrict the search results to
@@ -403,7 +403,7 @@ void QDeclarativeSearchResultModel::categories_clear(QQmlListProperty<QDeclarati
 {
     QDeclarativeSearchResultModel *searchModel = qobject_cast<QDeclarativeSearchResultModel *>(list->object);
     if (searchModel) {
-        //note: we do not need to delete each of the elements in m_categories since the search model
+        //note: we do not need to delete each of the objects in m_categories since the search model
         //should never be the parent of the categories anyway.
         searchModel->m_categories.clear();
         searchModel->m_request.setCategories(QList<QPlaceCategory>());
diff --git a/src/imports/location/declarativeplaces/qdeclarativesearchsuggestionmodel.cpp b/src/imports/location/declarativeplaces/qdeclarativesearchsuggestionmodel.cpp
index 8502cd86..8b4a271d 100644
--- a/src/imports/location/declarativeplaces/qdeclarativesearchsuggestionmodel.cpp
+++ b/src/imports/location/declarativeplaces/qdeclarativesearchsuggestionmodel.cpp
@@ -58,7 +58,7 @@ QT_USE_NAMESPACE
     \ingroup qml-QtLocation5-places-models
     \since Qt Location 5.0
 
-    \brief The PlaceSearchSuggestionModel element provides access to search term suggestions.
+    \brief Provides access to search term suggestions.
 
     The PlaceSearchSuggestionModel can be used to provide search term suggestions as the user enters their
     search term.  The properties of this model should match that of the \l PlaceSearchModel, which
diff --git a/src/imports/location/declarativeplaces/qdeclarativesupplier.cpp b/src/imports/location/declarativeplaces/qdeclarativesupplier.cpp
index 7fc95691..d1911290 100644
--- a/src/imports/location/declarativeplaces/qdeclarativesupplier.cpp
+++ b/src/imports/location/declarativeplaces/qdeclarativesupplier.cpp
@@ -53,8 +53,7 @@ QT_USE_NAMESPACE
     \ingroup qml-QtLocation5-places-data
     \since Qt Location 5.0
 
-    \brief The Supplier element holds data regarding the supplier of a place,
-    a place's image, review, or editorial.
+    \brief Holds data regarding the supplier of a place, a place's image, review, or editorial.
 
     Each instance represents a set of data about a supplier, which can include
     supplier's name, url and icon.  The supplier is typically a business or organization.
diff --git a/src/imports/location/qdeclarativecirclemapitem.cpp b/src/imports/location/qdeclarativecirclemapitem.cpp
index 3d0a0bc2..6cd6087c 100644
--- a/src/imports/location/qdeclarativecirclemapitem.cpp
+++ b/src/imports/location/qdeclarativecirclemapitem.cpp
@@ -69,7 +69,7 @@ QT_BEGIN_NAMESPACE
     may not always be a perfect circle on the screen: for instance, in
     the Mercator projection, circles become ovoid in shape as they near
     the poles. To display a perfect screen circle around a point, use a
-    MapQuickItem containing a relevant QML element instead.
+    MapQuickItem containing a relevant Qt Quick type instead.
 
     By default, the circle is displayed as a 1 pixel black border with
     no fill. To change its appearance, use the color, border.color
diff --git a/src/imports/location/qdeclarativegeoaddress.cpp b/src/imports/location/qdeclarativegeoaddress.cpp
index 9fb6d59f..637cdc2c 100644
--- a/src/imports/location/qdeclarativegeoaddress.cpp
+++ b/src/imports/location/qdeclarativegeoaddress.cpp
@@ -66,12 +66,12 @@ QT_BEGIN_NAMESPACE
     is the recommended way to display an address to the user and typically
     takes the format of an address as found on an envelope, but this is not always
     the case.  The \l text may be automatically generated from constituent
-    address elements such as \l street, \l city and and so on, but can also
+    address properties such as \l street, \l city and and so on, but can also
     be explicitly assigned.  See \l text for details.
 
     \section2 Example Usage
 
-    The following code snippet shows the declaration of an Address element.
+    The following code snippet shows the declaration of an Address object.
 
     \code
     Address {
@@ -138,13 +138,13 @@ void QDeclarativeGeoAddress::setAddress(const QGeoAddress &address)
 
     If an empty string is assigned to \c text, then \l isTextGenerated will be set
     to true and \c text will return a string which is locally formatted according to
-    \l countryCode and based on the elements of the address. Modifying the address
-    elements such as \l street, \l city and so on may cause the contents of \c text to
+    \l countryCode and based on the properties of the address. Modifying the address
+    properties such as \l street, \l city and so on may cause the contents of \c text to
     change.
 
     If a non-empty string is assigned to \c text, then \l isTextGenerated will be
     set to false and \c text will always return the explicitly assigned string.
-    Modifying address elements will not affect the \c text property.
+    Modifying address properties will not affect the \c text property.
 */
 QString QDeclarativeGeoAddress::text() const
 {
@@ -346,7 +346,7 @@ void QDeclarativeGeoAddress::setPostalCode(const QString &postalCode)
   \qmlproperty bool QtLocation5::Address::isTextGenerated
 
   This property holds a boolean that if true, indicates that \l text is automatically
-  generated from address elements.  If false, it indicates that the \l text has been
+  generated from address properties.  If false, it indicates that the \l text has been
   explicitly assigned.
 
 */
diff --git a/src/imports/location/qdeclarativegeocodemodel.cpp b/src/imports/location/qdeclarativegeocodemodel.cpp
index 6fc9983a..9ebc3a83 100644
--- a/src/imports/location/qdeclarativegeocodemodel.cpp
+++ b/src/imports/location/qdeclarativegeocodemodel.cpp
@@ -75,13 +75,13 @@ QT_BEGIN_NAMESPACE
     be used. By default, autoUpdate is disabled.
 
     The data stored and returned in the GeocodeModel consists of \l{Location}
-    elements, as a list with the role name "locationData". See the documentation
+    objects, as a list with the role name "locationData". See the documentation
     for \l{Location} for further details on its structure and contents.
 
     \section2 Example Usage
 
     The following snippet is two-part, showing firstly the declaration of
-    elements, and secondly a short piece of procedural code using it. We set
+    objects, and secondly a short piece of procedural code using it. We set
     the geocodeModel's \l{autoUpdate} property to false, and call \l{update} once
     the query is set up. In this case, as we use a string value in \l{query},
     only one update would occur, even with autoUpdate enabled. However, if we
@@ -358,7 +358,7 @@ void QDeclarativeGeocodeModel::setBounds(QObject *bounds)
     within the area. his is particularly useful if query is only partially filled out,
     as the service will attempt to (reverse) geocode all matches for the specified data.
 
-    Accepted element types are \l GeoRectangle and \l GeoCircle.
+    Accepted types are \l BoundingBox and \l BoundingCircle.
 
 */
 
@@ -698,10 +698,10 @@ void QDeclarativeGeocodeModel::setQuery(const QVariant &query)
     to changes in its attached query. The default value of this property
     is false.
 
-    If setting this value to 'true' and using an Address or Coordinate element
-    as the query, note that any change at all in the element's properties will
+    If setting this value to 'true' and using an Address or Coordinate type
+    as the query, note that any change at all in the object's properties will
     trigger a new request to be sent. If you are adjusting many properties of
-    the element whilst autoUpdate is enabled, this can generate large numbers
+    the object whilst autoUpdate is enabled, this can generate large numbers
     of useless (and later discarded) requests.
 */
 
diff --git a/src/imports/location/qdeclarativegeolocation.cpp b/src/imports/location/qdeclarativegeolocation.cpp
index 22baf996..ffea2e00 100644
--- a/src/imports/location/qdeclarativegeolocation.cpp
+++ b/src/imports/location/qdeclarativegeolocation.cpp
@@ -59,11 +59,11 @@ QT_USE_NAMESPACE
 
     The Location element is most commonly seen as the contents of a search
     model such as the GeocodeModel. When a GeocodeModel returns the list of
-    locations found for a given query, it represents these as Location elements.
+    locations found for a given query, it represents these as Location objects.
 
     \section2 Example Usage
 
-    The following example shows a simple Location element being declared with
+    The following example shows a simple Location object being declared with
     a set \l{coordinate} and \l{address}.
 
     \code
diff --git a/src/imports/location/qdeclarativegeomap.cpp b/src/imports/location/qdeclarativegeomap.cpp
index 4ec02a14..16d65a28 100644
--- a/src/imports/location/qdeclarativegeomap.cpp
+++ b/src/imports/location/qdeclarativegeomap.cpp
@@ -111,7 +111,7 @@ QT_BEGIN_NAMESPACE
 
     \section2 Map Objects
 
-    Map objects can be declared within the body of a Map element in QML and will
+    Map related objects can be declared within the body of a Map object in Qt Quick and will
     automatically appear on the Map. To add objects programmatically, first be
     sure they are created with the Map as their parent (for example in an argument to
     Component::createObject), and then call the \l addMapItem method on the Map.
diff --git a/src/imports/location/qdeclarativegeomapmousearea.cpp b/src/imports/location/qdeclarativegeomapmousearea.cpp
index 186f268c..e4214423 100644
--- a/src/imports/location/qdeclarativegeomapmousearea.cpp
+++ b/src/imports/location/qdeclarativegeomapmousearea.cpp
@@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE
 
     Like a standard Qt Quick \l{MouseArea}, the MapMouseArea provides mouse
     handling for an item. Creating a normal Qt Quick MouseArea inside a
-    map object element (for example MapPolygon) will result in undefined behaviour
+    map object type (for example MapPolygon) will result in undefined behavior
     due to the way in which Map objects are rendered, so MapMouseArea exists to
     provide this functionality instead.
 
diff --git a/src/imports/location/qdeclarativegeomaptype.cpp b/src/imports/location/qdeclarativegeomaptype.cpp
index 83cd3972..da822778 100644
--- a/src/imports/location/qdeclarativegeomaptype.cpp
+++ b/src/imports/location/qdeclarativegeomaptype.cpp
@@ -110,8 +110,7 @@ QString QDeclarativeGeoMapType::description() const
 /*!
     \qmlproperty bool MapType::mobile
 
-    \brief This read-only property indicates whether the map type is optimized
-    for the use on a mobile device.
+    \brief Whether the map type is optimized for the use on a mobile device.
 
     Map types for mobile devices usually have higher constrast to counteract the
     effects of sunlight and a reduced color for improved readability.
diff --git a/src/imports/location/qdeclarativegeoroute.cpp b/src/imports/location/qdeclarativegeoroute.cpp
index fddf7790..a9b5760a 100644
--- a/src/imports/location/qdeclarativegeoroute.cpp
+++ b/src/imports/location/qdeclarativegeoroute.cpp
@@ -56,10 +56,10 @@ QT_BEGIN_NAMESPACE
     as the length the route, the estimated travel time for the route,
     and enough information to render a basic image of the route on a map.
 
-    The QGeoRoute object also contains a list of \l RouteSegment elements which
+    The QGeoRoute object also contains a list of \l RouteSegment objects which
     describe subsections of the route in greater detail.
 
-    The primary means of acquiring Route elements is \l RouteModel.
+    The primary means of acquiring Route objects is \l RouteModel.
 
     \section1 Example
 
@@ -109,7 +109,7 @@ QList<QGeoCoordinate> QDeclarativeGeoRoute::routePath()
     if (!route_.path().isEmpty()) {
         return route_.path();
     } else if (!path_.isEmpty()) {
-        // this is for testing. Route elements are not meant
+        // this is for testing. Route types are not meant to be
         // user instantiable but for testing it makes sense
         QList<QGeoCoordinate> list;
         for (int i = 0; i < path_.count(); ++i)
@@ -163,8 +163,8 @@ qreal QDeclarativeGeoRoute::distance() const
     traveling along this segment of the route.
 
     To access individual segments you can use standard list accessors: 'path.length'
-    indicates the number of elements and 'path[index starting from zero]' gives
-    the actual element.
+    indicates the number of objects and 'path[index starting from zero]' gives
+    the actual object.
 
     \sa Coordinate
 */
@@ -227,11 +227,11 @@ void QDeclarativeGeoRoute::clearPath()
 /*!
     \qmlproperty QQmlListProperty<RouteSegment> QtLocation5::Route::segments
 
-    Read-only property which holds the list of \l RouteSegment elements of this route.
+    Read-only property which holds the list of \l RouteSegment objects of this route.
 
     To access individual segments you can use standard list accessors: 'segments.length'
-    indicates the number of elements and 'segments[index starting from zero]' gives
-    the actual element.
+    indicates the number of objects and 'segments[index starting from zero]' gives
+    the actual objects.
 
     \sa RouteSegment
 */
diff --git a/src/imports/location/qdeclarativegeoroutemodel.cpp b/src/imports/location/qdeclarativegeoroutemodel.cpp
index 41daeb00..815d31b0 100644
--- a/src/imports/location/qdeclarativegeoroutemodel.cpp
+++ b/src/imports/location/qdeclarativegeoroutemodel.cpp
@@ -76,7 +76,7 @@ QT_BEGIN_NAMESPACE
     Otherwise, the \l{update} method may be used. By default, autoUpdate is
     disabled.
 
-    The data stored and returned in the RouteModel consists of \l Route elements,
+    The data stored and returned in the RouteModel consists of \l Route objects,
     as a list with the role name "routeData". See the documentation for \l Route
     for further details on its structure and contents.
 
@@ -91,6 +91,7 @@ QT_BEGIN_NAMESPACE
     \code
     Plugin {
         id: aPlugin
+        name: "nokia"
     }
 
     RouteQuery {
@@ -604,14 +605,14 @@ void QDeclarativeGeoRouteModel::routingError(QGeoRouteReply *reply,
     as detailed preferences on how to optimize the route and what features
     to prefer or avoid along the path (such as toll roads, highways, etc).
 
-    RouteQuery elements are used exclusively to fill out the value of a
+    RouteQuery objects are used exclusively to fill out the value of a
     RouteModel's \l{RouteModel::query}{query} property, which can then begin
     the retrieval process to populate the model.
 
     \section2 Example Usage
 
     The following snipped shows an incomplete example of creating a RouteQuery
-    element and setting it as the value of a RouteModel's \l{RouteModel::query}{query}
+    object and setting it as the value of a RouteModel's \l{RouteModel::query}{query}
     property.
 
     \code
diff --git a/src/imports/location/qdeclarativegeoroutesegment.cpp b/src/imports/location/qdeclarativegeoroutesegment.cpp
index f0f73ca4..ff07df81 100644
--- a/src/imports/location/qdeclarativegeoroutesegment.cpp
+++ b/src/imports/location/qdeclarativegeoroutesegment.cpp
@@ -61,11 +61,11 @@ QT_BEGIN_NAMESPACE
     graph, with RouteManeuver instances as optional labels attached to the
     vertices of the graph.
 
-    The primary means of acquiring Route elements is via Routes via \l RouteModel.
+    The primary means of acquiring Route objects is via Routes via \l RouteModel.
 
     \section1 Example
 
-    The following QML snipplet demonstrates how to print information about a
+    The following QML snippet demonstrates how to print information about a
     route segment:
 
     \snippet snippets/declarative/routing.qml QtQuick import
@@ -140,8 +140,8 @@ QDeclarativeGeoManeuver *QDeclarativeGeoRouteSegment::maneuver() const
     traveling along this segment of the route.
 
     To access individual segments you can use standard list accessors: 'path.length'
-    indicates the number of elements and 'path[index starting from zero]' gives
-    the actual element.
+    indicates the number of objects and 'path[index starting from zero]' gives
+    the actual object.
 
     \sa Coordinate
 */