# HG changeset patch
# User fturovic <frank.turovich@nokia.com>
# Date 1245857310 18000
# Node ID ad429850197e5da1db25d7bec8dbc34629eaa62d
# Parent  fb456bb938f9664da006b5bd475c29deb45f04f9# Parent  652205e6022bdc4c577fb5f1e5cb8062ba85423f
merge

diff -r 652205e6022b -r ad429850197e core/com.nokia.carbide.cpp.doc.user/debuggerTOC.xml
--- a/core/com.nokia.carbide.cpp.doc.user/debuggerTOC.xml	Wed Jun 24 08:59:46 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/debuggerTOC.xml	Wed Jun 24 10:28:30 2009 -0500
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="Carbide.c++ User Guide" href="html/debugger.htm" >
-   
-	<topic label="Release notes"  href="html/release_notes.htm" />
-	<link toc="tocCarbide.xml" />
-	
-	<anchor id="anchorCarbideCPPMisc" />
-	
-	<topic label="Bugs fixed"  			href="html/bugs_fixed.htm" />
-	<topic label="Legal"  href="html/legal.htm" />
-
-</toc>
+<?xml version="1.0" encoding="UTF-8"?>
+<?NLS TYPE="org.eclipse.help.toc"?>
+
+<toc label="Carbide.c++ User Guide" href="html/debugger.htm" >
+   
+	<topic label="Release notes"  href="html/release_notes.htm" />
+
+	<link toc="tocCarbide.xml" />
+	<anchor id="anchorCarbideCPPMisc" />
+	
+	<topic label="Bugs fixed"  			href="html/bugs_fixed.htm" />
+	<anchor id="anchorNokiaOther" />
+
+	<topic label="Legal"  href="html/legal.htm" />
+
+</toc>
diff -r 652205e6022b -r ad429850197e core/com.nokia.carbide.cpp.doc.user/html/bugs_fixed.htm
--- a/core/com.nokia.carbide.cpp.doc.user/html/bugs_fixed.htm	Wed Jun 24 08:59:46 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/bugs_fixed.htm	Wed Jun 24 10:28:30 2009 -0500
@@ -21,6 +21,11 @@
 </ul>
 <h3><a name="bugs210" id="bugs4"></a>Bugs Fixed in v2.1.0</h3>
 <ul>
+  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=9164">9164</a> - Added some diagnostic instrumentation to the Eclipse platform and Carbide to aid users in reporting resource and workspace refreshing issues. </li>
+  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=9310">9310</a> - Can now properly save SBSv2 tools or gcc configurations in the Platform Filtering Preferences panel and added default Apply/Restore controls.  </li>
+</ul>
+<p><b>B1</b></p>
+<ul>
   <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=7351">7351</a> - Fixed an issue where cancelling &quot;Build all configurations&quot; should work and be much faster. </li>
   <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=8901">8901</a> - Fixed an issue in the error parser that prevented building Phone Debug builds due to Assembler warnings. </li>
   <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=8943">8943</a> - Fixed an issue in the error parser that caused code to be flagged as an error instead of a warning.</li>
diff -r 652205e6022b -r ad429850197e core/com.nokia.carbide.cpp.doc.user/html/release_notes.htm
--- a/core/com.nokia.carbide.cpp.doc.user/html/release_notes.htm	Wed Jun 24 08:59:46 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/release_notes.htm	Wed Jun 24 10:28:30 2009 -0500
@@ -49,13 +49,9 @@
   <li><b>New Launch Configuration improvements</b> - The <b>New Launch Configuration</b> wizard now starts with a new <a href="projects/launch/wiz_new_launch_config.htm#CATEGORY">Category Selection</a> page which helps guide developers in choosing the correct launch configuration  for a project, whether it be for Phones, Boards, or other target devices. In addition, the <a href="projects/launch/wiz_new_launch_config.htm#BLD_OPT">Build Options Selection</a> page enables developers to define if a project is automatically built or not at the launch configuration level.</li>
   <li><b>Customization (.bsf) and Symbian Variant Binary (.var) platform</b> discovery is now supported. See the Platform Filtering Preference panel for details.</li>
   <li><b>TRK improvements</b> - TRK continues to evolve and now includes these improvements:
-    <ul><li>XTI drivers should no longer miss any messages from the host PC.</li>
-      <li>Added support for XTI command line options. </li>
-      <li>TRK now automatically reconnects if you disconnect the USB cable and reconnect the cable.</li>
+    <ul>
+      <li>TRK now automatically reconnects if you disconnect the USB cable and then reconnect.</li>
       <li>Added support for targeting nested static libraries of a polymorphic dll. </li>
-      <li>Added support for phone info command. </li>
-      <li>Added support for detach command. </li>
-      <li>TRK no longer  queries for the USB device state during start up as this is not supported by all targets.</li>
       <li>TRK now checks for  duplicates before adding a library to the target list to avoid sending duplicate library loading commands (bug 9035).</li>
       <li>Users no longer need to specify a port number for Bluetooth connections as TRK now automatically locates BT serial port and uses that for the connections setup (bug 2502).</li>
     </ul>