--- a/qtmobility/src/systeminfo/qsysteminfo.cpp	Fri Jun 11 14:26:25 2010 +0300
+++ b/qtmobility/src/systeminfo/qsysteminfo.cpp	Wed Jun 23 19:08:38 2010 +0300
@@ -152,7 +152,7 @@
     \value EmergencyOnly          Emergency calls only.
     \value Searching              Searching for or connecting with the network.
     \value Busy                   Network is busy.
-    \value Connected              Connected to newtwork.
+    \value Connected              Connected to network.
     \value HomeNetwork            On Home Network.
     \value Denied                 Network access denied.
     \value Roaming                On Roaming network.
@@ -495,7 +495,7 @@
 /*!
   \property QSystemNetworkInfo::cellId
   \brief The devices Cell ID
-    Returns the Cell ID of the connected tower or based station.
+    Returns the Cell ID of the connected tower or based station, or 0 if not connected.
 */
 int QSystemNetworkInfo::cellId()
 {
@@ -506,7 +506,7 @@
   \property QSystemNetworkInfo::locationAreaCode
   \brief The LAC.
 
-    Returns the Location Area Code. In the case of none such as a Desktop, an empty string.
+    Returns the Location Area Code. In the case of a Desktop computer, 0 is returned.
 */
 int QSystemNetworkInfo::locationAreaCode()
 {
@@ -517,8 +517,8 @@
    \property QSystemNetworkInfo::currentMobileCountryCode
    \brief The current MCC.
 
-    Returns the current Mobile Country Code. In the case of none such as a Desktop, an empty string.
-/*/
+    Returns the current Mobile Country Code. In the case of a Desktop computer, an empty string is returned.
+*/
 QString QSystemNetworkInfo::currentMobileCountryCode()
 {
     return netInfoPrivate()->currentMobileCountryCode();
@@ -528,7 +528,7 @@
   \property QSystemNetworkInfo::currentMobileNetworkCode
   \brief The current MNC.
 
-    Returns the current Mobile Network Code. In the case of none such as a Desktop, an empty string.
+    Returns the current Mobile Network Code. In the case of a Desktop computer, an empty string is returned.
 */
 QString QSystemNetworkInfo::currentMobileNetworkCode()
 {
@@ -539,7 +539,7 @@
   \property QSystemNetworkInfo::homeMobileCountryCode
   \brief The home MNC.
 
-    Returns the home Mobile Country Code. In the case of none such as a Desktop, an empty string.
+    Returns the home Mobile Country Code. In the case of a Desktop computer, an empty string is returned.
 */
 QString QSystemNetworkInfo::homeMobileCountryCode()
 {
@@ -550,7 +550,7 @@
   \property QSystemNetworkInfo::homeMobileNetworkCode
   \brief The home MCC.
 
-    Returns the home Mobile Network Code. In the case of none such as a Desktop, an empty string.
+    Returns the home Mobile Network Code. In the case of a Desktop computer, an empty string is returned.
     Note: Some platforms don't support retrieving this info. In this case the Network Code is
     returned only when the device is registered on home network.
 */
@@ -577,7 +577,7 @@
 }
 
 /*!
-  Returns the first found QNetworkInterface for type \a mode.
+  Returns the first found QNetworkInterface for type \a mode, or an invalid QNetworkInterface, if none is found.
   */
 QNetworkInterface QSystemNetworkInfo::interfaceForMode(QSystemNetworkInfo::NetworkMode mode)
 {
@@ -607,6 +607,8 @@
                                  networkSignalStrengthChanged(QSystemNetworkInfo::NetworkMode, int))))) {
         netInfoPrivate()->setWlanSignalStrengthCheckEnabled(true);
     }
+#else
+Q_UNUSED(signal)
 #endif
 }
 
@@ -627,6 +629,8 @@
                                  networkSignalStrengthChanged(QSystemNetworkInfo::NetworkMode, int))))) {
         netInfoPrivate()->setWlanSignalStrengthCheckEnabled(false);
     }
+#else
+Q_UNUSED(signal)
 #endif
 }
 
@@ -663,7 +667,7 @@
 }
 
 /*!
-    Returns the color depth of the screen with the index \a screenNumber, in bits per pixel.
+    Returns the color depth of the screen with the index \a screenNumber, in bits per pixel, or 0 if the screen is not found.
 
     \sa QDesktopWidget::screenCount()
 */
@@ -711,7 +715,7 @@
   \property QSystemStorageInfo::logicalDrives
   \brief The logical drives.
 
-    Returns a QStringList of volumes or partitions.
+    Returns a QStringList of volumes or partitions, or an empty list if no drives are found.
 */
 QStringList QSystemStorageInfo::logicalDrives()
 {
@@ -821,7 +825,7 @@
   \property QSystemDeviceInfo::productName
   \brief The product name.
 
-    Returns the product name of the device. In the case where no product information is available,
+    Returns the product name of the device. In the case where no product information is available, an empty string will be returned.
 
 */
 QString QSystemDeviceInfo::productName()
@@ -907,7 +911,7 @@
  /*!
    Constructs a QSystemScreenSaver object with the given \a parent.
 
-   On platforms where there is no one default screensaver mechanism, such as Linux, this class
+   On platforms where there is no default screensaver mechanism, such as Linux, this class
    may not be available.
  */
 
@@ -933,8 +937,9 @@
 /*!
     Temporarily inhibits the screensaver.
 
-    Will be reverted upon destruction of the QSystemScreenSaver object.
-    Returns true on success, otherwise false.
+    The screensaver will be set to a non inhibited state only when this QSystemScreenSaver object gets destroyed.
+
+    This is a non blocking function that will return true if the inhibit procedure was successful, otherwise false.
 
     On platforms that support it, if screensaver is secure by policy, the policy will be honored
     and this will fail.