# HG changeset patch
# User fturovic <frank.turovich@nokia.com>
# Date 1263845217 21600
# Node ID ce19c6e825a9550893e093b63a9e3c2bb78bf569
# Parent  a4131d1d5bfa099dda6cc5e74e110c304bfc5e23# Parent  0384a72364f6cfecc8d1fe84519e3372fbe79487
head merge

diff -r 0384a72364f6 -r ce19c6e825a9 core/com.nokia.carbide.cpp.doc.user/html/bugs_fixed.htm
--- a/core/com.nokia.carbide.cpp.doc.user/html/bugs_fixed.htm	Mon Jan 18 13:58:28 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/bugs_fixed.htm	Mon Jan 18 14:06:57 2010 -0600
@@ -16,11 +16,15 @@
 <h2>Carbide.c++ bugs fixed </h2>
 <p>This is a comprehensive list of bugs fixed by release: </p>
 <ul>
-  <li>Bugs Fixed in <a href="#bugs240">2.4.0</a></li>
-  <li><a href="#bugs230">2.3.0</a>, <a href="#bugs220">2.2.0</a>, <a href="#bugs210">2.1.0</a>, <a href="#bugs204">2.0.4</a>, <a href="#bugs203">2.0.3</a>, <a href="#bugs202"> 2.0.2</a>, <a href="#bugs200">2.0.0</a></li>
+  <li>Bugs Fixed in <a href="#bugs240">2.5.0</a></li>
+  <li><a href="#bugs240">2.4.0</a>, <a href="#bugs230">2.3.0</a>, <a href="#bugs220">2.2.0</a>, <a href="#bugs210">2.1.0</a>, <a href="#bugs204">2.0.4</a>, <a href="#bugs203">2.0.3</a>, <a href="#bugs202"> 2.0.2</a>, <a href="#bugs200">2.0.0</a></li>
   <li><a href="#bugs131">1.3.1</a>, <a href="#bugs130">1.3.0</a> , <a href="#bugs122">1.2.2</a>, <a href="#bugs121">1.2.1</a></li>
 </ul>
-<h3><a name="bugs230" id="bugs8"></a>Bugs Fixed in v2.4.0</h3>
+<h3><a name="bugs250" id="bugs9"></a>Bugs Fixed in v2.5.0</h3>
+<ul>
+  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=9852">???</a> -  </li>
+</ul>
+<h3><a name="bugs240" id="bugs8"></a>Bugs Fixed in v2.4.0</h3>
 <ul>
   
   <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=9852">9852</a> - Fixed an issue that prevented the S60 GUI App template from building under SBSv2. </li>
@@ -465,7 +469,7 @@
   <li>3975	- The Variables view no longer displays strange  &quot;.sw&quot; variables<br />
 </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>
+<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
diff -r 0384a72364f6 -r ce19c6e825a9 core/com.nokia.carbide.cpp.doc.user/html/debugger.htm
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger.htm	Mon Jan 18 13:58:28 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger.htm	Mon Jan 18 14:06:57 2010 -0600
@@ -19,13 +19,13 @@
       <p align="right">&nbsp;</p>
       <p align="right">&nbsp;</p>
       <p align="right">&nbsp;</p>
-      <p class="titleSmall">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.<br>
+      <p class="titleSmall">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></p>
     </td>
   </tr>
   <tr>
     <td colspan="2"><h1 align="center">Carbide.c++ User Guide</h1>
-    <p align="center" class="titleSmall">Version 2.2.0, August, 2009</p></td>
+    <p align="center" class="titleSmall">Version 2.5.0, Jan, 2010</p></td>
   </tr>
 </table>
 <p align="center">&nbsp;</p>
diff -r 0384a72364f6 -r ce19c6e825a9 core/com.nokia.carbide.cpp.doc.user/html/hints_tips.htm
--- a/core/com.nokia.carbide.cpp.doc.user/html/hints_tips.htm	Mon Jan 18 13:58:28 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/hints_tips.htm	Mon Jan 18 14:06:57 2010 -0600
@@ -97,10 +97,11 @@
   <p>When using Bluetooth to connect to a device there are several things that require correction, including:</p>
   <ul>
     <li>If using built-in Bluetooth under WinXP SP2,  ensure the manufacturer&#8217;s device drivers are installed and active. The default Microsoft drivers do not work correctly for debugging devices using TRK. For example, if using IBM Integrated Bluetooth on your computer, make sure you have the IBM drivers for the device. </li>
-    <li>Ensure the COM port used by Bluetooth is not commandeered by another process or device</li>
+    <li>Ensure the COM port used by Bluetooth is not commandeered by another process or device.</li>
+    <li>Ensure that you have the <a href="tasks/trk/trk_installation_instr.htm">latest version </a>of TRK on the target device.</li>
   </ul>
 </blockquote>
-<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>
+<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>
diff -r 0384a72364f6 -r ce19c6e825a9 core/com.nokia.carbide.cpp.doc.user/html/release_notes.htm
--- a/core/com.nokia.carbide.cpp.doc.user/html/release_notes.htm	Mon Jan 18 13:58:28 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/release_notes.htm	Mon Jan 18 14:06:57 2010 -0600
@@ -16,7 +16,7 @@
   </style>
 </head>
 <body bgcolor="#ffffff">
-<h2>Carbide.c++ Release Notes 2.4.0</h2>
+<h2>Carbide.c++ Release Notes 2.5.0</h2>
 <p>The Carbide.c++  is a comprehensive development tool suite for Symbian OS that is based on the Eclipse framework. The C++ Development Toolkit (CDT), provides the foundation for project and build tools management, as well as the primary interface for the debugger to communicate with the IDE. </p>
 <p>This is a collection of important information concerning last-minute
   changes and other topics that deserve special attention.&nbsp;Please
@@ -35,14 +35,20 @@
 Updating the CDT feature in Carbide.c++/Eclipse will wipe out our
 changes making the tools unusable!</p>
 <p> See the <a href="hints_tips.htm">Tips &amp; tricks</a> page for more helpful information.</p>
-<h3><a name="whatsNew" id="whatsNew2"></a>What's New in 2.4.0 </h3>
+<h3><a name="whatsNew" id="whatsNew2"></a>What's New in 2.5.0 </h3>
 <p>The following features for Symbian  development are provided within Carbide.c++:</p>
+<blockquote>
+  <ul>
+    <li><b>Qt Tools 1.6</b> now supported.</li>
+  </ul>
+</blockquote>
+<h4><a name="240" id="210222"></a>2.4.0</h4>
 <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.</li>
+  <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/WINSCW_(build_version_information)">WINSCW</a> wiki page.</li>
   <li><b>Qt Tools 1.6</b> now supported.</li>
   <li>The <b>Run builds concurrently</b> option in the <a href="reference/wnd_build_prefs.htm">Builds</a> preference panel now supports up to 50 concurrent build jobs, up from 4.</li>
 </ul>
-<h4><a name="220" id="21022"></a>2.3.0</h4>
+<h4><a name="230" id="21022"></a>2.3.0</h4>
 <ul>
   <li>P2 update services now supported. Updating Carbide.c++ should be more flexible and easier than before.</li>
   <li>The official Qt code style is now included in the Code Style preference panel.</li>
@@ -380,7 +386,7 @@
   <li>Read the <a href="http://sw.nokia.com/id/d11442a8-4eb1-4c01-97f2-fd8be139b93f/Carbide_cpp_On_Device_Debugging_v1_0_en.pdf">Carbide.c++ On-device Debugging</a> whitepaper or an introduction to on-device debugging for S60 3rd Edition devices<br />
   </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>
+<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
diff -r 0384a72364f6 -r ce19c6e825a9 core/com.nokia.carbide.cpp.doc.user/html/sos_references.htm
--- a/core/com.nokia.carbide.cpp.doc.user/html/sos_references.htm	Mon Jan 18 13:58:28 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/sos_references.htm	Mon Jan 18 14:06:57 2010 -0600
@@ -1,26 +1,27 @@
-<!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>Developer Resources</title>
-    <link href="../book.css" rel="stylesheet" type="text/css">
-</head>
-
-<body>
-<h2>Developer Resources</h2>
-<p>The following developer references provide information on the S60 SDKs, Symbian SDKs, APIs, and a host of other useful sources. Visit them  to enhance your Symbian knowledge.</p>
- <p class="note"><b>NOTE</b> WINS (Visual Studio)
-   SDKs are not supported. If you want to do emulation debugging you need a WINSCW SDK.</p>
- <ul>
-   <li><a href="http://forum.nokia.com">Forum Nokia</a></li>
-   <li><a href="http://discussion.forum.nokia.com/forum/forumdisplay.php?f=95"> Carbide.c++ IDE and plug-ins</a> discussion forum</li>
-   <li>Symbian Foundation (<a href="http://www.symbian.org/">http://www.symbian.org/</a>) </li>
-   <li><a href="http://www.newlc.com">newlc</a> - a Symbian OS C++ developer portal</li>
-   <li><a href="http://www.allaboutsymbian.com/">allaboutsymbian</a> - a community site and portal for phones running the Symbian OS</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 Transitional//EN">
+
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<title>Developer Resources</title>
+    <link href="../book.css" rel="stylesheet" type="text/css">
+</head>
+
+<body>
+<h2>Developer Resources</h2>
+<p>The following developer references provide information on the S60 SDKs, Symbian SDKs, APIs, and a host of other useful sources. Visit them  to enhance your Symbian knowledge.</p>
+ <p class="note"><b>NOTE</b> WINS (Visual Studio)
+   SDKs are not supported. If you want to do emulation debugging you need a WINSCW SDK.</p>
+ <ul>
+   <li>Symbian Developer (<a href="http://developer.symbian.org">http://developer.symbian.org</a>) </li>
+   <li>Symbian Foundation (<a href="http://www.symbian.org/">http://www.symbian.org/</a>) </li>
+   <li><a href="http://forum.nokia.com">Forum Nokia</a></li>
+   <li><a href="http://discussion.forum.nokia.com/forum/forumdisplay.php?f=95"> Carbide.c++ IDE and plug-ins</a> discussion forum</li>
+   <li><a href="http://www.newlc.com">newlc</a> - a Symbian OS C++ developer portal</li>
+   <li><a href="http://www.allaboutsymbian.com/">allaboutsymbian</a> - a community site and portal for phones running the Symbian OS</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