Docs: change inappropriate references to 'element'.

'element' is no longer a correct term for Qt Quick/QML types. Sometimes
the term was used instead of 'type' and other times when 'object' would
be better.

Conflicts:

	doc/src/places.qdoc

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

9 files changed, 72 insertions, 72 deletions

diff --git a/doc/src/cpp-qml.qdoc b/doc/src/cpp-qml.qdoc
index 637221d5..204bec17 100644
--- a/doc/src/cpp-qml.qdoc
+++ b/doc/src/cpp-qml.qdoc
@@ -29,7 +29,7 @@
 \page location-cpp-qml.html
 \title Interfaces between C++ and QML Code
 
-\brief Some of the location QML elements providing interfaces to access and modify properties in C++.
+\brief Some of the location QML types providing interfaces to access and modify properties in C++.
 
 \section2 Category - QPlaceCategory
 \target category
diff --git a/doc/src/examples/declarative-flickr.qdoc b/doc/src/examples/declarative-flickr.qdoc
index f10f47c1..29739c70 100644
--- a/doc/src/examples/declarative-flickr.qdoc
+++ b/doc/src/examples/declarative-flickr.qdoc
@@ -37,7 +37,7 @@
     Qt Location API: the ability to retrieve and use the user's current
     geographic location.
 
-    Key QML elements shown in this example:
+    Key QML types shown in this example:
     \list
         \li \l{QtLocation5::PositionSource}{PositionSource}
         \li \l{XmlListModel}{XmlListModel}
@@ -48,7 +48,7 @@
     \section2 Retrieving the Current Location
 
     Retrieving the user's current location is achieved using the PositionSource
-    element. In this example, we instantiate the PositionSource as part of the
+    type. In this example, we instantiate the PositionSource as part of the
     GeoTab component (the floating "window" describing current location and
     status).
 
diff --git a/doc/src/examples/declarative-mapviewer.qdoc b/doc/src/examples/declarative-mapviewer.qdoc
index c234b5f6..492b26c3 100644
--- a/doc/src/examples/declarative-mapviewer.qdoc
+++ b/doc/src/examples/declarative-mapviewer.qdoc
@@ -50,7 +50,7 @@
     parameters they support.  The Nokia services plugin supplied with Qt requires an \e app_id and
     \e token pair.  See "\l {Qt Location Nokia Plugin}" for details.
 
-    QML elements shown in this example:
+    QML types shown in this example:
 
     \list
     \li Displaying a map
@@ -76,7 +76,7 @@
 
     \section2 Displaying a Map
 
-    Drawing a map on-screen is accomplished using the Map element, as shown
+    Drawing a map on-screen is accomplished using the Map type, as shown
     below.
 
     \snippet examples/declarative/mapviewer/content/map/MapComponent.qml top
@@ -84,7 +84,7 @@
     \snippet examples/declarative/mapviewer/content/map/MapComponent.qml end
 
     In this example, we give the map an initial center coordinate from a
-    contained Coordinate element, with a set latitude and longitude. We also
+    contained Coordinate object, with a set latitude and longitude. We also
     set the initial zoom level to 50% (halfway between the maximum and minimum).
 
     The calls to "pinch" and "flick" are used to enable gestures on the map.
@@ -101,7 +101,7 @@
 
     To locate a certain address or place on the map uses a process called
     geocoding. In order to perform a geocode operation, we first need to adjust
-    our Map element to be able to receive the result.
+    our Map object to be able to receive the result.
 
     Receiving results of geocoding is done through a GeocodeModel, which is
     typically instantiated as a property of the Map component:
@@ -120,7 +120,7 @@
     \snippet examples/declarative/mapviewer/content/map/MapComponent.qml pointdel0
     \snippet examples/declarative/mapviewer/content/map/MapComponent.qml pointdel1
 
-    With these three elements, we have enough to receive Geocode responses and
+    With these three objects, we have enough to receive Geocode responses and
     display them on our Map. The final piece is to send the actual Geocode
     request.
 
@@ -129,7 +129,7 @@
     create a similar component yourself using Dialog.qml in this example
     as a reference, or drive the process using any other UI you wish.
 
-    To send a geocode request, first we create an Address element, and fill it
+    To send a geocode request, first we create an Address object, and fill it
     in with the desired parameters. Then we set "map.geocodeModel.query" to
     the filled in Address, and call update() on the GeocodeModel.
 
