--- a/qtmobility/src/contacts/qcontactmanager.cpp	Fri Jun 11 14:26:25 2010 +0300
+++ b/qtmobility/src/contacts/qcontactmanager.cpp	Wed Jun 23 19:08:38 2010 +0300
@@ -198,7 +198,12 @@
     return true;
 }
 
-/*! Returns a URI that completely describes a manager implementation, datastore, and the parameters with which to instantiate the manager, from the given \a managerName, \a params and an optional \a implementationVersion */
+/*!
+   Returns a URI that completely describes a manager implementation, datastore, and the parameters
+   with which to instantiate the manager, from the given \a managerName, \a params and an optional
+   \a implementationVersion.  This function is generally useful only if you intend to construct a
+   manager with the \l fromUri() function, or wish to set the manager URI field in a QContactId
+   manually (for synchronization or other purposes).  Most clients will not need to use this function. */
 QString QContactManager::buildUri(const QString& managerName, const QMap<QString, QString>& params, int implementationVersion) 
 {
     QString ret(QLatin1String("qtcontacts:%1:%2"));
@@ -227,17 +232,17 @@
 }
 
 /*!
-  Constructs a QContactManager whose implementation, store and parameters are specified in the given \a storeUri,
-  and whose parent object is \a parent.
+  Constructs a QContactManager whose implementation version, manager name and specific parameters
+  are specified in the given \a managerUri, and whose parent object is \a parent.
  */
-QContactManager* QContactManager::fromUri(const QString& storeUri, QObject* parent)
+QContactManager* QContactManager::fromUri(const QString& managerUri, QObject* parent)
 {
-    if (storeUri.isEmpty()) {
+    if (managerUri.isEmpty()) {
         return new QContactManager(QString(), QMap<QString, QString>(), parent);
     } else {
         QString id;
         QMap<QString, QString> parameters;
-        if (parseUri(storeUri, &id, &parameters)) {
+        if (parseUri(managerUri, &id, &parameters)) {
             return new QContactManager(id, parameters, parent);
         } else {
             // invalid