Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public

2 files changed, 11 insertions, 9 deletions

diff --git a/demos/embedded/desktopservices/linktab.cpp b/demos/embedded/desktopservices/linktab.cpp
index 58d1cc6..32411fe 100644
--- a/demos/embedded/desktopservices/linktab.cpp
+++ b/demos/embedded/desktopservices/linktab.cpp
@@ -49,19 +49,19 @@
 // CLASS HEADER
 #include "linktab.h"
 
-LinkTab::LinkTab(QWidget *parent) : 
+LinkTab::LinkTab(QWidget *parent) :
     ContentTab(parent)
-{          
+{
 }
-        
-LinkTab::~LinkTab() 
+
+LinkTab::~LinkTab()
 {
 }
 
 void LinkTab::populateListWidget()
 {
     m_WebItem = new QListWidgetItem(QIcon(":/resources/browser.png"), tr("Launch Browser"), this);
-    m_MailToItem = new QListWidgetItem(QIcon(":/resources/message.png"), tr("New e-mail"), this);   
+    m_MailToItem = new QListWidgetItem(QIcon(":/resources/message.png"), tr("New e-mail"), this);
 }
 
 QUrl LinkTab::itemUrl(QListWidgetItem *item)
@@ -78,8 +78,8 @@ QUrl LinkTab::itemUrl(QListWidgetItem *item)
 }
 void LinkTab::handleErrorInOpen(QListWidgetItem *item)
 {
-    if(m_MailToItem == item) {   
-        QMessageBox::warning( this, tr("Operation Failed"), tr("Please check that you have\ne-mail accunt defined"), QMessageBox::Close);    
+    if(m_MailToItem == item) {
+        QMessageBox::warning( this, tr("Operation Failed"), tr("Please check that you have\ne-mail account defined."), QMessageBox::Close);
     } else {
         ContentTab::handleErrorInOpen(item);
     }
diff --git a/doc/src/installation.qdoc b/doc/src/installation.qdoc
index c8310ff..6fb367f 100644
--- a/doc/src/installation.qdoc
+++ b/doc/src/installation.qdoc
@@ -523,8 +523,10 @@ in the \l{Qt for S60 Requirements} document.
         to try out. An excellent starting point is the "fluidlauncher"
         demo. To run the demo on a real device, you first have to install
         \c{qt_libs.sis} and \c{fluidlauncher.sis} found in the Qt installation
-        directory. In Windows Explorer right click on the \c{.sis} files and select
-        "Install with Nokia Application Installer" and follow the instructions.
+        directory. Begin by connecting your phone using the USB cable and
+        selecting "PC Suite mode". In Windows Explorer right click on the
+        \c{.sis} files and select "Install with Nokia Application Installer"
+        and follow the instructions.
 
         To run the demos and examples on the emulator, you need to build them first.
         Open the "Qt for S60 Command Prompt" from the Start menu and type: