daily merge RCL_2_4
authorfturovic <frank.turovich@nokia.com>
Mon, 18 Jan 2010 12:02:46 -0600
branchRCL_2_4
changeset 781 8e21d6bb6e90
parent 771 dd82c352e68f (current diff)
parent 780 70dea91cab12 (diff)
child 782 54a289b8cadf
daily merge
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/book.css	Fri Jan 15 14:50:26 2010 -0600
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/book.css	Mon Jan 18 12:02:46 2010 -0600
@@ -12,7 +12,7 @@
 /* 20091007 added verdana and ariel to list to match SFO website fonts choices */
 body, p, table {
 	font-family: Verdana, Ariel, Helvetica, sans-serif;
-	font-size: 0.9em;
+	font-size: 1.0em;
 	font-weight: normal;
 }
 
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/compiler.htm	Fri Jan 15 14:50:26 2010 -0600
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/compiler.htm	Mon Jan 18 12:02:46 2010 -0600
@@ -25,7 +25,7 @@
   </tr>
   <tr>
     <td colspan="2"><h1 align="center">x86 C/C++ Compiler Reference</h1>
-      <p align="center" class="titleSmall">x86 Compiler 3.2.5 (Build 480); July, 2009</p></td>
+      <p align="center" class="titleSmall">x86 Compiler 3.2.5 (Build 487); Jan, 2010</p></td>
   </tr>
 </table>
 <p align="center">&nbsp;</p>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/introduction/new_features.htm	Fri Jan 15 14:50:26 2010 -0600
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/introduction/new_features.htm	Mon Jan 18 12:02:46 2010 -0600
@@ -5,11 +5,43 @@
 <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
 <title>New Features &amp; Bug Fixes</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+<style type="text/css">
