Fix a couple of doc warnings.

28 files changed, 90 insertions, 165 deletions

diff --git a/doc/src/multimedia.qdoc b/doc/src/multimedia.qdoc
index d298785eec..02915a95fb 100644
--- a/doc/src/multimedia.qdoc
+++ b/doc/src/multimedia.qdoc
@@ -254,7 +254,7 @@ Creating still images and video.
 In order to capture an image we need to create a \l QCamera object and use
 it to initialize a \l QVideoWidget, so we can see where the camera is
 pointing - a viewfinder. The camera object is also used to initialize a new
-QCameraImageCapture object, \e imageCapture. All that is then needed is to start
+QCameraImageCapture object, \i imageCapture. All that is then needed is to start
 the camera, lock it so that the settings are not changed while the image
 capture occurs, capture the image, and finally unlock the camera ready for
 the next photo.
diff --git a/plugins/declarative/gallery/qdeclarativegalleryquerymodel.cpp b/plugins/declarative/gallery/qdeclarativegalleryquerymodel.cpp
index 288fdc832b..94695a5280 100644
--- a/plugins/declarative/gallery/qdeclarativegalleryquerymodel.cpp
+++ b/plugins/declarative/gallery/qdeclarativegalleryquerymodel.cpp
@@ -682,7 +682,7 @@ void QDeclarativeDocumentGalleryModel::setRootType(QDeclarativeDocumentGallery::
 */
 
 /*!
-    \qmlproperty DocumentGalleryModel::count
+    \qmlproperty int DocumentGalleryModel::count
 
     This property holds the number of results returned by a query.
 */
diff --git a/src/contacts/qcontactaction.cpp b/src/contacts/qcontactaction.cpp
index 05abee112b..7f174987ca 100644
--- a/src/contacts/qcontactaction.cpp
+++ b/src/contacts/qcontactaction.cpp
@@ -87,42 +87,12 @@ QContactAction::~QContactAction()
  */
 
 /*!
-  \fn QContactAction::actionDescriptors(const QString& actionName) const
-  Returns the descriptor which uniquely identifies this action implementation.  A descriptor
-  consists of an action name, a vendor name and an implementation version.
-  The name of the action identifies the action provided; different implementations of an action
-  with the same name must provide the same functionality, but may differ in implementation semantics.
-  Hence, the action name includes the major version of the interface definition implemented.
-  The vendor name is the identification string of the vendor which has provided this implementation.
-  The implementation version is the (minor) version of the implementation, and is vendor-specific.
-
-  \sa QContactActionDescriptor
- */
-
-/*!
   \fn QContactAction::state() const
   Returns the current state of the action.
   \sa stateChanged()
  */
 
 /*!
-  \fn QContactAction::contactFilter() const
-  Returns a filter which may be used to filter contacts by the availability of this action implementation for them.
- */
-
-/*!
-  \fn QContactAction::isTargetSupported(const QContactActionTarget& target) const
-  Returns true if the provided \a target contains the information required for this action to be
-  performed on it; otherwise, returns false.
-  Some actions may require no details to be specified (e.g., serialize entire contact), some may require
-  exactly one detail (e.g., email this specific email account of the given contact), some may require
-  zero or one detail (e.g., email exactly on email account of the given contact, but the action can choose
-  which email account to email), some may require multiple details (e.g., email all specified email accounts
-  of the given contact).  In all cases, it is the action which decides how much information it needs.
-  If the target contains the required information, the function will return true; otherwise, returns false.
- */
-
-/*!
   \fn QContactAction::invokeAction(const QContact& contact, const QContactDetail& detail = QContactDetail(), const QVariantMap& parameters = QVariantMap())
   Initiates the implemented action on the specified \a detail of the given \a contact, or on the first
   eligible detail saved in the contact if the given \a detail is empty, with the given \a parameters specified.
diff --git a/src/contacts/qcontactactionfactory.cpp b/src/contacts/qcontactactionfactory.cpp
index 54988340b3..9f5b08b5c8 100644
--- a/src/contacts/qcontactactionfactory.cpp
+++ b/src/contacts/qcontactactionfactory.cpp
@@ -62,13 +62,6 @@ QContactActionFactory::~QContactActionFactory()
  */
 
 /*!
-  \fn QContactActionFactory::instance() const
-  Returns a pointer to an instance of the implementation of the action.
-  The caller takes ownership of the action instance returned from this function, and must delete it when
-  they are finished using it in order to avoid a memory leak.
- */
-
-/*!
   \fn QContactActionFactory::supportedTargets(const QContact& contact, const QContactActionDescriptor& which) const
   Returns the targets which are supported by the action which may be instantiated by this factory
   for the given \a contact.  If there are no supported targets for the \a contact, then that
diff --git a/src/contacts/qcontactactiontarget.cpp b/src/contacts/qcontactactiontarget.cpp
index 4e86f735ed..ae4d81d097 100644
--- a/src/contacts/qcontactactiontarget.cpp
+++ b/src/contacts/qcontactactiontarget.cpp
@@ -58,6 +58,16 @@ QTM_BEGIN_NAMESPACE
 */
 
 /*!
+  \enum QContactActionTarget::Type
+  This enumerator defines the type of a QContactActionTarget.
+
+  \value Invalid The type is invalid.
+  \value WholeContact The type is a complete contact.
+  \value SingleDetail The type is only a single detail.
+  \value MultipleDetails The type contains multiple details.
+*/
+
+/*!
  * Constructs a new action target from the given \a contact and the given list of that contact's \a details.
  * If no \a contact is specified, the target will be invalid.  If a \a contact but no \a details are specified,
  * the target will be valid, but the action which operates on the target may fail (for example, if it requires
diff --git a/src/gallery/qdocumentgallery.cpp b/src/gallery/qdocumentgallery.cpp
index 8ba46e1a65..9179b1777a 100644
--- a/src/gallery/qdocumentgallery.cpp
+++ b/src/gallery/qdocumentgallery.cpp
@@ -58,6 +58,19 @@ QTM_BEGIN_NAMESPACE
 */
 
 /*!
+    \enum QDocumentGallery::Error
+    This enum defines errors in a Gallery.
+
+    \value NoError No error.
+    \value NoGallery No Gallery defined or found.
+    \value NotSupported Gallery is not supported.
+    \value ConnectionError Connection to gallery is broken.
+    \value ItemIdError Id of a item is wrong.
+    \value ItemTypeError Type of an item is wrong.
+    \value FilterError Error in filter found.
+*/
+
+/*!
     \variable QDocumentGallery::File
 
     This type matches all files in the document gallery.
diff --git a/src/gallery/qgalleryabstractrequest.cpp b/src/gallery/qgalleryabstractrequest.cpp
index 342b556ed1..eb33d8314a 100644
--- a/src/gallery/qgalleryabstractrequest.cpp
+++ b/src/gallery/qgalleryabstractrequest.cpp
@@ -138,42 +138,20 @@ void QGalleryAbstractRequestPrivate::_q_progressChanged(int current, int maximum
     \value Active The request is currently executing.
     \value Cancelling The request was cancelled, but hasn't yet returned to the
     Inactive status.
+    \value Cancelled The request was cancelled.
     \value Idle The request has finished, and is monitoring its return values
     for changes.
+    \value Finished The request is finished.
+    \value Error The request runs into an error.
 */
 
 /*!
-    \enum QGalleryAbstractRequest::Result
-
-    Identifies the result of a gallery request.
-
-    \value NoResult The request is still active and no result is available yet.
-    \value Succeeded The request succeeded sucessfully.
-    \value Cancelled The request was cancelled before it could finish.
-    \value NoGallery The request cannot be executed because no \l gallery is
-    set.
-    \value NotSupported The request isn't supported by the \l gallery.
-    \value ConnectionError The request could not be executed due to a problem
-    connecting to the gallery.
-    \value InvalidItemError The request could not be executed due to an invalid
-    item ID.
-    \value ItemTypeError The request could not be executed due to an invalid
-    item type.
-    \value InvalidPropertyError The request could not be executed because a
-    filter referenced an invalid property.
-    \value PropertyTypeError The request could not be executed because a filter
-    compared a property to an invalid variant type.
-    \value UnsupportedFilterTypeError The request could not be executed because
-    a filter is not supported by the gallery.
-    \value UnsupportedFilterOptionError The request could not be executed
-    because an option on a filter is not supported by the gallery.
-    \value PermissionsError The request could not be executed because the
-    user has insufficient permissions.
-    \value InvalidDestinationError  The request could not be executed because
-    the given destination ID is invalid.
-    \value InvalidUrlError The request could not be executed due to an invalid
-    URL.
-    \value RequestError A minimum value for request specific error results.
+    \enum QGalleryAbstractRequest::RequestError
+
+    \value NoError No error.
+    \value NoGallery No gallery found.
+    \value NotSupported Request is not supported.
+    \value GalleryError The gallery is wrong or corrupt.
 */
 
 /*!
@@ -292,12 +270,6 @@ QGalleryAbstractRequest::Status QGalleryAbstractRequest::status() const
 }
 
 /*!
-    \fn QGalleryAbstractRequest::statusChanged(GalleryAbstractRequest::Status status)
-
-    Signals that the \a status of a request has changed.
-*/
-
-/*!
     \property QGalleryAbstractRequest::error
 
     \brief The error encountered by an unsuccessful request.
@@ -544,6 +516,12 @@ void QGalleryAbstractRequest::clear()
 */
 
 /*!
+    \fn QGalleryAbstractRequest::statusChanged(QGalleryAbstractRequest::Status status)
+
+    Signals that the \a status of a request has changed.
+*/
+
+/*!
     \fn QGalleryAbstractRequest::error(int error, const QString &errorString)
 
     Signals that a request failed with the given \a error.  The \a errorString
diff --git a/src/gallery/qgalleryabstractresponse.cpp b/src/gallery/qgalleryabstractresponse.cpp
index 2a2a79da61..22cf4a8ba4 100644
--- a/src/gallery/qgalleryabstractresponse.cpp
+++ b/src/gallery/qgalleryabstractresponse.cpp
@@ -261,7 +261,7 @@ void QGalleryAbstractResponse::error(int error, const QString &errorString)
 /*!
     \fn QGalleryAbstractResponse::resumed()
 
-    Signals that an \l idle() response has resumed communications.
+    Signals that an idle response has resumed communications.
 */
 
 /*!
diff --git a/src/gallery/qgalleryquerymodel.cpp b/src/gallery/qgalleryquerymodel.cpp
index 6553d40334..6d18da1183 100644
--- a/src/gallery/qgalleryquerymodel.cpp
+++ b/src/gallery/qgalleryquerymodel.cpp
@@ -676,27 +676,15 @@ QString QGalleryQueryModel::errorString() const
 */
 
 /*!
-    \fn QGalleryQueryModel::succeeded()
-
-    Signals that the query has finished successfully.
-*/
-
-/*!
     \fn QGalleryQueryModel::cancelled()
 
     Signals that the query was cancelled.
 */
 
 /*!
-    \fn QGalleryQueryModel::failed(int result)
-
-    Signals that the query has failed with the given \a result.
-*/
-
-/*!
     \fn QGalleryQueryModel::finished()
 
-    Signals that the query has finished with the given \a result.
+    Signals that the query has finished.
 */
 
 /*!
diff --git a/src/gallery/symbian/qgallerymdsutility.cpp b/src/gallery/symbian/qgallerymdsutility.cpp
index 3b395c796b..9cef038b01 100644
--- a/src/gallery/symbian/qgallerymdsutility.cpp
+++ b/src/gallery/symbian/qgallerymdsutility.cpp
@@ -776,7 +776,7 @@ QVariant::Type QDocumentGalleryMDSUtility::GetPropertyType( int key )
 /*!
  Converts a Symbian S60 descriptor (string) to a QString
 
- \param desc descriptor to be converted
+ \a desc descriptor to be converted
  \return QString containing the converted string
  */
 QString QDocumentGalleryMDSUtility::s60DescToQString(const TDesC& desc)
@@ -789,7 +789,7 @@ QString QDocumentGalleryMDSUtility::s60DescToQString(const TDesC& desc)
 
  Note: Ownership of the returned descriptor (string) is transferred to caller.
 
- \param string QString to be converted
+ \a string QString to be converted
  \return Pointer to a Symbian S60 descriptor on success;
  otherwise returns NULL pointer
  */
@@ -802,7 +802,7 @@ HBufC* QDocumentGalleryMDSUtility::qStringToS60Desc(const QString& string)
 /*!
  Converts a Symbian S60 8 bit descriptor (UTF8 string) to a QString
 
- \param desc 8 bit descriptor to be converted
+ \a desc 8 bit descriptor to be converted
  \return Converted QString on success; otherwise returns null QString
  */
 QString QDocumentGalleryMDSUtility::s60Desc8ToQString(const TDesC8& desc)
@@ -822,7 +822,7 @@ QString QDocumentGalleryMDSUtility::s60Desc8ToQString(const TDesC8& desc)
 
  Note: Ownership of the returned descriptor (string) is transferred to the caller
 
- \param string QString to be converted
+ \a string QString to be converted
  \return Pointer to a Symbian S60 descriptor containing the UTF8 string on success;
  otherwise returns NULL pointer
  */
diff --git a/src/location/landmarks/qlandmarkmanager.cpp b/src/location/landmarks/qlandmarkmanager.cpp
index a75f2e9628..9af870a086 100644
--- a/src/location/landmarks/qlandmarkmanager.cpp
+++ b/src/location/landmarks/qlandmarkmanager.cpp
@@ -186,22 +186,18 @@ Q_DEFINE_LATIN1_CONSTANT(QLandmarkManager::Kmz, "Kmz");
 /*!
     \enum QLandmarkManager::LandmarkFeature
     Defines the possible features the landmark manager can support.
-    \value ExtendedAttributes The manager supports extra attributes above the standard cross platform attributes.
-                              These attributes are specific to the manager backend implementation.
-    \value CustomAttributes The manager supports applications associating arbitrary custom attributes to
-                            landmarks and categories.
-    \value ImportExport The manager supports import and/or export operations
-    \value Notifications The manager will emit notification signals when landmarks/categories have
+    \value ImportExportFeature The manager supports import and/or export operations
+    \value NotificationsFeature The manager will emit notification signals when landmarks/categories have
                          been added/modified/removed from the datastore it manages.
 */
 
 /*!
     \enum QLandmarkManager::SupportLevel
     Defines the possible support levels the manager can provide for a given filter or sort order list.
-    \value Native The manager natively supports the filter or sort order list.
-    \value Emulated The manager emulates the behaviour of the filter or sort order list.
+    \value NativeSupport The manager natively supports the filter or sort order list.
+    \value EmulatedSupport The manager emulates the behaviour of the filter or sort order list.
                      Emulated behaviour will inherently be slower than a natively supported implementation.
-    \value None The manager does not support the filter or sort order list at all.
+    \value NoSupport The manager does not support the filter or sort order list at all.
 */
 
 /*!
diff --git a/src/location/maps/qgeomapdata.cpp b/src/location/maps/qgeomapdata.cpp
index bcce48d71c..b91edab954 100644
--- a/src/location/maps/qgeomapdata.cpp
+++ b/src/location/maps/qgeomapdata.cpp
@@ -343,7 +343,7 @@ void QGeoMapData::clearMapObjects()
     Attempts to fit the bounding box \a bounds into the viewport of the map.
 
     This method will change the zoom level to the maximum zoom level such
-    that all of \bounds is visible within the resulting viewport.
+    that all of \a bounds is visible within the resulting viewport.
 
     If \a preserveViewportCenter is false the map will be centered on the
     bounding box \a bounds before the zoom level is changed, otherwise the
diff --git a/src/location/maps/qgeomapobjectinfo.cpp b/src/location/maps/qgeomapobjectinfo.cpp
index d37a273c60..327ea0f5e8 100644
--- a/src/location/maps/qgeomapobjectinfo.cpp
+++ b/src/location/maps/qgeomapobjectinfo.cpp
@@ -91,7 +91,7 @@ QGeoMapObjectInfo::~QGeoMapObjectInfo()
     delete d_ptr;
 }
 
-/*!
+/*
     Returns the QGeoMapObjectInfo instance associated with the parent of
     this object, or 0 if it has no parent or if there is no QGeoMapObjectInfo
     instance asssoicated with the parent object.
diff --git a/src/location/maps/qgraphicsgeomap.cpp b/src/location/maps/qgraphicsgeomap.cpp
index e19dd5c37f..a38c87f25f 100644
--- a/src/location/maps/qgraphicsgeomap.cpp
+++ b/src/location/maps/qgraphicsgeomap.cpp
@@ -499,7 +499,7 @@ QGeoBoundingBox QGraphicsGeoMap::viewport() const
     Attempts to fit the bounding box \a bounds into the viewport of the map.
 
     This method will change the zoom level to the maximum zoom level such 
-    that all of \bounds is visible within the resulting viewport.
+    that all of \a bounds is visible within the resulting viewport.
 
     If \a preserveViewportCenter is false the map will be centered on the 
     bounding box \a bounds before the zoom level is changed, otherwise the 
diff --git a/src/location/maps/qgraphicsgeomap.h b/src/location/maps/qgraphicsgeomap.h
index f8e62de227..a8523058cf 100644
--- a/src/location/maps/qgraphicsgeomap.h
+++ b/src/location/maps/qgraphicsgeomap.h
@@ -64,6 +64,7 @@ class Q_LOCATION_EXPORT QGraphicsGeoMap : public QGraphicsWidget
     Q_PROPERTY(qreal zoomLevel READ zoomLevel WRITE setZoomLevel NOTIFY zoomLevelChanged)
     Q_PROPERTY(MapType mapType READ mapType WRITE setMapType NOTIFY mapTypeChanged)
     Q_PROPERTY(QGeoCoordinate center READ center WRITE setCenter NOTIFY centerChanged)
+    Q_PROPERTY(ConnectivityMode connectivityMode READ connectivityMode WRITE setConnectivityMode)
 
 public:
     enum MapType {
diff --git a/src/location/maps/tiled/qgeotiledmaprequest.cpp b/src/location/maps/tiled/qgeotiledmaprequest.cpp
index ef298ea948..25ffa0e7f0 100644
--- a/src/location/maps/tiled/qgeotiledmaprequest.cpp
+++ b/src/location/maps/tiled/qgeotiledmaprequest.cpp
@@ -135,7 +135,7 @@ bool QGeoTiledMapRequest::operator== (const QGeoTiledMapRequest &other) const
             (d_ptr->connectivityMode == other.d_ptr->connectivityMode);
 }
 
-/*!
+/*
     Returns the QGeoMapData instance associated with this request.
 */
 //QGeoTiledMapData* QGeoTiledMapRequest::mapData() const
diff --git a/src/multimedia/qcameraexposurecontrol.cpp b/src/multimedia/qcameraexposurecontrol.cpp
index e66f311fe0..5bbf399d29 100644
--- a/src/multimedia/qcameraexposurecontrol.cpp
+++ b/src/multimedia/qcameraexposurecontrol.cpp
@@ -63,7 +63,7 @@ the same level of review and testing as the rest of the APIs.
 The API exposed by the classes in this component are not stable, and will
 undergo modification or removal prior to the final release of Qt Mobility.
 
-    \sa QMediaService::control(), QCamera
+    \sa QCamera
 */
 
 /*!
@@ -133,6 +133,8 @@ Set the metering mode to \a mode.
 
 /*!
   \enum QCameraExposureControl::ExposureParameter
+  \value InvalidParameter
+         Parameter is invalid.
   \value ISO
          Camera ISO sensitivity, specified as integer value.
   \value Aperture
@@ -157,6 +159,16 @@ Set the metering mode to \a mode.
 */
 
 /*!
+  \enum QCameraExposureControl::ParameterFlag
+  \value AutomaticValue
+         Use the automatic values for parameters.
+  \value ReadOnly
+         Parameters are read only.
+  \value ContinuousRange
+         Parameters are continous in their range.
+*/
+
+/*!
   \fn QCameraExposureControl::isParameterSupported(ExposureParameter parameter) const
 
   Returns true is exposure \a parameter is supported by backend.
@@ -170,14 +182,9 @@ Set the metering mode to \a mode.
 
 
 /*!
-  \fn QCameraExposureControl::supportedParameterRange(ExposureParameter parameter, bool *continuous) const
+  \fn QCameraExposureControl::supportedParameterRange(ExposureParameter parameter) const
 
   Returns the list of supported \a parameter values;
-
-  If the camera supports arbitrary values within the supported range,
-  *\a continuous is set to true, otherwise *\a continuous is set to false.
-  In this case at least the minimum and maximim values should be returned in the list.
-  Backend still can return more than two values if some of them are preffered intended to be displayed to user.
 */
 
 /*!
@@ -205,7 +212,7 @@ Set the metering mode to \a mode.
 /*!
     \fn void QCameraExposureControl::exposureParameterChanged(int parameter)
 
-    Signal emitted when the exposure \a parameter has changed to \a value.
+    Signal emitted when the exposure \a parameter has changed.
 */
 
 /*!
diff --git a/src/multimedia/qcameraflashcontrol.cpp b/src/multimedia/qcameraflashcontrol.cpp
index 2ca5558f51..61f9956b8b 100644
--- a/src/multimedia/qcameraflashcontrol.cpp
+++ b/src/multimedia/qcameraflashcontrol.cpp
@@ -61,7 +61,7 @@ the same level of review and testing as the rest of the APIs.
 The API exposed by the classes in this component are not stable, and will
 undergo modification or removal prior to the final release of Qt Mobility.
 
-    \sa QMediaService::control(), QCamera
+    \sa QCamera
 */
 
 /*!
diff --git a/src/multimedia/qcameraimageprocessingcontrol.cpp b/src/multimedia/qcameraimageprocessingcontrol.cpp
index db1d331749..4b1baaa574 100644
--- a/src/multimedia/qcameraimageprocessingcontrol.cpp
+++ b/src/multimedia/qcameraimageprocessingcontrol.cpp
@@ -113,16 +113,6 @@ QCameraImageProcessingControl::~QCameraImageProcessingControl()
 */
 
 /*!
-    \fn QCameraImageProcessingControl::manualWhiteBalance() const
-    Return the manual white balance, in K.
-*/
-
-/*!
-    \fn QCameraImageProcessingControl::setManualWhiteBalance(int colorTemperature)
-    Set the white balance to \a colorTemperature
-*/
-
-/*!
     \fn bool QCameraImageProcessingControl::isProcessingParameterSupported(ProcessingParameter parameter) const
 
     Returns true if the camera supports adjusting image processing \a parameter.
diff --git a/src/multimedia/qmediaplaylist.cpp b/src/multimedia/qmediaplaylist.cpp
index a80386b570..9b2c52a258 100644
--- a/src/multimedia/qmediaplaylist.cpp
+++ b/src/multimedia/qmediaplaylist.cpp
@@ -316,7 +316,7 @@ int QMediaPlaylist::mediaCount() const
 /*!
   Returns true if the playlist contains no items; otherwise returns false.
 
-  \sa size()
+  \sa mediaCount()
   */
 bool QMediaPlaylist::isEmpty() const
 {
@@ -326,7 +326,7 @@ bool QMediaPlaylist::isEmpty() const
 /*!
   Returns true if the playlist can be modified; otherwise returns false.
 
-  \sa size()
+  \sa mediaCount()
   */
 bool QMediaPlaylist::isReadOnly() const
 {
diff --git a/src/multimedia/qvideowidget.cpp b/src/multimedia/qvideowidget.cpp
index 55f2642ec2..2ef589bb30 100644
--- a/src/multimedia/qvideowidget.cpp
+++ b/src/multimedia/qvideowidget.cpp
@@ -896,9 +896,9 @@ QSize QVideoWidget::sizeHint() const
 }
 
 /*!
-    \reimp
-    \internal
- */
+  Current event \a event.
+  Returns the value of the baseclass QWidget::event(QEvent *event) function.
+*/
 bool QVideoWidget::event(QEvent *event)
 {
     Q_D(QVideoWidget);
diff --git a/src/organizer/details/qorganizeritemdetails.cpp b/src/organizer/details/qorganizeritemdetails.cpp
index 041d8b38c5..a7c2af728e 100644
--- a/src/organizer/details/qorganizeritemdetails.cpp
+++ b/src/organizer/details/qorganizeritemdetails.cpp
@@ -761,14 +761,6 @@ Q_DEFINE_LATIN1_CONSTANT(QOrganizerItemReminder::FieldRepetitionDelay, "Repetiti
 */
 
 /*!
-   \fn QOrganizerItemReminder::setRepetitionCount(int count)
-
-   Sets the number of times the user should be reminded of the item to \a count.
-
-   \sa setRepetitionDelay()
-*/
-
-/*!
    \fn int QOrganizerItemReminder::repetitionCount() const
 
    Returns the number of times the user should be reminded of the item.
@@ -777,14 +769,6 @@ Q_DEFINE_LATIN1_CONSTANT(QOrganizerItemReminder::FieldRepetitionDelay, "Repetiti
 */
 
 /*!
-   \fn QOrganizerItemReminder::setRepetitionDelay(int delay)
-
-   Sets the delay (in seconds) between each repetition of the reminder to \a delay.
-
-   \sa setRepetitionCount()
-*/
-
-/*!
    \fn int QOrganizerItemReminder::repetitionDelay() const
 
    Returns the delay (in seconds) between each repetition of the reminder.
@@ -830,7 +814,7 @@ Q_DEFINE_LATIN1_CONSTANT(QOrganizerItemReminder::FieldRepetitionDelay, "Repetiti
 Q_DEFINE_LATIN1_CONSTANT(QOrganizerItemAudibleReminder::DefinitionName, "AudibleReminder");
 
 /*!
-   \variable QOrganizerItemAudibleReminder::DataUrl
+   \variable QOrganizerItemAudibleReminder::FieldDataUrl
    The constant key for which the value of the sound data url is stored.
  */
 Q_DEFINE_LATIN1_CONSTANT(QOrganizerItemAudibleReminder::FieldDataUrl, "DataUrl");
@@ -841,12 +825,6 @@ Q_DEFINE_LATIN1_CONSTANT(QOrganizerItemAudibleReminder::FieldDataUrl, "DataUrl")
    Sets the url of the audible data which should be played to \a dataUrl.
 */
 
-/*!
-   \fn QUrl QOrganizerItemAudibleReminder::dataUrl() const
-
-   Returns the url of the audible data which should be played.
-*/
-
 /* ==================== QOrganizerItemEmailReminder ======================= */
 
 /*!
@@ -912,12 +890,6 @@ Q_DEFINE_LATIN1_CONSTANT(QOrganizerItemEmailReminder::FieldRecipients, "Recipien
 */
 
 /*!
-   \fn QVariantList QOrganizerItemEmailReminder::attachments() const
-
-   Retruns the attachments of the email.
-*/
-
-/*!
    \fn QOrganizerItemEmailReminder::setRecipients(const QStringList& recipients)
 
    Sets the list of recipients that the user wishes to be sent an email as part of the reminder
diff --git a/src/serviceframework/qremoteservicecontrol.cpp b/src/serviceframework/qremoteservicecontrol.cpp
index 5ea62ebe3b..44c10a187f 100644
--- a/src/serviceframework/qremoteservicecontrol.cpp
+++ b/src/serviceframework/qremoteservicecontrol.cpp
@@ -59,6 +59,11 @@ QTM_BEGIN_NAMESPACE
     \sa QRemoteServiceClassRegister   
 */
 
+
+/*! \typedef QRemoteServiceControl::securityFilter
+    QRemoteServiceControl -style synonym for bool (*securityFilter)(const void *message)
+*/
+
 /*!
     Creates a service control instance with the given \a parent.
 */
@@ -87,6 +92,9 @@ void QRemoteServiceControl::publishServices( const QString& ident)
     d->publishServices(ident);
 }
 
+/*!
+    \property QRemoteServiceControl::quitOnLastInstanceClosed
+*/
 bool QRemoteServiceControl::quitOnLastInstanceClosed() const
 {
   return d->quitOnLastInstanceClosed();
diff --git a/src/systeminfo/qsystemscreensaver.cpp b/src/systeminfo/qsystemscreensaver.cpp
index 91f397b209..96f3b02278 100644
--- a/src/systeminfo/qsystemscreensaver.cpp
+++ b/src/systeminfo/qsystemscreensaver.cpp
@@ -78,7 +78,6 @@ QSystemScreenSaver::~QSystemScreenSaver()
 }
 
 /*!
-  \fn bool QSystemScreenSaver::setScreenSaverInhibit()
   \brief Set the screensaver to be inhibited.
 
    Temporarily inhibits the screensaver.
diff --git a/src/systeminfo/qsystemstorageinfo.cpp b/src/systeminfo/qsystemstorageinfo.cpp
index 9d0a74ea7f..1e3fd74ad3 100644
--- a/src/systeminfo/qsystemstorageinfo.cpp
+++ b/src/systeminfo/qsystemstorageinfo.cpp
@@ -73,7 +73,7 @@ QSystemStorageInfoPrivate *getSystemStorageInfoPrivate() { return storageInfoPri
         */
 
         /*!
-           \fn void QSystemStorageInfo::logicalDriveChanged(bool,const QString &))
+           \fn void QSystemStorageInfo::logicalDriveChanged(bool added,const QString &vol);
 
            This signal gets emitted when new storage has been added or removed from the system.
         */
diff --git a/src/versit/qversitcontacthandler.cpp b/src/versit/qversitcontacthandler.cpp
index 5dc2df3dc3..08a25a2a28 100644
--- a/src/versit/qversitcontacthandler.cpp
+++ b/src/versit/qversitcontacthandler.cpp
@@ -101,7 +101,7 @@ Q_DEFINE_LATIN1_CONSTANT(QVersitContactHandlerFactory::ProfileBackup, "Backup");
  */
 
 /*!
-  \fn int index() const
+  \fn int QVersitContactHandlerFactory::index() const
   This function should return an index that helps with determining the order in which to run the
   plugins.  Plugins are run in the following order:
   \list
diff --git a/src/versit/qversitreader.cpp b/src/versit/qversitreader.cpp
index 6ecbb6467e..cac40607c9 100644
--- a/src/versit/qversitreader.cpp
+++ b/src/versit/qversitreader.cpp
@@ -242,7 +242,7 @@ void QVersitReader::cancel()
 /*!
  * If the state is ActiveState, blocks until the reader has finished reading or \a msec milliseconds
  * has elapsed, returning true if it successfully finishes or is cancelled by the user.
- * If \m msec is negative or zero, the function blocks until the writer has finished, regardless of
+ * If \a msec is negative or zero, the function blocks until the writer has finished, regardless of
  * how long it takes.
  * If the state is FinishedState, returns true immediately.
  * Otherwise, returns false immediately.
diff --git a/src/versit/qversitwriter.cpp b/src/versit/qversitwriter.cpp
index 972efbe12d..9b1b9a6410 100644
--- a/src/versit/qversitwriter.cpp
+++ b/src/versit/qversitwriter.cpp
@@ -229,7 +229,7 @@ void QVersitWriter::cancel()
 /*!
  * If the state is ActiveState, blocks until the writer has finished writing or \a msec milliseconds
  * has elapsed, returning true if it successfully finishes or is cancelled by the user.
- * If \m msec is negative or zero, the function blocks until the writer has finished, regardless of
+ * If \a msec is negative or zero, the function blocks until the writer has finished, regardless of
  * how long it takes.
  * If the state is FinishedState, returns true immediately.
  * Otherwise, returns false immediately.