@@ -139,7 +139,7 @@
 
     \section2 Directions and Travel Routes
 
-    Similar to the GeocodeModel, Qt Location also features the RouteModel element,
+    Similar to the GeocodeModel, Qt Location also features the RouteModel type,
     which allows information about routes (for example driving directions) between two
     or more points, to be received and used with a Map.
 
diff --git a/doc/src/examples/declarative-places.qdoc b/doc/src/examples/declarative-places.qdoc
index 6ee12e00..2069a6eb 100644
--- a/doc/src/examples/declarative-places.qdoc
+++ b/doc/src/examples/declarative-places.qdoc
@@ -80,7 +80,7 @@
 
     \snippet declarative/places/places.qml CategoryModel model
 
-    The \l CategoryModel element provides a model of the available categories.  It can provide
+    The \l CategoryModel type provides a model of the available categories.  It can provide
     either a flat list or a hierarchical tree model.  In this example, we use a hierarchical tree
     model, by setting the \l {CategoryModel::hierarchical}{hierarchical} property to \e true.  The
     \l {CategoryModel::plugin}{plugin} property is set to \e placesPlugin which is the \e identifier of the
@@ -125,7 +125,7 @@
     \target Presenting-Search-Suggestions
     \section1 Presenting Search Suggestions
 
-    The \l PlaceSearchSuggestionModel element is used to fetch suggested search terms based on a
+    The \l PlaceSearchSuggestionModel type is used to fetch suggested search terms based on a
     partially entered search term.
 
     A new suggestion search is triggered whenever the entered search term is changed.
@@ -142,21 +142,21 @@
 
     \snippet declarative/places/content/places/SearchBox.qml PlaceSearchSuggestionModel model
 
-    The main element in the "SuggestionsShown" state is the \l ListView showing the search
+    The main object in the "SuggestionsShown" state is the \l ListView showing the search
     suggestions.
 
     \snippet declarative/places/content/places/SearchBox.qml PlaceSearchSuggestionModel view 1
     \codeline
     \snippet declarative/places/content/places/SearchBox.qml PlaceSearchSuggestionModel view 2
 
-    A \l Text element is used as the delegate to display the suggestion text.  Clicking on the
+    A \l Text object is used as the delegate to display the suggestion text.  Clicking on the
     suggested search term updates the search term and triggers a place search using the search
     suggestion.
 
 
     \section1 Searching for Places
 
-    The \l PlaceSearchModel element is used to search for places.
+    The \l PlaceSearchModel type is used to search for places.
 
     \snippet declarative/places/places.qml PlaceSearchModel model
 
@@ -174,7 +174,7 @@
     \snippet declarative/places/content/places/SearchResultView.qml PlaceSearchModel place list
 
     The delegate used in the \l ListView, \e SearchResultDelegate, is designed to handle multiple
-    search result types via a \l Loader element.  For results of type \e PlaceResult the delegate
+    search result types via a \l Loader object.  For results of type \e PlaceResult the delegate
     is:
 
     \snippet declarative/places/content/places/SearchResultDelegate.qml PlaceSearchModel place delegate
@@ -185,7 +185,7 @@
     content is accessed via a set of models.  Content models are generally not created directly by
     the application developer, instead models are obtained from the
     \l {Place::editorialModel}{editorialModel}, \l {Place::reviewModel}{reviewModel} and
-    \l {Place::imageModel}{imageModel} properties of the \l Place element.
+    \l {Place::imageModel}{imageModel} properties of the \l Place type.
 
     \snippet declarative/places/content/places/PlaceEditorials.qml PlaceEditorialModel view
 
diff --git a/doc/src/imports/qtlocation5.qdoc b/doc/src/imports/qtlocation5.qdoc
index b9f0f8c1..ca6ee104 100644
--- a/doc/src/imports/qtlocation5.qdoc
+++ b/doc/src/imports/qtlocation5.qdoc
@@ -52,29 +52,29 @@ API.
         \li Searching for and managing points of interest.
 \endtable
 
-\section1 Common QML Elements
+\section1 Common QML Types
 
 \annotatedlist qml-QtLocation5-common
 
-\section1 Positioning QML Elements
+\section1 Positioning QML Types
 
 \annotatedlist qml-QtLocation5-positioning
 
-\section1 Maps QML Elements
+\section1 Maps QML Types
 
 \annotatedlist qml-QtLocation5-maps
 
-\section1 Navigation and Routing QML Elements
+\section1 Navigation and Routing QML Types
 
 \annotatedlist qml-QtLocation5-routing
 
-\section1 Geocoding QML Elements
+\section1 Geocoding QML Types
 
 \annotatedlist qml-QtLocation5-geocoding
 
-\section1 Places QML Elements
+\section1 Places QML Types
 
 \annotatedlist qml-QtLocation5-places
 
-\section1 Alphabetical Listing of all QML Elements
+\section1 Alphabetical Listing of all QML Types
 */
diff --git a/doc/src/maps.qdoc b/doc/src/maps.qdoc
index 4fba72cb..b0740572 100644
--- a/doc/src/maps.qdoc
+++ b/doc/src/maps.qdoc
@@ -34,28 +34,28 @@
 \brief Provides QtQuick user interfaces for displaying, navigating and
        interacting with maps, as well as geocoding and navigation.
 
-\b{Maps and Navigation} provides QtQuick user interface elements for
+\b{Maps and Navigation} provides QtQuick user interface types for
 displaying geographic information on a map, as well as allowing user
 interaction with map overlay objects and the display itself. It also
 contains utilities for geocoding (finding a geographic coordinate from a
 street address) and navigation (including driving and walking directions).
 
-It builds upon the API concepts and elements in the \l{Positioning (QML)}{QML Positioning API}.
+It builds upon the API concepts and types in the \l{Positioning (QML)}{QML Positioning API}.
 
 \section1 Maps
 
 \section2 Displaying Maps
 
-Displaying a map is done using the \l{QtLocation5::Map}{Map} QML element.  The Map element supports
-user interaction through the \l{QtLocation5::MapGestureArea}{MapGestureArea} QML element. The Map
-element draws the map on-screen using OpenGL (ES), allowing for hardware-accelerated rendering
+Displaying a map is done using the \l{QtLocation5::Map}{Map} QML types.  The Map type supports
+user interaction through the \l{QtLocation5::MapGestureArea}{MapGestureArea} QML type. The Map
+object draws the map on-screen using OpenGL (ES), allowing for hardware-accelerated rendering
 where available.
 
-\b{Key Elements}
+\b{Key Types}
 \table
     \row
         \li \l{QtLocation5::Plugin}{Plugin}
-        \li A location-based services plugin provides data including map data which is then displayed in a Map element.
+        \li A location-based services plugin provides data including map data which is then displayed in a Map object.
     \row
         \li \l{QtLocation5::Map}{Map}
         \li QtQuick item to display a map on-screen.
@@ -64,8 +64,8 @@ where available.
         \li Interaction helper for panning, flicking and pinch-to-zoom gesture on a Map.
 \endtable
 
-Note that the client must create a \l{QtLocation5::Plugin}{Plugin} element
-prior to using a \l{QtLocation5::Map}{Map} element in order to have access
+Note that the client must create a \l{QtLocation5::Plugin}{Plugin} object
+prior to using a \l{QtLocation5::Map}{Map} type in order to have access
 to map data to display.
 
 \section2 Putting Objects on a Map (Map Overlay Objects)
@@ -73,23 +73,23 @@ to map data to display.
 Maps can also contain map overlay objects, which are used to display information
 on its surface. There is a set of basic pre-defined map overlay objects, as well
 as the ability to implement custom map overlay objects using the
-\l{QtLocation5::MapQuickItem}{MapQuickItem} element, which can contain any
+\l{QtLocation5::MapQuickItem}{MapQuickItem} type, which can contain any
 standard QtQuick item.
 
-\b{Key Elements}
+\b{Key Types}
 \table
     \row
         \li \l{QtLocation5::MapCircle}{MapCircle}
         \li A geographic circle (all points at a set distance from a center), optionally with a border.
     \row
         \li \l{QtLocation5::MapRectangle}{MapRectangle}
-        \li A rectangle whose top left and bottom right points are specified as Coordinate elements, optionally with a border.
+        \li A rectangle whose top left and bottom right points are specified as Coordinate types, optionally with a border.
     \row
         \li \l{QtLocation5::MapPolygon}{MapPolygon}
-        \li A polygon made of an arbitrary list of \l{QtLocation5::Coordinate}{Coordinate} elements.
+        \li A polygon made of an arbitrary list of \l{QtLocation5::Coordinate}{Coordinate} types.
     \row
         \li \l{QtLocation5::MapPolyline}{MapPolyline}
-        \li A polyline made of an arbitrary list of \l{QtLocation5::Coordinate}{Coordinate} elements.
+        \li A polyline made of an arbitrary list of \l{QtLocation5::Coordinate}{Coordinate} types.
     \row
         \li \l{QtLocation5::MapQuickItem}{MapQuickItem}
         \li Turns any arbitrary QtQuick Item into a map overlay object.  MapQuickItem is an enabler for specifying custom map overlay objects.
@@ -99,10 +99,10 @@ standard QtQuick item.
 
 To automatically generate map overlay objects based on the contents of a QtQuick
 model (for example a ListModel item), the \l{QtLocation5::MapItemView}{MapItemView}
-element is available. It accepts any map overlay object as its delegate, and can
+type is available. It accepts any map overlay object as its delegate, and can
 only be created within a \l{QtLocation5::Map}{Map}.
 
-\b{Key Elements}
+\b{Key Types}
 \table
     \row
         \li \l{QtLocation5::MapItemView}{MapItemView}
@@ -112,8 +112,8 @@ only be created within a \l{QtLocation5::Map}{Map}.
 \section2 Interaction with Map Overlay Objects
 
 Interaction with the pre-defined map overlay object types is done using the
-\l{QtLocation5::MapMouseArea}{MapMouseArea} element, which behaves much like a
-normal QtQuick MouseArea. MapQuickItems can also contain MapMouseArea elements,
+\l{QtLocation5::MapMouseArea}{MapMouseArea} type, which behaves much like a
+normal QtQuick MouseArea. MapQuickItems can also contain MapMouseArea objects,
 but can additionally use normal QtQuick MouseAreas to provide interaction.
 
 Properties of map overlay objects that influence their appearance on the display can
@@ -121,7 +121,7 @@ be changed at any time, and many can also be used in animations. Animating
 coordinate-based map overlay objects, such as MapPolygon and MapPolyline, is not yet
 available.
 
-\b{Key Elements}
+\b{Key Types}
 \table
     \row
         \li \l{QtLocation5::MapMouseArea}{MapMouseArea}
@@ -143,14 +143,14 @@ or address being translated, as different areas of the Earth are mapped to
 varying degrees of accuracy.
 
 A geocoding query in QML is performed using the
-\l{QtLocation5::GeocodeModel}{GeocodeModel} element. For an address-to-coordinate
+\l{QtLocation5::GeocodeModel}{GeocodeModel} type. For an address-to-coordinate
 query, its \c{query} property may be set to either an
-\l{QtLocation5::Address}{Address} element or a string containing the textual
+\l{QtLocation5::Address}{Address} object or a string containing the textual
 form of the address to search for. To perform the reverse, the same property
 can be set to a Coordinate instead. Results are made available in the contents
 of the model.
 
-\b{Key Elements}
+\b{Key Types}
 \table
     \row
         \li \l{QtLocation5::Plugin}{Plugin}
@@ -163,9 +163,9 @@ of the model.
         \li Structured address for use in queries and results of geocoding.
 \endtable
 
-Note that the client must create a \l{QtLocation5::Plugin}{Plugin} element
-prior to using a \l{QtLocation5::GeocodeModel}{GeocodeModel} element in order
-to have access to geocoding translation services and thus data to display.
+Note that the client must create a \l{QtLocation5::Plugin}{Plugin} object
+prior to using a \l{QtLocation5::GeocodeModel}{GeocodeModel} object. This
+will enable access to geocoding translation services and thus data to display.
 
 \section1 Routing and Navigation
 
@@ -176,7 +176,7 @@ up the journey can be constructed. If these \l {RouteSegment}s are simple then w
 add navigation information at the connecting points, \l {RouteManeuver}s,
 between the segments.
 
-\b{Key Elements}
+\b{Key Types}
 \table
     \row
         \li \l{QtLocation5::Route}{Routing}
diff --git a/doc/src/places.qdoc b/doc/src/places.qdoc
index e09c99c6..3d4164b6 100644
--- a/doc/src/places.qdoc
+++ b/doc/src/places.qdoc
@@ -43,7 +43,7 @@
     \section2 Plugin
     A \l Plugin is an abstraction for a backend. One \l Plugin might access places from a
     REST server while another may access places from a local database. The following
-    instantiates a \l Plugin element by providing a name of "nokia". The \l Plugin name
+    instantiates a \l Plugin object by providing a name of "nokia". The \l Plugin name
     identifies which backend to choose from. Plugins may also be provided with a set of
     \l {PluginParameter} {parameters}, which essentially takes the form of a set of
     key-value pairs. The \l {PluginParameter} {parameters} that can be specified vary
@@ -190,13 +190,13 @@
 
     \section2 Learn More
     The above snippets only exhibit a small subset of Places functionality.
-    Refer to the \l {Places Elements} shown below for richer content such as \l {ImageModel} {images}, \l {ReviewModel} {reviews} etc, as well as more indepth descriptions and explanations.
+    Refer to the \l {Places Types} shown below for richer content such as \l {ImageModel} {images}, \l {ReviewModel} {reviews} etc, as well as more indepth descriptions and explanations.
 
     See also the \l {Places (QML)}{Places (QML)} example for a more comprehensive demonstration on
     how to use the API.
 
-    \section1 Places Elements
-    \section2 Data Elements
+    \section1 Places Types
+    \section2 Data Types
     \annotatedlist qml-QtLocation5-places-data
 
     \section2 Models
diff --git a/doc/src/plugins/qml-location.qdoc b/doc/src/plugins/qml-location.qdoc
index 66743c43..5507c3d5 100644
--- a/doc/src/plugins/qml-location.qdoc
+++ b/doc/src/plugins/qml-location.qdoc
@@ -48,45 +48,45 @@
 
     \section2 Coordinate
 
-    The \l Coordinate is a basic unit of geographical information. The \l Coordinate element includes properties to hold the coordinate values for \l {Coordinate::latitude}{latitude}, \l {Coordinate::longitude}{longitude} and \l {Coordinate::altitude}{altitude}.
+    The \l Coordinate is a basic unit of geographical information. The \l Coordinate type includes properties to hold the coordinate values for \l {Coordinate::latitude}{latitude}, \l {Coordinate::longitude}{longitude} and \l {Coordinate::altitude}{altitude}.
 
     \section2 Position
 
-    The three dimensional position of an object such as a mobile device can be specified by giving the latitude, longitude and altitude. That is the values held in the Coordinate element. Additionally for computation of future positions we would like to know if the object is moving, what \l {Position::speed}{speed} it is doing and what is the \l {Position::timestamp}{timestamp} of the last position data. Position therefore includes values for \l {Coordinate::latitude}{latitude}, \l {Coordinate::longitude}{longitude}, \l {Coordinate::altitude}{altitude}, \l {Position::speed}{speed} and a \l {Position::timestamp}{timestamp}. \l Position also takes responsibility for validation of sensible values for these properties: just as there is a \l {Coordinate::latitude}{latitude} there is a property \l {Position::latitudeValid}{latitudeValid}. Similarly for the other properties with the exception of the timestamp.
+    The three dimensional position of an object such as a mobile device can be specified by giving the latitude, longitude and altitude. That is the values held in the Coordinate type. Additionally for computation of future positions we would like to know if the object is moving, what \l {Position::speed}{speed} it is doing and what is the \l {Position::timestamp}{timestamp} of the last position data. Position therefore includes values for \l {Coordinate::latitude}{latitude}, \l {Coordinate::longitude}{longitude}, \l {Coordinate::altitude}{altitude}, \l {Position::speed}{speed} and a \l {Position::timestamp}{timestamp}. \l Position also takes responsibility for validation of sensible values for these properties: just as there is a \l {Coordinate::latitude}{latitude} there is a property \l {Position::latitudeValid}{latitudeValid}. Similarly for the other properties with the exception of the timestamp.
 
 
     \section2 PositionSource
 
-    We have a Position element, a Coordinate element but where do we get the
+    We have a Position type, a Coordinate type but where do we get the
     data from? It is a good idea to be able to indicate alternative sources.
     Perhaps instead of directly picking up GPS satellites you want to do
     some testing using a datafile. We may also need to manage our
     interaction with the source.
 
-    The \l PositionSource element provides the developer with control,
+    The \l PositionSource type provides the developer with control,
     within the limits allowed by the platform, of the source of the
     geographical data. The positional data can be sourced from a logfile
     which is in NMEA format.
 
     \l {http://en.wikipedia.org/wiki/NMEA}{NMEA} is a common text-based protocol for specifying navigational data. For convenience, the \l {PositionSource::nmeaSource}{nmeaSource} property is provided to enable QML applications to read NMEA data from a log file, the source will emit updates according to the time stamp of each NMEA sentence to produce a "replay" of the recorded data.
 
-    \section2 Positioning Elements
+    \section2 Positioning Types
 
 
     \annotatedlist qml-location
 
     \section1 Maps
 
-    The Map element can be used be used to display a map of the world.  The
+    The Map type can be used be used to display a map of the world.  The
     bulk of the functionality is provided by a mapping plugin described
-    by the plugin element associated with the Map.
+    by the plugin type associated with the Map.
 
     Various map objects can be added to the map.  These map objects are
     specified in terms of coordinates and meters.
 
     Interaction with the map objects is done via the MapMouseArea item.
 
-    \section2 Map Elements
+    \section2 Map Types
 
     \annotatedlist qml-location-maps
 
diff --git a/doc/src/qml-maps.qdoc b/doc/src/qml-maps.qdoc
index ff8948db..39a8ed2f 100644
--- a/doc/src/qml-maps.qdoc
+++ b/doc/src/qml-maps.qdoc
@@ -41,7 +41,7 @@
 
 \section1 Overview
 
-The \l Map element allows the display of a map and placing objects within the map.
+The \l Map type allows the display of a map and placing objects within the map.
 Various points of interest can be defined and added to the map for display.
 Also the \l Map has features to control how the map is displayed. With the
 Map item you can center the map, zoom, pinch and make the item flickable.
@@ -56,11 +56,11 @@ children of the
 
 \section2 Position
 
-The basic element of position information is the \l Coordinate. A coordinate
+The basic type of position information is the \l Coordinate. A coordinate
 encapsulates data for the latitude, longitude and altitude of the location.
 Altitude is in meters. It also has a method to determine distance to another
-Coordinate. The \l Coordinate element may also be held within a \l {QtLocation5::Location}{Location}
-element, this will also have information on a bounding box size to determine
+Coordinate. The \l Coordinate object may also be held within a \l {QtLocation5::Location}{Location}
+object, this will also have information on a bounding box size to determine
 sufficient proximity to the location and a location address.
 
 \section2 Geocoding
@@ -69,7 +69,7 @@ sufficient proximity to the location and a location address.
 geographical coordinates (latitude and longitude) from other geographical references
 to the locations. For example, this can be a street address. Reverse geocoding is also possible with
 a street address being used to determine a geographical coordinate. Geocoding
-is performed by using the \l GeoCodeModel element.
+is performed by using the \l GeoCodeModel type.
 
 The following code examples are a small part of the \c map component in the
 \l {Map Viewer (QML)}{Map Viewer (QML)} example. The snippets
@@ -77,7 +77,7 @@ demonstrate the declaration of the \l GeocodeModel component.
 
 In the snippet we see that the \c geocodeModel property contains the plugin
 and two signal handlers. One for changes in status (\c onStatusChanged ) and
-the other to update the centering of the Map element (\c onLocationsChanged ).
+the other to update the centering of the Map object (\c onLocationsChanged ).
 
 \snippet examples/declarative/mapviewer/content/map/MapComponent.qml geocodemodel0
 \snippet examples/declarative/mapviewer/content/map/MapComponent.qml geocodemodel0 body
@@ -95,7 +95,7 @@ process and determine the geographical coordinates.
 
 \section2 Navigation
 
-A very important function of the \l Map element is navigation
+A very important function of the \l Map type is navigation
 from one place to a destination with possible waypoints along the route. The
 route will be divided up into a series of segments. At the end of each segment
 is a vertex called a \e maneuver. The \e segments contain information about
@@ -184,16 +184,16 @@ The \l Map item also supports user interface interactions with the map using
 tactile and mouse gestures. That is features such as swiping to pan,
 pinching to zoom.
 
-Enabling and configuring pinch and flickable is easy within the \l Map element.
+Enabling and configuring pinch and flickable is easy within the \l Map type.
 
 \snippet examples/declarative/mapviewer/content/map/MapComponent.qml top
 \snippet examples/declarative/mapviewer/content/map/MapComponent.qml end
 
-Zoom can also be controlled by other elements like sliders, as shown in the
+Zoom can also be controlled by other objects like sliders, as shown in the
 example, by implementing the \c onValueChanged handler to update the Map
 \l {QtLocation5::Map::}{zoomLevel}.
 
-\section1 Elements
+\section1 Types
 
 \section3 Positioning
 \annotatedlist qml-QtLocation5-positioning