--- a/qtmobility/src/contacts/qcontactmanager.cpp	Wed Jun 23 19:08:38 2010 +0300
+++ b/qtmobility/src/contacts/qcontactmanager.cpp	Tue Jul 06 15:12:50 2010 +0300
@@ -363,7 +363,7 @@
   Returns the list of contacts stored in the manager sorted according to the given list of \a sortOrders.
 
   The \a fetchHint parameter describes the optimization hints that a manager may take.
-  If the \a fetchHint is the default constructed hint, all existing details and relationships
+  If the \a fetchHint is the default constructed hint, all existing details, relationships and action preferences
   in the matching contacts will be returned.  A client should not make changes to a contact which has
   been retrieved using a fetch hint other than the default fetch hint.  Doing so will result in information
   loss when saving the contact back to the manager (as the "new" restricted contact will
@@ -384,7 +384,7 @@
   contacts and testing them against the supplied filter - see the \l isFilterSupported() function.
 
   The \a fetchHint parameter describes the optimization hints that a manager may take.
-  If the \a fetchHint is the default constructed hint, all existing details and relationships
+  If the \a fetchHint is the default constructed hint, all existing details, relationships and action preferences
   in the matching contacts will be returned.  A client should not make changes to a contact which has
   been retrieved using a fetch hint other than the default fetch hint.  Doing so will result in information
   loss when saving the contact back to the manager (as the "new" restricted contact will
@@ -405,7 +405,7 @@
   and the error returned by \l error() will be \c QContactManager::DoesNotExistError.
 
   The \a fetchHint parameter describes the optimization hints that a manager may take.
-  If the \a fetchHint is the default constructed hint, all existing details and relationships
+  If the \a fetchHint is the default constructed hint, all existing details, relationships and action preferences
   in the matching contact will be returned.  A client should not make changes to a contact which has
   been retrieved using a fetch hint other than the default fetch hint.  Doing so will result in information
   loss when saving the contact back to the manager (as the "new" restricted contact will
@@ -558,6 +558,15 @@
 }
 
 /*!
+  \deprecated
+*/
+QString QContactManager::synthesizedDisplayLabel(const QContact& contact) const
+{
+    d->m_error = QContactManager::NoError;
+    return d->m_engine->synthesizedDisplayLabel(contact, &d->m_error);
+}
+
+/*!
   Returns a display label for a \a contact which is synthesized from its details in a manager specific
   manner.
 
@@ -630,7 +639,6 @@
     return d->m_engine->selfContactId(&d->m_error);
 }
 
-
 /*!
   Returns a list of relationships in which the contact identified by the given \a participantId participates in the given \a role.
   If \a participantId is the default-constructed id, \a role is ignored and all relationships are returned.
@@ -776,7 +784,7 @@
   \enum QContactManager::ManagerFeature
   This enum describes the possible features that a particular manager may support
   \value Groups The manager supports saving contacts of the \c QContactType::TypeGroup type
-  \omitvalue ActionPreferences The manager supports saving preferred details per action per contact
+  \value ActionPreferences The manager supports saving preferred details per action per contact
   \value DetailOrdering When a contact is retrieved, the manager will return the details in the same order in which they were saved
   \value Relationships The manager supports at least some types of relationships between contacts
   \value ArbitraryRelationshipTypes The manager supports relationships of arbitrary types between contacts