+<!--
+.style5 {color: #FF0000}
+-->
+</style>
 </head>
 <body bgcolor="#FFFFFF">
 <h2>New Features &amp; Bug Fixes</h2>
 <p>A list of bug fixes for the compiler and linker can be found in the <span class="code">Symbian_x86_BuildTools_Notes.txt</span> file located in the <span class="code">&lt;Carbide_Install_Dir&gt;\x86Build\Release_Notes</span> directory.</p>
 <p>This reference has new and updated topics:</p>
+<h5>3.2.5 Build 487</h5>
+<ul>
+  <li><span class="style5"><b>IMPORTANT WINSCW COMPILER</b></span> change - the WINSCW compiler 3.2.5 build 487  provides new name mangling to support critical exception handling. Without this change an exception can cause a program or system crash. For more information visit the <a href="http://developer.symbian.org/wiki/index.php/Category:C/C++/WINSCW">WINSCW</a> wiki page. <br>
+  </li>
+  
+  <li>Made &quot;<span class="code">-def_for_structclass on</span>&quot; the default.</li>
+</ul>
+<h5>3.2.5 Build 486</h5>
+<ul>
+  <li>Fixed a C file compile error when assigning a DLL import function name to a function pointer.</li>
+</ul>
+<h5>3.2.5 Build 485</h5>
+<ul>
+  <li>Fixed a codegen bug when a bit field object with post-decrement is used as a while loop counter.</li>
+</ul>
+<h5>3.2.5 Build 482</h5>
+<ul>
+  <li>Fixed a bad assert flagging false an internal compiler error.</li>
+</ul>
+<h5>3.2.5 Build 481</h5>
+<ul>
+  
+  <li>Default constructor initialized to zero to comply with C++ standard &sect;5.3.4.15.</li>
+  <li>Fixed an issue for bad relocation type in reference to the destructor of an imported class from a DLL.</li>
+  <li>Reverted bugfix on the issue around forward declaration in class/struct conflicting with definition, 	we added a new command line switch <span class="code">-def_for_structclass on</span>, and <span class="code">#pragma def_for_structclass</span> for the picking 	up the definition instead of forward declaration.</li>
+</ul>
+<h4>Previous releases</h4>
 <ul>
   <li>See pragma <a href="../pragmas/p_gcc_extensions.htm">gcc_extensions </a>for GCC improvements</li>
   <li>See pragma <a href="../pragmas/p_c99.htm">c99</a> for C99 improvements</li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_01.htm	Fri Jan 15 14:50:26 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_01.htm	Mon Jan 18 12:02:46 2010 -0600
@@ -1,33 +1,32 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Qt Preference Panel</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Creating Qt Projects</h2>
-<p>Use the <b>Qt Project</b> creation wizard to create new Qt-based projects  based on Qt SDKs integrated into S60. The wizard walks you through the process of defining and creating a Qt project.</p>
-<ol>
-  <li><b>Launch the New Qt Project Wizard</b></li>
-  <li><a href="qt_creating_projs_02.htm">Select type of Qt project</a></li>
-  <li><a href="qt_creating_projs_03.htm">Enter project name and  location</a></li>
-  <li><a href="qt_creating_projs_04.htm">Select SDKs for build targets</a></li>
-  <li><a href="qt_creating_projs_05.htm">Select Qt modules to include in project</a></li>
-  <li><a href="qt_creating_projs_06.htm">Set application UID</a></li>
-</ol>
-<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../reference/SDKPreferences.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to </p>
-<p class="note"> it to the Discovered Symbian OS SDK list.</p>
-<h3><b>Launch the New Qt Project Wizard</b></h3>
-<p>Select the <b>File &gt; New &gt; New Qt Project</b> menu item to open the <b>New Qt Symbian OS C++ Project</b> dialog.</p>
-<p align="center"><img src="images/qt_wiz_01_project_type.png" width="500" height="500"></p>
-<p class="figure">Figure 1. Qt project wizard - New Qt Symbian OS C++ Project page</p>
-<h4>Other references</h4>
-<ul>
-  <li><a href="qt_overview.htm">Qt Project Support</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Qt Preference Panel</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Creating Qt Projects</h2>
+<p>Use the <b>Qt Project</b> creation wizard to create new Qt-based projects  based on Qt SDKs integrated into Symbian. The wizard walks you through the process of defining and creating a Qt project.</p>
+<ol>
+  <li><b>Launch the New Qt Project Wizard</b></li>
+  <li><a href="qt_creating_projs_02.htm">Select type of Qt project</a></li>
+  <li><a href="qt_creating_projs_03.htm">Enter project name and  location</a></li>
+  <li><a href="qt_creating_projs_04.htm">Select SDKs for build targets</a></li>
+  <li><a href="qt_creating_projs_05.htm">Select Qt modules to include in project</a></li>
+  <li><a href="qt_creating_projs_06.htm">Set application UID</a></li>
+</ol>
+<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../reference/SDKPreferences.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to it to the Discovered Symbian OS SDK list.</p>
+<h3><b>Launch the New Qt Project Wizard</b></h3>
+<p>Select the <b>File &gt; New &gt; New Qt Project</b> menu item to open the <b>New Qt Symbian OS C++ Project</b> dialog.</p>
+<p align="center"><img src="images/qt_wiz_01_project_type.png" width="500" height="500"></p>
+<p class="figure">Figure 1. Qt project wizard - New Qt Symbian OS C++ Project page</p>
+<h4>Other references</h4>
+<ul>
+  <li><a href="qt_overview.htm">Qt Project Support</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_02.htm	Fri Jan 15 14:50:26 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_02.htm	Mon Jan 18 12:02:46 2010 -0600
@@ -1,32 +1,32 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Qt Preference Panel</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Creating Qt Projects</h2>
-<p>Use the <b>Qt Project</b> creation wizard to create new Qt-based projects  based on Qt SDKs integrated into S60. The wizard walks you through the process of defining and creating a Qt project.</p>
-<ol>
-  <li><a href="qt_creating_projs_01.htm">Launch the New Qt Project Wizard</a></li>
-  <li><b>Select type of Qt project</b></li>
-  <li><a href="qt_creating_projs_03.htm">Enter project name and  location</a></li>
-  <li><a href="qt_creating_projs_04.htm">Select SDKs for build targets</a></li>
-  <li><a href="qt_creating_projs_05.htm">Select Qt modules to include in project</a></li>
-  <li><a href="qt_creating_projs_06.htm">Set application UID</a></li>
-</ol>
-<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../reference/SDKPreferences.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to <a href="../tasks/sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
-<h3>Select type of Qt project</h3>
-<p>Use the<b> Select a type of project</b> page in the <b>New Qt Project Wizard</b> to choose a Qt project template that will be used to generate the new project, then click <b>Next</b>. Note that the templates shown are filtered to </p>
-<p align="center"><img src="images/qt_wiz_01_project_type.png" width="500" height="500"></p>
-<p class="figure">Figure 1. Qt project wizard - New Qt Symbian OS C++ Project page</p>
-<h4>Other references</h4>
-<ul>
-  <li><a href="qt_overview.htm">Qt Project Support</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Qt Preference Panel</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Creating Qt Projects</h2>
+<p>Use the <b>Qt Project</b> creation wizard to create new Qt-based projects  based on Qt SDKs integrated into Symbian. The wizard walks you through the process of defining and creating a Qt project.</p>
+<ol>
+  <li><a href="qt_creating_projs_01.htm">Launch the New Qt Project Wizard</a></li>
+  <li><b>Select type of Qt project</b></li>
+  <li><a href="qt_creating_projs_03.htm">Enter project name and  location</a></li>
+  <li><a href="qt_creating_projs_04.htm">Select SDKs for build targets</a></li>
+  <li><a href="qt_creating_projs_05.htm">Select Qt modules to include in project</a></li>
+  <li><a href="qt_creating_projs_06.htm">Set application UID</a></li>
+</ol>
+<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../reference/SDKPreferences.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to <a href="../tasks/sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
+<h3>Select type of Qt project</h3>
+<p>Use the<b> Select a type of project</b> page in the <b>New Qt Project Wizard</b> to choose a Qt project template that will be used to generate the new project, then click <b>Next</b>. Note that the templates shown are filtered to </p>
+<p align="center"><img src="images/qt_wiz_01_project_type.png" width="500" height="500"></p>
+<p class="figure">Figure 1. Qt project wizard - New Qt Symbian OS C++ Project page</p>
+<h4>Other references</h4>
+<ul>
+  <li><a href="qt_overview.htm">Qt Project Support</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_03.htm	Fri Jan 15 14:50:26 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_03.htm	Mon Jan 18 12:02:46 2010 -0600
@@ -1,51 +1,51 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Qt Preference Panel</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Creating Qt Projects</h2>
-<p>Use the <b>Qt Project</b> creation wizard to create new Qt-based projects  based on Qt SDKs integrated into S60. The wizard walks you through the process of defining and creating a Qt project.</p>
-<ol>
-  
-  <li><a href="qt_creating_projs_01.htm">Launch the New Qt Project Wizard</a></li>
-  <li><a href="qt_creating_projs_02.htm">Select type of Qt project</a></li>
-  <li><b>Enter project name and  location</b></li>
-  <li><a href="qt_creating_projs_04.htm">Select SDKs for build targets</a></li>
-  <li><a href="qt_creating_projs_05.htm">Select Qt modules to include in project</a></li>
-  <li><a href="qt_creating_projs_06.htm">Set application UID</a></li>
-</ol>
-<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../reference/SDKPreferences.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to <a href="../tasks/sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
-<h3><b>Enter project name and  location</b></h3>
-<p>Use the <b>New Qt Symbian OS C++ Project</b> page in the <b>Qt Project Wizard</b> to define the projects name and where it should be saved, then click <b>Next</b>. In Qt projects, the name of the project folder must match the project name. </p>
-<p align="center"><img src="images/qt_wiz_02_project_name.png" width="500" height="500"></p>
-<p class="figure">Figure 1. Qt project wizard - New Qt Symbian OS C++ Project page</p>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="27%" scope="col">Item</th>
-    <th width="62%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><b>Project name</b></td>
-    <td>Enter the name of the new project.</td>
-  </tr>
-  <tr>
-    <td><b>Use default location</b></td>
-    <td><span style="font-weight: normal;">Enable the <b>Use default location</b> option to save the project in the current workspace. Unselect this option to save your project to another location.</span></td>
-  </tr>
-  <tr>
-    <td><b>Location</b></td>
-    <td><span style="font-weight: normal;">Enter the path in the <b>Location</b> field or click <b>Browse</b> button to locate the directory. Qt projects require that the location name match the project name.</span></td>
-  </tr>
-</table>
-<h4>Other references</h4>
-<ul>
-  <li><a href="qt_overview.htm">Qt Project Support</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Qt Preference Panel</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Creating Qt Projects</h2>
+<p>Use the <b>Qt Project</b> creation wizard to create new Qt-based projects  based on Qt SDKs integrated into Symbian. The wizard walks you through the process of defining and creating a Qt project.</p>
+<ol>
+  
+  <li><a href="qt_creating_projs_01.htm">Launch the New Qt Project Wizard</a></li>
+  <li><a href="qt_creating_projs_02.htm">Select type of Qt project</a></li>
+  <li><b>Enter project name and  location</b></li>
+  <li><a href="qt_creating_projs_04.htm">Select SDKs for build targets</a></li>
+  <li><a href="qt_creating_projs_05.htm">Select Qt modules to include in project</a></li>
+  <li><a href="qt_creating_projs_06.htm">Set application UID</a></li>
+</ol>
+<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../reference/SDKPreferences.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to <a href="../tasks/sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
+<h3><b>Enter project name and  location</b></h3>
+<p>Use the <b>New Qt Symbian OS C++ Project</b> page in the <b>Qt Project Wizard</b> to define the projects name and where it should be saved, then click <b>Next</b>. In Qt projects, the name of the project folder must match the project name. </p>
+<p align="center"><img src="images/qt_wiz_02_project_name.png" width="500" height="500"></p>
+<p class="figure">Figure 1. Qt project wizard - New Qt Symbian OS C++ Project page</p>
+<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="27%" scope="col">Item</th>
+    <th width="62%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><b>Project name</b></td>
+    <td>Enter the name of the new project.</td>
+  </tr>
+  <tr>
+    <td><b>Use default location</b></td>
+    <td><span style="font-weight: normal;">Enable the <b>Use default location</b> option to save the project in the current workspace. Unselect this option to save your project to another location.</span></td>
+  </tr>
+  <tr>
+    <td><b>Location</b></td>
+    <td><span style="font-weight: normal;">Enter the path in the <b>Location</b> field or click <b>Browse</b> button to locate the directory. Qt projects require that the location name match the project name.</span></td>
+  </tr>
+</table>
+<h4>Other references</h4>
+<ul>
+  <li><a href="qt_overview.htm">Qt Project Support</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_04.htm	Fri Jan 15 14:50:26 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_04.htm	Mon Jan 18 12:02:46 2010 -0600
@@ -1,48 +1,48 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Qt Preference Panel</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Creating Qt Projects</h2>
-<p>Use the <b>Qt Project</b> creation wizard to create new Qt-based projects   based on Qt SDKs integrated into S60. The wizard walks you through the process of defining and creating a Qt project.</p>
-<ol>
-  
-  <li><a href="qt_creating_projs_01.htm">Launch the New Qt Project Wizard</a></li>
-  <li><a href="qt_creating_projs_02.htm">Select type of Qt project</a></li>
-  <li><a href="qt_creating_projs_03.htm">Enter project name and  location</a></li>
-  <li><b>Select SDKs for build targets</b></li>
-  <li><a href="qt_creating_projs_05.htm">Select Qt modules to include in project</a></li>
-  <li><a href="qt_creating_projs_06.htm">Set application UID</a></li>
-</ol>
-<p class="note"><b>NOTE</b> If everything is built correctly, the <span class="code">QtCore.lib</span> should be in your SDK's <span class="code">&lt;platform&gt; &lt;target&gt; UDEB</span> directory.  If this library is missing, then the SDK will not show up as a supported SDK-target in the build configurations. </p>
-<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../reference/SDKPreferences.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to <a href="../tasks/sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
-<h3><b>Select SDKs for build targets</b></h3>
-<p>Use the <b>Build Targets</b> page of the <b>Qt Project Wizard</b> to select one or more Qt SDKs to include in the project, then click <b>Next</b>.</p>
-<p align="center"><img src="images/qt_wiz_03_build_targets.png"></p>
-<p class="figure">Figure 1. Qt project wizard - Build Targets page</p>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="27%" scope="col">Item</th>
-    <th width="62%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><b>SDKs and Build Configurations</b></td>
-    <td>Shows the list of available SDKs and build configurations to associate with this project upon import. </td>
-  </tr>
-  <tr>
-    <td><b>Filter build configurations that don't contain Qt support</b></td>
-    <td>Enable to filter out of the  SDKs and Build Configurations list any SDK or build configurations that does not contain Qt support. If disabled, all SDKs are shown and available for selection, whether they support Qt or not. The default setting is enabled. The criteria for Qt support is the presence of <span class="code">qtcore.lib</span> in the build configuration output directory.</td>
-  </tr>
-</table>
-<h4>Other references</h4>
-<ul>
-  <li><a href="qt_overview.htm">Qt Project Support</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Qt Preference Panel</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Creating Qt Projects</h2>
+<p>Use the <b>Qt Project</b> creation wizard to create new Qt-based projects   based on Qt SDKs integrated into Symbian. The wizard walks you through the process of defining and creating a Qt project.</p>
+<ol>
+  
+  <li><a href="qt_creating_projs_01.htm">Launch the New Qt Project Wizard</a></li>
+  <li><a href="qt_creating_projs_02.htm">Select type of Qt project</a></li>
+  <li><a href="qt_creating_projs_03.htm">Enter project name and  location</a></li>
+  <li><b>Select SDKs for build targets</b></li>
+  <li><a href="qt_creating_projs_05.htm">Select Qt modules to include in project</a></li>
+  <li><a href="qt_creating_projs_06.htm">Set application UID</a></li>
+</ol>
+<p class="note"><b>NOTE</b> If everything is built correctly, the <span class="code">QtCore.lib</span> should be in your SDK's <span class="code">&lt;platform&gt; &lt;target&gt; UDEB</span> directory.  If this library is missing, then the SDK will not show up as a supported SDK-target in the build configurations. </p>
+<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../reference/SDKPreferences.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to <a href="../tasks/sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
+<h3><b>Select SDKs for build targets</b></h3>
+<p>Use the <b>Build Targets</b> page of the <b>Qt Project Wizard</b> to select one or more Qt SDKs to include in the project, then click <b>Next</b>.</p>
+<p align="center"><img src="images/qt_wiz_03_build_targets.png"></p>
+<p class="figure">Figure 1. Qt project wizard - Build Targets page</p>
+<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="27%" scope="col">Item</th>
+    <th width="62%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><b>SDKs and Build Configurations</b></td>
+    <td>Shows the list of available SDKs and build configurations to associate with this project upon import. </td>
+  </tr>
+  <tr>
+    <td><b>Filter build configurations that don't contain Qt support</b></td>
+    <td>Enable to filter out of the  SDKs and Build Configurations list any SDK or build configurations that does not contain Qt support. If disabled, all SDKs are shown and available for selection, whether they support Qt or not. The default setting is enabled. The criteria for Qt support is the presence of <span class="code">qtcore.lib</span> in the build configuration output directory.</td>
+  </tr>
+</table>
+<h4>Other references</h4>
+<ul>
+  <li><a href="qt_overview.htm">Qt Project Support</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_05.htm	Fri Jan 15 14:50:26 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_05.htm	Mon Jan 18 12:02:46 2010 -0600
@@ -1,33 +1,33 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Qt Preference Panel</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Creating Qt Projects</h2>
-<p>Use the <b>Qt Project</b> creation wizard to create new Qt-based projects  based on Qt SDKs integrated into S60. The wizard walks you through the process of defining and creating a Qt project.</p>
-<ol>
-  
-  <li><a href="qt_creating_projs_01.htm">Launch the New Qt Project Wizard</a></li>
-  <li><a href="qt_creating_projs_02.htm">Select type of Qt project</a></li>
-  <li><a href="qt_creating_projs_03.htm">Enter project name and  location</a></li>
-  <li><a href="qt_creating_projs_04.htm">Select SDKs for build targets</a></li>
-  <li><b>Select Qt modules to include in project</b></li>
-  <li><a href="qt_creating_projs_06.htm">Set application UID</a></li>
-</ol>
-<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../reference/SDKPreferences.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to <a href="../tasks/sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
-<h3><b>Select Qt modules to include in project</b></h3>
-<p>Use the <b>Qt Modules</b> page to select one or more Qt modules to include with the project, then click <b>Next</b>.</p>
-<p align="center"><img src="images/qt_wiz_04_qt_modules.png" width="500" height="500"></p>
-<p class="figure">Figure 1. Qt project wizard - Qt Modules page</p>
-<h4>Other references</h4>
-<ul>
-  <li><a href="qt_overview.htm">Qt Project Support</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Qt Preference Panel</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Creating Qt Projects</h2>
+<p>Use the <b>Qt Project</b> creation wizard to create new Qt-based projects  based on Qt SDKs integrated into Symbian. The wizard walks you through the process of defining and creating a Qt project.</p>
+<ol>
+  
+  <li><a href="qt_creating_projs_01.htm">Launch the New Qt Project Wizard</a></li>
+  <li><a href="qt_creating_projs_02.htm">Select type of Qt project</a></li>
+  <li><a href="qt_creating_projs_03.htm">Enter project name and  location</a></li>
+  <li><a href="qt_creating_projs_04.htm">Select SDKs for build targets</a></li>
+  <li><b>Select Qt modules to include in project</b></li>
+  <li><a href="qt_creating_projs_06.htm">Set application UID</a></li>
+</ol>
+<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../reference/SDKPreferences.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to <a href="../tasks/sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
+<h3><b>Select Qt modules to include in project</b></h3>
+<p>Use the <b>Qt Modules</b> page to select one or more Qt modules to include with the project, then click <b>Next</b>.</p>
+<p align="center"><img src="images/qt_wiz_04_qt_modules.png" width="500" height="500"></p>
+<p class="figure">Figure 1. Qt project wizard - Qt Modules page</p>
+<h4>Other references</h4>
+<ul>
+  <li><a href="qt_overview.htm">Qt Project Support</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_06.htm	Fri Jan 15 14:50:26 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_06.htm	Mon Jan 18 12:02:46 2010 -0600
@@ -1,42 +1,42 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Qt Preference Panel</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Creating Qt Projects</h2>
-<p>Use the <b>Qt Project</b> creation wizard to create new Qt-based projects  based on Qt SDKs integrated into S60. The wizard walks you through the process of defining and creating a Qt project.</p>
-<ol>
-<li><a href="qt_creating_projs_01.htm">Launch the New Qt Project Wizard</a></li>
-<li><a href="qt_creating_projs_02.htm">Select type of Qt project</a></li>
-  <li><a href="qt_creating_projs_03.htm">Enter project name and  location</a></li>
-  <li><a href="qt_creating_projs_04.htm">Select SDKs for build targets</a></li>
-  <li><a href="qt_creating_projs_05.htm">Select Qt modules to include in project</a></li>
-  <li><b>Set application UID</b></li>
-</ol>
-<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../reference/SDKPreferences.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to <a href="../tasks/sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
-<h3><b>Set application UID</b></h3>
-<p>Use the <b>Basic Settings</b> page of the <b>Qt Project Wizard </b>to define an Application UID to the executable. Click <b>Random</b> to generate a  unique UID for program testing purposes. Click <b>Finish</b> when ready to create the project.</p>
-<p align="center"><img src="images/qt_wiz_05_basic_settings.png"></p>
-<p class="figure">Figure 1. Qt project wizard - Basic Settings page</p>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="27%" scope="col">Item</th>
-    <th width="62%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><b>Application UID</b></td>
-    <td>Enter the UID to associate with this executable. Click <b>Random</b> to generate a valid temporary UID for development purposes.</td>
-  </tr>
-</table>
-<h4>Other references</h4>
-<ul>
-  <li><a href="qt_overview.htm">Qt Project Support</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Qt Preference Panel</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Creating Qt Projects</h2>
+<p>Use the <b>Qt Project</b> creation wizard to create new Qt-based projects  based on Qt SDKs integrated into Symbian. The wizard walks you through the process of defining and creating a Qt project.</p>
+<ol>
+<li><a href="qt_creating_projs_01.htm">Launch the New Qt Project Wizard</a></li>
+<li><a href="qt_creating_projs_02.htm">Select type of Qt project</a></li>
+  <li><a href="qt_creating_projs_03.htm">Enter project name and  location</a></li>
+  <li><a href="qt_creating_projs_04.htm">Select SDKs for build targets</a></li>
+  <li><a href="qt_creating_projs_05.htm">Select Qt modules to include in project</a></li>
+  <li><b>Set application UID</b></li>
+</ol>
+<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../reference/SDKPreferences.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to <a href="../tasks/sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
+<h3><b>Set application UID</b></h3>
+<p>Use the <b>Basic Settings</b> page of the <b>Qt Project Wizard </b>to define an Application UID to the executable. Click <b>Random</b> to generate a  unique UID for program testing purposes. Click <b>Finish</b> when ready to create the project.</p>
+<p align="center"><img src="images/qt_wiz_05_basic_settings.png"></p>
+<p class="figure">Figure 1. Qt project wizard - Basic Settings page</p>
+<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="27%" scope="col">Item</th>
+    <th width="62%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><b>Application UID</b></td>
+    <td>Enter the UID to associate with this executable. Click <b>Random</b> to generate a valid temporary UID for development purposes.</td>
+  </tr>
+</table>
+<h4>Other references</h4>
+<ul>
+  <li><a href="qt_overview.htm">Qt Project Support</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_importing_projs_01.htm	Fri Jan 15 14:50:26 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_importing_projs_01.htm	Mon Jan 18 12:02:46 2010 -0600
@@ -1,28 +1,28 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Importing Qt Projects</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Importing Qt Projects</h2>
-<p>Use the <b>Qt Project</b> import wizard to import  Qt-based projects based on Qt SDKs integrated into S60. The wizard walks you through the process of importing a Qt project, stored as a <span class="code">.pro</span> file.</p>
-<p>To import a Qt project:</p>
-<ol>
-  <li><b>Launch the importer</b></li>
-  <li><a href="qt_importing_projs_02.htm">Select type of Qt project</a></li>
-  <li><a href="qt_importing_projs_02.htm">Select .pro file to import</a></li>
-  <li><a href="qt_importing_projs_03.htm">Choose build targets</a></li>
-</ol>
-<h3><b>Launching the importer</b></h3>
-<p>Choose the <b>File &gt; Import...</b> menu option to launch the Import wizard. The Import wizard dialog appears.</p>
-<h4>Other references</h4>
-<ul>
-  <li><a href="qt_overview.htm">Qt Project Support</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Importing Qt Projects</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Importing Qt Projects</h2>
+<p>Use the <b>Qt Project</b> import wizard to import  Qt-based projects based on Qt SDKs integrated into Symbian. The wizard walks you through the process of importing a Qt project, stored as a <span class="code">.pro</span> file.</p>
+<p>To import a Qt project:</p>
+<ol>
+  <li><b>Launch the importer</b></li>
+  <li><a href="qt_importing_projs_02.htm">Select type of Qt project</a></li>
+  <li><a href="qt_importing_projs_02.htm">Select .pro file to import</a></li>
+  <li><a href="qt_importing_projs_03.htm">Choose build targets</a></li>
+</ol>
+<h3><b>Launching the importer</b></h3>
+<p>Choose the <b>File &gt; Import...</b> menu option to launch the Import wizard. The Import wizard dialog appears.</p>
+<h4>Other references</h4>
+<ul>
+  <li><a href="qt_overview.htm">Qt Project Support</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_importing_projs_02.htm	Fri Jan 15 14:50:26 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_importing_projs_02.htm	Mon Jan 18 12:02:46 2010 -0600
@@ -1,30 +1,30 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Importing Qt Projects</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Importing Qt Projects</h2>
-<p>Use the <b>Qt Project</b> import wizard to import  Qt-based projects  based on Qt SDKs integrated into S60. The wizard walks you through the process of importing a Qt project, stored as a <span class="code">.pro</span> file.</p>
-<p>To import a Qt project:</p>
-<ol>
-  <li><a href="qt_importing_projs_01.htm">Launch the importer</a></li>
-  <li><b>Select type of Qt project</b></li>
-  <li><a href="qt_importing_projs_03.htm">Select .pro file to import</a></li>
-  <li><a href="qt_importing_projs_04.htm">Choose build targets</a></li>
-</ol>
-<h3>Select type of Qt project</h3>
-<p>Use the<b> Select </b> page in the <b>New Qt Project Wizard</b> to choose a Qt project template that will be used to create the new project based on the <span class="code">.pro</span> file, then click <b>Next</b>.</p>
-<p align="center"><img src="images/qt_import_01_select.png" width="470" height="550"></p>
-<p class="figure">Figure 1. Import wizard - Select page</p>
-<h4>Other references</h4>
-<ul>
-  <li><a href="qt_overview.htm">Qt Project Support</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Importing Qt Projects</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Importing Qt Projects</h2>
+<p>Use the <b>Qt Project</b> import wizard to import  Qt-based projects  based on Qt SDKs integrated into Symbian. The wizard walks you through the process of importing a Qt project, stored as a <span class="code">.pro</span> file.</p>
+<p>To import a Qt project:</p>
+<ol>
+  <li><a href="qt_importing_projs_01.htm">Launch the importer</a></li>
+  <li><b>Select type of Qt project</b></li>
+  <li><a href="qt_importing_projs_03.htm">Select .pro file to import</a></li>
+  <li><a href="qt_importing_projs_04.htm">Choose build targets</a></li>
+</ol>
+<h3>Select type of Qt project</h3>
+<p>Use the<b> Select </b> page in the <b>New Qt Project Wizard</b> to choose a Qt project template that will be used to create the new project based on the <span class="code">.pro</span> file, then click <b>Next</b>.</p>
+<p align="center"><img src="images/qt_import_01_select.png" width="470" height="550"></p>
+<p class="figure">Figure 1. Import wizard - Select page</p>
+<h4>Other references</h4>
+<ul>
+  <li><a href="qt_overview.htm">Qt Project Support</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_importing_projs_03.htm	Fri Jan 15 14:50:26 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_importing_projs_03.htm	Mon Jan 18 12:02:46 2010 -0600
@@ -1,40 +1,40 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Importing Qt Projects</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Importing Qt Projects</h2>
-<p>Use the <b>Qt Project</b> import wizard to import  Qt-based projects   based on Qt SDKs integrated into S60. The wizard walks you through the process of importing a Qt project, stored as a <span class="code">.pro</span> file.</p>
-<p>To import a Qt project:</p>
-<ol>
-  <li><a href="qt_importing_projs_01.htm">Launch the importer</a></li>
-  <li><a href="qt_importing_projs_01.htm">Select type of Qt project</a></li>
-  <li><b>Select .pro file to import</b></li>
-  <li><a href="qt_importing_projs_04.htm">Choose build targets</a></li>
-</ol>
-<h3>Select .pro file to import</h3>
-<p>Use the<b> Qt Project</b> page in the <b>File Import Wizard</b> to browse for the <span class="code">.pro</span> file to import,  then click <b>Next</b>.</p>
-<p align="center"><img src="images/qt_import_02_qt_project.png" width="527" height="550"></p>
-<p class="figure">Figure 1. File Import wizard - Qt Project page</p>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="27%" scope="col">Item</th>
-    <th width="62%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><b>.pro file</b></td>
-    <td>Enter the path to the Qt <span class="code">.pro</span> file to import. Click <b>Browse</b> to navigate to and select the file.</td>
-  </tr>
-</table>
-<h4>Other references</h4>
-<ul>
-  <li><a href="qt_overview.htm">Qt Project Support</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Importing Qt Projects</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Importing Qt Projects</h2>
+<p>Use the <b>Qt Project</b> import wizard to import  Qt-based projects   based on Qt SDKs integrated into Symbian. The wizard walks you through the process of importing a Qt project, stored as a <span class="code">.pro</span> file.</p>
+<p>To import a Qt project:</p>
+<ol>
+  <li><a href="qt_importing_projs_01.htm">Launch the importer</a></li>
+  <li><a href="qt_importing_projs_01.htm">Select type of Qt project</a></li>
+  <li><b>Select .pro file to import</b></li>
+  <li><a href="qt_importing_projs_04.htm">Choose build targets</a></li>
+</ol>
+<h3>Select .pro file to import</h3>
+<p>Use the<b> Qt Project</b> page in the <b>File Import Wizard</b> to browse for the <span class="code">.pro</span> file to import,  then click <b>Next</b>.</p>
+<p align="center"><img src="images/qt_import_02_qt_project.png" width="527" height="550"></p>
+<p class="figure">Figure 1. File Import wizard - Qt Project page</p>
+<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="27%" scope="col">Item</th>
+    <th width="62%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><b>.pro file</b></td>
+    <td>Enter the path to the Qt <span class="code">.pro</span> file to import. Click <b>Browse</b> to navigate to and select the file.</td>
+  </tr>
+</table>
+<h4>Other references</h4>
+<ul>
+  <li><a href="qt_overview.htm">Qt Project Support</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_importing_projs_04.htm	Fri Jan 15 14:50:26 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_importing_projs_04.htm	Mon Jan 18 12:02:46 2010 -0600
@@ -1,47 +1,47 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Importing Qt Projects</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Importing Qt Projects</h2>
-<p>Use the <b>Qt Project</b> import wizard to import  Qt-based projects  based on Qt SDKs integrated into S60. The wizard walks you through the process of importing a Qt project, stored as a <span class="code">.pro</span> file.</p>
-<p>To import a Qt project:</p>
-<ol>
-  <li><a href="qt_importing_projs_01.htm">Launch the importer</a></li>
-  <li><a href="qt_importing_projs_01.htm">Select type of Qt project</a></li>
-  <li><a href="qt_importing_projs_03.htm">Select .pro file to import</a></li>
-  <li><b>Choose build targets</b></li>
-</ol>
-<p class="note"><b>NOTE</b> If everything is built correctly, the <span class="code">QtCore.lib</span> should be in your SDK's <span class="code">&lt;platform&gt; &lt;target&gt; UDEB</span> directory.  If this library is missing, then the SDK will not show up as a supported SDK-target in the build configurations. </p>
-<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../reference/SDKPreferences.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to <a href="../tasks/sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
-<h3>Select .pro file to import</h3>
-<p>Use the<b> Build Targets </b> page in the <b>File Import Wizard</b> to select which SDKs and build configurations to associate with the project,  then click <b>Finish</b>. The <span class="code">.pro</span> file is imported and a new project created in the <a href="../reference/view_cpp_projects.htm">Project Explorer</a> view.</p>
-<p align="center"><img src="images/qt_import_03_build_targets.png"></p>
-<p class="figure">Figure 1. File Import wizard - Build Targets page</p>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="27%" scope="col">Item</th>
-    <th width="62%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><b>SDKs and Build Configurations</b></td>
-    <td>Shows the list of available SDKs and build configurations to associate with this project upon import. </td>
-  </tr>
-  <tr>
-    <td><b>Filter build configurations that don't contain Qt support</b></td>
-    <td><p>Enable to filter out of the  SDKs and Build Configurations list any SDK or build configurations that Qt does not support. If disabled, all SDKs are shown and available for selection, whether they support Qt or not. The default setting is enabled.</p>
-    </td>
-  </tr>
-</table>
-<h4>Other references</h4>
-<ul>
-  <li><a href="qt_overview.htm">Qt Project Support</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Importing Qt Projects</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Importing Qt Projects</h2>
+<p>Use the <b>Qt Project</b> import wizard to import  Qt-based projects  based on Qt SDKs integrated into Symbian. The wizard walks you through the process of importing a Qt project, stored as a <span class="code">.pro</span> file.</p>
+<p>To import a Qt project:</p>
+<ol>
+  <li><a href="qt_importing_projs_01.htm">Launch the importer</a></li>
+  <li><a href="qt_importing_projs_01.htm">Select type of Qt project</a></li>
+  <li><a href="qt_importing_projs_03.htm">Select .pro file to import</a></li>
+  <li><b>Choose build targets</b></li>
+</ol>
+<p class="note"><b>NOTE</b> If everything is built correctly, the <span class="code">QtCore.lib</span> should be in your SDK's <span class="code">&lt;platform&gt; &lt;target&gt; UDEB</span> directory.  If this library is missing, then the SDK will not show up as a supported SDK-target in the build configurations. </p>
+<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../reference/SDKPreferences.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to <a href="../tasks/sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
+<h3>Select .pro file to import</h3>
+<p>Use the<b> Build Targets </b> page in the <b>File Import Wizard</b> to select which SDKs and build configurations to associate with the project,  then click <b>Finish</b>. The <span class="code">.pro</span> file is imported and a new project created in the <a href="../reference/view_cpp_projects.htm">Project Explorer</a> view.</p>
+<p align="center"><img src="images/qt_import_03_build_targets.png"></p>
+<p class="figure">Figure 1. File Import wizard - Build Targets page</p>
+<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="27%" scope="col">Item</th>
+    <th width="62%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><b>SDKs and Build Configurations</b></td>
+    <td>Shows the list of available SDKs and build configurations to associate with this project upon import. </td>
+  </tr>
+  <tr>
+    <td><b>Filter build configurations that don't contain Qt support</b></td>
+    <td><p>Enable to filter out of the  SDKs and Build Configurations list any SDK or build configurations that Qt does not support. If disabled, all SDKs are shown and available for selection, whether they support Qt or not. The default setting is enabled.</p>
+    </td>
+  </tr>
+</table>
+<h4>Other references</h4>
+<ul>
+  <li><a href="qt_overview.htm">Qt Project Support</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_overview.htm	Fri Jan 15 14:50:26 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_overview.htm	Mon Jan 18 12:02:46 2010 -0600
@@ -1,31 +1,31 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Qt Projects Overview</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Qt Projects Overview </h2>
-<p>Carbide supports the creation, importing, development, and debugging of programs based upon Qt.</p>
-<p>The following  topics are covered for Qt: </p>
-<ul>
-  <li><a href="qt_project_setup.htm">Qt Development Setup</a></li>
-  <li><a href="qt_perspectives.htm">Qt Perspective</a></li>
-  <li><a href="qt_pref_panel.htm">Qt Preference panel</a></li>
-  <li><a href="qt_creating_projs_01.htm">Creating Qt Projects</a></li>
-  <li><a href="qt_importing_projs_01.htm">Importing Qt Projects</a></li>
-  <li><a href="qt_project_properties.htm">Qt Project Properties</a></li>
-</ul>
-<h3>Locating Qt Help</h3>
-<p>Help for using Qt can be found in these locations:</p>
-<ul>
-  <li>Qt + Eclipse integration &#8212;  see the <a href="PLUGINS_ROOT/com.trolltech.qtcppintegrationhelp/doc/eclipse-integration.html">Qt Developer User Guide</a></li>
-  <li>Qt SDK help  &#8212;  look in the <span class="code">qt_sdk_install/doc/html</span> directory of the Qt SDK</li>
-  <li>Qt support  &#8212; visit <a href="http://trolltech.com">trolltech.com</a> for more information</li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Qt Projects Overview</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Qt Projects Overview </h2>
+<p>Carbide supports the creation, importing, development, and debugging of programs based upon Qt.</p>
+<p>The following  topics are covered for Qt: </p>
+<ul>
+  <li><a href="qt_project_setup.htm">Qt Development Setup</a></li>
+  <li><a href="qt_perspectives.htm">Qt Perspective</a></li>
+  <li><a href="qt_pref_panel.htm">Qt Preference panel</a></li>
+  <li><a href="qt_creating_projs_01.htm">Creating Qt Projects</a></li>
+  <li><a href="qt_importing_projs_01.htm">Importing Qt Projects</a></li>
+  <li><a href="qt_project_properties.htm">Qt Project Properties</a></li>
+</ul>
+<h3>Locating Qt Help</h3>
+<p>Help for using Qt can be found in these locations:</p>
+<ul>
+  <li>Qt + Eclipse integration &#8212;  see the <a href="PLUGINS_ROOT/com.trolltech.qtcppintegrationhelp/doc/eclipse-integration.html">Qt Developer User Guide</a></li>
+  <li>Qt SDK help  &#8212;  look in the <span class="code">qt_sdk_install/doc/html</span> directory of the Qt SDK</li>
+  <li>Qt information  &#8212; visit <a href="http://wiki.forum.nokia.com/index.php/Category:Qt">Forum Nokia Qt</a> wiki topic for more information</li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_project_setup.htm	Fri Jan 15 14:50:26 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_project_setup.htm	Mon Jan 18 12:02:46 2010 -0600
@@ -1,35 +1,35 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Qt Development Setup</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Qt Development Setup</h2>
-<p>There are some prerequisites to using Qt projects within the Carbide environment. This includes downloading the correct SDKs, building <span class="code">qmake</span> to use the SDKs, and finally, building the libraries for your target environments. </p>
-<p>You should have the Qt SDK for S60 that works with the S60 SDK in order to develop applications with Carbide. These steps include:</p>
-<ol type="a">
-  <li>Download  the <a href="http://trolltech.com/developer/technical-preview-qt-for-s60">Qt SDK for S60</a> package</li>
-  <li>Install the Qt SDK using the instructions found in the INSTALL file located in the Qt SDK for S60 folder, including:
-    <ol>
-        <ol>
-          <li>Install needed IDE and SDKs</li>
-          <li>Install Qt</li>
-          <li>Setup Environment Variables</li>
-          <li>Configure Qt</li>
-          <li>Build Qt</li>
-        </ol>
-    </ol>
-  </li>
-</ol>
-<p>Once  completed, you should be able to <a href="qt_importing_projs_01.htm">import</a> or create <a href="qt_creating_projs_01.htm">new</a> projects using the Qt SDK for S60.</p>
-<h4>Other references</h4>
-<ul>
-  <li><a href="qt_overview.htm">Qt Project Support</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Qt Development Setup</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Qt Development Setup</h2>
+<p>There are some prerequisites to using Qt projects within the Carbide environment. This includes downloading the correct SDKs, building <span class="code">qmake</span> to use the SDKs, and finally, building the libraries for your target environments. </p>
+<p>You should have the Qt SDK for Symbian that works with the S60 SDK in order to develop applications with Carbide. These steps include:</p>
+<ol type="a">
+  <li>Download  the <a href="http://qt.nokia.com/downloads/symbian-cpp">Qt SDK for Symbian</a> package</li>
+  <li>Install the Qt SDK using the instructions found in the <span class="code">INSTALL</span> file located in the Qt SDK for Symbian folder, including:
+  <ol>
+        <ol>
+          <li>Install needed IDE and SDKs</li>
+          <li>Install Qt</li>
+          <li>Setup Environment Variables</li>
+          <li>Configure Qt</li>
+          <li>Build Qt</li>
+        </ol>
+    </ol>
+  </li>
+</ol>
+<p>Once  completed, you should be able to <a href="qt_importing_projs_01.htm">import</a> or create <a href="qt_creating_projs_01.htm">new</a> projects using the Qt SDK for Symbian.</p>
+<h4>Other references</h4>
+<ul>
+  <li><a href="qt_overview.htm">Qt Project Support</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_updating.htm	Fri Jan 15 14:50:26 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_updating.htm	Mon Jan 18 12:02:46 2010 -0600
@@ -19,13 +19,13 @@
 <p class="note"><span class="style2"><b>IMPORTANT</b> We recommend that you  not install any updates for Carbide.c++ features except for those provided by Nokia via Install New Software. Replacing any standard Eclipse plugin with an updated version from a non-Nokia update site  can result in Carbide.c++ no longer working as intended.</span></p>
 <div class="step">
   <h4>Installing Carbide Updates</h4>
-  <p class="note"><b>NOTE</b> Always run the <b>Help &gt; Check for Updates</b> wizard and install all updates before attempting to install  new software. This can prevent the occurance of any dependency errors.</p>
+  <p class="note"><b>NOTE</b> Always run the <b>Help &gt; Check for Updates</b> wizard and install all updates before attempting to install  new software. This can prevent the occurrence of any dependency errors.</p>
   <ol>
     <li>Select <b class="step">Help &gt; Install New Software...</b> to display the Available Software pane of the Install dialog. 
       <p align="center"><img src="images/p2_available_sw.png" width="616" height="544"></p>
       <p class="figure">Figure 1 - Install dialog - Available Software pane</p>
       <ol type="a">
-        <li>Select an update site from the Work with dropdown, or click Add... to enter a new site URL.</li>
+        <li>Select an update site from the Work with drop down, or click Add... to enter a new site URL.</li>
         <li>Click to select the items to update from the Name column.</li>
         <li>Click Next</li>
       </ol>
--- a/core/com.nokia.carbide.cpp/about.html	Fri Jan 15 14:50:26 2010 -0600
+++ b/core/com.nokia.carbide.cpp/about.html	Mon Jan 18 12:02:46 2010 -0600
@@ -1,26 +1,26 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-	<title>Tips &amp; Hints</title>
-    <link href="carbide.css" rel="stylesheet" type="text/css">
-</head>
-
-<body>
-<p align="center">&nbsp;</p>
-<table width="530" border="0" align="center" cellspacing="5" bgcolor="#FFFFFF">
-  <tr>
-    <td width="215"><img src="icons/about.png" width="215" height="199"></td>
-    <td width="294"><p align="right" class="text"><b><img src="intro/css/graphics/rootpage/brandmark.gif" ></b></p>
-      <p class="text">&nbsp;</p>
-      <p class="text">&nbsp;</p>
-      <p class="titleSmall">Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).  
-All rights reserved. <br>
-License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></p>
-      <p class="titleSmall">This product includes software developed by Eclipse Project. <a href="http://www.eclipse.org">http://www.eclipse.org</a></p>
-    </td>
-  </tr>
-</table>
-</body>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<title>Tips &amp; Hints</title>
+    <link href="carbide.css" rel="stylesheet" type="text/css">
+</head>
+
+<body>
+<p align="center">&nbsp;</p>
+<table width="530" border="0" align="center" cellspacing="5" bgcolor="#FFFFFF">
+  <tr>
+    <td width="215"><img src="icons/about.png" width="215" height="199"></td>
+    <td width="294"><p align="right" class="text"><b><img src="intro/css/graphics/rootpage/brandmark.gif" ></b></p>
+      <p class="text">&nbsp;</p>
+      <p class="text">&nbsp;</p>
+      <p class="titleSmall">Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).  
+All rights reserved. <br>
+License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></p>
+      <p class="titleSmall">This product includes software developed by Eclipse Project. <a href="http://www.eclipse.org">http://www.eclipse.org</a></p>
+    </td>
+  </tr>
+</table>
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp/html/helpDATA.xml	Fri Jan 15 14:50:26 2010 -0600
+++ b/core/com.nokia.carbide.cpp/html/helpDATA.xml	Mon Jan 18 12:02:46 2010 -0600
@@ -1,23 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.index"?>
-
-<!-- help data customization XML -->
-<!-- replaces the org.eclipse.help/baseTOCS setting prior to 3.3 -->
-
-<extensions>
-   <tocOrder>
-      <toc id="/com.nokia.carbide.help.common/carbideHelpTOC.xml" />
-      <category id="carbide.reference"/>
-      <toc id="/com.nokia.carbide.cpp.doc.user/debuggerTOC.xml" />
-      <toc id="/com.nokia.carbide.cpp.uidesigner.doc.user/toc.xml" />
-      <toc id="/com.nokia.carbide.cpp.pi.doc.user/tocPI.xml" />	   
-      <category id="carbide.extensions"/>
-      <toc id="/com.nokia.carbide.cpp.doc.user.crashdebugger/helptocCDB.xml" />	   
-      <toc id="/com.nokia.carbide.cpp.codescanner/tocCodeScanner.xml" />	   
-      <toc id="/com.nokia.s60tools.appdep.help/toc.xml" />	   
-      <toc id="/com.nokia.carbide.epocwindDisplay/html/toolTOC.xml" />
-	  <toc id="/com.nokia.carbide.cpp.sdk.doc.user/sdkTOC.xml" />	   
-   </tocOrder>
-   <hidden>
-   </hidden>
-</extensions>
+<?xml version="1.0" encoding="UTF-8"?>
+<?NLS TYPE="org.eclipse.help.index"?>
+
+<!-- help data customization XML -->
+<!-- replaces the org.eclipse.help/baseTOCS setting prior to 3.3 -->
+
+<extensions>
+   <tocOrder>
+      <category id="carbide.references"/>
+      <toc id="/org.eclipse.workbench/XXX.xml" />
+      <toc id="/com.nokia.carbide.cpp.doc.user/debuggerTOC.xml" />
+	  <toc id="/com.nokia.carbide.cpp.sdk.doc.user/sdkTOC.xml" />
+	  
+      <category id="carbide.plugins"/>
+      <toc id="/com.nokia.carbide.help.common/carbideHelpTOC.xml" />
+      <toc id="/com.nokia.carbide.cpp.debug.crashdebugger/help/tocCDB.xml" />	   
+      <toc id="/com.nokia.carbide.cpp.epocwindDisplay/html/toolTOC.xml" />
+	  <toc id="/com.nokia.carbide.apiquery.help/html/toolTOC.xml" />
+
+      <category id="carbide.s60tools"/>
+      <toc id="/com.nokia.s60tools.appdep.help/toc.xml" />	   
+      <toc id="/com.nokia.s60tools.symbianfoundationtemplates.help/toc.xml" />	   
+	    
+      <category id="carbide.tools"/>
+      <toc id="/com.nokia.carbide.cpp.uidesigner.doc.user/toc.xml" />
+      <toc id="/com.nokia.carbide.cpp.pi.doc.user/tocPI.xml" />	
+      <toc id="/com.nokia.carbide.cpp.codescanner/tocCodeScanner.xml" />	   
+
+      <category id="carbide.languages"/>
+      <toc id="/org.eclipse.cdt.doc.user/toc.xml" />	
+      <toc id="/com.nokia.carbide.cpp.compiler.doc.user/compilerTOC.xml" />	   
+	     
+   </tocOrder>
+   <hidden>
+   </hidden>
+</extensions>
--- a/core/com.nokia.carbide.cpp/html/help_keys_Toc.htm	Fri Jan 15 14:50:26 2010 -0600
+++ b/core/com.nokia.carbide.cpp/html/help_keys_Toc.htm	Mon Jan 18 12:02:46 2010 -0600
@@ -1,42 +1,42 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-
-<head>
-<meta http-equiv="Content-Language" content="en-us">
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Key Shortcuts</title>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-</head>
-
-<h2>Key Shortcuts</h2>
-<p>The following  key shortcuts are available for working with the Carbide.c++ tools:</p>
-<ul>
-  
-  <li><a href="help_keys_vs.htm">Microsoft Visual Studio Shortcuts</a></li>
-  <li><a href="help_keys_carbide.htm">Nokia Carbide.c++ Shortcuts</a></li>
-  <li><a href="help_keys_cw.htm">Nokia Codewarrior Shortcuts</a></li>
-</ul>
-<h3>Exporting shortcuts</h3>
-<p>Key preferences can be exported using the standard Export menu option:</p>
-<ol>
-  <li>Click the <b>File &gt; Export...</b> menu option.</li>
-  <li>Choose <b>General &gt; Preferences</b> in the <b>Select</b> page of the <b>Export</b> window</li>
-  <li>Click <b>Next</b></li>
-  <li>Select  <b>Keys Preferences</b> item in the <b>Select Export</b> page</li>
-  <li>Enter a <b>To preference file</b> name</li>
-  <li>Click <b>Finish</b></li>
-</ol>
-<h3>Importing shortcuts</h3>
-<p>Key preferences can be imported using the standard Import menu option:</p>
-<ol>
-  <li>Click the <b>File &gt; Import...</b> menu option.</li>
-  <li>Choose <b>General &gt; Preferences</b> in the <b>Select</b> page of the <b>Import</b> window</li>
-  <li>Click <b>Next</b></li>
-  <li><b>Browse</b> or enter the <b>From preference file</b> name in the <b>Select Import</b> page</li>
-  <li>Click <b>Finish</b></li>
-</ol>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</body>
-
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+
+<head>
+<meta http-equiv="Content-Language" content="en-us">
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Key Shortcuts</title>
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
+</head>
+
+<h2>Key Shortcuts</h2>
+<p>The following  key shortcuts are available for working with the Carbide.c++ tools:</p>
+<ul>
+  
+  <li><a href="help_keys_vs.htm">Microsoft Visual Studio Shortcuts</a></li>
+  <li><a href="help_keys_carbide.htm">Nokia Carbide.c++ Shortcuts</a></li>
+  <li><a href="help_keys_cw.htm">Nokia Codewarrior Shortcuts</a></li>
+</ul>
+<h3>Exporting shortcuts</h3>
+<p>Key preferences can be exported using the standard Export menu option:</p>
+<ol>
+  <li>Click the <b>File &gt; Export...</b> menu option.</li>
+  <li>Choose <b>General &gt; Preferences</b> in the <b>Select</b> page of the <b>Export</b> window</li>
+  <li>Click <b>Next</b></li>
+  <li>Select  <b>Keys Preferences</b> item in the <b>Select Export</b> page</li>
+  <li>Enter a <b>To preference file</b> name</li>
+  <li>Click <b>Finish</b></li>
+</ol>
+<h3>Importing shortcuts</h3>
+<p>Key preferences can be imported using the standard Import menu option:</p>
+<ol>
+  <li>Click the <b>File &gt; Import...</b> menu option.</li>
+  <li>Choose <b>General &gt; Preferences</b> in the <b>Select</b> page of the <b>Import</b> window</li>
+  <li>Click <b>Next</b></li>
+  <li><b>Browse</b> or enter the <b>From preference file</b> name in the <b>Select Import</b> page</li>
+  <li>Click <b>Finish</b></li>
+</ol>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp/html/help_keys_carbide.htm	Fri Jan 15 14:50:26 2010 -0600
+++ b/core/com.nokia.carbide.cpp/html/help_keys_carbide.htm	Mon Jan 18 12:02:46 2010 -0600
@@ -1,126 +1,126 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-
-<head>
-<meta http-equiv="Content-Language" content="en-us">
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Nokia Carbide.c++ Shortcuts</title>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-<link href="../book.css" rel="stylesheet" type="text/css">
-</head>
-
-<h2>Nokia Carbide.c++  Shortcuts</h2>
-<p>Table 1 describes the Nokia Carbide.c++ key shortcuts.  </p>
-<p>Keys can be viewed or edited in the <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Keys)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" border="0" align="absmiddle">
-<b>General &gt; Keys</b></a> preference panel.</p>
-<h5>Table 1.  Nokia Carbide.c++ key shortcuts</h5>
-<table cellspacing="0" cellpadding="0" width="100%" border="1">
-  <tr>
-    <th width="24%" scope="col"><p class="style2">Category</p></th>
-    <th width="31%" scope="col">Carbide.c++</th>
-    <th width="45%" scope="col"><span class="style2">Shortcut Added </span></th>
-  </tr>
-  <tr bgcolor="#FFFFCC">
-    <td colspan="3"><b>Project</b></td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >Build All Configurations </td>
-    <td class="code" >CTRL+ALT+A</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >Build Clean </td>
-    <td class="code" >CTRL+SHIFT+-</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >Build Project </td>
-    <td class="code" >CTRL+B</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >Build Symbian Component </td>
-    <td class="code" >CTRL+ALT+P</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >Clean Symbian Component </td>
-    <td class="code" >CTRL+ALT+X</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >Freeze Symbian Component </td>
-    <td class="code" >CTRL+ALT+B</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >Compile</td>
-    <td class="code" >CTRL+ALT+C</td>
-  </tr>
-  <tr bgcolor="#FFFFCC">
-    <td><b>Run/Debug</b></td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >Debug</td>
-    <td class="code" >F11</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >Run</td>
-    <td class="code" >CTRL+F11</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >Step Into </td>
-    <td class="code" >F5</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >Step Over </td>
-    <td class="code" >F6</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >Step Return </td>
-    <td class="code" >F7</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >Build Project </td>
-    <td class="code" >CTRL+B</td>
-  </tr>
-  <tr bgcolor="#FFFFCC">
-    <td><b>Search</b></td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >System Search </td>
-    <td class="code" >ALT+SHIFT+G</td>
-  </tr>
-  <tr bgcolor="#FFFFCC">
-    <td><b>Help</b></td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >Show Key Assist </td>
-    <td class="code" >CTRL+SHIFT+L</td>
-  </tr>
-</table>
-<h5>Related references</h5>
-<ul>
-  <li><a href="help_keys_vs.htm">Microsoft Visual Studio Shortcuts</a></li>
-  <li><a href="help_keys_cw.htm">Nokia Codewarrior Shortcuts</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</body>
-
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+
+<head>
+<meta http-equiv="Content-Language" content="en-us">
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Nokia Carbide.c++ Shortcuts</title>
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+<link href="../book.css" rel="stylesheet" type="text/css">
+</head>
+
+<h2>Nokia Carbide.c++  Shortcuts</h2>
+<p>Table 1 describes the Nokia Carbide.c++ key shortcuts.  </p>
+<p>Keys can be viewed or edited in the <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Keys)")'>
+<img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" border="0" align="absmiddle">
+<b>General &gt; Keys</b></a> preference panel.</p>
+<h5>Table 1.  Nokia Carbide.c++ key shortcuts</h5>
+<table cellspacing="0" cellpadding="0" width="100%" border="1">
+  <tr>
+    <th width="24%" scope="col"><p class="style2">Category</p></th>
+    <th width="31%" scope="col">Carbide.c++</th>
+    <th width="45%" scope="col"><span class="style2">Shortcut Added </span></th>
+  </tr>
+  <tr bgcolor="#FFFFCC">
+    <td colspan="3"><b>Project</b></td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >Build All Configurations </td>
+    <td class="code" >CTRL+ALT+A</td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >Build Clean </td>
+    <td class="code" >CTRL+SHIFT+-</td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >Build Project </td>
+    <td class="code" >CTRL+B</td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >Build Symbian Component </td>
+    <td class="code" >CTRL+ALT+P</td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >Clean Symbian Component </td>
+    <td class="code" >CTRL+ALT+X</td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >Freeze Symbian Component </td>
+    <td class="code" >CTRL+ALT+B</td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >Compile</td>
+    <td class="code" >CTRL+ALT+C</td>
+  </tr>
+  <tr bgcolor="#FFFFCC">
+    <td><b>Run/Debug</b></td>
+    <td>&nbsp;</td>
+    <td>&nbsp;</td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >Debug</td>
+    <td class="code" >F11</td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >Run</td>
+    <td class="code" >CTRL+F11</td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >Step Into </td>
+    <td class="code" >F5</td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >Step Over </td>
+    <td class="code" >F6</td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >Step Return </td>
+    <td class="code" >F7</td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >Build Project </td>
+    <td class="code" >CTRL+B</td>
+  </tr>
+  <tr bgcolor="#FFFFCC">
+    <td><b>Search</b></td>
+    <td>&nbsp;</td>
+    <td>&nbsp;</td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >System Search </td>
+    <td class="code" >ALT+SHIFT+G</td>
+  </tr>
+  <tr bgcolor="#FFFFCC">
+    <td><b>Help</b></td>
+    <td>&nbsp;</td>
+    <td>&nbsp;</td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >Show Key Assist </td>
+    <td class="code" >CTRL+SHIFT+L</td>
+  </tr>
+</table>
+<h5>Related references</h5>
+<ul>
+  <li><a href="help_keys_vs.htm">Microsoft Visual Studio Shortcuts</a></li>
+  <li><a href="help_keys_cw.htm">Nokia Codewarrior Shortcuts</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp/html/help_keys_cw.htm	Fri Jan 15 14:50:26 2010 -0600
+++ b/core/com.nokia.carbide.cpp/html/help_keys_cw.htm	Mon Jan 18 12:02:46 2010 -0600
@@ -1,211 +1,211 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-
-<head>
-<meta http-equiv="Content-Language" content="en-us">
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Nokia CodeWarrior Shortcuts</title>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<style type="text/css">
-<!--
-.style2 {font-weight: bold}
--->
-</style>
-</head>
-
-<h2>Nokia CodeWarrior Shortcuts</h2>
-<p>Table 1 describes the Nokia CodeWarrior key shortcuts supported by Carbide.c++.  </p>
-<p class="note"><b>NOTE</b> These shortcuts extend the Default key shortcuts and not every CodeWarror tool shortcut is supported.</p>
-<p>Keys can be viewed or edited in the <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Keys)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" border="0" align="absmiddle">
-<b>General &gt; Keys</b></a> preference panel.</p>
-<h5>Table 1. Nokia CodeWarrior key shortcuts</h5>
-<table cellspacing="0" cellpadding="0" width="100%" border="1">
-  <tr>
-    <th width="24%" scope="col"><p class="style2">Category</p></th>
-    <th width="31%" scope="col">Nokia CodeWarrior</th>
-    <th width="31%" scope="col">Carbide.c++</th>
-    <th width="45%" scope="col"><span class="style2">Shortcut Added </span></th>
-  </tr>
-  <tr bgcolor="#FFFFCC">
-    <td colspan="4"><b>C/C++ Source </b></td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >Find Definition </td>
-    <td class="code" >Open Definition </td>
-    <td class="code" >CTRL+'</td>
-  </tr>
-  <tr bgcolor="#FFFFCC">
-    <td colspan="4"><b>Edit</b></td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >Find Next </td>
-    <td class="code" >Find Next </td>
-    <td class="code" >F3</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >Find Previous </td>
-    <td class="code" >Find Previous </td>
-    <td class="code" >SHIFT+F3</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >Replace</td>
-    <td class="code" >Find and Replace </td>
-    <td class="code" >CTRL+H</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >Undo</td>
-    <td class="code" >Undo</td>
-    <td class="code" >CTRL+Backspace</td>
-  </tr>
-  <tr bgcolor="#FFFFCC">
-    <td colspan="4"><b>Project</b></td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >Make</td>
-    <td class="code" >Build Project </td>
-    <td class="code" >F7</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >&nbsp;</td>
-    <td class="code" >Compile</td>
-    <td class="code" >CTRL+F7</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >&nbsp;</td>
-    <td class="code" >Build Target Only </td>
-    <td class="code" >CTRL+SHIFT+F7</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >New</td>
-    <td class="code" >New</td>
-    <td class="code" >CTRL+SHIFT+N</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td><span class="code">Remove Object Code </span></td>
-    <td class="code" >Build Clean</td>
-    <td class="code" >CTRL+-</td>
-  </tr>
-  <tr bgcolor="#FFFFCC">
-    <td colspan="4"><b>Run/Debug</b></td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >Debug</td>
-    <td class="code" >Start</td>
-    <td class="code" >F5</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >Goto Line </td>
-    <td class="code" >Run to  Line </td>
-    <td class="code" >CTRL+G</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >Run</td>
-    <td class="code" >Start without Debugging</td>
-    <td class="code" >CTRL+F5</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >Set/Clear Breakpoint </td>
-    <td class="code" >Toggle Breakpoint </td>
-    <td class="code" >F9</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >Step Into </td>
-    <td class="code" >Step Into </td>
-    <td class="code" >F11</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >Step Over </td>
-    <td class="code" >Step Over </td>
-    <td class="code" >F10</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >Step Return </td>
-    <td class="code" >Step Return </td>
-    <td class="code" >SHIFT+F11</td>
-  </tr>
-  <tr>
-    <td colspan="4" bgcolor="#FFFFCC"><b>Search</b></td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >&nbsp;</td>
-    <td class="code" >Search Backwards </td>
-    <td class="code" >CTRL+B</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >&nbsp;</td>
-    <td class="code" >Search Forwards </td>
-    <td class="code" >CTRL+F</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >&nbsp;</td>
-    <td class="code" >Find Text in Workspace </td>
-    <td class="code" >CTRL+F3</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >Find in Files </td>
-    <td class="code" >Search</td>
-    <td class="code" >CTRL+SHIFT+M</td>
-  </tr>
-  <tr>
-    <td colspan="4" bgcolor="#FFFFCC"><b>Text Editing </b></td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >Select Word Left </td>
-    <td class="code" >Select Next Word </td>
-    <td class="code" >CTRL+RIGHT ARROW </td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >Select Word Right </td>
-    <td class="code" >Select Previous Word </td>
-    <td class="code" >CTRL+LEFT ARROW </td>
-  </tr>
-  <tr>
-    <td colspan="4" bgcolor="#FFFFCC"><b>Windows</b></td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >Cycle Windows</td>
-    <td class="code" >Next Editor </td>
-    <td class="code" >CTRL+TAB</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >Cycle Windows</td>
-    <td class="code" >Previous Editor </td>
-    <td class="code" >CTRL+SHIFT+TAB</td>
-  </tr>
-</table>
-<h5>Related references</h5>
-<ul>
-  <li><a href="help_keys_vs.htm">Microsoft Visual Studio Shortcuts</a></li>
-  <li><a href="help_keys_carbide.htm">Nokia Carbide.c++ Shortcuts</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</body>
-
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+
+<head>
+<meta http-equiv="Content-Language" content="en-us">
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Nokia CodeWarrior Shortcuts</title>
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
+<style type="text/css">
+<!--
+.style2 {font-weight: bold}
+-->
+</style>
+</head>
+
+<h2>Nokia CodeWarrior Shortcuts</h2>
+<p>Table 1 describes the Nokia CodeWarrior key shortcuts supported by Carbide.c++.  </p>
+<p class="note"><b>NOTE</b> These shortcuts extend the Default key shortcuts and not every CodeWarror tool shortcut is supported.</p>
+<p>Keys can be viewed or edited in the <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Keys)")'>
+<img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" border="0" align="absmiddle">
+<b>General &gt; Keys</b></a> preference panel.</p>
+<h5>Table 1. Nokia CodeWarrior key shortcuts</h5>
+<table cellspacing="0" cellpadding="0" width="100%" border="1">
+  <tr>
+    <th width="24%" scope="col"><p class="style2">Category</p></th>
+    <th width="31%" scope="col">Nokia CodeWarrior</th>
+    <th width="31%" scope="col">Carbide.c++</th>
+    <th width="45%" scope="col"><span class="style2">Shortcut Added </span></th>
+  </tr>
+  <tr bgcolor="#FFFFCC">
+    <td colspan="4"><b>C/C++ Source </b></td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >Find Definition </td>
+    <td class="code" >Open Definition </td>
+    <td class="code" >CTRL+'</td>
+  </tr>
+  <tr bgcolor="#FFFFCC">
+    <td colspan="4"><b>Edit</b></td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >Find Next </td>
+    <td class="code" >Find Next </td>
+    <td class="code" >F3</td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >Find Previous </td>
+    <td class="code" >Find Previous </td>
+    <td class="code" >SHIFT+F3</td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >Replace</td>
+    <td class="code" >Find and Replace </td>
+    <td class="code" >CTRL+H</td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >Undo</td>
+    <td class="code" >Undo</td>
+    <td class="code" >CTRL+Backspace</td>
+  </tr>
+  <tr bgcolor="#FFFFCC">
+    <td colspan="4"><b>Project</b></td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >Make</td>
+    <td class="code" >Build Project </td>
+    <td class="code" >F7</td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >&nbsp;</td>
+    <td class="code" >Compile</td>
+    <td class="code" >CTRL+F7</td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >&nbsp;</td>
+    <td class="code" >Build Target Only </td>
+    <td class="code" >CTRL+SHIFT+F7</td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >New</td>
+    <td class="code" >New</td>
+    <td class="code" >CTRL+SHIFT+N</td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td><span class="code">Remove Object Code </span></td>
+    <td class="code" >Build Clean</td>
+    <td class="code" >CTRL+-</td>
+  </tr>
+  <tr bgcolor="#FFFFCC">
+    <td colspan="4"><b>Run/Debug</b></td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >Debug</td>
+    <td class="code" >Start</td>
+    <td class="code" >F5</td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >Goto Line </td>
+    <td class="code" >Run to  Line </td>
+    <td class="code" >CTRL+G</td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >Run</td>
+    <td class="code" >Start without Debugging</td>
+    <td class="code" >CTRL+F5</td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >Set/Clear Breakpoint </td>
+    <td class="code" >Toggle Breakpoint </td>
+    <td class="code" >F9</td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >Step Into </td>
+    <td class="code" >Step Into </td>
+    <td class="code" >F11</td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >Step Over </td>
+    <td class="code" >Step Over </td>
+    <td class="code" >F10</td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >Step Return </td>
+    <td class="code" >Step Return </td>
+    <td class="code" >SHIFT+F11</td>
+  </tr>
+  <tr>
+    <td colspan="4" bgcolor="#FFFFCC"><b>Search</b></td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >&nbsp;</td>
+    <td class="code" >Search Backwards </td>
+    <td class="code" >CTRL+B</td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >&nbsp;</td>
+    <td class="code" >Search Forwards </td>
+    <td class="code" >CTRL+F</td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >&nbsp;</td>
+    <td class="code" >Find Text in Workspace </td>
+    <td class="code" >CTRL+F3</td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >Find in Files </td>
+    <td class="code" >Search</td>
+    <td class="code" >CTRL+SHIFT+M</td>
+  </tr>
+  <tr>
+    <td colspan="4" bgcolor="#FFFFCC"><b>Text Editing </b></td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >Select Word Left </td>
+    <td class="code" >Select Next Word </td>
+    <td class="code" >CTRL+RIGHT ARROW </td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >Select Word Right </td>
+    <td class="code" >Select Previous Word </td>
+    <td class="code" >CTRL+LEFT ARROW </td>
+  </tr>
+  <tr>
+    <td colspan="4" bgcolor="#FFFFCC"><b>Windows</b></td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >Cycle Windows</td>
+    <td class="code" >Next Editor </td>
+    <td class="code" >CTRL+TAB</td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >Cycle Windows</td>
+    <td class="code" >Previous Editor </td>
+    <td class="code" >CTRL+SHIFT+TAB</td>
+  </tr>
+</table>
+<h5>Related references</h5>
+<ul>
+  <li><a href="help_keys_vs.htm">Microsoft Visual Studio Shortcuts</a></li>
+  <li><a href="help_keys_carbide.htm">Nokia Carbide.c++ Shortcuts</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp/html/help_keys_vs.htm	Fri Jan 15 14:50:26 2010 -0600
+++ b/core/com.nokia.carbide.cpp/html/help_keys_vs.htm	Mon Jan 18 12:02:46 2010 -0600
@@ -1,202 +1,202 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-
-<head>
-<meta http-equiv="Content-Language" content="en-us">
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Microsoft Visual Studio Key Shortcuts</title>
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-<style type="text/css">
-<!--
-.style2 {color: #FFFFFF}
--->
-</style>
-</head>
-
-<h2>Microsoft Visual Studio Shortcuts</h2>
-<p>Table 1 describes the Microsoft Visual Studio key shortcuts supported by Carbide.c++. </p>
-<p class="note"><b>NOTE</b> These shortcuts extend the Default key shortcuts and not every Visual Studio tool shortcut is supported.</p>
-<p>Keys can be viewed or edited in the <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Keys)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" border="0" align="absmiddle">
-<b>General &gt; Keys</b></a> preference panel.</p>
-<h5>Table 1. Microsoft Visual Studio key shortcuts</h5>
-<table cellspacing="0" cellpadding="0" width="100%" border="1" valign="center">
-  <tr>
-    <th width="24%" scope="col"><p class="style2">Category</p></th>
-    <th width="31%" scope="col">Visual Studio </th>
-    <th width="31%" scope="col">Carbide.c++</th>
-    <th width="45%" scope="col"><span class="style2">Shortcut Added </span></th>
-  </tr>
-  <tr bgcolor="#FFFFCC">
-    <td colspan="4"><b>C/C++ Source </b></td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >Edit.GoToDefinition </td>
-    <td class="code" >Open Definition</td>
-    <td class="code" >F12</td>
-  </tr>
-  <tr bgcolor="#FFFFCC">
-    <td colspan="4"><b>Edit</b></td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >Edit.FindNext </td>
-    <td class="code" >Find Next </td>
-    <td class="code" >F3</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >&nbsp;</td>
-    <td class="code" >Find at Current Cursor Position </td>
-    <td class="code" >CTRL+F3</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >Edit.FindPrevious </td>
-    <td class="code" >Find Previous </td>
-    <td class="code" >SHIFT+F3</td>
-  </tr>
-  <tr bgcolor="#FFFFCC">
-    <td colspan="4"><b>Project</b></td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >Build.BuildSolution</td>
-    <td class="code" >Build Project </td>
-    <td class="code" >F7</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >&nbsp;</td>
-    <td class="code" >Compile</td>
-    <td class="code" >CTRL+F7</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >&nbsp;</td>
-    <td class="code" >Build Target Only </td>
-    <td class="code" >CTRL+SHIFT+F7</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >File.NewProject</td>
-    <td class="code" >New</td>
-    <td class="code" >CTRL+SHIFT+N</td>
-  </tr>
-  <tr bgcolor="#FFFFCC">
-    <td colspan="4"><strong>Navigation</strong></td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >Add Bookmark </td>
-    <td class="code" >Add Bookmark </td>
-    <td class="code" >CTRL+F2</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >Go to Line </td>
-    <td class="code" >Go to Line... </td>
-    <td class="code" >CTRL+G</td>
-  </tr>
-  <tr bgcolor="#FFFFCC">
-    <td colspan="4"><b>Run/Debug</b></td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >Debug.Start</td>
-    <td class="code" >Start / Resume </td>
-    <td class="code" >F5</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >Debug.StartWithoutDebugging</td>
-    <td class="code" >Start without Debugging</td>
-    <td class="code" >CTRL+F5</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >Debug.StepInto</td>
-    <td class="code" >Step Into </td>
-    <td class="code" >F11</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >Debug.StepOut</td>
-    <td class="code" >Step Return </td>
-    <td class="code" >SHIFT+F11</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >Debug.StepOver</td>
-    <td class="code" >Step Over </td>
-    <td class="code" >F10</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >Debug.ToggleBreakpoint</td>
-    <td class="code" >Toggle Breakpoint </td>
-    <td class="code" >F9</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >Debug.RunToCursor</td>
-    <td class="code" >Run to Line </td>
-    <td class="code" >CTRL+F10</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >Debug.Breakpoints</td>
-    <td class="code" >Breakpoints</td>
-    <td class="code" >CTRL+ALT+B</td>
-  </tr>
-  <tr>
-    <td colspan="4" bgcolor="#FFFFCC"><b>Search</b></td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >Edit.FindinFiles</td>
-    <td class="code" >Search</td>
-    <td class="code" >CTRL+SHIFT+F</td>
-  </tr>
-  <tr>
-    <td colspan="4" bgcolor="#FFFFCC"><b>Text Editing </b></td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >Edit.WordNext</td>
-    <td class="code" >Select Next Word </td>
-    <td class="code" >CTRL+RIGHT ARROW </td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >Edit.WordPrevious</td>
-    <td class="code" >Select Previous Word </td>
-    <td class="code" >CTRL+LEFT ARROW </td>
-  </tr>
-  <tr>
-    <td colspan="4" bgcolor="#FFFFCC"><b>Windows</b></td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >Window.NextDocumentWindow</td>
-    <td class="code" >Next Editor </td>
-    <td class="code" >CTRL+TAB</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="code" >Window.PreviousDocumentWindow</td>
-    <td class="code" >Previous Editor </td>
-    <td class="code" >CTRL+SHIFT+TAB</td>
-  </tr>
-</table>
-<h5>Related references</h5>
-<ul>
-  <li><a href="help_keys_carbide.htm">Nokia Carbide.c++ Shortcuts</a></li>
-  <li><a href="help_keys_cw.htm">Nokia Codewarrior Shortcuts</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</body>
-
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+
+<head>
+<meta http-equiv="Content-Language" content="en-us">
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Microsoft Visual Studio Key Shortcuts</title>
+<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+<style type="text/css">
+<!--
+.style2 {color: #FFFFFF}
+-->
+</style>
+</head>
+
+<h2>Microsoft Visual Studio Shortcuts</h2>
+<p>Table 1 describes the Microsoft Visual Studio key shortcuts supported by Carbide.c++. </p>
+<p class="note"><b>NOTE</b> These shortcuts extend the Default key shortcuts and not every Visual Studio tool shortcut is supported.</p>
+<p>Keys can be viewed or edited in the <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Keys)")'>
+<img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" border="0" align="absmiddle">
+<b>General &gt; Keys</b></a> preference panel.</p>
+<h5>Table 1. Microsoft Visual Studio key shortcuts</h5>
+<table cellspacing="0" cellpadding="0" width="100%" border="1" valign="center">
+  <tr>
+    <th width="24%" scope="col"><p class="style2">Category</p></th>
+    <th width="31%" scope="col">Visual Studio </th>
+    <th width="31%" scope="col">Carbide.c++</th>
+    <th width="45%" scope="col"><span class="style2">Shortcut Added </span></th>
+  </tr>
+  <tr bgcolor="#FFFFCC">
+    <td colspan="4"><b>C/C++ Source </b></td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >Edit.GoToDefinition </td>
+    <td class="code" >Open Definition</td>
+    <td class="code" >F12</td>
+  </tr>
+  <tr bgcolor="#FFFFCC">
+    <td colspan="4"><b>Edit</b></td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >Edit.FindNext </td>
+    <td class="code" >Find Next </td>
+    <td class="code" >F3</td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >&nbsp;</td>
+    <td class="code" >Find at Current Cursor Position </td>
+    <td class="code" >CTRL+F3</td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >Edit.FindPrevious </td>
+    <td class="code" >Find Previous </td>
+    <td class="code" >SHIFT+F3</td>
+  </tr>
+  <tr bgcolor="#FFFFCC">
+    <td colspan="4"><b>Project</b></td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >Build.BuildSolution</td>
+    <td class="code" >Build Project </td>
+    <td class="code" >F7</td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >&nbsp;</td>
+    <td class="code" >Compile</td>
+    <td class="code" >CTRL+F7</td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >&nbsp;</td>
+    <td class="code" >Build Target Only </td>
+    <td class="code" >CTRL+SHIFT+F7</td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >File.NewProject</td>
+    <td class="code" >New</td>
+    <td class="code" >CTRL+SHIFT+N</td>
+  </tr>
+  <tr bgcolor="#FFFFCC">
+    <td colspan="4"><strong>Navigation</strong></td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >Add Bookmark </td>
+    <td class="code" >Add Bookmark </td>
+    <td class="code" >CTRL+F2</td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >Go to Line </td>
+    <td class="code" >Go to Line... </td>
+    <td class="code" >CTRL+G</td>
+  </tr>
+  <tr bgcolor="#FFFFCC">
+    <td colspan="4"><b>Run/Debug</b></td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >Debug.Start</td>
+    <td class="code" >Start / Resume </td>
+    <td class="code" >F5</td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >Debug.StartWithoutDebugging</td>
+    <td class="code" >Start without Debugging</td>
+    <td class="code" >CTRL+F5</td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >Debug.StepInto</td>
+    <td class="code" >Step Into </td>
+    <td class="code" >F11</td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >Debug.StepOut</td>
+    <td class="code" >Step Return </td>
+    <td class="code" >SHIFT+F11</td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >Debug.StepOver</td>
+    <td class="code" >Step Over </td>
+    <td class="code" >F10</td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >Debug.ToggleBreakpoint</td>
+    <td class="code" >Toggle Breakpoint </td>
+    <td class="code" >F9</td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >Debug.RunToCursor</td>
+    <td class="code" >Run to Line </td>
+    <td class="code" >CTRL+F10</td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >Debug.Breakpoints</td>
+    <td class="code" >Breakpoints</td>
+    <td class="code" >CTRL+ALT+B</td>
+  </tr>
+  <tr>
+    <td colspan="4" bgcolor="#FFFFCC"><b>Search</b></td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >Edit.FindinFiles</td>
+    <td class="code" >Search</td>
+    <td class="code" >CTRL+SHIFT+F</td>
+  </tr>
+  <tr>
+    <td colspan="4" bgcolor="#FFFFCC"><b>Text Editing </b></td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >Edit.WordNext</td>
+    <td class="code" >Select Next Word </td>
+    <td class="code" >CTRL+RIGHT ARROW </td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >Edit.WordPrevious</td>
+    <td class="code" >Select Previous Word </td>
+    <td class="code" >CTRL+LEFT ARROW </td>
+  </tr>
+  <tr>
+    <td colspan="4" bgcolor="#FFFFCC"><b>Windows</b></td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >Window.NextDocumentWindow</td>
+    <td class="code" >Next Editor </td>
+    <td class="code" >CTRL+TAB</td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="code" >Window.PreviousDocumentWindow</td>
+    <td class="code" >Previous Editor </td>
+    <td class="code" >CTRL+SHIFT+TAB</td>
+  </tr>
+</table>
+<h5>Related references</h5>
+<ul>
+  <li><a href="help_keys_carbide.htm">Nokia Carbide.c++ Shortcuts</a></li>
+  <li><a href="help_keys_cw.htm">Nokia Codewarrior Shortcuts</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp/html/legal.htm	Fri Jan 15 14:50:26 2010 -0600
+++ b/core/com.nokia.carbide.cpp/html/legal.htm	Mon Jan 18 12:02:46 2010 -0600
@@ -1,34 +1,34 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-	<title>Legal</title>
-    <link href="../book.css" rel="stylesheet" type="text/css">
-</head>
-
-<body>
-<h2>License Information</h2>
-<h5>COPYRIGHTS</h5>
-<p>Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></p>
-<h5>NOTICES</h5>
-<p>Portions of this product are covered by the following licenses:</p>
-<ul>
-  <li>Eclipse 3.4 (available at <a href="http://www.eclipse.org/legal/epl/notice.php">http://www.eclipse.org/legal/epl/notice.php</a>)</li>
-  <li>Eclipse CDT 5.0 (available at <a href="http://www.eclipse.org/legal/epl/notice.php">http://www.eclipse.org/legal/epl/notice.php</a>)</li>
-  <li>Eclipse EMF 2.3 (available at <a href="http://www.eclipse.org/legal/epl/notice.php">http://www.eclipse.org/legal/epl/notice.php</a>) </li>
-  <li>Eclipse GEF 3.3 (available at <a href="http://www.eclipse.org/legal/epl/notice.php">http://www.eclipse.org/legal/epl/notice.php</a>) </li>
-  <li>Eclipse Remote System Explorer-1.0 (available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>)</li>
-  <li>Eclipse System Search (available at <a href="http://www.eclipse.org/legal/epl/notice.php">http://www.eclipse.org/legal/epl/notice.php</a>)</li>
-  <li>Apache Xerces-2.2.0  (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>) </li>
-  <li>Apache Batick-1.6  (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-  <li>Apache HttpClient (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-  <li>Mozilla Rhino 1.5r2 (available at <a href="http://www.mozilla.org/NPL/">http://www.mozilla.org/NPL/</a>) </li>
-  <li>OmniORB-4.0.4 (available at <a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>) </li>
-  <li>GNU Binutils (available at <a href="http://sources.redhat.com/binutils/">http://sources.redhat.com/binutils/</a>)</li>
-  <li>Python 2.5.1 (available from <a href="http://www.python.org/download/releases/2.5/license/">http://www.python.org/download/releases/2.5/license/</a>) </li>
-  <li>Psyco 1.5.2 (available from <a href="http://www.opensource.org/licenses/mit-license.php">http://www.opensource.org/licenses/mit-license.php</a>) </li>
-</ul>
-<p>&nbsp;</p>
-</body>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<title>Legal</title>
+    <link href="../book.css" rel="stylesheet" type="text/css">
+</head>
+
+<body>
+<h2>License Information</h2>
+<h5>COPYRIGHTS</h5>
+<p>Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></p>
+<h5>NOTICES</h5>
+<p>Portions of this product are covered by the following licenses:</p>
+<ul>
+  <li>Eclipse 3.5 (available at <a href="http://www.eclipse.org/legal/epl/notice.php">http://www.eclipse.org/legal/epl/notice.php</a>)</li>
+  <li>Eclipse CDT 6.0 (available at <a href="http://www.eclipse.org/legal/epl/notice.php">http://www.eclipse.org/legal/epl/notice.php</a>)</li>
+  <li>Eclipse EMF 2.3 (available at <a href="http://www.eclipse.org/legal/epl/notice.php">http://www.eclipse.org/legal/epl/notice.php</a>) </li>
+  <li>Eclipse GEF 3.3 (available at <a href="http://www.eclipse.org/legal/epl/notice.php">http://www.eclipse.org/legal/epl/notice.php</a>) </li>
+  <li>Eclipse Remote System Explorer-1.0 (available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>)</li>
+  <li>Eclipse System Search (available at <a href="http://www.eclipse.org/legal/epl/notice.php">http://www.eclipse.org/legal/epl/notice.php</a>)</li>
+  <li>Apache Xerces-2.2.0  (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>) </li>
+  <li>Apache Batick-1.6  (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+  <li>Apache HttpClient (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+  <li>Mozilla Rhino 1.5r2 (available at <a href="http://www.mozilla.org/NPL/">http://www.mozilla.org/NPL/</a>) </li>
+  <li>OmniORB-4.0.4 (available at <a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>) </li>
+  <li>GNU Binutils (available at <a href="http://sources.redhat.com/binutils/">http://sources.redhat.com/binutils/</a>)</li>
+  <li>Python 2.5.1 (available from <a href="http://www.python.org/download/releases/2.5/license/">http://www.python.org/download/releases/2.5/license/</a>) </li>
+  <li>Psyco 1.5.2 (available from <a href="http://www.opensource.org/licenses/mit-license.php">http://www.opensource.org/licenses/mit-license.php</a>) </li>
+</ul>
+<p>&nbsp;</p>
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp/html/online_banner.html	Fri Jan 15 14:50:26 2010 -0600
+++ b/core/com.nokia.carbide.cpp/html/online_banner.html	Mon Jan 18 12:02:46 2010 -0600
@@ -38,7 +38,7 @@
 	<table width="100%" cellspacing="0" cellpadding="8" border="0">
 		<tr>
 			<td align="left" valign="center" bgcolor="#FFC550"><img src="../intro/css/graphics/rootpage/brandmark.gif" alt="Carbide icon" title="Carbide icon">			</td>
-			<td align="right" valign="center" bgcolor="#FFC550"><B>Carbide Online Help Center v2.4</B></td>
+			<td align="right" valign="center" bgcolor="#FFC550"><B>Carbide Online Help Center v2.5.0</B></td>
 	  </tr>
 	</table>
 
--- a/core/com.nokia.carbide.cpp/html/welcome_note.htm	Fri Jan 15 14:50:26 2010 -0600
+++ b/core/com.nokia.carbide.cpp/html/welcome_note.htm	Mon Jan 18 12:02:46 2010 -0600
@@ -7,9 +7,9 @@
   <link href="../book.css" rel="stylesheet" type="text/css">
 </head>
 <body>
-<h2>Welcome to Carbide.c++ 2.4.0</h2>
-<p>Thank you for installing Carbide.c++2.4! It's an improvement over 2.3 with many improvements including support for Eclipse 3.5 and CDT 6.0, as well as numerous bug fixes. </p>
-<p>However, perhaps the best part about Carbide.c++ is the Carbide.c++ Development Kit (CDK) that you can use to build custom extensions for Carbide.c++. <a href="PLUGINS_ROOT/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_updating.htm">Update</a> your installation of Carbide through the <b>Carbide.c++ Update Site</b> to get a copy of the <b>Carbide.c++ Development Kit &gt; Carbide.c++ Plug-in SDK</b>. Take a look, and let us know what you build!</p>
+<h2>Welcome to Carbide.c++ 2.5.0</h2>
+<p>Thank you for installing Carbide.c++2.5! It's an improvement over 2.4 with many improvements including support for Eclipse 3.5 and CDT 6.0, as well as numerous bug fixes. </p>
+<p>However, perhaps the best part about Carbide.c++ is the <a href="http://carbidehelp.nokia.com/help/topic/com.nokia.carbide.cpp.sdk.doc.user/html/sdkMainTopic.htm">Carbide.c++ Development Kit</a> (CDK) that you can use to build custom extensions for Carbide.c++. <a href="PLUGINS_ROOT/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_updating.htm">Update</a> your installation of Carbide through the <b>Carbide.c++ Update Site</b> to get a copy of the <b>Carbide.c++ Development Kit &gt; Carbide.c++ Plug-in SDK</b>. Take a look, and let us know what you build!</p>
 <p>Finally, if you find bugs, please let us know by submitting it at the new Carbide Bugzilla bug tracking site located at <a href="https://xdabug001.ext.nokia.com/bugzilla">https://xdabug001.ext.nokia.com/bugzilla</a> </p>
 <p>For any other questions, please don't hesitate to contact us.</p>
 <p> Thank you again for choosing Carbide.c++! We hope you like it. </p>
--- a/core/com.nokia.carbide.cpp/plugin.xml	Fri Jan 15 14:50:26 2010 -0600
+++ b/core/com.nokia.carbide.cpp/plugin.xml	Mon Jan 18 12:02:46 2010 -0600
@@ -34,13 +34,13 @@
 		<!-- Product attributes that support themes and universal intro -->
 		<property
 			name="introTitle"
-			value="Carbide.c++ v2.4.0 for Symbian"/>
+			value="Carbide.c++ v2.5.0 for Symbian"/>
 		<property
 			name="introBrandingImage"
 			value="product:themes/carbide/graphics/root/brandmark.gif"/>
 		<property
 			name="introBrandingImageText"
-			value="Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved."/>
+			value="Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved."/>
 		<property
 			name="introDescription-overview"
 			value="Carbide.c++ provides C/C++ developer tools for creating programs that operate on the Symbian OS. Carbide.c++ is based on Eclipse - an open extensible IDE for anything and nothing in particular."/>
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/mmpEditor/messages.properties	Fri Jan 15 14:50:26 2010 -0600
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/mmpEditor/messages.properties	Mon Jan 18 12:02:46 2010 -0600
@@ -125,7 +125,7 @@
 RuntimeSectionPart_chooseCapabilitiesTooltip=Click here to choose from a list of available capabilities.
 RuntimeSectionPart_heapSizeValidationErr=The Heap size field must contain a valid number
 RuntimeSectionPart_minHeapLabel=Minimum heap size:
-RuntimeSectionPart_minHeapTooltip=Overrides the default minimium heap size for the process. Units are bytes.
+RuntimeSectionPart_minHeapTooltip=Overrides the default minimum heap size for the process. Units are bytes.
 RuntimeSectionPart_maxHeapLabel=Maximum heap size:
 RuntimeSectionPart_maxHeapTooltip=Overrides the default maximum heap size for the process. Units are bytes.
 RuntimeSectionPart_stackSizeLabel=Stack size: