merge 2.6 changes to 3.0 docs
authorfturovic <frank.turovich@nokia.com>
Tue, 13 Apr 2010 15:55:45 -0500
changeset 1207 e265bbe56eb0
parent 1205 5310aeaa3526
child 1208 54c7e69fdb2c
merge 2.6 changes to 3.0 docs
core/com.nokia.carbide.cpp.doc.user/build.properties
core/com.nokia.carbide.cpp.doc.user/html/bugs_fixed.htm
core/com.nokia.carbide.cpp.doc.user/html/concepts/CarbidePerspective.html
core/com.nokia.carbide.cpp.doc.user/html/concepts/MBMDefWizard.html
core/com.nokia.carbide.cpp.doc.user/html/concepts/SampleExampleProjectCreate.html
core/com.nokia.carbide.cpp.doc.user/html/concepts/autotargeting.htm
core/com.nokia.carbide.cpp.doc.user/html/concepts/build_configurations.htm
core/com.nokia.carbide.cpp.doc.user/html/concepts/build_targets.htm
core/com.nokia.carbide.cpp.doc.user/html/concepts/carbide_projects.htm
core/com.nokia.carbide.cpp.doc.user/html/concepts/common_debug_actions.htm
core/com.nokia.carbide.cpp.doc.user/html/concepts/concepts.htm
core/com.nokia.carbide.cpp.doc.user/html/concepts/contextual_menus.htm
core/com.nokia.carbide.cpp.doc.user/html/concepts/emulators.htm
core/com.nokia.carbide.cpp.doc.user/html/concepts/images/view_registers.png
core/com.nokia.carbide.cpp.doc.user/html/concepts/mmpfiles.htm
core/com.nokia.carbide.cpp.doc.user/html/concepts/ngage_projects.htm
core/com.nokia.carbide.cpp.doc.user/html/concepts/precompiled_headers.htm
core/com.nokia.carbide.cpp.doc.user/html/concepts/registers.htm
core/com.nokia.carbide.cpp.doc.user/html/concepts/watchpoints.htm
core/com.nokia.carbide.cpp.doc.user/html/concepts/working_with_programs.htm
core/com.nokia.carbide.cpp.doc.user/html/context_help/carbide_debug_dialogs_help.xml
core/com.nokia.carbide.cpp.doc.user/html/context_help/eclipse_dialogs_help.xml
core/com.nokia.carbide.cpp.doc.user/html/debugger.htm
core/com.nokia.carbide.cpp.doc.user/html/debugger/breakpoints/breakpoints.htm
core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/cmds_starting.htm
core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/adding_expressions.htm
core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/editing_expressions.htm
core/com.nokia.carbide.cpp.doc.user/html/legal.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/attach_process.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/customizing_launch_configs.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/emulation.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/launch_board_01.png
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/launch_phone_01.png
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/launch_phone_02.png
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/wnd_change_conn.png
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/wnd_change_debug_process.png
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/wnd_change_other_settings.png
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_board.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_configs_overview.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_configuration_filter.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_emulator.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_phone.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_debugger.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_main.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/run_mode.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/stop_mode.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/trace32.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/wiz_new_launch_config.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/wnd_change_connection.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/wnd_change_debug_process.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/wnd_change_other_settings.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/wnd_config_launch_config.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/wnd_debug_configuration.htm
core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_01.htm
core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_02.htm
core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_03.htm
core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_04.htm
core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_05.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/BasicSettings.html
core/com.nokia.carbide.cpp.doc.user/html/reference/INF_Editor.html
core/com.nokia.carbide.cpp.doc.user/html/reference/INF_Editor_addedit_make.html
core/com.nokia.carbide.cpp.doc.user/html/reference/INF_Editor_addedit_mmp.html
core/com.nokia.carbide.cpp.doc.user/html/reference/INF_Editor_exports.html
core/com.nokia.carbide.cpp.doc.user/html/reference/INF_Editor_file.html
core/com.nokia.carbide.cpp.doc.user/html/reference/MBMEditor.html
core/com.nokia.carbide.cpp.doc.user/html/reference/MMP_Editor_libraries.html
core/com.nokia.carbide.cpp.doc.user/html/reference/NewMMP_wizard.html
core/com.nokia.carbide.cpp.doc.user/html/reference/ProjectDirectories.html
core/com.nokia.carbide.cpp.doc.user/html/reference/ProjectNameAndLocation.html
core/com.nokia.carbide.cpp.doc.user/html/reference/ProjectOtherSettings.html
core/com.nokia.carbide.cpp.doc.user/html/reference/ProjectPreferences.html
core/com.nokia.carbide.cpp.doc.user/html/reference/ProjectTypeandSDK.html
core/com.nokia.carbide.cpp.doc.user/html/reference/ROM_build_settings.html
core/com.nokia.carbide.cpp.doc.user/html/reference/SDKPreferences.html
core/com.nokia.carbide.cpp.doc.user/html/reference/add_from_filesys.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/add_from_project.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_env.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_paths.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_sis.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_project_settings.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/wnd_sis_properties.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/debugger_settings.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/images/icon_build_all_configs.png
core/com.nokia.carbide.cpp.doc.user/html/reference/images/icon_freeze_exports.png
core/com.nokia.carbide.cpp.doc.user/html/reference/images/icon_rc_available.png
core/com.nokia.carbide.cpp.doc.user/html/reference/images/icon_rc_connection.png
core/com.nokia.carbide.cpp.doc.user/html/reference/images/icon_rc_not_accessible.png
core/com.nokia.carbide.cpp.doc.user/html/reference/images/icon_rc_not_active.png
core/com.nokia.carbide.cpp.doc.user/html/reference/images/tab_new_conn_install_agent.png
core/com.nokia.carbide.cpp.doc.user/html/reference/images/tab_new_conn_setup_conn.png
core/com.nokia.carbide.cpp.doc.user/html/reference/images/tab_new_conn_test_conn.png
core/com.nokia.carbide.cpp.doc.user/html/reference/images/trim_remote_conns.png
core/com.nokia.carbide.cpp.doc.user/html/reference/images/view_disassembly_menu.png
core/com.nokia.carbide.cpp.doc.user/html/reference/launch_configuration_filter.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/menus/abld.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/panel_debug_exceptions.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/reference.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/trk/panel_filter.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/trk/view_remote_connection.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_install_tab.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_connection_wizard.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_on_device_check_tab.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_on_device_setup.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/view_disassembly.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/view_expressions.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/view_global_variables.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/view_mem_array.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/view_memory_wnd.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/view_mifdef_editor.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/view_registers.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/view_signals_wnd.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/view_symbian_kernel.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/view_system_browser.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_build_prefs.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_carbide_pref.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_debug_configuration.htm
core/com.nokia.carbide.cpp.doc.user/html/release_notes.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/AddingClasses.html
core/com.nokia.carbide.cpp.doc.user/html/tasks/AddinganSDK.html
core/com.nokia.carbide.cpp.doc.user/html/tasks/AppInfoFile.html
core/com.nokia.carbide.cpp.doc.user/html/tasks/CreatingNewProjects.html
core/com.nokia.carbide.cpp.doc.user/html/tasks/CreatingProjectsToc.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/EmulatorToc.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/ExportingtoMMP_BLDinf.html
core/com.nokia.carbide.cpp.doc.user/html/tasks/Multi-BitmapFile.html
core/com.nokia.carbide.cpp.doc.user/html/tasks/RmvngandVwngPropsosSDK.html
core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_01.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_02.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_03.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_04.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_05.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_06.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_07.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_08.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug_launchcfg.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/eventpoints_disabling.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/eventpoints_enabling.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/log_point_clear.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/log_point_set.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/pause_point_clear.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/pause_point_set.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/trace_collection_clear.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/trace_collection_off.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/trace_collection_on.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/images/wnd_chooseBaseClass.png
core/com.nokia.carbide.cpp.doc.user/html/tasks/index.html
core/com.nokia.carbide.cpp.doc.user/html/tasks/processes/open_log_view.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_build.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_creating_sis_file.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_config.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_console.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/sdk_search.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_debugging.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_requirements.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/start/images/p2_available_sw.png
core/com.nokia.carbide.cpp.doc.user/html/tasks/start/images/p2_install_details_01.png
core/com.nokia.carbide.cpp.doc.user/html/tasks/start/images/p2_install_details_02.png
core/com.nokia.carbide.cpp.doc.user/html/tasks/start/images/p2_review_licenses.png
core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_carbide_setup.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_connection_bluetooth.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_connection_usb.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_installation_instr.htm
core/com.nokia.carbide.cpp.doc.user/index.xml
core/com.nokia.carbide.cpp.doc.user/intro/tutorialsCarbideExtContent.xml
core/com.nokia.carbide.cpp.doc.user/intro/whatsnew_IntroExt.xml
core/com.nokia.carbide.cpp.doc.user/plugin.xml
core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml
--- a/core/com.nokia.carbide.cpp.doc.user/build.properties	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/build.properties	Tue Apr 13 15:55:45 2010 -0500
@@ -1,22 +1,12 @@
-bin.includes = plugin.xml,\
+bin.includes = book.css,\
                debuggerTOC.xml,\
                intro/,\
-               index.xml,\
                tocCarbide.xml,\
-               book.css,\
-               tocRelease.xml,\
-               src.includes = META-INF/,\
-               debuggerTOC.xml,\
+               plugin.xml,\
+               html/
+src.includes = tocCarbide.xml,\
                plugin.xml,\
-               index.xml,\
-               tocRelease.xml,\
-               tocCarbide.xml,\
-               book.css,\
-               META-INF/,\
-               html/
-src.includes = book.css,\
+               intro/,\
+               html/,\
                debuggerTOC.xml,\
-               html/,\
-               intro/,\
-               tocCarbide.xml,\
-               plugin.xml
+               book.css
--- a/core/com.nokia.carbide.cpp.doc.user/html/bugs_fixed.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/bugs_fixed.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -16,14 +16,31 @@
 <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.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>Bugs Fixed in <a href="#bugs260">2.6.0</a></li>
+  <li><a href="#bugs240">2.5.0</a>, <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="bugs260" id="bugs10"></a>Bugs Fixed in v2.6.0</h3>
+<ul><li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10267">10267</a> - Fixed an issue that prevented some executables from appearing in the Executables view. </li>
+  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10525">10525</a> - Raptor builds correctly report an error of a missing header file and not the input source file itself. </li>
+  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10591">10591</a> - Carbide now recognizes the Symbian ^3 SDK and supplies the proper templates and build configurations. </li>
+  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10659">10659</a> - Updated x86 WINSCW tools to build 489. </li>
+  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10743">10743</a> - Corrected an issue that prevented compiling of files with different case handling of file names across different OS systems. </li>
+  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10759">10759</a> - Corrected an issue where a remote connection was not removed from the Remote Connections view when the device was no longer connected. </li>
+  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10795">10795</a> - Carbide detection of Symbian^3 SDKs is now more robust. </li>
+  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10805">10805</a> - Improved device connection behavior when devices are plugged and unplugged or when devices are swapped making notification message more reliable. </li>
+  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10861">10861</a> - Launch wizard can no longer automatically select DLLs as the executable.</li>
+</ul>
 <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=10282">10282</a> -  Fixed an issue that prevented updating of the source path in the Executables view when working from a subst drive and a project is open that contains the source file.</li>
+  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10395">10395</a> - Fixed an issue in WINSCW where a const exception is thrown but it was not getting caught by a non const catch block.</li>
   <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10396">10396</a> - Added reminder &quot;NOTE Always run the Help &gt; Check for Updates wizard and install all updates before attempting to install new software. This can prevent the occurrence of any dependency errors.&quot; to the <a href="tasks/start/carbide_updating.htm">Upgrading Carbide.c++</a> page.</li>
+  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10467">10467</a> - Fixed a timeout problem with SBS version checks that caused Carbide to hang.</li>
+  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10477">10477</a> - Fixed an internal compiler error in floating point code generation during optimization.</li>
+  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10591">10591</a> - Carbide now recognizes the Symbian ^3 SDK and supplies the proper templates and build configurations.</li>
+  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10622">10622</a> -  Fixed a path issue where the MMP Editor would display platform path macros and unknown MMP statements.</li>
+  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10742">10742</a> - SBSv2 now always appears as a build option and  displays appropriate errors if the <span class="code">SBS_HOME</span> environment variable is missing.</li>
 </ul>
 <h3><a name="bugs240" id="bugs8"></a>Bugs Fixed in v2.4.0</h3>
 <ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/CarbidePerspective.html	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/CarbidePerspective.html	Tue Apr 13 15:55:45 2010 -0500
@@ -26,7 +26,7 @@
      </ul>
 	 <p class="note"><b>NOTE</b> When launching a program to debug, the <a href="../reference/perspective_debug.htm">Debug</a> perspective appears.</p>
 
-	 <p align="center"><img src="images/workbench.png" width="815" height="638" /></p>
+	 <p align="center"><img src="images/workbench.png" width="906" height="609" /></p>
    <p class="figure">Figure 1 - Carbide C/C++ perspective </p>
 	 <p class="note"><b>NOTE</b> Click the <img src="../images/icons/double_arrow_icon.png" width="12" height="9" align="absmiddle" /> icon to show additional options that may not be visible in the perspective view.</p>
 	 <p>For more information on perspectives see <b>Workbench User Guide &gt; Concepts &gt; <a href="PLUGINS_ROOT/org.eclipse.platform.doc.user/concepts/concepts-4.htm">Perspectives</a></b>, and for views see  <b>C/C++ Development User Guide &gt; Reference
@@ -40,7 +40,7 @@
        <li><a href="../reference/view_cpp_projects.htm">C/C++ Projects</a> view</li>
        <li><a href="../reference/view_sym_proj_nav.htm">Symbian Project Navigator</a> view </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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/MBMDefWizard.html	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/MBMDefWizard.html	Tue Apr 13 15:55:45 2010 -0500
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
 <title>MBM File in Concepts</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
-   </head>
+</head>
    <body>
    <h2>MBM File</h2>
    
@@ -9,9 +9,9 @@
 	  MBM, or multi-bitmap, is a Symbian OS-specific bitmap file format. This
 		file contains multiple bitmaps and it can contain both bitmaps with masks and
 		bitmaps without masks. It optimizes the bitmap handling capability of Symbian
-		OS. The MMP editor (in Sources tab &gt; Resources &gt; Bitmaps) and Symbian Project Navigator view provide support for creating and editing mbm
-   files. In the Symbian Project Navigator you can right-click on a scalable icon makefile (for example, Icons_scalable_dc.mk) and select Add MBM/MIF Entry... to open the Edit MBM/MIF Contents window.</p>
-   <p>
+		OS. The <a href="../reference/MMP_Editor.html">MMP Editor</a> (in <b>Sources</b> tab <b>&gt; Resources &gt; Bitmaps</b>) and <a href="../reference/view_sym_proj_nav.htm">Symbian Project Navigator</a> view provide support for creating and editing MBM
+   files. In the <a href="../reference/view_sym_proj_nav.htm">Symbian Project Navigator</a> view you can right-click on a scalable icon makefile (for example, <span class="code">Icons_scalable_dc.mk</span>) and select <b>Add MBM/MIF Entry...</b> to open the Edit MBM/MIF Contents window.</p>
+<p>
 	  The following information is required to add a bitmap without a mask: 
    </p>
    <ul> 
@@ -59,8 +59,7 @@
 	 <ul>
        <li><a href="../reference/MBMEditor.html">MBM Editor</a></li>
    </ul>
-	 <div id="footer"></div>
-<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; 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/concepts/SampleExampleProjectCreate.html	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/SampleExampleProjectCreate.html	Tue Apr 13 15:55:45 2010 -0500
@@ -4,63 +4,41 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <meta http-equiv="Content-Style-Type" content="text/css" />
 <title>Simple Example Project in Getting Started</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/></head>
 <body>
 <h2>Simple DLL Example</h2>
 
    <p>
-	  This section will walk through the process of creating a simple
-	  &#8220;Test1&#8221; DLL project. For more information on creating a new project, see
-	  <a href="../tasks/CreatingNewProjects.html">Tasks &gt; Creating New Projects</a>. 
-   </p>
-   <p>
-	  To start, click File &gt; New &gt; Project to
-		invoke the New Project wizard. Select Symbian OS C++ Project in the Symbian OS folder and click Next to
-	  continue with the following steps:</p>
-   <ol>
-     <li>Select Basic dynamically linked library (DLL) project template and click Next.</li>
-   </ol>
-   <p align="center"><img src="../images/new_simple_project_01.png" width="409" height="503" align="middle" alt="" /></p>
-   <p class="figure">Figure 1 - Select Basic DLL</p>
-   <ol>
-     <li value="2">Enter a project name and specify a workspace location to store the project. </li>
-   </ol>
-   <p align="center"><img src="../images/new_simple_project_02.png" width="430" height="319" align="middle" alt="" /></p>
-   <p class="figure">Figure 2 - Specify Project Name and Location</p>
-   <ol>
-     <li value="3">Select the Symbian OS SDK and Build Configurations to use for this project, then click Next.</li>
-   </ol>
-   <blockquote>
-     <p class="note"><b>NOTE</b> This dialog will show SDKs installed on your PC.</p>
-   </blockquote>
-   <p align="center"><img src="../images/new_simple_project_03.png" width="403" height="397" align="middle" alt="" /></p>
-   <p class="figure">Figure 3 - Symbian OS SDKs and Build Configurations</p>
-   <ol>
-     <li value="4">Specify UID2 as &#8220;0x00000004&#8221;, your
-			               name as the Author and your Copyright notice.
-			               For more details on UID2, see <a href="../tasks/CreatingNewProjects.html">Creating New Projects</a>.
-               Click Next to continue.</li>
-   </ol>
-   <p align="center"><img src="../images/new_simple_project_04.png" width="403" height="397" align="middle" alt="" /> </p>
-   <p class="figure">Figure 4 - Basic Settings page</p>
-   <ol>
-     <li value="6"> 
-       Accept the default names for all directories.</li>
-   </ol>
-   <p align="center"><img src="../images/new_simple_project_05.png" width="403" height="397" align="middle" alt="" /></p>
-   <p class="figure">Figure 5- Project Directories page</p>
-   <ol>
-     <li value="7">
-        Click Finish. The simple &#8220;test1&#8221; DLL project is
-                         listed in the navigation view with the set of files created for the project. </li>
-   </ol>
-   <blockquote>
-     <p> This completes the simple &#8220;test1&#8221; DLL project creation. The image
-          below shows the expanded project  view.</p>
-   </blockquote>
-  <p align="center" class="Image"><img src="../images/navigatorview.gif" alt="The Navigator view provides a hierarchic..." width="271" height="345"  border="0" /></p>
-<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>
+	  This example walks through the process of creating a basic
+	  &#8220;MyDynamicDLL&#8221; DLL project. </p>
+   <p>For more information on creating new projects of all types, see<b> </b><a href="../tasks/CreatingNewProjects.html">Creating New Projects</a>. </p>
+   <div class="step">
+     <h4>Creating a DLL Project</h4>
+     <ol>
+       <li>Click <b>File &gt; New &gt; Symbian OS C++ Project</b> to invoke the <b>New</b> <b>Symbian OS C++ Project</b> wizard.</li>
+       <li>Select Basic dynamically linked library (DLL) project template and click Next.</li>
+       <p class="figure"><img src="../images/new_simple_project_01.png" width="500" height="567" alt="" /></p>
+       <p class="figure">Figure 1. Select Basic DLL template</p>
+       <li>Enter a project name and specify a workspace location to store the project. </li>
+       <p align="center"><img src="../images/new_simple_project_02.png" width="500" height="567"alt="" /></p>
+       <p align="center" class="figure">Figure 2. Project name and location information</p>
+       <li>Select the Symbian OS SDK and Build Configurations to use for this project, then click Next.</li>
+       <p align="center"><img src="../images/new_simple_project_03.png" width="500" height="567" alt="" /></p>
+       <p class="figure">Figure 3. SDK selection for project</p>
+       <li>Enter Specify UID2 as &#8220;0x0000008d&#8221;, your name as the Author and your Copyright notice.
+         For more details on UID2, see <a href="../tasks/CreatingNewProjects.html">Creating New Projects</a>.  
+         <p align="center"><img src="../images/new_simple_project_04.png" width="500" height="567" alt="" /></p>
+       </li>
+     </ol>
+     <p class="figure">Figure 4. Basic settings for DLL</p>
+     <ol start="6">
+       <li>Click Finish to generate the project. </li>
+       <p>The simple &#8220;MyDynamicDLL&#8221;  project is listed in the Project Explorer view with the set of files created for the project. </p>
+     </ol>
+     <p align="center" class="Image"><img src="../images/navigatorview.gif" alt="" width="342" height="387"  border="0" /></p>
+     <p align="center" class="figure">Figure 5. DLL example project in Project Explorer view</p>
+   </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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/autotargeting.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/autotargeting.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -9,12 +9,16 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Auto-Targeting of Executables</h2>
-<p>In run-mode  debugger now supports the auto-targeting of processes that are already running or are created during the execution of the debug session. Previously, the debugger forced users to explicitly attach to a running process. Now, the debugger attempts to target all the EXEs specified in the <a href="../projects/launch/page_executables.htm">Executables</a> tab of the launch configuration. </p>
+<p>In run-mode  the Carbide debugger now supports the auto-targeting of processes that are already running or are created during the execution of the debug session. Previously, the debugger forced users to explicitly attach to a running process. Now, the debugger attempts to target all the EXEs specified in the <a href="../projects/launch/page_executables.htm">Executables</a> tab of the launch configuration. </p>
 <ul>
   <li>If the executables are already started, it gets the load address of the executable and targets it for debugging, resolving any breakpoints it finds.</li>
   <li>The debugger will target any executable not already started whenever a &quot;process load&quot; event occurs, resolving its breakpoints as well.</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>
+<h5>Other References</h5>
+<ul>
+  <li><a href="../projects/launch/page_executables.htm">Executables</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.doc.user/html/concepts/build_configurations.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/build_configurations.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -15,7 +15,7 @@
   <li>a <a href="../projects/launch/launch_configs_overview.htm">build  configuration</a> -  a project level configuration that includes an  SDK and any related files required to compile and build the project </li>
 </ul>
 <p>Build configurations are defined when the project is created. A project can have any number of build configurations and more  can be <a href="../tasks/projects/prj_new_build_config.htm">added</a> as necessary. Each build configuration can have its own combination of tool settings to precisely control how it is defined and built. Build configurations are maintained in the project Properties window in the Carbide Build Configurations panel. To open the panel, select a project in the <a href="../reference/view_sym_proj_nav.htm">Symbian Project Navigator</a> or <a href="../reference/view_cpp_projects.htm">Project Explorer</a> view and select <b>Project &gt; Properties</b> or right-click and select Properties.</p>
-<p align="center"><img src="images/build_configs.png" width="778" height="595"></p>
+<p align="center"><img src="images/build_configs.png" width="795" height="679"></p>
 <p>You can select a build configuration in the <b>Active Configuration</b> dropdown list or use the <b>Project &gt; Active  Configuration</b> menu option  to <a href="../tasks/projects/prj_set_build_tgt.htm">set</a> which build configuration to launch when running or debugging a program. The currently selected project can be launched by clicking the <b>Run</b> (<img src="../images/icons/btn_run.png" width="16" height="16" align="absmiddle" />) or <b>Debug</b> (<img src="../images/icons/btn_debug.png" width="17" height="16" align="absmiddle" />) control on the tool bar to launch the project with the currently active build configuration. When no project is selected the last project debugged will be launched.</p>
 <p>If no <a href="../projects/launch/launch_configs_overview.htm">launch configuration</a> is present in the project, one is created on initial launch. Subsequent launches of the project will use either the last launch configuration or if more than one launch configuration exists, it uses the most correct one.</p>
 <p class="note"><b>NOTE</b> The Carbide <b>Run</b> and <b>Debug</b> buttons are shaded in blue to indicate their behavior differs from the standard Eclipse behavior.</p>
@@ -35,12 +35,12 @@
   </tr>
 </table>
 <h5>Build Configuration Naming</h5>
-<p>When the Carbide.c++ IDE creates an build  configuration it uses a standard naming convention to make it easy to identify. For example, <span class="code">HelloCarbide S60 3.0 Emulator Debug</span> is a typical configuration name.  The default name follows the form of:</p>
+<p>When the Carbide.c++ IDE creates an build  configuration it uses a standard naming convention to make it easy to identify. For example, <span class="code">HelloCarbide S60 5.0 Emulator Debug</span> is a typical configuration name.  The default name follows the form of:</p>
 <ul>
   <li><span class="code">&lt;Phone|Emulator&gt; </span>The build target (Emulator, Phone, etc.)</li>
   <li><span class="code">&lt;Debug|Release&gt; </span>Debug (final file contains debug symbols) or Release version</li>
   <li><span class="code">&lt;platform&gt; </span>Platform on which you are building</li>
-  <li><span class="code">&lt;sdk ID from devices.xml&gt; </span>The SDK and version used by the build configurations(s60, UIq, etc)</li>
+  <li><span class="code">&lt;sdk ID from devices.xml&gt; </span>The SDK and version used by the build configurations (S60, etc.)</li>
 </ul>
 <p>You can use the  <a href="../reference/wnd_debug_configuration.htm">Debug</a> window to edit the default build configuration names.</p>
 <h5>Other references </h5>
@@ -50,7 +50,7 @@
   <li><a href="../tasks/projects/prj_debug_config.htm">Creating Launch Configurations</a> </li>
   <li><a href="../tasks/projects/prj_new_build_config.htm">Adding/Removing Build Configurations</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>
+<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.doc.user/html/concepts/build_targets.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/build_targets.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -21,10 +21,10 @@
   <tr>
     <th width="17%" rowspan="2" valign="middle" scope="col">Target Types </th>
     <th colspan="2" scope="col">Platform Security<br />
-(S60 3.1, S60 3.0, UIQ 3.0) </th>
+(S60 3.2, S60 5.0) </th>
   </tr>
   <tr>
-    <th width="15%" valign="middle" scope="col"><div align="center">GCCE, ARMV5, ARMV5_ABIV2</div></th>
+    <th width="15%" valign="middle" scope="col"><div align="center">RAPTOR, GCCE, ARMV5, ARMV5_ABIV2</div></th>
     <th width="17%" valign="middle" scope="col"><div align="center">WINSCW <br />
       (EKA2)</div></th>
   </tr>
@@ -65,7 +65,7 @@
   <li><a href="../tasks/projects/prj_set_build_tgt.htm">Setting Build Configurations</a></li>
   <li><a href="../tasks/projects/prj_debug_config.htm">Creating a Launch Configuration</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>
+<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.doc.user/html/concepts/carbide_projects.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/carbide_projects.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -9,14 +9,14 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Carbide.c++ Projects</h2>
-<p>Carbide.c++ can import .inf files to create projects. Once imported, those files are forgotten and all changes made to a Carbide.c++ project, like adding files or libraries, are handled by the IDE itself either using the <b>File &gt; New</b> menu item, <b>File &gt; Import</b>, or the <a href="../reference/ProjectPreferences.html">Project Properties</a> window.</p>
-<p>Carbide.c++ can not export changes back to an  .inf file.</p>
+<p>Carbide.c++ can import <span class="code">.INF</span> files to create projects. Once imported, those files are forgotten and all changes made to a Carbide.c++ project, like adding files or libraries, are handled by the IDE itself either using the <b>File &gt; New</b>, <b>File &gt; Import</b>, or the <a href="../reference/ProjectPreferences.html">Properties</a> for project window.</p>
+<p>Carbide.c++ can not export changes back to an  <span class="code">.INF</span> file.</p>
 <h5>Related tasks</h5>
 <ul>
   <li><a href="../tasks/projects/prj_set_build_tgt.htm">Setting Build Configuartions</a></li>
   <li><a href="../tasks/projects/prj_debug_config.htm">Creating a Launch Configuration</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>
+<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/common_debug_actions.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/common_debug_actions.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -9,7 +9,7 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Common Debugging Actions</h2>
-<p>  This section explains how to perform common debugging actions within the <a href="../reference/perspective_debug.htm">Debug perspective</a> to correct source-code errors, control program execution, and observe memory behavior:</p>
+<p>  This section explains how to perform common debugging actions within the <a href="../reference/perspective_debg.htm">Debug</a> perspective to correct source-code errors, control program execution, and observe memory behavior:</p>
 <ul>
   <li><a href="../debugger/debug/cmds_starting.htm">Start</a> the debugger</li>
   <li>Step <a href="../debugger/debug/cmds_stepping.htm">into</a>, <a href="../debugger/debug/cmds_stepping.htm">out</a> of, or <a href="../debugger/debug/cmds_stepping.htm">over</a> routines</li>
@@ -27,7 +27,7 @@
   <li><a href="../projects/launch/page_debugger.htm">Debugger Pane </a></li>
   <li><a href="../reference/wnd_debugger_prefs.htm">Debugger Preferences</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>
+<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/concepts.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/concepts.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -17,7 +17,7 @@
 <p> The plug-ins simplify Symbian OS development by removing the need to use
   command line build tools, and provide a graphical interface to Symbian OS
   specific file formats, such as AIF and MBM. </p>
-<p> The plug-ins provide a new perspective, called the Carbide.c++ Perspective, on
+<p> The plug-ins provide a new perspective, called the <a href="CarbidePerspective.html">Carbide.c++ Perspective</a>, on
   the Eclipse workbench. This perspective enhances the standard CDT C/C++
   perspective by allowing you to select easily the SDKs and build target types
   that you want to use for each project. </p>
@@ -41,13 +41,11 @@
   <li><a href="precompiled_headers.htm">Precompiled Headers</a></li>
   <li><a href="registers.htm">Registers</a></li>
   <li><a href="../tasks/WorkingwithSDKs.html">SDK Support</a></li>
-  <li><a href="symbol_hints.htm">Symbol Hint</a></li>
   <li><a href="symbols_pkg.htm">Symbols, .pkg</a></li>
-  <li><a href="watchpoints.htm">Watchpoints</a></li>
   <li><a href="workspaces.htm">Workspace Information</a></li>
 </ul>
 <div class="step">
-  <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>
 
 </div>
 </body>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/contextual_menus.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/contextual_menus.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -9,7 +9,7 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Context Menus</h2>
-<p>  A context menu provides a shortcut to frequently used menu commands. The available menu commands change, based on the context of the selected item. For example, the Breakpoints view uses commands that differ from the Editor view. </p>
+<p>  A context menu provides a shortcut to frequently used menu commands. The available menu commands change, based on the context of the selected item. For example, the <a href="../debugger/breakpoints/viewing_breakpoints.htm">Breakpoints</a> view uses commands that differ from the Editor view. </p>
 <p>Sample uses of the context menu for different tasks include:</p>
 <ul>
   <li>Editor views - perform editing functions, format, compare, and a host of other file actions </li>
@@ -21,8 +21,8 @@
 </ul>
 <p class="note"><b>TIP</b> Experiment using the context menu in various views to discover additional capabilities.</p>
 <p>Figure 1 shows a sample context menu in the Breakpoints view.</p>
-<p align="center"><img src="images/breakpt_popup_menu.png" width="155" height="187" /></p>
-<p class="figure">Figure 1 - Context menu in Breakpoints view </p>
+<p align="center"><img src="images/breakpt_popup_menu.png" width="236" height="260" /></p>
+<p class="figure">Figure 1 - Example context menu in Breakpoints view </p>
 <div class="step">
   <h4>Using Context Menus</h4>
   <p>Use context menus to apply context-specific commands to selected items.</p>
@@ -39,7 +39,7 @@
   <ul>
     <li><a href="../reference/menus/menus.htm">Menus</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>
+  <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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/emulators.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/emulators.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -14,9 +14,9 @@
   functionality, letting you do most development tasks on a single desktop computer. The 
   emulator and the software you build for it with the Carbide.c++ software run natively on the Intel x86 family of processors.</p>
 <p> In many cases, you can build and debug a complete application using the emulator, then test the application on the actual device. There are cases however, where you cannot use
-  the emulator, such as when developing device drivers that access hardware on a device.<br />
-  For more information about the emulator, please see the documentation that came with
-  your SDK under: <b>Developer Library&gt;Tools and Utilities&gt;Emulator</b>.</p>
+  the emulator, such as when developing device drivers that access hardware on a device.</p>
+<p>For more information about the emulator, please see the documentation that came with
+  your SDK under: <b>Developer Library &gt; Tools and Utilities &gt; Emulator</b>.</p>
 <p> You will find an emulator to use with Carbide.c++  in:</p>
 <blockquote>
   <p class="code">C:\Symbian\&lt;version&gt;\&lt;sdk&gt;\Epoc32\release\winscw\udeb</p>
@@ -30,7 +30,7 @@
   <li>I<a href="../tasks/projects/prj_import_exe.htm">mporting Executables for Debugging </a></li>
 </ul>
 <div class="step">
-  <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>
 
 </div>
 </body>
Binary file core/com.nokia.carbide.cpp.doc.user/html/concepts/images/view_registers.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/mmpfiles.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/mmpfiles.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -15,7 +15,7 @@
   <li><a href="../reference/MMP_Editor.html">MMP Editor</a> </li>
 </ul>
 <div class="step">
-  <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>
 
 </div>
 </body>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/ngage_projects.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/ngage_projects.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -68,7 +68,7 @@
 <p>With your game file installed on the device, create a launch configuration for the project. In Carbide:</p>
 <ol>
   <li>Open<span class="note"><b>Window &gt; Preferences &gt; Run/Debug &gt;<img src="../images/command_link.png" width="16" height="12"> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.debug.ui.LaunchingPreferencePage)")'> Launching</a></b> preference panel </span>and disable the <b>Build (if required) before launching</b> option</li>
-  <li>Right-click the project and choose <b>Debug As &gt; Open Debug Dialog</b> to open the <b><a href="../reference/wnd_debug_configuration.htm">Debug</a></b> window</li>
+  <li>Right-click the project and choose <b>Debug As &gt; Debug As</b> to open the <b><a href="../reference/wnd_debug_configuration.htm">Debug</a></b> window</li>
   <li><a href="../tasks/projects/prj_debug_config.htm">Create</a> an <b>Application TRK</b> launch configuration
     <ul>
       <li>In the <b><a href="../projects/launch/page_connection.htm">Connection</a></b> tab select the COM port used to connect to the device. </li>
@@ -85,7 +85,7 @@
 <p>With your game file installed to the emulator, create a launch configuration for the project. In Carbide:</p>
 <ol>
   <li>Open <b>Window &gt; Preferences &gt;   Run/Debug &gt; Launching</b> and disable the <b>Build (if required) before launching</b> option</li>
-  <li>Right-click the project and choose <b>Debug As &gt; Open Debug Dialog</b> to open the <b>Debug</b> window</li>
+  <li>Right-click the project and choose <b>Debug As &gt; Debug As</b> to open the <b>Debug</b> window</li>
   <li>Create an <b>Symbian OS Emulation </b> launch configuration</li>
   <li>Click <b>Debug</b> to launch the emulator </li>
   <li>In the emulator, select <b>File &gt; Open</b>,  locate and select the .N-GAGE installation file and click <b>Open</b> to install the project </li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/precompiled_headers.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/precompiled_headers.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -30,7 +30,6 @@
 </div>
 <p>The resultant output file, <span class="code">pch_test.mch</span> can be included in other source or prefix files as:</p>
 <p class="listing"> #include pch_test.mch</p>
-<p>&nbsp;</p>
 <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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/registers.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/registers.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -11,10 +11,14 @@
 <h2>Registers</h2>
 <p>  Registers are the register contents of the central processing unit (CPU) of the host computer or the targeted device. When debugging projects using the emulator, only the host computer x86 registers are visible in the <a href="../reference/view_registers.htm">Registers</a> view. When debugging projects on a device, only the target device registers are visible. </p>
 <p>In most cases, the contents of all the registers can be modified. However,  when debugging applications on a target device with Application TRK, you cannot change the LR and SP registers.</p>
-<p>The types of registers include:</p>
+<p align="center"><img src="images/view_registers.png" width="463" height="260"></p>
+<p class="figure">Figure 1. Registers view with possible register types</p>
+<p>The types of registers can include:</p>
 <ul>
-  <li><b>general</b>&#8212;the register contents of the central processing unit (CPU) of the host computer</li>
-  <li><b>FPU</b>&#8212;register contents of the floating-point unit (FPU) of the host computer</li>
+  <li><b>general</b> &#8212; the register contents of the central processing unit (CPU) of the host computer</li>
+  <li><b>FPU</b> &#8212; register contents of the floating-point unit (FPU) of the host computer</li>
+  <li><b>MMX</b> &mdash; 64-bit MultiMedia eXtension (MMX) registers</li>
+  <li><b>SSE</b> &mdash; 128-bit Streaming SIMD Extension registers</li>
   <li><b>host-specific</b>&#8212;additional register contents for registers specific to the host (for example ARM registers)</li>
 </ul>
 <p class="note"><b>NOTE</b> When opening the Registers view, the list of available registers will vary depending upon the target devices being debugged. </p>
@@ -25,7 +29,7 @@
   <li><a href="../tasks/registers/mem_reg_changing.htm">Changing Register Values</a> </li>
   <li><a href="arm_registers.htm">ARM Registers </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>
+<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/watchpoints.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/watchpoints.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -5,113 +5,20 @@
 <meta http-equiv="Content-Style-Type" content="text/css" />
 <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
 <title>Watchpoints Overview</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Watchpoints Overview </h2>
-<p>  Use <em>watchpoints</em> (sometimes referred to as access breakpoints) to halt program execution when a specific global location is accessed. After you set a watchpoint at a key point in memory, you can halt program execution whenever that point in memory is written to or read from. You can then examine the call chain, check register and variable values, and step through your code. You can also change values and alter the flow of normal program execution.</p>
-<p>A watchpoint must be both enabled and resolved during a debug session in order to halt program execution. The  <a href="../reference/view_breakpoints.htm">Breakpoints view</a> indicates the status of any watchpoint using a set of common icons and checkmark status badge. These include:</p>
-<ul>
-  <li>An <b>enabled</b> watchpoint has a non-gray icon (<img src="../tasks/watchpoints/images/icon_watchpoint_write_resolved.png" width="15" height="16" align="absmiddle" />) indicating that program execution  halts when encountered.</li>
-  <li>A <b>disabled</b> watchpoint displays a gray icon (<img src="../tasks/watchpoints/images/icon_watchpoint_write_disabled.png" width="16" height="16" align="absmiddle" />) indicating that program execution will not stop when encountered. </li>
-  <li>A <b>resolved</b> watchpoint has a small checkmark badge (<img src="../tasks/watchpoints/images/icon_watchpoint_rw_enabled_resolved.png" width="16" height="16" align="absmiddle" /> ) indicating that the debugger has located it in memory during program launch. When resolved, the debugger can halt program execution if the watchpoint is encountered.</li>
-</ul>
-<p>In effect, a watchpoint that is enabled by the user and resolved by the debugger during program launch can halt program execution. The table below shows the various states that cause the debugger to halt program execution: </p>
-<h5>Table 1 Watchpoint&mdash;stop execution chart </h5>
-<table width="50%"  border="0" align="left" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="32%" scope="col">Watchpoint</th>
-    <th width="32%" scope="col"><div align="center">Resolved</div></th>
-    <th width="36%" scope="col"><div align="center">Unresolved</div></th>
-  </tr>
-  <tr>
-    <th scope="col">Enabled</th>
-    <td><div align="center"><b>Stops execution </b></div></td>
-    <td><div align="center"><b>No</b></div></td>
-  </tr>
-  <tr>
-    <th scope="col">Disabled</th>
-    <td><div align="center"><b>No</b></div></td>
-    <td><div align="center"><b>No</b></div></td>
-  </tr>
-</table>
-<p>&nbsp;</p>
-<p>&nbsp;</p>
-<p>&nbsp;</p>
-<p>In addition, you can use these types of watchpoints:</p>
+<p>A <b>watchpoint</b> is a marker set on a specific memory location which is designed to suspend program execution when the value at that location changes. Watchpoints are closely related to breakpoints and are shown in the <a href="../breakpoints/viewing_breakpoints.htm">Breakpoints</a> view. </p>
+<p>When a watchpoint is encountered during program execution, the debugger suspends execution and the <a href="../../reference/perspective_debug.htm">Debug</a> perspective appears so you can examine the executable's current state,  check register and variable values, and use the stepping commands to walk line by line through the program to verify its operation. You can also change values and alter the flow of normal program execution. Setting watchpoints helps you debug your program and verify its efficiency.</p>
+<p>The following topics cover various breakpoint concepts and actions: </p>
 <ul>
-  <li><a href="../tasks/watchpoints/pgm_wpt_setting.htm">regular</a> watchpoints&mdash;halt program execution</li>
-  <li><a href="../tasks/watchpoints/pgm_wpt_conditional.htm">conditional</a> watchpoints&mdash;halt program execution after meeting a condition that you specify (same as for breakpoints)</li>
-</ul>
-<p>A watchpoint is equivalent to a memory breakpoint.</p>
-<p>Unlike a breakpoint, a watchpoint can detect when any part of your program affects memory. For example, if a write or write/read watchpoint is set, when the program writes a new value to the address or area of memory that has the watchpoint, the debugger suspends program execution.</p>
-<p class="note"><b>NOTE</b> You cannot set a watchpoint on a local variable, because the debugger cannot detect watchpoints for variables stored on the stack or in registers.</p>
-<h5>Table 2 Watchpoint&mdash;types and states </h5>
-<table width="90%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="14%" scope="col">Type</th>
-    <th width="14%" scope="col">State</th>
-    <th width="10%" scope="col">Icon</th>
-    <th width="62%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td rowspan="2"><b>Write</b></td>
-    <td>enabled</td>
-    <td><div align="center"><img src="../tasks/watchpoints/images/icon_watchpoint_write_resolved.png" width="15" height="16" /></div></td>
-    <td><p>The watchpoint is activated for write access operations on the specific memory location and if resolved, will halt program execution on a write operation at the watchpoint. </p>
-    </td>
-  </tr>
-  <tr>
-    <td>disabled</td>
-    <td><div align="center"><img src="../tasks/watchpoints/images/icon_watchpoint_write_disabled.png" width="16" height="16" /></div></td>
-    <td><p>Watchpoint is disabled for the source line, debugger does not halt program execution on a write operation. </p>
-    </td>
-  </tr>
-  <tr>
-    <td rowspan="2"><b>Read</b></td>
-    <td>enabled</td>
-    <td><div align="center"><img src="../tasks/watchpoints/images/icon_watchpoint_read_enabled.png" width="16" height="16" /></div></td>
-    <td><p>The watchpoint is activated for read access operations on the specific memory location and if resolved, will halt program execution on a read operation at the watchpoint. </p>
-    </td>
-  </tr>
-  <tr>
-    <td>disabled</td>
-    <td><div align="center"><img src="../tasks/watchpoints/images/icon_watchpoint_read_disabled.png" width="16" height="16" /></div></td>
-    <td><p>Watchpoint is disabled for the source line, debugger does not halt program execution on a read operation. </p>
-    </td>
-  </tr>
-  <tr>
-    <td rowspan="2"><b>Write/Read</b></td>
-    <td>enabled</td>
-    <td><div align="center"><img src="../tasks/watchpoints/images/icon_watchpoint_rw_enabled.png" width="16" height="16" /></div></td>
-    <td><p>The watchpoint is activated for both read and write access operations on the specific memory location and if resolved, will halt program execution  on any read or write operation at the watchpoint. </p>
-    </td>
-  </tr>
-  <tr>
-    <td>disabled</td>
-    <td><div align="center"><img src="../tasks/watchpoints/images/icon_watchpoint_rw_disabled.png" width="16" height="16" /></div></td>
-    <td><p>Watchpoint is disabled for the source line, debugger does not halt program execution on a read or write operation. </p>
-    </td>
-  </tr>
-</table>
-<p>A project can have a different maximum number of watchpoints, depending on the build target. The IDE generally limits the acceptable range for watchpoints to memory that it can write-protect. This range also depends on the host and on the application. </p>
-<p>All set watchpoints appear in the <a href="../reference/view_breakpoints.htm">Breakpoints view</a>  list.</p>
-<h5>Related concepts</h5>
-<ul>
-  <li> <a href="breakpoints.htm">Breakpoints</a></li>
-</ul>
-<h5>Related tasks </h5>
-<ul>
-  <li><a href="../tasks/watchpoints/pgm_wpt_setting.htm">Setting Watchpoints</a></li>
-  <li><a href="../tasks/watchpoints/pgm_wpt_enable.htm">Enabling Watchpoints</a></li>
-  <li><a href="../tasks/watchpoints/pgm_wpt_disable.htm">Disabling Watchpoints</a></li>
-  <li><a href="../tasks/watchpoints/pgm_wpt_clearing.htm">Clearing Watchpoints</a></li>
-</ul>
-<h5>Related references </h5>
-<ul>
-  <li><a href="../reference/view_breakpoints.htm">Breakpoints view</a> </li>
+  <li><a href="../breakpoints/viewing_breakpoints.htm">Viewing Breakpoints and Watchpoints</a> </li>
+  <li><a href="status_watchpoints.htm">Watchpoint Status Indicators</a></li>
+  <li><a href="setting_watchpoints.htm">Setting and Removing Watchpoints</a></li>
+  <li><a href="toggling_watchpoints.htm">Enabling and Disabling Watchpoints</a></li>
+  <li><a href="../breakpoints/exporting_breakpoints.htm">Exporting</a> and <a href="../breakpoints/importing_breakpoints.htm">importing</a> watchpoints</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/concepts/working_with_programs.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/working_with_programs.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -22,7 +22,7 @@
 <ul>
   <li><a href="breakpoints.htm">Breakpoints </a></li>
   <li><a href="common_debug_actions.htm">Common Debug Actions </a></li>
-  <li><a href="watchpoints.htm">Watchpoints</a></li>
+  <li><a href="../debugger/watchpoints/watchpoints.htm">Watchpoints</a></li>
 </ul>
 <h5>Related references </h5>
 <ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/context_help/carbide_debug_dialogs_help.xml	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/context_help/carbide_debug_dialogs_help.xml	Tue Apr 13 15:55:45 2010 -0500
@@ -97,6 +97,35 @@
 		<topic label="Creating Launch Configurations"		href="html/tasks/projects/prj_debug_config.htm" />
 		<topic label="Launch Configuration Overview"  		href="html/projects/launch/launch_configs_overview.htm" />
 	</context>
+
+	<!-- ============================================================== -->
+	<!-- PnP NEW WIZARD SECTION (added 2.5)                             -->
+	<!-- ============================================================== -->
+
+	<!-- Added Launch Options page (2.5) -->
+	<context id="newwizard_wizard_dialog_launch_options_page" >
+    <description>Review or modify the project's new launch configuration.</description>
+	   <topic label="Configure Launch Configuration" 	href="html/projects/launch/launch_configs_overview.htm"/>
+	</context>
+
+	<!-- Added Change Connections page (2.5) -->
+	<context id="newwizard_wizard_dialog_change_connection" >
+    <description>Select or edit a connection, or create new remote connections.</description>
+	   <topic label="Change Connection" 				href="html/projects/launch/wnd_change_connection.htm"/>
+	</context>
+
+	<!-- Added Change Debug Process page (2.5) -->
+	<context id="newwizard_wizard_dialog_change_debug_process" >
+    <description>Specify the executable to launch or process to attach to.</description>
+	   <topic label="Change Debug Process" 				href="html/projects/launch/wnd_change_debug_process.htm"/>
+	</context>
+
+	<!-- Added Other Settings page (2.5) -->
+	<context id="newwizard_wizard_dialog_other_settings" >
+    <description>Control how auto build is configured.</description>
+	   <topic label="Other Settings" 					href="html/projects/launch/wnd_change_other_settings.htm"/>
+	</context>
+
 	
 	<!-- ============================================================== -->
 	<!-- EMULATOR SECTION                                               -->
@@ -361,4 +390,5 @@
 	   <topic label="Launch Configuration Main page" 		href="html/projects/launch/page_main.htm"/>
 	</context>
 
+
 </contexts>
--- a/core/com.nokia.carbide.cpp.doc.user/html/context_help/eclipse_dialogs_help.xml	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/context_help/eclipse_dialogs_help.xml	Tue Apr 13 15:55:45 2010 -0500
@@ -225,6 +225,8 @@
 
 	<!-- ============================================================== -->
 	<!-- LAUNCH CONFIGURATION DIALOG                                    -->
+	<!-- ============================================================== -->
+
 	<context id="launch_configuration_dialog" >
 		<description>Use the Debug or Run panels to create launch configurations for your applications.</description>
 		<topic label="Creating Launch Configurations"			href="html/tasks/projects/prj_debug_config.htm" />
@@ -247,6 +249,15 @@
 	</context>
 
 	
+	<!-- DEBUG AS DIALOG -->
+	<!-- ADDED 2.5  -->
+	<context id="select_launch_method_dialog" >
+		<description>Select the type of Symbian OS device to debug.</description>
+		<topic label="Emulator Launch"  				href="html/projects/launch/emulator_phone.htm" />
+		<topic label="Phone Launch"  					href="html/projects/launch/launch_phone.htm" />
+		<topic label="Reference Board Launch"  			href="html/projects/launch/board_phone.htm" />
+	</context>
+
 	<!-- WORKING SET PAGE  -->
 
 	<!--
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -25,7 +25,7 @@
   </tr>
   <tr>
     <td colspan="2"><h1 align="center">Carbide.c++ User Guide</h1>
-    <p align="center" class="titleSmall">Version 2.5.0, Jan, 2010</p></td>
+    <p align="center" class="titleSmall">Version 3.0.0b, Apr, 2010</p></td>
   </tr>
 </table>
 <p align="center">&nbsp;</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/breakpoints/breakpoints.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/breakpoints/breakpoints.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -4,63 +4,31 @@
 <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>Breakpoints</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+<title>Breakpoints Overview</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
 <body bgcolor="#FFFFFF">
-<h2>Breakpoints </h2>
-<p>  A <b>breakpoint</b> is a marker set on a specific line of source code and is designed to halt program execution when encountered by the debugger. After you set a breakpoint at a key point in the program, you can halt its execution, examine its current state, and check register and variable values. You can also change values and alter the flow of normal program execution. Setting breakpoints helps you debug your program and verify its efficiency.</p>
-<p>A project can have multiple breakpoints set in the source code files. All breakpoints  in a project are shown in the <a href="../reference/view_breakpoints.htm">Breakpoints</a> view. Breakpoints are enabled or disabled on the currently selected line within  a source code editor by selecting the <b>Run &gt; Toggle Breakpoint</b> menu option, right-clicking the marker bar in the editor and selecting <b>Toggle Breakpoint</b>, or by pressing <span class="code">CTRL-SHIFT-B</span>.</p>
-<p>You can set a breakpoint on any executable line of code that the debugger can resolve. Lines containing comments and other non executable code cannot be assigned a breakpoint as they are normally stripped from the  compiled   binary. The debugger must load  the symbols for a module before it can attempt to resolve  breakpoints within the module. This is most easily done using the <a href="../reference/view_executables.htm">Executables</a> view to import a binary file, especially if the binary is not in the workspace. </p>
-<p>When the debugger attempts to resolve a breakpoint it will result in:</p>
+<h2>Breakpoints Overview </h2>
+<p>A <b>breakpoint</b> is a marker set on a specific line of source code and is designed to suspend program execution. Breakpoints are shown in the UI both with the associated source code in an editor view as well as a dedicated <a href="viewing_breakpoints.htm">Breakpoints</a> view. </p>
+<p>When a breakpoint is encountered during program execution, the debugger suspends execution and the <a href="../../reference/perspective_debug.htm">Debug</a> perspective appears so you can examine the executable's current state,  check register and variable values, and use the stepping commands to walk line by line through the program to verify its operation. You can also change values and alter the flow of normal program execution. Setting breakpoints helps you debug your program and verify its efficiency.</p>
+<p>The following topics cover various breakpoint concepts and actions: </p>
 <ul>
-  <li><b>resolved</b> &#8212; the symbols for the module  are loaded  and the breakpoint  located in the executable that&#8217;s currently being debugged, circle icon changes to flagged icon </li>
-  <li><b>resolved and moved</b> &#8212;the breakpoint is not found in the executable at the specified point. Debugger moves breakpoint forward in the current function until a line is found that can be resolved. Breakpoint icon moved to source line matching new breakpoint location and changed to flagged icon.</li>
-  <li><b>unresolved</b>  &#8212;  if the symbols for the module  are not loaded or the breakpoint was not able to be set within the current function. This may indicate no executable code in the source line or a deadstripped function  not present in the executable. Breakpoint icon remains in unflagged state indicating unresolved status.</li>
+  <li><a href="viewing_breakpoints.htm">Viewing Breakpoints</a></li>
+  <li><a href="resolving_breakpoints.htm">Breakpoint status indicators </a> </li>
+  <li><a href="toggling_breakpoints.htm">Enabling, Disabling and Removing Breakpoints</a></li>
+  <li><a href="properties_breakpoints.htm">Breakpoint properties </a>
+    <ul>
+      <li><a href="temporary_breakpoints.htm">Creating temporary breakpoints</a> </li>
+      <li><a href="conditional_breakpoints.htm">Creating conditional breakpoints</a> </li>
+    </ul>
+  </li>
+  <li><a href="exporting_breakpoints.htm">Exporting</a> and <a href="importing_breakpoints.htm">importing</a> breakpoints</li>
+  <li><a href="../../reference/menus/hardware_breakpoints.htm">Toggle hardware breakpoints</a> </li>
 </ul>
-<p>Breakpoints have enabled and disabled types as well as resolved and unresolved states. Table 1 explains the different breakpoint types and states.</p>
-<h5>Table 1 Breakpoint&mdash;type and states </h5>
-<table width="90%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="15%" scope="col">Type</th>
-    <th width="14%" scope="col">State</th>
-    <th width="14%" scope="col">Icon</th>
-    <th width="71%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td>Enabled</td>
-    <td><div align="center">Unresolved</div></td>
-    <td><div align="center"><img src="../tasks/breakpoints/images/breakpoints_enabled_icon.png" width="9" height="10" /></div></td>
-    <td>Indicates that the breakpoint is currently enabled but not located in the executable during a debug session. Debugger cannot halt program execution.</td>
-  </tr>
-  <tr>
-    <td>Enabled</td>
-    <td><div align="center">Resolved</div></td>
-    <td><div align="center"> <img src="../images/icons/breakpoints_enabled_icon.png" width="15" height="12" /></div></td>
-    <td>Indicates that the breakpoint is currently enabled and resolved for the source line. The debugger halts program execution at an enabled breakpoint. </td>
-  </tr>
-  <tr>
-    <td>Disabled</td>
-    <td><div align="center">Unresolved</div></td>
-    <td><div align="center"><img src="../tasks/breakpoints/images/breakpoints_disabled_icon.png" width="12" height="11" /></div></td>
-    <td>Indicates that the breakpoint is currently disabled but not located in the executable during a debug session. The debugger does not halt program execution at a disabled breakpoint.</td>
-  </tr>
-  <tr>
-    <td>Disabled</td>
-    <td><div align="center">Resolved</div></td>
-    <td><div align="center"><img src="../images/icons/breakpoints_disabled_icon.png" width="15" height="12" /></div></td>
-    <td>Indicates that the breakpoint is currently disabled and resolved for the source line. The debugger does not halt program execution at a disabled breakpoint.</td>
-  </tr>
-</table>
-<p>Other references </p>
+<h4>Other references</h4>
 <ul>
-  <li><a href="../reference/view_executables.htm">Executables view</a></li>
-  <li><a href="../tasks/breakpoints/pgm_bp_setting.htm">Setting Breakpoints</a></li>
-  <li><a href="../tasks/breakpoints/pgm_bp_enable.htm">Enabling Breakpoints</a></li>
-  <li><a href="../tasks/breakpoints/pgm_bp_disable.htm">Disabling Breakpoints</a></li>
-  <li><a href="../tasks/breakpoints/pgm_bp_clearing.htm">Clearing Breakpoints</a></li>
+  <li>Debugging overview </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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/cmds_starting.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/cmds_starting.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -17,7 +17,7 @@
 </ul>
 <h4><a name="START_DB" id="START_DB"></a>Starting a session</h4>
 <p>Use the <b>Debug</b> command (<img src="../../images/icons/btn_debug.png" width="17" height="16" align="absmiddle" />) to execute a program under debugger control using the current <a href="../../reference/wnd_debug_configuration.htm">launch configuration</a> settings.</p>
-<p>If the project does not already have a launch configuration, the <a href="../../projects/launch/wiz_new_launch_config.htm">New Launch Configuration Wizard</a> will automatically create one for emulator targets or ask for additional information to create one. It will generate a default name for the launch configuration and add it to the list of available launch configurations for the project. Once complete and saved the debug session is launched. If a  launch configuration is already available, the Debug command launches  the last  launch configuration used by the project. </p>
+<p>If the project does not already have a launch configuration, the <a href="../../projects/launch/wiz_new_launch_config.htm">New Launch Configuration Wizard</a> will automatically create one for <a href="../../projects/launch/launch_emulator.htm">emulator</a> targets or ask for additional information to create <a href="../../projects/launch/launch_phone.htm">phone</a> or <a href="../../projects/launch/launch_board.htm">hardware device</a> configurations. It will generate a default name for the launch configuration and add it to the list of available launch configurations for the project. Once complete and saved the debug session is launched. If a  launch configuration is already available, the Debug command launches  the last  launch configuration used by the project. </p>
 <p>To create new launch configurations where none previously existed or launch the last one created:</p>
 <ul>
   <li>Click the <b>Debug</b> button (<img src="../../images/icons/btn_debug.png" width="17" height="16" align="absmiddle" />) in the <b>Carbide C/C++</b> perspective</li>
@@ -41,7 +41,10 @@
 <h4>Other references</h4>
 <ul>
   <li><a href="debug.htm">Debugging overview</a> </li>
+  <li><a href="../../projects/launch/launch_emulator.htm">Symbian OS Emulator Launch</a></li>
+  <li><a href="../../projects/launch/launch_phone.htm">Symbian OS Phone Launch</a></li>
+  <li><a href="../../projects/launch/launch_board.htm">Symbian OS Reference Board Launch</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>
+<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/adding_expressions.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/adding_expressions.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -31,6 +31,6 @@
 <ul>
   <li><a href="variables.htm">Variables and Expressions Overview</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>
+<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/editing_expressions.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/editing_expressions.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -13,10 +13,23 @@
 <p>Use the <b>Enable</b> control to set whether this expression should be automatically evaluated during a debug session.</p>
 <p align="center"><img src="../images/wnd_edit_watch_expr.png"></p>
 <p class="figure">Figure 1. Edit Watch Expression dialog</p>
+<p>You can enter any valid C/C++ expression, for example:</p>
+<blockquote>
+  <p class="code">2 + 2<br>
+    myVariable + 8<br>
+    &amp;myVariable<br>
+    myClass.myMemberVar<br>
+    etc.</p>
+</blockquote>
+<p>are all valid expressions that the Expressions view can monitor and display. However, an expression cannot call a function or execute code. The following example will not work:</p>
+<blockquote>
+  <p class="code">std:strlen(&quot;Hello&quot;); </p>
+</blockquote>
 <h5>Other references</h5>
 <ul>
   <li><a href="variables.htm">Variables and Expressions Overview</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>
+<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/legal.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/legal.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -10,7 +10,7 @@
 <body>
 <h2>License Information</h2>
 <h5>COPYRIGHTS</h5>
-<p>Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. This component and the accompanying materials are made available under the terms of the License &quot;Eclipse Public License v1.0&quot; which accompanies this distribution, and is available at the URL &quot;<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>&quot;.  </p>
+<p>Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. This component and the accompanying materials are made available under the terms of the License &quot;Symbian Foundation License v1.0&quot; which accompanies this distribution, and is available at the URL &quot;<a href="http://www.symbianfoundation.org/legal/sfl-v10.html">http://www.symbianfoundation.org/legal/sfl-v10.html</a>&quot;.  </p>
 <h5>Initial Contributors:  </h5>
 <p>Nokia Corporation - initial contribution</p>
 <h5>NOTICES</h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/attach_process.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/attach_process.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -12,7 +12,7 @@
 <p>Use the <b>Symbian OS Attach to Process</b> launch configuration to attach the debugger to an already running Symbian OS process or thread on a target device from within any project. This is useful for debugging servers running in RAM in a client-server relationship where the client relies on the presence of the server process to operate as one example. </p>
 <p>Attaching to a process requires a both target device running the Symbian OS and the presence of a TRK debug agent on the device. <span class="note">You can also use the <a href="../../reference/view_symbian_kernel.htm">Symbian OS Data</a> view to attach to a process while debugging.</span> However, you can not attach to a process running on an emulator. </p>
 <p>If  the <a href="wiz_new_launch_config.htm">New Launch Configuration Wizard</a> created the Attach to Process launch configuration no changes are usually needed. The Attach to Process options match those of System TRK with one additional step, selection of the process to debug in the <b>Attach to Process</b> dialog. </p>
-<p>To modify the  launch configuration settings, select the <b>Run &gt; Open Debug Dialog...</b> menu option to open the <b>Debug</b> dialog. Select the Attach to Process configuration and click a tab to set specific options. Click <b>Apply</b> to save any option modifications. Click <b>Debug</b> to launch a debugging session using the new settings.</p>
+<p>To modify the  launch configuration settings, select the <b>Run &gt;  Debug As</b> menu option to open the <b>Debug</b> dialog. Select the Attach to Process configuration and click a tab to set specific options. Click <b>Apply</b> to save any option modifications. Click <b>Debug</b> to launch a debugging session using the new settings.</p>
 <p align="center"><img src="../images/wnd_debug_attach_process_launch_config.png" width="800" height="582"></p>
 <p class="figure">Figure 1. Attach to Process launch configuration in the Debug dialog </p>
 <p>The <span class="figure">Attach to Process</span> launch configuration panes include:</p>
@@ -28,6 +28,6 @@
 <ul>
   <li><a href="launch_configs_overview.htm">Launch Configuration Overview</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>
+<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/customizing_launch_configs.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/customizing_launch_configs.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -16,7 +16,7 @@
   <li><b>Default launch configuration</b> (recommended) &#8212;  the <a href="wiz_new_launch_config.htm">New Launch Configuration Wizard</a> automatically sets up a default launch configuration to run or debug the project on the first <b>Run</b> or <b>Debug</b> execution. This provides a quick and easy method to start running or debugging a  project without the inconvenience of setting a lot of options. The default launch configuration can always be edited later as the project launch requirements change.</li>
   <li><b>Custom launch configuration</b>&#8212; enables you to create or modify a  launch configuration to suit the needs of the project. To modify a launch configuration, create one using the <b>New Launch Configuration Wizard</b>, then enable the <b>Advanced Options</b> option on the <b>New Launch Configuration</b> page before you click <b>Finish</b>. This  opens the <b>Debug</b> dialog so  you can immediately customize the new launch configuration's options. </li>
 </ul>
-<p class="note"><b>NOTE</b> To see if a project already has a launch configuration, open a Run or Debug window using the <b>Run &gt; Open Run Dialog...</b> or <b>Run &gt; Open Debug Dialog...</b> menu items. 
+<p class="note"><b>NOTE</b> To see if a project already has a launch configuration, open a Run or Debug window using the <b>Run &gt; Run As</b> or <b>Run &gt; Debug As</b> menu items. 
     
 </p>
   <p>In the event that the default launch configuration settings need to be changed, it is possible to edit them in the <a href="../../reference/wnd_debug_configuration.htm">Debug</a> window, or create a new launch configuration for the project that deviates from the default settings.</p>
@@ -25,7 +25,7 @@
 <ol>
   <li>Open the Run or Debug launch configuration window
     <ul>
-      <li>Select the Run> <b>Open Run Dialog</b>... or <b>Run &gt; Open Debug Dialog... </b> menu item
+      <li>Select the Run> <b>Run As</b> or <b>Run &gt; Debug As </b> menu item
         <p>The appropriate Run or <a href="../../reference/wnd_debug_configuration.htm">Debug</a> launch configuration window appears (Figure 1).</p>
       </li>
    </ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/emulation.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/emulation.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -10,7 +10,7 @@
 <body>
 <h2>Emulator Launch Configuration</h2>
 <p>Select the <b>Symbian OS Emulator</b> launch configuration  to run or debug executables using an emulator.  </p>
-<p>If  the <a href="wiz_new_launch_config.htm">New Launch Configuration Wizard</a> was used to create a emulator launch configuration no changes are usually needed. To modify the  launch configuration settings, select the <b>Run &gt; Open Debug Dialog...</b> menu option to open the <b>Debug</b> dialog. Select the Symbian OS Emulation launch configuration and click a tab to set specific options. Click <b>Apply</b> to save any option modifications. Click <b>Debug</b> to launch a debugging session using the new settings.</p>
+<p>If  the <a href="wiz_new_launch_config.htm">New Launch Configuration Wizard</a> was used to create a emulator launch configuration no changes are usually needed. To modify the  launch configuration settings, select the <b>Run &gt;  Debug As</b> menu option to open the <b>Debug</b> dialog. Select the Symbian OS Emulation launch configuration and click a tab to set specific options. Click <b>Apply</b> to save any option modifications. Click <b>Debug</b> to launch a debugging session using the new settings.</p>
 <p align="center"><img src="../images/wnd_debug_emulation_launch_config.png" width="658" height="403"></p>
 <p class="figure">Figure 1 - Emulator  launch configuration in Debug dialog </p>
 <p>The <b>Debug</b>  window provides C/C++ emulator debug options when a Symbian OS Emulation launch configuration is created. The  settings included in the Symbian OS Emulation launch configuration are a combination of Carbide, CDT, and Eclipse options. The tabs in the window include: </p>
@@ -28,6 +28,6 @@
 <ul>
   <li><a href="launch_configs_overview.htm">Launch Configuration Overview</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>
+<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>
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/launch_board_01.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/launch_phone_01.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/launch_phone_02.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/wnd_change_conn.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/wnd_change_debug_process.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/wnd_change_other_settings.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_board.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -0,0 +1,37 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Symbian OS Reference Board Launch</title>
+<link href="../../../book.css" rel="stylesheet" type="text/css">
+</head>
+
+<body>
+<h2>Symbian OS Reference Board Launch</h2>
+<p>Use the <b>Debug As</b> dialog to select  the <b>New Launch Configuration Wizard</b> to create a  launch configuration for a development board or reference hardware using a JTAG connection.</p>
+<p align="center"><img src="images/launch_board_01.png" width="350" height="350"></p>
+<p class="figure">Figure 1. Debug As dialog</p>
+    <div class="step">
+      <h4>Creating a Launch Configuration for a Reference Board</h4>
+      <ol>
+        <li>Select the <b>Run &gt; Debug</b> menu item, or click the Debug (<img src="../../reference/images/view_symbianOSbtn_debug.png" width="18" height="17" align="absmiddle">) icon, or press F11<br>
+              <p><b>SHORTCUT</b> Select the <b class="note">Run &gt; Debug As &gt; Debug Symbian OS Application on Reference Board</b> menu item to skip Step 2.</p>
+</li>
+        <li>Select the <b>Symbian OS Reference Board Launch</b> item, then click <b>OK</b></li>
+        <li>Select a <a href="wiz_new_launch_config.htm">Launch Type</a>, then click Next</li>
+        <li>Complete each page in the New Launch Configuration Wizard for the chosen Launch Type. </li>
+        <li>Review  the settings in the <a href="wiz_new_launch_config.htm">New Launch Configuration</a> page</li>
+        <li>Click <b>Finish to download and debug the project on the reference board</b></li>
+      </ol>
+</div>
+<h5>Other references</h5>
+<ul>
+  
+  <li><a href="launch_emulator.htm">Symbian OS Emulator Launch</a></li>
+  <li><a href="launch_phone.htm">Symbian OS Phone Launch</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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_configs_overview.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_configs_overview.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -8,7 +8,7 @@
 
 <body>
 <h2>Launch Configuration Overview</h2>
-<p>A <b>launch configuration</b> defines the operational settings used by the Carbide.c++ tools  to launch and debug programs. A project must have at least one launch configuration, and can have as many as necessary. This enables you to develop and debug your project using various compilers (GCCE and RVCT) and different targets (emulator and on-device) as each launch configuration can be tailored to fit the intended target. </p>
+<p>A <b>launch configuration</b> defines the operational settings used by the Carbide.c++ tools  to launch and debug programs. A project must have at least one launch configuration, and can have as many as necessary. This enables you to develop and debug your project using various compilers (GCCE and RVCT) and different targets (emulator, on-device, and reference boards) as each launch configuration can be tailored to fit the intended target. </p>
 <h4>Creating a Launch Configuration </h4>
 <p>To create a default launch configuration for a project use the <a href="wiz_new_launch_config.htm">New Launch Configuration Wizard</a>. Using this method ensures that you have a working launch configuration for the project. You can invoke the New Launch Configuration Wizard for projects lacking a launch configuration by selecting the <b>Run &gt; Debug</b> (<span class="code">F11</span>) or<b> </b><b>Run &gt; Run</b> (<span class="code">CTRL+F11</span>) menu options, or clicking the <b>Run</b> (<img src="../../images/icons/btn_run.png" alt="Run icon" width="16" height="16" align="absmiddle" />) or <b>Debug</b> (<img src="../../images/icons/btn_debug.png" width="17" height="16" align="absmiddle" alt="Debug icon"/>) icons in the toolbar. If a project already has a defined launch configuration, selecting the  <b>Run</b> or <b>Debug</b> command calls  the   previously defined and last used launch configuration, bypassing the wizard entirely.</p>
 <p>For emulator projects  the wizard simply gathers the data it needs from the project and creates an emulator launch configuration and launches the emulator. For on-device targets, more information is required, so the wizard asks for the missing information it needs, creates the  launch configuration, then downloads the executable to the device and launches it. Once the emulator or device is loaded with the executable, the debug session   commences. </p>
@@ -16,15 +16,14 @@
 <h4>Available Launch Configurations</h4>
 <p>Launch configurations come in several varieties, each designed for a specific purpose. You must choose one at the very start of the New Launch Configuration Wizard, so knowing the differences between them is important. Currently, the types to choose from include: </p>
 <ul>
-  <li><b><a href="applications.htm">Symbian OS Application</a></b>&#8212;used to run or debug executables. </li>
-  <li><b><a href="run_mode.htm">Symbian OS Appication TRK</a></b> &#8212;used to run or debug applications on a target device using the Application TRK on-device debug agent. Application TRK is an application that runs on released phones and allows you to debug your executables. The debugger will download a Symbian OS installation file to the phone and install it prior to launching.</li>
-  <li><b><a href="attach_process.htm">Symbian OS Attach to Process</a></b> &#8212;used to debug processes running on a target device for which a symbol file is available. This is available only for TRK and stop mode debugging.  This launch configuration is not available for emulator debugging.  Stop mode and TRK can both attach to a process from the <a href="../../reference/view_symbian_kernel.htm">Symbian OS Data</a> view.</li>
-  <li><b>Symbian OS Crash Debugger</b> &#8212;used to launch an interactive command-line session with the Symbian OS crash debugger when the device crashes </li>
-  <li><b><a href="emulation.htm">Symbian OS Emulation</a> </b>&#8212;used to run or debug executables on an emulator. </li>
-  <li><b><a href="stop_mode.htm">Symbian OS System TRK</a></b> (<i>not available Developer Editions</i>) &#8212;used to run or debug applications or ROM code on a target device using the System TRK on-device debug agent. System TRK is an application that runs on reference boards and prototype phones and allows you to debug your executables. The debugger will download files to the phone prior to launching.</li>
-  <li><b><a href="trace32.htm">Symbian OS Trace32</a></b> (<i>only available in OEM Edition</i>)&#8212;is an external debugger that the Carbide debugger communicates with, to debug any Symbian OS module on a target using a JTAG connection.</li>
+  <li><b><a href="applications.htm">Symbian OS Application</a></b> &#8212; used to run or debug executables. </li>
+  <li><b><a href="run_mode.htm">Symbian OS Appication TRK</a></b> &#8212; used to run or debug applications on a target device using the Application TRK on-device debug agent. Application TRK is an application that runs on released phones and allows you to debug your executables. The debugger will download a Symbian OS installation file to the phone and install it prior to launching.</li>
+  <li><b><a href="attach_process.htm">Symbian OS Attach to Process</a></b> &#8212; used to debug processes running on a target device for which a symbol file is available. This is available only for TRK and stop mode debugging.  This launch configuration is not available for emulator debugging.  Stop mode and TRK can both attach to a process from the <a href="../../reference/view_symbian_kernel.htm">Symbian OS Data</a> view.</li>
+  <li><b><a href="PLUGINS_ROOT/com.nokia.carbide.cpp.debug.crashdebugger/html/view.html">Symbian OS Crash Debugger</a></b> &#8212; used to launch an interactive command-line session with the Symbian OS crash debugger when the device crashes </li>
+  <li><b><a href="emulation.htm">Symbian OS Emulation</a> </b>&#8212; used to run or debug executables on an emulator. </li>
+  <li><b><a href="stop_mode.htm">Symbian OS System TRK</a></b> &#8212; used to run or debug applications or ROM code on a target device using the System TRK on-device debug agent. System TRK is an application that runs on reference boards and prototype phones and allows you to debug your executables. The debugger will download files to the phone prior to launching.</li>
+  <li><b><a href="trace32.htm">Symbian OS Trace32</a></b> &#8212; is an external debugger that the Carbide debugger communicates with, to debug any Symbian OS module on a target using a JTAG connection.</li>
 </ul>
-<p class="note"><b>NOTE</b> The specific launch configuration availability is determined by the Carbide.c++ edition you are using. </p>
 <h4>Other references</h4>
 <ul>
   <li>Creating Projects Overview </li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_configuration_filter.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_configuration_filter.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -4,26 +4,27 @@
 <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>Launch Configuration Filtering</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+<title>Launch Configuration Filters</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
 <body bgcolor="#FFFFFF">
-<h2>Launch Configuration Filtering </h2>
-<p>Use the  <b>Launch Configuration </b> preference panel to  filter the launch configurations that appear in the configurations list in the <b>Run</b> or <b><a href="wnd_debug_configuration.htm">Debug</a></b> dialog. This allows you to manage which configuration types are shown. For example, enable the <b>Filter checked launch configuration types</b> option and check the configuration types that you do not want to appear in the <b>Run</b> and <b>Debug</b> dialogs. As shown in Figure 1, all the configurations related to TRK have been enabled and won't appear in the configurations list. </p>
-<p align="center"><img src="images/filter_launch_config.png" width="627" height="574" /></p>
-<p class="figure">Figure 1 - Launch Configurations preference panel </p>
+<h2>Launch Configuration Filters</h2>
+<p>Use the <b>Launch Configurations</b> panel  to  filter out which launch configurations appear in the <b>Run</b> or <b>Debug</b> window used to define launch configurations. For example, select the <b>Delete configurations when associated resource is deleted</b> option and check the configuration types that you do not want to appear in the <b>Run &gt; Run...</b> or <b>Run &gt; Debug...</b> window, as shown in Figure 1. </p>
+<p align="center"><img src="images/filter_launch_config.png" width="627" height="557" /></p>
+<p class="figure">Figure 1 - Launch Configurations preference panel</p>
 <h5>Related references</h5>
 <ul>
-  <li><a href="wnd_debug_configuration.htm">Debug Window</a> </li>
+  <li><a href="../reference/wnd_debug_configuration.htm">Debug Window</a> </li>
 </ul>
 <h5>Related tasks </h5>
 <ul>
-  <li><a href="../../tasks/projects/prj_debug_config.htm">Creating a Launch Configuration</a></li>
-  <li><a href="../../tasks/projects/prj_new_build_config.htm">Adding/Removing Build Configurations</a></li>
-  <li><a href="../../tasks/projects/prj_set_build_tgt.htm">Setting a Build Configuration </a></li>
+  <li><a href="../tasks/projects/prj_debug_config.htm">Creating a Launch Configuration</a></li>
+  <li><a href="../tasks/projects/prj_new_build_config.htm">Adding/Removing Build Configurations</a></li>
+  <li><a href="../tasks/projects/prj_set_build_tgt.htm">Setting a Build Configuration </a></li>
 </ul>
 <div class="step">
-  <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>
+
 </div>
 </body>
 </html>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_emulator.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -0,0 +1,34 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Symbian OS Emulator Launch</title>
+<link href="../../../book.css" rel="stylesheet" type="text/css">
+</head>
+
+<body>
+<h2>Symbian OS Emulator Launch</h2>
+<p>Use the <b>Debug As</b> dialog to select the <b>New Launch Configuration Wizard</b> that will create a launch configuration for the project. </p>
+<p align="center"><img src="images/launch_phone_01.png" width="350" height="350"></p>
+<p class="figure">Figure 1. Debug As dialog</p>
+<div class="step">
+  <h4>Creating a Launch Configuration for  Emulators</h4>
+  <ol>
+    <li>Select the <b>Run &gt; Debug</b> menu item, or click the Debug (<img src="../../reference/images/view_symbianOSbtn_debug.png" width="18" height="17" align="absmiddle">) icon, or press F11<br>
+        <p><b>SHORTCUT</b> Select the <b class="note">Run &gt; Debug As &gt; Debug Symbian OS Application on Emulator</b> menu item to skip Step&nbsp;2.</p>
+    </li>
+    <li>Select the <b>Symbian OS Emulator Launch</b> item, then click <b>OK</b></li>
+    <li>Complete each page in the New Launch Configuration Wizard , then click Next</li>
+    <li>Review  the settings in the <a href="wiz_new_launch_config.htm">New Launch Configuration</a> page</li>
+    <li>Click <b>Debug</b> to download and debug the project on the emulator</li>
+  </ol>
+</div>
+<h5>Other references</h5>
+<ul>
+  <li><a href="launch_phone.htm">Symbian OS Phone Launch</a></li>
+  <li><a href="launch_board.htm">Symbian OS Reference Board Launch</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>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_phone.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -0,0 +1,42 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Symbian OS Phone Launch</title>
+<link href="../../../book.css" rel="stylesheet" type="text/css">
+</head>
+
+<body>
+<h2>Symbian OS Phone Launch</h2>
+<p>Use the <b>Debug As</b> dialog to select the <b>New Launch Configuration Wizard</b> that will create a launch configuration for the project. </p>
+<p align="center"><img src="images/launch_phone_01.png" width="350" height="350"></p>
+<p class="figure">Figure 1. Debug As dialog</p>
+<div class="step">
+  <h4>Creating a Launch Configuration for a Phone</h4>
+  <ol>
+    <li>Select the <b>Run &gt; Debug</b> menu item, or click the Debug (<img src="../../reference/images/view_symbianOSbtn_debug.png" width="18" height="17" align="absmiddle">) icon, or press F11<br>
+        <p><b>SHORTCUT</b> Select the <b class="note">Run &gt; Debug As &gt; Debug Symbian OS Application on Phone</b> menu item to skip Step 2.</p>
+    </li>
+    <li>Select the <b>Symbian OS Phone Launch</b> item, then click <b>OK</b></li>
+    <li>(Optional) Modify the launch configuration settings
+      <ol type="a">
+          <li>Modify the <a href="wnd_change_connection.htm">Remote connection setting</a> options</li>
+        <li>Modify the <a href="wnd_change_debug_process.htm">Debug Process settings</a> options</li>
+        <li>Modify the <a href="wnd_change_other_settings.htm">Other Settings</a> options</li>
+        <li>Edit addition <a href="customizing_launch_configs.htm">launch configuration</a> settings</li>
+      </ol>
+    </li>
+    <li>Review  the launch configurations settings</li>
+    <li>Click <b>Debug</b> to download and debug the project on the phone</li>
+  </ol>
+</div>
+<h5>Other references</h5>
+<ul>
+  
+  <li><a href="launch_emulator.htm">Symbian OS Emulator Launch</a></li>
+  <li><a href="launch_board.htm">Symbian OS Reference Board Launch</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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_debugger.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_debugger.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -5,8 +5,7 @@
 <meta http-equiv="Content-Style-Type" content="text/css" />
 <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
 <title>Carbide Debugger panes</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/></head>
 <body bgcolor="#FFFFFF">
 <h2>Debugger panes</h2>
 <p>The options shown in the <b>Debugger</b> page differ based upon the type of launch configuration. Generally, the options fall into these choices: </p>
@@ -89,7 +88,7 @@
   </tr>
 </table>
 <h3><a name="trk_stopmode" id="trk_stopmode"></a>Stop-mode Debugger page </h3>
-<p>In  stop-mode launch configurations like <b><a href="stop_mode.htm">System TRK</a></b>, <b><a href="trace32.htm">Trace32</a></b>, and <a href="attach_process.htm"><b>Attach to Process</b></a>, use the <b>Startup Options</b> to  attach to a target and debug or run from the specified start address. Then use <b>Target Options</b> to specify the target's processor type,  and set which initialization and memory configuration files to use in the debug session. </p>
+<p>In  stop-mode launch configurations like <b><a href="stop_mode.htm">System TRK</a></b>, <b><a href="trace32.htm">Trace32</a></b>,<b> </b>and <a href="attach_process.htm"><b>Attach to Process</b></a>, use the <b>Startup Options</b> to  attach to a target and debug or run from the specified start address. Then use <b>Target Options</b> to specify the target's processor type,  and set which initialization and memory configuration files to use in the debug session. </p>
 <p align="center"><img src="images/page_debugger_stop_mode.png" width="642" height="401"></p>
 <p class="figure">Figure 3 - Debugger page showing stop-mode options  </p>
 <h5>Table 3. Debugger page &mdash; stop-mode  options </h5>
@@ -135,7 +134,7 @@
     <td>&nbsp;</td>
     <td><b>Target initialization file </b></td>
     <td><p>Check this box to have the debugger run an initialization script when the debug session starts. For example, if a target device requires initialization for the debugger to be able to read and write memory or registers, you can specify an initialization script here.</p>
-    <p> Click Browse to select a script file using a standard file selection dialog box. When using T32, most of the initialization is done in the CMM script file. With other debug protocols you can specify the initialization file, which can be run after connecting to the target. </p></td>
+    <p> Click Browse to select a script file using a standard file selection dialog box. When using T32, most of the initialization is done in the CMM script file. With other debug protocols you  specify the initialization file, which can be run after connecting to the target. </p></td>
   </tr>
   <tr>
     <td>&nbsp;</td>
@@ -150,6 +149,6 @@
   <li><a href="emulation.htm">Emulation  Launch Configuration</a></li>
   <li><a href="stop_mode.htm">System TRK  Launch Configuration </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>
+<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_main.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_main.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -19,7 +19,7 @@
 <p>The <b>Symbian OS <a href="emulation.htm">Emulation</a></b> launch configuration uses the <b>Main</b> page to define the process to be launched by the emulator. </p>
 <p>The behavior that occurs when launching a debug session varies based upon the <a href="page_main.htm">SDK</a>. Normally, <a href="../../debugger/debug/cmds_starting.htm">starting</a> a debug session launches the emulator (<span class="code">epoc.exe</span>) and you must then navigate to your application and open it. However, starting a debug session for an .exe file will, in most cases, launch the .exe directly. This starts the emulator and then opens your application automatically. Note that some SDKs do not support this behavior. In those cases you must still open your application in the emulator manually.</p>
 <p align="center"><img src="images/page_debug_main.png" width="562" height="249"></p>
-<p class="figure">Figure 1. Main page (Emulation shown) </p>
+<p class="figure">Figure 1. Main page (<i>Emulation shown</i>) </p>
 <h5>Table 1. Emulator Main page &mdash;items </h5>
 <table width="94%"  border="0" cellpadding="2" cellspacing="0">
   <tr>
@@ -36,7 +36,7 @@
   </tr>
   <tr>
     <td><b>Build Configuration</b></td>
-    <td>Use the <b>Build Configuration</b> drop down list to select which configuration to build before launching the resulting <b>Executable</b>. If <b>Use Active</b> is selected, then the build configuration currently active is built and launched, otherwise the chosen build configuration is always used.</td>
+    <td>Use the <b>Build Configuration</b> drop down list to select which configuration to build before launching the resulting executable. </td>
   </tr>
   <tr>
     <td><b>Build (if required) before launching</b></td>
@@ -53,7 +53,7 @@
 <h3><a name="run_mode" id="run_mode"></a>Run-mode Main page </h3>
 <p>The <b>Symbian OS <a href="run_mode.htm">Application TRK </a></b> launch configuration uses the <b>Main</b> page to defines the project and the process to launch on the target device. </p>
 <p align="center"><img src="images/page_main_run_mode.png" width="545" height="345"></p>
-<p class="figure">Figure 2 - Main page (Application TRK shown) </p>
+<p class="figure">Figure 2 - Main page (<i>Application TRK shown</i>) </p>
 <h5>Table 2.  Run-mode Main page &mdash;items </h5>
 <table width="94%"  border="0" cellpadding="2" cellspacing="0">
   <tr>
@@ -88,10 +88,9 @@
   </tr>
 </table>
 <h3><a name="stop_mode" id="stop_mode"></a>Stop-mode Main page </h3>
-<p>The <b>Symbian OS</b> <a href="stop_mode.htm">System TRK</a>, and <a href="trace32.htm">Trace32</a> launch configurations uses the Main page to defines the project and the executable to launch on the target device. </p>
-<b>
+<p>The <b>Symbian OS <a href="stop_mode.htm">System TRK</a></b> and <b><a href="trace32.htm">Trace32</a> </b> launch configurations uses the <b>Main</b> page to defines the project and the executable to launch on the target device. </p>
 <p align="center"><img src="images/page_main_stop_mode.png" width="556" height="301"></p>
-<p class="figure">Figure 3. Main page (TRACE32 shown)</p>
+<p class="figure">Figure 3. Main page (<i>TRACE32 shown</i>)</p>
 <h5>Table 3. Stop-mode Main page &mdash; items</h5>
 <table width="94%"  border="0" cellpadding="2" cellspacing="0">
   <tr>
@@ -124,10 +123,7 @@
 <ul>
   <li><a href="launch_configs_overview.htm">Launch Configuration Overview</a></li>
 </ul>
-</b>
-<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>
-<b>
+<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>
 <h5>&nbsp;</h5>
 </b>
 </body>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/run_mode.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/run_mode.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -10,7 +10,7 @@
 <body>
 <h2>Application TRK  Launch Configuration (Run-mode) </h2>
 <p>Select the <b>Symbian OS Application TRK </b>  launch configuration to debug or run applications on a target device using the Application TRK on-device debug agent. Application TRK is an application that runs on released phones and allows you to debug your executables. The debugger will download a Symbian OS installation file to the phone and install it prior to launching.</p>
-<p>If  the <a href="wiz_new_launch_config.htm">New Launch Configuration Wizard</a> was used to create the Application TRK launch configuration no changes are usually needed. To modify the  launch configuration settings, select the <b>Run &gt; Open Debug Dialog...</b> menu option to open the <b>Debug</b> dialog. Select the Application TRK configuration and click a tab to set specific options. Click <b>Apply</b> to save any option modifications. Click <b>Debug</b> to launch a debugging session using the new settings.</p>
+<p>If  the <a href="wiz_new_launch_config.htm">New Launch Configuration Wizard</a> was used to create the Application TRK launch configuration no changes are usually needed. To modify the  launch configuration settings, select the <b>Run &gt;  Debug As</b> menu option to open the <b>Debug</b> dialog. Select the Application TRK configuration and click a tab to set specific options. Click <b>Apply</b> to save any option modifications. Click <b>Debug</b> to launch a debugging session using the new settings.</p>
 <p align="center"><img src="../images/wnd_debug_AppTRK_launch_config.png" width="871" height="600"></p>
 <p class="figure">Figure 1. Application TRK launch configuration in the Debug dialog </p>
 <p>The Application TRK launch configuration panes include: </p>
@@ -28,6 +28,6 @@
 <ul>
   <li><a href="launch_configs_overview.htm">Launch Configuration Overview</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>
+<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/stop_mode.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/stop_mode.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -9,8 +9,8 @@
 
 <body>
 <h2>System TRK  Launch Configuration (Stop-mode) </h2>
-<p>Select the <b>Symbian OS System TRK </b> launch configuration  (<i>only available in OEM Edition</i>) provides C/C++ stop-mode debug options that use a JTAG interface when a Symbian OS <a href="trace32.htm">Trace32</a> launch configuration is created. The  settings included in these launch configuration are a combination of Carbide, CDT, and Eclipse options. </p>
-<p>If  the <a href="wiz_new_launch_config.htm">New Launch Configuration Wizard</a> was used to create the System TRK launch configuration no changes are usually needed. To modify the  launch configuration settings, select the <b>Run &gt; Open Debug Dialog...</b> menu option to open the <b>Debug</b> dialog. Select the System TRK configuration and click a tab to set specific options. Click <b>Apply</b> to save any option modifications. Click <b>Debug</b> to launch a debugging session using the new settings.</p>
+<p>Select the <b>Symbian OS System TRK </b> launch configuration provides C/C++ stop-mode debug options that use a JTAG interface when a Symbian OS <a href="trace32.htm">Trace32</a> launch configuration is created. The  settings included in these launch configuration are a combination of Carbide, CDT, and Eclipse options. </p>
+<p>If  the <a href="wiz_new_launch_config.htm">New Launch Configuration Wizard</a> was used to create the System TRK launch configuration no changes are usually needed. To modify the  launch configuration settings, select the <b>Run &gt;  Debug As</b> menu option to open the <b>Debug</b> dialog. Select the System TRK configuration and click a tab to set specific options. Click <b>Apply</b> to save any option modifications. Click <b>Debug</b> to launch a debugging session using the new settings.</p>
 <p align="center"><img src="../images/wnd_debug_trace32_launch_config.png" width="832" height="640"></p>
 <p class="figure">Figure 1. System TRK launch configuration in the Debug dialog </p>
 <p>The System TRK launch configuration panes include: </p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/trace32.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/trace32.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -9,13 +9,14 @@
 
 <body>
 <h2> Trace32 Launch Configuration</h2>
-<p>Select the <b>Symbian OS Trace32 </b> launch configuration  (<i>only available in OEM Edition</i>) to debug any Symbian OS module on a target using a JTAG connection. The external Trace32 debugger communicates with the  Carbide debugger and enables stop mode debugging of the target device. </p>
-<p>If  the <a href="wiz_new_launch_config.htm">New Launch Configuration Wizard</a> was used to create a Trace32 launch configuration no changes are usually needed. To modify the  launch configuration settings, select the <b>Run &gt; Open Debug Dialog...</b> menu option to open the <b>Debug</b> dialog. Select the Trace32 configuration and click a tab to set specific options. Click <b>Apply</b> to save any option modifications. Click <b>Debug</b> to launch a debugging session using the new settings.</p>
+<p>Select the <b>Symbian OS Trace32 </b> launch configuration to debug any Symbian OS module on a target using a JTAG connection. The external Trace32 debugger communicates with the  Carbide debugger and enables stop mode debugging of the target device. </p>
+<p>If  the <a href="wiz_new_launch_config.htm">New Launch Configuration Wizard</a> was used to create a Trace32 launch configuration no changes are usually needed. To modify the  launch configuration settings, select the <b>Run &gt; Debug As</b> menu option to open the <b>Debug</b> dialog. Select the Trace32 configuration and click a tab to set specific options. Click <b>Apply</b> to save any option modifications. Click <b>Debug</b> to launch a debugging session using the new settings.</p>
 <p align="center"><img src="../images/wnd_debug_trace32_launch_config.png" width="832" height="640"></p>
 <p class="figure">Figure 1. Trace32 launch configuration in the Debug dialog </p>
 <p>The Trace32 launch configuration panes include: </p>
 <ul>
   <li>The <a href="page_main.htm">Main</a> tab defines the project to be launched. Enter the name of the project in the Project field, and the executable name in the Executable field.</li>
+  <li>The <a href="page_connection.htm">Connection</a> tab</li>
   <li>The <a href="page_debugger.htm">Debugger</a> tab defines debug configurations, such as entry point to begin debugging and target options.</li>
   <li>The <a href="page_rom_image.htm">ROM Image</a> tab allows you to define startup options and ROM image download information.</li>
   <li>The <a href="page_executables.htm">Executables</a> tab allows you to specify which executables that you want to debug  that are part of the project.</li>
@@ -26,6 +27,6 @@
 <ul>
   <li><a href="launch_configs_overview.htm">Launch Configuration Overview</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>
+<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/wiz_new_launch_config.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/wiz_new_launch_config.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -32,8 +32,7 @@
       <li><a href="#EXE_SEL">Executable Selection</a></li>
       <li><a href="#BLD_OPT">Build Option Selection</a></li>
       <li><a href="#FINISH">New Launch Configuration</a></li>
-      </ul>
-    </td>
+      </ul>    </td>
   </tr>
   <tr>
     <td><b>Application TRK and System TRK</b></td>
@@ -105,6 +104,9 @@
 <h5>Other references</h5>
 <ul>
   <li><a href="../../projects/launch/launch_configs_overview.htm">Launch Configuration</a>  </li>
+  <li><a href="launch_emulator.htm">Symbian OS Emulator Launch</a></li>
+  <li><a href="launch_phone.htm">Symbian OS Phone Launch</a></li>
+  <li><a href="launch_board.htm">Symbian OS Reference Board Launch</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>
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/wnd_change_connection.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -0,0 +1,41 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Change Connection</title>
+<link href="../../../book.css" rel="stylesheet" type="text/css">
+</head>
+
+<body>
+<h2>Change Connection</h2>
+<p>Use the <b>Change connection</b> page of the <b>New Launch Configuration Wizard</b> dialog to select a connection, edit a connection, or create new remote connection settings to apply to the  launch configuration.</p>
+<p align="center"><img src="images/wnd_change_conn.png" width="438" height="296"></p>
+<p class="figure">Figure 1. Change connection</p>
+<h5>Table 1. Change connection &mdash; options</h5>
+<table width="94%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="34%" scope="col">Item</th>
+    <th width="66%" scope="col">Description</th>
+  </tr>
+  <tr>
+    <td><b>Current connection</b></td>
+    <td><p>Shows the current remote connection to assign to the launch configuration. If more than one remote connection is available, you can choose a different one from the drop down menu.</p>
+    <p class="note"><b>NOTE</b> The Current connection  appears blank if no remote PnP device is available. Simply plug in the device to create a remote connection for communicating with it.</p></td>
+  </tr>
+  <tr>
+    <td><b>New...</b></td>
+    <td>Click <b>New...</b> to open the <b>New Connection</b> window at th <b>Edit connection name and type</b> page.</td>
+  </tr>
+  <tr>
+    <td><b>Edit...</b></td>
+    <td>Once a remote connection is chosen, click  <b>Edit...</b> to open the <b>Set Connection Settings</b> page where you can modify the connection settings.</td>
+  </tr>
+</table>
+<h4>Other references</h4>
+<ul>
+  <li><a href="launch_phone.htm">Symbian OS Phone Launch</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>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/wnd_change_debug_process.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -0,0 +1,52 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Change Debug Process</title>
+<link href="../../../book.css" rel="stylesheet" type="text/css">
+</head>
+
+<body>
+<h2>Change Debug Process</h2>
+<p>Use the <b>Change Debug Process</b> page of the <b>New Launch Configuration Wizard</b> to specify which executable to launch or which process to attach to, and customize what is downloaded to the target device before launch.</p>
+<p align="center"><img src="images/wnd_change_debug_process.png" width="547" height="408"></p>
+<p class="figure">Figure 1. Change Debug Process page</p>
+<h5>Table 1. Change Debug Process &mdash; options</h5>
+<table width="94%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="34%" scope="col">Item</th>
+    <th width="66%" scope="col">Description</th>
+  </tr>
+  <tr>
+    <td><b>Launch project executable</b></td>
+    <td><p>Enable to launch the executable shown in the drop down list. If more than one executable is present in the project, use the dropdown list to select it.</p>    </td>
+  </tr>
+  <tr>
+    <td><b>Launch remote program</b></td>
+    <td>Enable to launch the remote program specified in the edit box. Requires a complete path and filename.</td>
+  </tr>
+  <tr>
+    <td><b>Attach to process</b></td>
+    <td>Enable when you need to attach to a process on the remote device.</td>
+  </tr>
+  <tr>
+    <td><b>Install package before launch</b></td>
+    <td>Enable to deploy a package before launch on the remote device.</td>
+  </tr>
+  <tr>
+    <td><b>SIS file to install</b></td>
+    <td>The name of the SIS file to install. If more than one is available in the project, select the correct one from the dropdown list.</td>
+  </tr>
+  <tr>
+    <td><b>Modify SIS builder settings for build configuration</b></td>
+    <td>Opens the <a href="../../reference/build_properties/pane_build_config_sis.htm">SIS Builder</a> tab in the <a href="../../reference/build_properties/pane_build_config.htm">Build Configurations</a> panel in the project <b>Properties</b> window where you can edit, add, or remove SIS files associated with the project.</td>
+  </tr>
+</table>
+<h4>Other references</h4>
+<ul>
+  <li><a href="launch_phone.htm">Symbian OS Phone Launch</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>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/wnd_change_other_settings.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -0,0 +1,44 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Symbian OS Phone Launch</title>
+<link href="../../../book.css" rel="stylesheet" type="text/css">
+</head>
+
+<body>
+<h2>Other Settings</h2>
+<p>Use the <b>Other Settings</b> pane of the <b>New Launch Configuration Wizard</b> to control how auto build is configured for the launch configuration. Changing this setting overrides the global workspace setting and may provide some speed improvements. </p>
+<p align="center"><img src="images/wnd_change_other_settings.png" width="520" height="281"></p>
+<p class="figure">Figure 1. Other settings	</p>
+<h5>Table 1. Other settings &mdash; options</h5>
+<table width="94%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="34%" scope="col">Item</th>
+    <th width="66%" scope="col">Description</th>
+  </tr>
+  <tr>
+    <td><b>Disable build before launch</b></td>
+    <td><p>Disables auto build for the launch configuration which may improve launch performance.</p>        </td>
+  </tr>
+  <tr>
+    <td><b>Enable build before launch</b></td>
+    <td>Enables auto build for the launch configuration which can slow down launch performance.</td>
+  </tr>
+  <tr>
+    <td><b>Use workspace settings (enabled)</b></td>
+    <td> Uses the global auto build settings. This is the default.</td>
+  </tr>
+  <tr>
+    <td><b>Configure Workspace Settings</b></td>
+    <td>Opens the <b>Launching</b> preference panel where you can change the workspace settings.</td>
+  </tr>
+</table>
+<h4>Other references</h4>
+<ul>
+  <li><a href="launch_phone.htm">Symbian OS Phone Launch</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>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/wnd_config_launch_config.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -0,0 +1,44 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Configure Launch Configuration</title>
+<link href="../../../book.css" rel="stylesheet" type="text/css">
+</head>
+
+<body>
+<h2><b>Configure Launch Configuration</b></h2>
+<p>Use the <b>Configure launch configuration</b> pane of the <b>New Launch Configuration Wizard</b> to review or modify the  project's launch configuration for the remote device.</p>
+<p align="center"><img src="images/launch_phone_02.png" width="524" height="415"></p>
+<p class="figure">Figure 1. Configure Launch Configuration window</p>
+<h5>Table 1. Configurr Launch Configuration &mdash; options</h5>
+<table width="94%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="34%" scope="col">Item</th>
+    <th width="66%" scope="col">Description</th>
+  </tr>
+  <tr>
+    <td><b>Connect to device</b></td>
+    <td><p>Shows the current remote connection setting used to communicate with the Symbian OS phone or device. Click <b>Change...</b> to open the <a href="wnd_change_connection.htm">Change Connection</a> page of the <b>New Launch Configuration Wizard</b> to modify the connection settings.</p>        </td>
+  </tr>
+  <tr>
+    <td><b>Debug process</b></td>
+    <td>Shows the name of the executable to download and launch on the targeted phone. Click <b>Change...</b> to open the <a href="images/wnd_change_debug_process.png">Change Debug Process</a> page of the <b>New Launch Configuration Wizard</b> to modify the debug process.</td>
+  </tr>
+  <tr>
+    <td><b>Other settings</b></td>
+    <td><p>Shows how the project is treated at launch. Click <b>Change...</b> to open the <a href="images/wnd_change_other_settings.png">Other Settings</a> page of the <b>New Launch Configuration Wizard</b> to modify the project build process.</p>    </td>
+  </tr>
+  <tr>
+    <td><b>Edit advanced settings before launch</b></td>
+    <td>Toggles the advanced settings edit feature. When enabled, the <b>Finish</b> control is replaced with an <b>Edit</b> control. Click <b>Edit</b> to open the <b>Debug Configurations</b> window where you can modify all  launch configuration options.</td>
+  </tr>
+</table>
+<h4>Other references</h4>
+<ul>
+  <li></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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/wnd_debug_configuration.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/wnd_debug_configuration.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -4,19 +4,18 @@
 <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>Debug Window</title>
+<title>Debug Configurations Window</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
-<link href="../../../book.css" rel="stylesheet" type="text/css">
 </head>
 <body bgcolor="#FFFFFF">
-<h2>Debug Window</h2>
-<p>The <b>Debug</b> or launch configuration window provides C/C++ debugger options. A <a href="../projects/launch/launch_configs_overview.htm">launch configuration</a> defines the settings used by the Carbide debugger to launch and debug programs. A project must have at least one debug launch configuration in order to debug a project and can have many more. </p>
+<h2>Debug Configurations Window</h2>
+<p>The <b>Debug Configurations</b> or launch configuration window provides C/C++ debugger options. A <a href="../projects/launch/launch_configs_overview.htm">launch configuration</a> defines the settings used by the Carbide debugger to launch and debug programs. A project must have at least one debug launch configuration in order to debug a project and can have many more. </p>
 <p>By default, Carbide creates a debug launch configuration the first time you launch the debugger based on current project settings. If additional information is required, like a port ID, the <a href="../projects/launch/wiz_new_launch_config.htm">New Launch Configuration Wizard</a>  appears asking for the additional information. </p>
 <p>The tabs in the window vary depending upon the currently selected launch configuration.</p>
-<p align="center" class="figure"><img src="images/wnd_debug_overview.png" width="864" height="471"><br />
-Figure 1 - Debug or launch configuration window (Symbian OS emulation view)</p>
-<h5>Table 1. Debug window &mdash; common items</h5>
-<table width="94%"  border="1" cellpadding="2" cellspacing="0">
+<p align="center"><img src="images/wnd_debug_overview.png" width="872" height="548"></p>
+<p align="center" class="figure">  Figure 1 - Debug or launch configuration window (Symbian OS emulation view)</p>
+<h5>Table 1. Debug Configuration window &mdash; common items</h5>
+<table width="94%"  border="0" cellpadding="2" cellspacing="0">
   <tr>
     <th width="7%" scope="col">Icon</th>
     <th width="41%" scope="col">Item</th>
@@ -59,12 +58,12 @@
 <div class="step">
   <h4>To open the Debug window </h4>
   <ul>
-    <li>Select the Run &gt; Open Debug Dialog... menu item</li>
+    <li>Select the Run &gt; Debug As menu item</li>
   </ul>
   <ol>
     The Debug window (Figure 1) appears.</ol>
   <ul>
-    <li>Select Run &gt; Open Run Dialog...  to open a Run window to create a launch configuration for a release build.</li>
+    <li>Select Run &gt; Run As  to open a Run window to create a launch configuration for a release build.</li>
   </ul>
 </div>
 <h5>Other references</h5>
@@ -75,7 +74,7 @@
   <li><a href="../projects/launch/run_mode.htm">Run-mode overview</a></li>
   <li><a href="../projects/launch/stop_mode.htm">Stop-mode overview</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>
+<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.doc.user/html/qt_help/qt_creating_projs_01.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_01.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -9,7 +9,7 @@
 </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>
+<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>
@@ -18,8 +18,7 @@
   <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>
+<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_02.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_02.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -9,7 +9,7 @@
 </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>
+<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_03.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_03.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -9,7 +9,7 @@
 </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>
+<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_04.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_04.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -9,7 +9,7 @@
 </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>
+<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_05.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_05.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -9,7 +9,7 @@
 </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>
+<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/BasicSettings.html	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/BasicSettings.html	Tue Apr 13 15:55:45 2010 -0500
@@ -8,10 +8,12 @@
 		You can set some basic properties for the project in this page, like	   Application UID, Author and Copyright
 	 notice for the project. </p>
 	 <p class="note"><b>NOTE</b> Fields appearing in window vary depending upon the type of project being created. </p>
-    <p align="center" class="Image"><img src="../images/step5.png" width="438" height="389" /></p>
-     <table cellpadding="2" cellspacing="0"
-border="0">
-     <tr valign="top"><th width="147" class="Cell">Name</th><th width="699" class="Cell">Function</th></tr><tr valign="top"><td class="Cell">
+    <p align="center" class="Image"><img src="../images/step5.png" width="500" height="567" /></p>
+   <table width="787"
+border="0" cellpadding="2" cellspacing="0">
+     <tr valign="top"><th width="206" class="Cell">Name</th>
+     <th width="765" class="Cell">Function</th>
+     </tr><tr valign="top"><td class="Cell">
 		  <p>
 			 <b>Application UID</b> 
 	      </p></td><td class="Cell">
@@ -41,14 +43,14 @@
 				project. 
 			 </p></td></tr>
      </table>
-     <p class="note"><b>NOTE</b> Tooltips are available for the various fields. Simply hover the pointer over the field title to view the tooltip. </p>
+   <p class="note"><b>NOTE</b> Tooltips are available for the various fields. Simply hover the pointer over the field title to view the tooltip. </p>
      <h5>Related tasks</h5>
 		<ul>
 		  <li><a href="../tasks/CreatingNewProjects.html">Creating New Projects</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>
+<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/INF_Editor.html	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/INF_Editor.html	Tue Apr 13 15:55:45 2010 -0500
@@ -7,49 +7,45 @@
    <h2>INF Editor - Overview Tab</h2>
    
    <p>
-   The INF Editor allows you to view and modify Symbian project files and export files to be included in building your application. The settings displayed are those active for the active build configuration. However, changes made in the INF editor can be applied globally to all build configurations. Changes made in the INF editor are automatically written to the project's .INF file. You can view the .inf file by selecting the bld.inf tab located along the bottom of the INF editor.</p>
-   <p>
+   The <b>INF Editor</b> allows you to view and modify Symbian project files and export files to be included in building your application. The settings displayed are those active for the active build configuration. However, changes made in the INF editor can be applied globally to all build configurations. Changes made in the INF editor are automatically written to the project's .INF file. You can view the .inf file by selecting the bld.inf tab located along the bottom of the INF editor.</p>
+<p>
 	  The INF Editor is shown when an INF  file is
-   opened from the C/C++ Projects view or Symbian Project Navigator view by double-clicking on the file. The INF Editor is shown in Figure 1.</p>
-   <p align="center"><img src="images/inf_editor_overview.png" width="656" height="563" /></p>
+   opened from the <a href="view_cpp_projects.htm">Project Explorer</a> view or <a href="view_sym_proj_nav.htm">Symbian Project Navigator</a> view by double-clicking on the file. The INF Editor is shown in Figure 1.</p>
+   <p align="center"><img src="images/inf_editor_overview.png" width="743" height="533" /></p>
    <p align="left" class="figure">Figure 1 - INF Editor</p>
    <p></p>
    <table cellpadding="2" cellspacing="0"
 border="0">
-	 <tr valign="top"><th width="173" class="Cell">Name</th><th width="516" class="Cell">Function</th></tr><tr valign="top"><td class="Cell">
+<tr valign="top"><th width="173" class="Cell">Name</th><th width="516" class="Cell">Function</th></tr><tr valign="top"><td class="Cell">
 		    <p>
 			   <b>Components</b></p></td><td class="Cell">
 			 <p>
 				Add components such as MMP and make files to be part of the normal build process.</p>
 			 <ul>
-			   <li>Add MMP file - Click to add an MMP file to the bottom of the list of components.</li>
-			   <li>Add make file - Click to add a make file to the bottom of the list of components. </li>
+			   <li>Create New MMP File - creates a new  MMP file at the bottom of the Component list.</li>
+			   <li>Add Existing MMP File - imports a MMP file at the bottom of the Component list.</li>
+			   <li>Add Existing Makefile - adds a make file to the bottom of the Component list. </li>
 			   <li>Edit - Select a component and click Edit to apply the Tidy attribute or specify the Build as ARM option.</li>
 			   <li>Open - Select a component and click Open to open the component in an editor window.</li>
 			   <li>Up - Select a component and click Up to move the component up in the list.</li>
 			   <li>Down - Select a component and click Down to move the component down in the list.</li>
-			   <li>Remove - Select a component and click Remove to remove the component from the build process. </li>
+			   <li>Remove - Select a component and click Remove to remove the component from the build process.</li>
 			 </ul></td></tr><tr valign="top"><td class="Cell">
 			 <p>
 				<b>Test Components</b> 
 			 </p></td><td class="Cell">
 			 <p>
-				Add, edit, open, move, or remove MMP and make files that are part of a test build process.</p></td></tr>
+				Create, import, edit, open, move, or remove MMP and make files that are part of a test build process.</p></td></tr>
    </table>
-	 <p>&nbsp;</p>
-	 <h5>Related references</h5>
+   <h5>Other references</h5>
 	 <ul>
       <li><a href="INF_Editor_addedit_mmp.html">INF Editor - Add/Edit MMP File</a></li>
       <li><a href="INF_Editor_addedit_make.html">INF Editor - Add/Edit Make File</a></li>
       <li><a href="INF_Editor_exports.html">INF Editor - Exports</a></li>
-      <li><a href="MMP_Editor_sources.html">MMP Editor Sources window</a></li>
-      <li><a href="MMP_Editor_libraries.html">MMP Editor Libraries window</a></li>
-      <li><a href="MMP_Editor_options.html">MMP Editor Options window</a></li>
-      <li><a href="MMP_Editor_mmp_tab.html">MMP File Window</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>
+<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/INF_Editor_addedit_make.html	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/INF_Editor_addedit_make.html	Tue Apr 13 15:55:45 2010 -0500
@@ -1,37 +1,46 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html><head>
-<title>INF Editor - Add/Edit Make</title>
+<title>INF Editor - Create/Edit Make</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
    <body>
-   <h2>INF Editor - Add / Edit Make File</h2>
+   <h2>INF Editor - Create / Edit Makefile Entry</h2>
    
-   <h3>Add make file entry </h3>
-   <p align="left">The Add make file dialog (figure 1) is used to add a make file to the build process. Enter or browse to the make file in the File path field and, if desired, apply the Tidy attribute or specify the Build as ARM option to the make file. Options include:</p>
-	 <ul>
-       <li>Tidy - Specify the tidy attribute if the release that an .mmp file defines is internal to your component and not required by other components or for your component to execute.</li>
-       <li>Build as ARM - Specifies the build_as_arm statement, which instructs an ARMV5 build to build the project for the ARM instruction set and not the THUMB instruction set.</li>
-       <li>Makefile type - Select the type of make file that has been selected.</li>
-   </ul>
-	 <p align="center"><img src="images/inf_editor_addMake.png" width="600" height="210" /></p>
-	 <p align="left" class="figure">Figure 1 - Add make file entry</p>
-	 <h3 align="left">Edit make file entry dialog</h3>
-	 <p align="left">The Edit make file entry dialog (figure 2) allows you to change the file path and set the Tidy or Build as ARM option for the selected make file.</p>
-	 <p align="center"><img src="images/inf_editor_editMake.png" width="434" height="210" /></p>
-	 <p align="left" class="figure">Figure 2 - Edit make file entry</p>
-	 <p align="left">&nbsp;</p>
-	 <h5>Related references</h5>
+   <p align="left">The <b>Add Makefile entry</b> dialog (figure 1) is used to add a makefile to the build process. Enter or browse to the make file in the File path field and, if desired, apply the Tidy attribute or specify the Build as ARM option to the make file. </p>
+   <p align="center"><img src="images/inf_editor_addMake.png" width="600" height="210" /></p>
+	 <p align="left" class="figure">Figure 1 - Add/Edit makefile entry</p>
+	 <h5>Table 1. Add/Edit Makefile entry &mdash; items</h5>
+	 <table width="796"
+border="0" cellpadding="2" cellspacing="0">
+       <tr valign="top">
+         <th width="186" class="Cell">Name</th>
+         <th width="600" class="Cell">Function</th>
+       </tr>
+	   <tr valign="top">
+	     <td class="Cell"><p> <b>File path</b></p></td>
+	     <td class="Cell"><p>Type the path and filename for the makefile to create or click Browse to set a path.</p>         </td>
+       </tr>
+	   <tr valign="top">
+	     <td class="Cell"><p><b>Tidy</b> </p></td>
+	     <td class="Cell"><p>Specify the tidy attribute if the release that an .mmp file defines is internal to your component and not required by other components or for your component to execute.</p></td>
+       </tr>
+	   <tr valign="top">
+	     <td class="Cell"><b>Build as ARM</b></td>
+	     <td class="Cell">Specifies the <span class="code">build_as_arm</span> statement, which instructs an ARMV5 build to build the project for the ARM instruction set and not the THUMB instruction set.</td>
+       </tr>
+	   <tr valign="top">
+	     <td class="Cell"><b>Makefile format</b></td>
+	     <td class="Cell">Set the format of the makefile to be created.</td>
+       </tr>
+     </table>
+	 <h5>Other references</h5>
 	 <ul>
       <li><a href="INF_Editor.html">INF Editor</a></li>
       <li><a href="INF_Editor_exports.html">INF Editor - Exports</a></li>
-      <li><a href="MMP_Editor_sources.html">MMP Editor Sources window</a></li>
-      <li><a href="MMP_Editor_libraries.html">MMP Editor Libraries window</a></li>
-      <li><a href="MMP_Editor_options.html">MMP Editor Options window</a></li>
-      <li><a href="MMP_Editor_mmp_tab.html">MMP File Window</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>
+<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/INF_Editor_addedit_mmp.html	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/INF_Editor_addedit_mmp.html	Tue Apr 13 15:55:45 2010 -0500
@@ -4,33 +4,39 @@
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
    <body>
-   <h2>INF Editor - Add / Edit MMP File</h2>
+   <h2>INF Editor - Add / Edit MMP File Entry</h2>
    
-   <h3>   Add MMP file dialog</h3>
-   <p>The Add MMP file dialog (figure 1) is used to add a mmp file and, if desired, apply the Tidy attribute or specify the Build as ARM option to the mmp file. Options include:</p>
-	 <ul>
-	   <li>Tidy - Specify the tidy attribute if the release that an .mmp file defines is internal to your component and  not required by other components or for your component to execute.</li>
-       <li>Build as ARM - Specifies the build_as_arm statement, which instructs an ARMV5 build to  build the project for the ARM instruction set and not the THUMB instruction set.</li>
-   </ul>
-	 <p align="center"><img src="images/inf_editor_addMMP.png" width="490" height="184" /></p>
-	 <p align="left" class="figure">Figure 1 - Add MMP file entry</p>
-	 <h3 align="left">Edit MMP file entry dialog</h3>
-	 <p align="left">The Edit MMP file entry dialog (figure 2) allows you to change the file path and set the Tidy or Build as ARM option for the selected mmp file.</p>
-	 <p align="center"><img src="images/inf_editor_editMMP.png" width="476" height="180" /></p>
-	 <p align="left" class="figure">Figure 2 - Edit MMP file entry</p>
-	 <p align="left">&nbsp;</p>
-	 <h5>Related references</h5>
+      The <b>Add MMP file entry</b> dialog (figure 1) is used to add a mmp file and, if desired, apply the Tidy attribute or specify the Build as ARM option to the mmp file. 
+     <p align="center"><img src="images/inf_editor_addMMP.png" width="600" height="180" /></p>
+   <p align="left" class="figure">Figure 1 - Add MMP File Entry</p>
+	 <h5>Table 1. Add MMP file entry &mdash; items</h5>
+	 <table width="796"
+border="0" cellpadding="2" cellspacing="0">
+       <tr valign="top">
+         <th width="186" class="Cell">Name</th>
+         <th width="600" class="Cell">Function</th>
+       </tr>
+       <tr valign="top">
+         <td class="Cell"><p> <b>File path</b></p></td>
+         <td class="Cell"><p>Type the path and filename for the MMP file to create or click Browse to set a path.</p></td>
+       </tr>
+       <tr valign="top">
+         <td class="Cell"><p><b>Tidy</b> </p></td>
+         <td class="Cell"><p>Specify the tidy attribute if the release that an .mmp file defines is internal to your component and  not required by other components or for your component to execute.</p></td>
+       </tr>
+       <tr valign="top">
+         <td class="Cell"><b>Build as ARM</b></td>
+         <td class="Cell">Specifies the <span class="code">build_as_arm</span> statement, which instructs an ARMV5 build to  build the project for the ARM instruction set and not the THUMB instruction set.</td>
+       </tr>
+     </table>
+   <h5>Other references</h5>
 	 <ul>
       <li><a href="INF_Editor.html">INF Editor</a> </li>
       <li><a href="INF_Editor_exports.html">INF Editor - Exports</a></li>
-      <li><a href="MMP_Editor_sources.html">MMP Editor Sources window</a></li>
-      <li><a href="MMP_Editor_libraries.html">MMP Editor Libraries window</a></li>
-      <li><a href="MMP_Editor_options.html">MMP Editor Options window</a></li>
-      <li><a href="MMP_Editor_mmp_tab.html">MMP File Window</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>
+<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/INF_Editor_exports.html	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/INF_Editor_exports.html	Tue Apr 13 15:55:45 2010 -0500
@@ -7,9 +7,10 @@
    <h2>INF Editor - Exports Tab</h2>
    
    <p>
-   The INF Editor exports pane lists files to be copied to the indicated destination path and are part of the normal build process. You can add files, edit paths, move files up or down in the list, or remove files from the list.</p>
+   The <b>INF Editor Exports</b> pane lists files to be copied to the indicated destination path that are part of the normal build process. You can add files, edit paths, move files up or down in the list, or remove files from the list.</p>
    <p align="center"><img src="images/inf_editor_exports.png" width="656" height="456" /></p>
    <p align="left" class="figure">Figure 1 - INF Editor - Exports Pane</p>
+   <h5>Table 1. Export tab &mdash; items</h5>
    <table cellpadding="2" cellspacing="0"
 border="0">
      <tr valign="top">
@@ -33,38 +34,63 @@
      </tr>
    </table>
    <p></p>
-   <h3>Add Export dialog<a name="addexport" id="addexport"></a></h3>
-   <p>Use the Add Export dialog (figure 2) to add a file to be exported to the destination path when the project is built. Options include:</p>
-   <ul>
-     <li>Source path - Path and name of file to be exported. </li>
-     <li>Destination path - Path location where file is to be exported. </li>
-     <li>Export is a zip file - Check this option if the export is a zip file and you want to extract it on the destination path. </li>
-   </ul>
+   <h3><a name="addexport" id="addexport"></a>Add Export dialog</h3>
+   <p>Click the <b>Add</b> control to open the <b>Add Export</b> dialog (figure 2) to add a file to be exported to the destination path when the project is built.</p>
    <p align="center"><img src="images/inf_editor_addexport.png" width="447" height="229" /></p>
    <p class="figure">Figure 2 - Add Export dialog</p>
    <p></p>
+   <h5>Table 2. Add Export &mdash; items</h5>
+   <table width="796"
+border="0" cellpadding="2" cellspacing="0">
+     <tr valign="top">
+       <th width="186" class="Cell">Name</th>
+       <th width="600" class="Cell">Function</th>
+     </tr>
+     <tr valign="top">
+       <td class="Cell"><p> <b>Source path</b></p></td>
+       <td class="Cell"><p>Path and name of file to be exported.</p></td>
+     </tr>
+     <tr valign="top">
+       <td class="Cell"><p><b>Destination path</b> </p></td>
+       <td class="Cell"><p>Path location where file is to be exported.</p></td>
+     </tr>
+     <tr valign="top">
+       <td class="Cell"><b>Export is a zip file</b></td>
+       <td class="Cell">Check this option if the export is a zip file and you want to extract it on the destination path.</td>
+     </tr>
+   </table>
    <h3>Edit Export dialog</h3>
-   <p>Use the Edit Export dialog (figure 3) to edit the source and destination path of the selected file. Options include:</p>
-   <ul>
-     <li>Source path - Path and name of file to be exported. </li>
-     <li>Destination path - Path location where file is to be exported. </li>
-     <li>Export is a zip file - Check this option if the export is a zip file and you want to extract it on the destination path. </li>
-   </ul>
+   <p>Click the <b>Edit</b> control to open the <b>Edit Export</b> dialog (figure 3) to edit the source and destination path of the selected file.</p>
    <p align="center"><img src="images/inf_editor_editexport.png" width="446" height="225" /></p>
    <p align="left" class="figure">Figure 3 - Edit Export dialog</p>
-   <p></p>
-   <h5>Related references</h5>
-	 <ul>
+   <h5>Table 3. Edit Export &mdash; items</h5>
+	 <table width="796"
+border="0" cellpadding="2" cellspacing="0">
+       <tr valign="top">
+         <th width="186" class="Cell">Name</th>
+         <th width="600" class="Cell">Function</th>
+       </tr>
+       <tr valign="top">
+         <td class="Cell"><p> <b>Source path</b></p></td>
+         <td class="Cell"><p>Path and name of file to be exported.</p></td>
+       </tr>
+       <tr valign="top">
+         <td class="Cell"><p><b>Destination path</b> </p></td>
+         <td class="Cell"><p>Path location where file is to be exported.</p></td>
+       </tr>
+       <tr valign="top">
+         <td class="Cell"><b>Export is a zip file</b></td>
+         <td class="Cell">Check this option if the export is a zip file and you want to extract it on the destination path.</td>
+       </tr>
+     </table>
+	 <h5>Other references</h5>
+<ul>
       <li><a href="INF_Editor.html">INF Editor</a></li>
       <li><a href="INF_Editor_file.html">INF Editor - bld.inf</a></li>
-      <li><a href="MMP_Editor_sources.html">MMP Editor Sources window</a></li>
-      <li><a href="MMP_Editor_libraries.html">MMP Editor Libraries window</a></li>
-      <li><a href="MMP_Editor_options.html">MMP Editor Options window</a></li>
-      <li><a href="MMP_Editor_mmp_tab.html">MMP File Window</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>
+<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/INF_Editor_file.html	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/INF_Editor_file.html	Tue Apr 13 15:55:45 2010 -0500
@@ -7,7 +7,7 @@
    <h2>INF Editor - BLD.INF Tab</h2>
    
    <p>
-   The bld.inf pane shows the source text of the file. This file is automatically updated with changes made in the INF editor Overview and Exports panes or changes can be made manually in this pane. Validation is provided in this window. For example, an error mark is displayed next to the line where an error occurs, as shown in Figure 1. Hover your mouse pointer over the error mark or red error markers in upper right column to display helpful error information.</p>
+   The <b>bld.inf </b>pane shows the source text of the <span class="code">bld.inf</span> file. This file is automatically updated with changes made in the INF editor <a href="INF_Editor.html">Overview</a> and <a href="INF_Editor_exports.html">Exports</a> panes or changes can be made manually in this pane. Validation is provided in this window. For example, an error mark is displayed next to the line where an error occurs, as shown in Figure 1. Hover your mouse pointer over the error mark or red error markers in upper right column to display helpful error information.</p>
    <p align="center"><img src="images/inf_editor_file.png" width="656" height="488" /></p>
    <p align="left" class="figure">Figure 1 - INF Editor - bld.inf Pane</p>
    <p></p>
@@ -15,14 +15,10 @@
 	 <ul>
       <li><a href="INF_Editor.html">INF Editor</a></li>
       <li><a href="INF_Editor_exports.html">INF Editor - Exports</a></li>
-      <li><a href="MMP_Editor_sources.html">MMP Editor Sources window</a></li>
-      <li><a href="MMP_Editor_libraries.html">MMP Editor Libraries window</a></li>
-      <li><a href="MMP_Editor_options.html">MMP Editor Options window</a></li>
-      <li><a href="MMP_Editor_mmp_tab.html">MMP File Window</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>
+<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/MBMEditor.html	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/MBMEditor.html	Tue Apr 13 15:55:45 2010 -0500
@@ -6,11 +6,10 @@
    <h2>MBM Editor</h2>
 	  
 	 <p>
-		The MBM Editor allows you to specify the bitmaps that
+		The <b>MBM Editor</b> allows you to specify the bitmaps that
 		should be included in a Symbian OS multi-bitmap (MBM) file. Use of MBM files for general purpose graphics is restricted to using <span class="filename">.bmp</span> files and works for versions 2.x and later releases of the Symbian OS SDKs. For more
-		information, see<a href="../concepts/MBMDefWizard.html"> MBM File</a> and <a href="../tasks/Multi-BitmapFile.html">Creating a MBM File</a>.
-   </p>
-	 <p>
+		information, see <a href="../concepts/MBMDefWizard.html">MBM File</a> and <a href="../tasks/Multi-BitmapFile.html">Creating a MBM File</a>.   </p>
+<p>
 		The MBM Editor is shown when an MBM file is
 	 opened for editing:</p>
      <p class="Image"><img src="../tasks/projects/images/MBM_editor.png" width="900" height="600" /></p>
@@ -95,7 +94,6 @@
         <td>A preview of the image as it will appear at runtime. </td>
       </tr>
     </table>
-    <p class="Image">&nbsp;</p>
     <h5>Related  concepts</h5>
 
    <ul>
@@ -105,7 +103,7 @@
    <ul>
      <li><a href="../tasks/Multi-BitmapFile.html">Creating an MBM File</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>
+   <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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/MMP_Editor_libraries.html	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/MMP_Editor_libraries.html	Tue Apr 13 15:55:45 2010 -0500
@@ -4,7 +4,7 @@
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
    </head>
    <body>
-   <h2>MMP Editor Libraries Window</h2>
+   <h2>MMP Editor &gt; Libraries</h2>
    
    <p>
    The MMP editor libraries window lists the libraries used by the currently selected build configuration in the selected project. The MMP editor libraries window is shown in Figure 1. Click on a library group to expand the list of libraries and show the related control buttons. You can add, remove or edit the list of libraries for each group. You can also move libraries up or down in the list.</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/NewMMP_wizard.html	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/NewMMP_wizard.html	Tue Apr 13 15:55:45 2010 -0500
@@ -44,7 +44,7 @@
    </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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/ProjectDirectories.html	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/ProjectDirectories.html	Tue Apr 13 15:55:45 2010 -0500
@@ -13,8 +13,8 @@
 	 </p> 
 	 <div class="Figure">
 
-		<p align="center" class="Image"><img src="../images/step6.png" width="438" height="389" /></p>
-		<p class="Image">Figure 1 - Project Directories page </p>
+		<p align="center" class="Image"><img src="../images/step6.png" width="500" height="567" /></p>
+	   <p class="Image">Figure 1 - Project Directories page </p>
 	 </div><table width="720"
 border="0" cellpadding="2" cellspacing="0">
 	   <tr valign="top"><th width="108" class="Cell">Name</th><th width="493" class="Cell">Function</th></tr><tr valign="top"><td class="Cell">
@@ -52,9 +52,9 @@
 </div>
 <h5>Related tasks</h5>
 <ul>
-  <li><a href="../tasks/CreatingNewProjects.html">Creating New Projects</a></i>
+  <li><a href="../tasks/CreatingNewProjects.html">Creating New Projects</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>
+<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/ProjectNameAndLocation.html	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/ProjectNameAndLocation.html	Tue Apr 13 15:55:45 2010 -0500
@@ -11,25 +11,33 @@
 		files are to be stored. 
    </p> 
 
-		<p align="center" class="Image"><img src="images/wiz_name_and_location_page.png" width="438" height="415" /></p>
-		<p align="center" class="figure">Figure 1 - Name and Location page </p>
+		<p align="center" class="Image"><img src="images/wiz_name_and_location_page.png" width="607" height="500" /></p>
+   <p align="center" class="figure">Figure 1 - Name and Location page </p>
 	 <h5>Table 1 - Name and Locations page options</h5>
-	 <table width="720"
+	 <table width="785"
 border="0" cellpadding="2" cellspacing="0">
-	   <tr valign="top"><th width="201" class="Cell">Name</th><th width="509" class="Cell">Function</th></tr><tr valign="top"><td class="Cell">
+	   <tr valign="top"><th width="219" class="Cell">Name</th><th width="491" class="Cell">Function</th></tr><tr valign="top"><td class="Cell">
 			 <p>
 				<b>Class name </b></p></td><td class="Cell">
-			 <p>Class name to create. 
-				</p></td></tr><tr valign="top"><td class="Cell">
-			 <p>
-				<b>Source</b></p></td><td class="Cell">
-			 <p>Specify directory to store source information. </p></td></tr>
+			 <p>Class name to create.				</p></td></tr>
+	   <tr valign="top">
+	     <td class="Cell"><b>Use default</b></td>
+	     <td class="Cell">Checkmark to use the suggested default names, or uncheck to customize the names.</td>
+       </tr>
+	   <tr valign="top"><td class="Cell">
+		 <p>
+		 <b>Source</b></p></td><td class="Cell">
+		   <p>Specify directory to store source information. </p></td></tr>
 			 <tr valign="top">
 			   <td class="Cell"><b>Include</b></td>
 			   <td class="Cell">Specify directory to store header information. </td>
     </tr>
+			 <tr valign="top">
+			   <td class="Cell"><b>Force files to lowercase</b></td>
+			   <td class="Cell">Checkmark to force all filenames to use lowercase letters. Uncheck to use mixed case.</td>
+	   </tr>
 </table>
-     <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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/ProjectOtherSettings.html	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/ProjectOtherSettings.html	Tue Apr 13 15:55:45 2010 -0500
@@ -7,7 +7,7 @@
 <h2>Other Settings </h2>
 </div>
    <p>
-		Specify the name of the author and copyright notice information. 
+		Specify the name of the author, version, and copyright notice information. 
    </p> 
 
 		<p align="center" class="Image"><img src="../tasks/projects/images/wiz_add_sos_class_06.png" width="419" height="420" /></p>
@@ -18,13 +18,17 @@
 	   <tr valign="top"><th width="201" class="Cell">Name</th><th width="509" class="Cell">Function</th></tr><tr valign="top"><td class="Cell">
 			 <p>
 				<b>Author</b></p></td><td class="Cell">
-			 <p>Enter author information. 
-				</p></td></tr><tr valign="top"><td class="Cell">
-			 <p>
-				<b>Copyright notice </b></p></td><td class="Cell">
-			 <p>Enter copyright notice information.</p></td></tr>
+			 <p>Enter author information.				</p></td></tr>
+	   <tr valign="top">
+	     <td class="Cell"><b>Version</b></td>
+	     <td class="Cell">Enter version information.</td>
+       </tr>
+	   <tr valign="top"><td class="Cell">
+		 <p>
+		 <b>Copyright notice </b></p></td><td class="Cell">
+		   <p>Enter copyright notice information.</p></td></tr>
 </table>
-     <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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/ProjectPreferences.html	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/ProjectPreferences.html	Tue Apr 13 15:55:45 2010 -0500
@@ -21,6 +21,8 @@
   <li><a href="build_properties/pane_project_settings.htm">Project Settings</a></li>
   <li>other - additional panels may appear here as well. For example,  <b>CodeScanner</b> and <b>UI Designer</b>, to name two.   </li>
    </ul>
+<p align="center"><img src="images/carbide_build_config.png" width="795" height="692"></p>
+<p class="figure">Figure 1. Project for <i>project_name</i> dialog</p>
 <p>
 		To change the settings only for a particular file, right-click the file
 		from the <b>Project Explorer</b>, <b>C/C++ Project</b>, or <b>Symbian Project Navigator</b> views, and choose <b>Properties</b>  from the context menu. The <b>Properties for &lt;<i>file_name</i>&gt;</b> window  shows  the settings that are
@@ -30,7 +32,7 @@
 	   <ul>
 	     <li><a href="../tasks/projects/prj_build.htm">Building Projects</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>
+<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/ProjectTypeandSDK.html	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/ProjectTypeandSDK.html	Tue Apr 13 15:55:45 2010 -0500
@@ -11,7 +11,7 @@
 <div class="Bodytext">
 <p> You can set the SDKs and Build Configurations in this page. The available SDKs shown are determined by the settings in the <a href="SDKPreferences.html">SDK Preferences</a> page. </p>
 <div class="Figure">
-<p align="center" class="Image"><img src="../images/step4.png" width="500" height="500"><br>
+<p align="center" class="Image"><img src="../images/step4.png" width="500" height="567"><br>
 </p>
 </div>
 
@@ -55,7 +55,7 @@
 <li><a href="../tasks/WorkingwithSDKs.html">Working with SDKs</a></li>
 <li><a href="SDKPreferences.html">SDK Preferences</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>
+<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/ROM_build_settings.html	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/ROM_build_settings.html	Tue Apr 13 15:55:45 2010 -0500
@@ -35,7 +35,7 @@
            </td>
      </tr>
    </table>
-	 <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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/SDKPreferences.html	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/SDKPreferences.html	Tue Apr 13 15:55:45 2010 -0500
@@ -24,8 +24,8 @@
    <p class="note"><b>NOTE</b> This panel serves as a <span class="code">devices.xml</span> file editor. The <span class="code">devices.xml</span> file stores information about the installed SDKs used for Symbian OS development.</p>
    <div class="Figure">
 
-	  <p align="center" class="Image"><img src="../images/SDKPreferences.png" width="696" height="583" alt="SDK preferences panel" /></p>
-	  <p align="center" class="figure">Figure 1. SDK Preferences preference panel </p>
+	  <p align="center" class="Image"><img src="../images/SDKPreferences.png" width="740" height="546" alt="SDK preferences panel" /></p>
+     <p align="center" class="figure">Figure 1. SDK Preferences preference panel </p>
    </div>
    <table cellpadding="2" cellspacing="0"
 border="0">
@@ -38,14 +38,14 @@
            <p>Click on a SDK name to see its EPOCROOT location and build configuration status in the SDK Information area. </p></td>
         </tr>
          <tr valign="top">
+           <td class="Cell"><b>Remove SDK </b></td>
+           <td class="Cell">Click to remove the selected SDK from the Available Symbian OS SDK's list. </td>
+         </tr>
+         <tr valign="top">
            <td class="Cell"><b>Add New SDK </b></td>
            <td class="Cell"><p>Click to <a href="../tasks/sdks/sdk_add.htm">add</a> an SDK to the <b>Available Symbian OS SDKs</b> list.</p>           </td>
      </tr>
          <tr valign="top">
-           <td class="Cell"><b>Remove SDK </b></td>
-           <td class="Cell">Click to remove the selected SDK from the Available Symbian OS SDK's list. </td>
-        </tr>
-         <tr valign="top">
            <td class="Cell"><b>SDK Properties</b></td>
            <td class="Cell"><p>Click to view and edit the <a href="../tasks/sdks/sdk_view_properties.htm">properties</a> of the currently selected SDK in the <b>Available Symbian OS SDKs</b> list.</p>           </td>
      </tr>
@@ -59,16 +59,14 @@
              <p class="note"><b>NOTE</b> Carbide.c++ scans for available SDKs each time it is started.</p></td>
         </tr>
    </table>
-	 <h3>Legacy SDK's </h3>
-	 <p>For legacy SDK's the OS/SDK version is determined from the SDK id. Some older SDK's have two verisons, one where the emulator was built with MSVC and the other built with CodeWarrior. We support those SDK's built with CodeWarrior. The id of that SDK is <span class="code">S60_2nd_FP2_CW</span>.</p>
-	 <h5>Related tasks</h5>
+   <h5>Related tasks</h5>
 	 <ul>
        
        <li><a href="../tasks/WorkingwithSDKs.html">Working with SDKs</a></li>
        <li><a href="../tasks/AddinganSDK.html">Adding an SDK</a></li>
        <li><a href="../tasks/RmvngandVwngPropsosSDK.html">SDK Properties</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>
+<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/add_from_filesys.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/add_from_filesys.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -8,11 +8,10 @@
 
 <h2>Add Images From Filesystem</h2>
 	  
-	 <p>The Add Images from Filesystem dialog allows you to search for and add images currently available in the filesystem. Select an image and click Ok to add the image.</p>
-	 <p class="note"><b>NOTE</b> Information displayed under Help group will vary slightly depending upon whether this dialog was called from a MBM,MIF, or AIF editor. </p>
-	 <p>&nbsp;</p>
+	 <p>The <b>Add Images from Filesystem</b> dialog allows you to search for and add images currently available in the filesystem. Select an image and click <b>OK</b> to add the image.</p>
+   <p class="note"><b>NOTE</b> Information displayed under Help group will vary slightly depending upon whether this dialog was called from a MBM, MIF, or AIF editor. </p>
 	 <p align="center" class="Image"><img src="images/add_images_from_filesys.png" width="640" height="700"></p>
-		<p class="figure">Figure 1 - Add Images from Filesystem </p>
+   <p class="figure">Figure 1 - Add Images from Filesystem </p>
 		<h5>Table 1. Add Images&mdash;Items</h5>
 		<table width="94%"  border="0" cellpadding="2" cellspacing="0">
           <tr>
@@ -45,8 +44,11 @@
             <td>Click the Choose... button to display the Select a folder dialog, then select a project folder to store the images.</td>
           </tr>
         </table>
-		<p>&nbsp;</p>
-		<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>
+		<h5>Other references</h5>
+		<ul>
+          <li><a href="MBMEditor.html">MBM Editor</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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/add_from_project.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/add_from_project.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -8,14 +8,15 @@
 
 <h2>Add Images From Project </h2>
 	  
-	 <p>The Add Images from Project dialog allows you to add images currently available in the project. Select an image and click Ok to add the image. </p>
-	 <p class="note"><b>NOTE</b> Information displayed under Help group will vary slightly depending upon whether this dialog was called from a MBM,MIF, or AIF editor.</p>
-	 <p>&nbsp;</p>
-	 <p align="center" class="Image"><img src="images/add_images_from_project.png" width="640" height="567"></p>
+	 <p>The <b>Add Images from Project</b> dialog allows you to add images currently available in the project. Select an image and click <b>OK</b> to add the image. </p>
+   <p class="note"><b>NOTE</b> Information displayed under Help group will vary slightly depending upon whether this dialog was called from a MBM, MIF, or AIF editor.</p>
+   <p align="center" class="Image"><img src="images/add_images_from_project.png" width="640" height="567"></p>
 		<p class="figure">Figure 1 - Add Images from Project </p>
-		<p>&nbsp;</p>
-		<p>&nbsp;</p>
-		<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>
+		<h5>Other references</h5>
+		<ul>
+          <li><a href="MBMEditor.html">MBM Editor</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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -10,8 +10,8 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Carbide Build Configurations </h2>
-<p>The <b>Carbide Build Configurations</b> panel is used to specify the project's <a href="../../concepts/build_configurations.htm">active build configuration</a> and its related build properties.  </p>
-<p align="center"><img src="../images/carbide_build_config.png" width="795" height="682" /></p>
+<p>Use the <b>Carbide Build Configurations</b> panel to specify the project's <a href="../../concepts/build_configurations.htm">active build configuration</a> and its related build properties.  </p>
+<p align="center"><img src="../images/carbide_build_config.png" width="778" height="675" /></p>
 <p class="figure">Figure 1 - Carbide Build Configurations panel </p>
 <h5>Table 1 Carbide Build Configuration items </h5>
 <table width="100%"  border="0" cellpadding="2" cellspacing="0">
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_env.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_env.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -16,7 +16,7 @@
   <li><span class="code">PATH</span> &#8212; will always place &quot;<span class="code">${EPOCROOT}\epoc32\tools;${EPOCROOT}\epoc32\gcc\bin;</span>&quot; at the front of the <span class="code">PATH</span> regardless of what it is changed to </li>
   <li><span class="code">PATH</span>, <span class="code">EPOCROOT</span>, and <span class="code">*MW</span> variables &#8212; <span class="note">cannot be undefined as they are required for system builds</span></li>
 </ul>
-<p align="center"><img src="../images/page_build_config_env.png" width="575" height="473"></p>
+<p align="center"><img src="../images/page_build_config_env.png" width="558" height="456"></p>
 <p class="figure">Figure 1 - Environment Variables</p>
 <h5>Table 1 Environment variable items</h5>
 <table width="100%"  border="0" cellpadding="2" cellspacing="0">
@@ -56,7 +56,7 @@
   <li><a href="pane_build_config_args.htm">Arguments</a></li>
   <li><a href="pane_build_config_paths.htm">Paths and Symbols </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>
+<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.doc.user/html/reference/build_properties/pane_build_config_paths.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_paths.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -26,7 +26,8 @@
   <li><a href="pane_build_config_env.htm">Environment</a></li>
   <li><a href="pane_build_config_args.htm">Arguments</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>
+<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.doc.user/html/reference/build_properties/pane_build_config_sis.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_sis.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -17,7 +17,7 @@
   <li><b>Unsigned SIS file</b> - names of the unsigned SIS files used by the project </li>
   <li><b>Signed SIS file</b>  - names of the signed SIS files created by the project  </li>
 </ul>
-<p align="center"><img src="../images/carbide_build_config.png" width="795" height="692" /></p>
+<p align="center"><img src="../images/carbide_build_config.png" width="778" height="675" /></p>
 <p class="figure">Figure 1 - SIS Builder pane</p>
 <h5>Table 1 <span class="figure">SIS Builder</span> items </h5>
 <table width="100%"  border="0" cellpadding="2" cellspacing="0">
@@ -50,7 +50,12 @@
 <p>The SIS Builder supports the generation of partial upgrade .SIS files. A dialog appears when a SIS file exceeds 250k in size that describes the partial upgrade feature with a link to the SIS Builder page. Partial upgrade files enable Carbide to generate and download to the device only those portions of the application that have changed, enabling faster debug cycles. It does this using the SIS partial upgrade (PU) flag to mark the SIS file as a replacement or addition to the original SIS file. Debugging of large applications using Application TRK is enhanced as the entire application no longer needs to be installed on the device each time a change is made. </p>
 <p>When the Partial update option is checked for a SIS file, both a complete and partial SIS files are generated. This ensures that the full SIS file is kept in sync with the partial upgrade SIS file. The partial upgrade SIS files are placed in the same folder as the full SIS file when stored in a project directory, or in the root of the project directory when the SIS file exists outside of the project. You can see where a partial upgrade file is created by examining the <b>Partial upgrade sis/sisx path</b> in the <a href="../../projects/launch/page_installation.htm">Installation</a> tab of the launch configuration. Links to the partial upgrade files are added to the project within the <a href="../view_cpp_projects.htm">Project Explorer</a> view.</p>
 <p class="note"><b>NOTE</b> Internally, the .PKG file format of a partial upgrade file is identical to a complete .PKG file with two exceptions, 1) the file list only includes the names of files changed, and 2) the PU flag is set.</p>
-<p>Partial upgrade files are deleted and only full SIS/SISX files are generated when: 1) the full SIS/SISX files do not already exist, 2) the PKG file is changed, and 3) the Partial upgrade option is disabled.</p>
+<p>Partial upgrade files are deleted and only full SIS/SISX files are generated when:</p>
+<ul>
+  <li>the full SIS/SISX files do not already exist</li>
+  <li>the PKG file is changed</li>
+  <li>the Partial upgrade option is disabled</li>
+</ul>
 <h5>Other references</h5>
 <ul>
   <li><a href="pane_build_config.htm">Carbide Build Configurations </a><a href="../../tasks/projects/working_with_sis_pkg_files.htm"></a></li>
@@ -58,7 +63,7 @@
   <li><a href="pane_build_config_args.htm">Arguments</a></li>
   <li><a href="pane_build_config_paths.htm">Paths and Symbols</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>
+<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.doc.user/html/reference/build_properties/pane_project_settings.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_project_settings.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -8,10 +8,7 @@
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 <style type="text/css">
 <!--
-.style1 {
-	font-family: Georgia, "Times New Roman", Times, serif;
-	font-weight: bold;
-}
+.style5 {font-family: Verdana, Ariel, Helvetica, sans-serif; font-weight: bold; }
 -->
 </style>
 </head>
@@ -58,7 +55,7 @@
   </tr>
 </table>
 <p>&nbsp;</p>
-<p align="center"><img src="../images/carbide_proj_settings_sbsv1.png" alt="sbsv1 tab" width="420" height="283"></p>
+<p align="center"><img src="../images/carbide_proj_settings_sbsv1.png" alt="sbsv1 tab" width="417" height="243"></p>
 <p align="center" class="figure">Figure 2 - SBSv1 Tab</p>
 <h5 align="left">Table 2 Symbian Build System v1 tab </h5>
 <table width="100%"  border="0" cellpadding="2" cellspacing="0">
@@ -67,7 +64,7 @@
     <th width="57%" scope="col">Explanation</th>
   </tr>
   <tr>
-    <td><span class="style1">Clean level </span></td>
+    <td><span class="style5">Clean level </span></td>
     <td><p>Specifies the level of clean to perform on  project files. The levels include:</p>
       <ul>
         <li>Level 0  (<span class="code">abld clean</span>) - removes all the intermediate files created during compilation, and all the executables and import libraries created by the linker</li>
@@ -76,7 +73,7 @@
       </ul></td>
   </tr>
   <tr>
-    <td><span class="style1">Manage dependency tracking </span></td>
+    <td><span class="style5">Manage dependency tracking </span></td>
     <td>If checked, the Symbian command line build system will not generate dependencies for source and resource files. These will be managed by Carbide. This can reduce build times. </td>
   </tr>
   <tr>
@@ -90,7 +87,7 @@
   </tr>
 </table>
 <p align="left">&nbsp;</p>
-<p align="center"><img src="../images/carbide_proj_settings_sbsv2.png" alt="sbsv2 tab" width="420" height="283"></p>
+<p align="center"><img src="../images/carbide_proj_settings_sbsv2.png" alt="sbsv2 tab" width="427" height="269"></p>
 <p align="center" class="figure">Figure 3 - SBSv2 Tab</p>
 <h5 align="left">Table 3 Symbian Build System v2 tab (only visible for Projects created with SBSv2 builder) </h5>
 <table width="100%"  border="0" cellpadding="2" cellspacing="0">
@@ -99,10 +96,12 @@
     <th width="57%" scope="col">Explanation</th>
   </tr>
   <tr>
-    <td><span class="style1">Clean level </span></td>
+    <td><b>Clean level </b></td>
     <td>Select the level of clean when cleaning a project.
-      <p><strong>abld clean</strong> erases all files created by a corresponding abld target   command (all intermediate files created during compilation and all executables and import libraries created by the linker)</p>
-      <p><strong>abld reallyclean</strong> does what abld clean does, and also removes files   exported by abld export and makefiles generated by abld makefile, or the abld   test equivalents</p></td>
+      <ul>
+        <li><strong>abld clean</strong> erases all files created by a corresponding abld target   command (all intermediate files created during compilation and all executables and import libraries created by the linker)</li>
+        <li><strong>abld reallyclean</strong> does what abld clean does, and also removes files   exported by abld export and makefiles generated by abld makefile, or the abld   test equivalents</li>
+      </ul></td>
   </tr>
   <tr>
     <td><b>Keep going  </b></td>
@@ -114,7 +113,7 @@
       <p>By default, the build system generates symbolic debug information only for   the debug builds. With this option, the generation of symbolic debug information   is extended to release builds to support debugging of release binaries on ARM   ABI compliant platforms.</p></td>
   </tr>
   <tr>
-    <td><span class="style1">Override default make engine</span> </td>
+    <td><b>Override default make engine</b> </td>
     <td>Check this box to enable  an edit box to specify the make engine to use, for example, eMake  from Electric Cloud.</td>
   </tr>
 </table>
@@ -122,6 +121,6 @@
 <h4>Related tasks</h4>
 <ul><li><a href="../../tasks/projects/prj_build.htm">Building Projects</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>
+<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.doc.user/html/reference/build_properties/wnd_sis_properties.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/wnd_sis_properties.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -9,8 +9,8 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>SIS Properties </h2>
-<p> Use the<b> SIS Properties</b> dialog to specify SIS file creation and signing options for selected SIS file included in the project. </p>
-<p align="center"><img src="../images/wnd_sis_properties.png" width="455" height="452" /></p>
+<p> Use the<b> SIS Properties</b> dialog to specify SIS file creation and signing options for the selected SIS file included in the project. </p>
+<p align="center"><img src="../images/wnd_sis_properties.png" width="375" height="452" /></p>
 <p class="figure">Figure 1 - SIS Properties dialog </p>
 <h5>Table 1 <span class="figure">SIS Properties window</span> items </h5>
 <table width="100%"  border="0" cellpadding="2" cellspacing="0">
@@ -54,7 +54,7 @@
   <li><a href="pane_build_config.htm">Carbide Build Configurations</a></li>
   <li><a href="pane_build_config_env.htm">Environment variables</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>
+<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.doc.user/html/reference/debugger_settings.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/debugger_settings.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -25,7 +25,7 @@
   <li><a href="../tasks/start/carbide_debugging.htm">Debugging a Program</a> (Example)</li>
   <li><a href="../tasks/projects/prj_debug_config.htm">Creating a Launch Configuration</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>
+<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>
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/icon_build_all_configs.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/icon_freeze_exports.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/icon_rc_available.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/icon_rc_connection.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/icon_rc_not_accessible.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/icon_rc_not_active.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/tab_new_conn_install_agent.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/tab_new_conn_setup_conn.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/tab_new_conn_test_conn.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/trim_remote_conns.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/view_disassembly_menu.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/launch_configuration_filter.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/launch_configuration_filter.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -4,28 +4,26 @@
 <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>Launch Configuration Filters</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+<title>Launch Configuration Filtering</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
 <body bgcolor="#FFFFFF">
-<h2>Launch Configuration Filters</h2>
-<p>The Launch Configuration Filters panel is used to  filter out which launch configurations will not appear in the Run or Debug window used to define launch configurations. For example, select the <b>Filter checked launch configuration types</b> option and check the configuration types that you do not want to appear in the <b>Run &gt; Run...</b> or <b>Run &gt; Debug...</b> window, as shown in Figure 1. </p>
-<p align="center"><img src="images/filter_launch_config.png" width="580" height="573" /></p>
-<p class="figure">Figure 1 - Launch Configuration Filters </p>
-<p>&nbsp;</p>
+<h2>Launch Configuration Filtering </h2>
+<p>Use the  <b>Launch Configuration </b> preference panel to  filter the launch configurations that appear in the configurations list in the <b>Run</b> or <b><a href="wnd_debug_configuration.htm">Debug</a></b> dialog. This allows you to manage which configuration types are shown. For example, enable the <b>Filter checked launch configuration types</b> option and check the configuration types that you do not want to appear in the <b>Run</b> and <b>Debug</b> dialogs. As shown in Figure 1, all the configurations related to TRK have been enabled and won't appear in the configurations list. </p>
+<p align="center"><img src="images/filter_launch_config.png" width="627" height="574" /></p>
+<p class="figure">Figure 1 - Launch Configurations preference panel </p>
 <h5>Related references</h5>
 <ul>
-  <li><a href="../reference/wnd_debug_configuration.htm">Debug Window</a> </li>
+  <li><a href="wnd_debug_configuration.htm">Debug Window</a> </li>
 </ul>
 <h5>Related tasks </h5>
 <ul>
-  <li><a href="../tasks/projects/prj_debug_config.htm">Creating a Launch Configuration</a></li>
-  <li><a href="../tasks/projects/prj_new_build_config.htm">Adding/Removing Build Configurations</a></li>
-  <li><a href="../tasks/projects/prj_set_build_tgt.htm">Setting a Build Configuration </a></li>
+  <li><a href="../../tasks/projects/prj_debug_config.htm">Creating a Launch Configuration</a></li>
+  <li><a href="../../tasks/projects/prj_new_build_config.htm">Adding/Removing Build Configurations</a></li>
+  <li><a href="../../tasks/projects/prj_set_build_tgt.htm">Setting a Build Configuration </a></li>
 </ul>
 <div class="step">
   <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>
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/abld.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/abld.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -10,7 +10,7 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>ABLD Actions </h2>
-<p>Use the <b>ABLD</b> menu option to invoke an specific <span class="code">abld</span> command on the selected project or file. ABLD is available under  <b>Project &gt; ABLD</b> or by right-clicking a project or file in the <a href="../view_cpp_projects.htm">Project Explorer</a> or <a href="../view_sym_proj_nav.htm">Symbian Project Navigator</a> views and choosing <b>ABLD &gt; <i>command</i></b>. When executed any arguments specified in the <a href="../build_properties/pane_build_config_args.htm">Carbide Build Configurations</a> pane for the command are passed to the selected tool. </p>
+<p>Use the <b>ABLD</b> menu option to invoke an specific <span class="code">abld</span> command on the selected project or file. ABLD is available under  <b>Project &gt; ABLD</b> or by right-clicking a project or file in the <a href="../view_cpp_projects.htm">Project Explorer</a>, <a href="../view_sym_proj_nav.htm">Symbian Project Navigator</a>, and <a href="../view_disassembly.htm">Disassembly</a> views and choosing <b>ABLD &gt; <i>command</i></b>. When executed any arguments specified in the <a href="../build_properties/pane_build_config_args.htm">Carbide Build Configurations</a> pane for the command are passed to the selected tool. </p>
 <p align="center"><img src="../images/menu_abld.png" width="496" height="136"></p>
 <p class="figure">Figure 1 - Available ABLD actions</p>
 <p>The available commands include:</p>
@@ -28,7 +28,7 @@
 <ul>
   <li><a href="menus.htm">Carbide Menu</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>
+<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.doc.user/html/reference/panel_debug_exceptions.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/panel_debug_exceptions.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -19,11 +19,11 @@
     <th width="62%" scope="col">Explanation</th>
   </tr>
   <tr>
-    <td>Check All </td>
+    <td><b>Check All </b></td>
     <td>Enables catching all exceptions.</td>
   </tr>
   <tr>
-    <td>Clear All </td>
+    <td><b>Clear All </b></td>
     <td>Disables catching all exceptions.</td>
   </tr>
 </table>
@@ -53,7 +53,7 @@
     <li><a href="../debugger/debug/viewing_debug.htm">Debug View</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>
+<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/reference.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/reference.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -15,7 +15,7 @@
   <li><a href="view_expressions.htm">Expression views</a> &mdash; shows how to work with expressions in a debugging session</li>
   <li><a href="view_variables.htm">Variable views</a> &mdash; shows how to work with variables in a debugging session</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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/panel_filter.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/panel_filter.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -14,7 +14,7 @@
   <h4>To access the Launch Configurations Filter Window</h4>
 </div>
 <ol>
-  <li>Select the <b>Run &gt; Open Debug Dialog...</b> menu item</li>
+  <li>Select the <b>Run &gt; Debug As</b> menu item</li>
   <p>The <b>Debug</b> window appears.</p>
   <li>Select the Filter icon in the toolbar above the list of configuration types and defined configurations.</li>
   <p>The <b>Preferences (Filtered)</b> window appears (Figure 1).</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/view_remote_connection.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/view_remote_connection.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -35,9 +35,9 @@
 </ul>
 <p align="center"><img src="../images/view_remote_connections.png" width="588" height="177"></p>
 <p class="figure">Figure 1 - Remote Connections view</p>
-<p>When the view is closed or another perspective opened, a small display item appears in the lower-left corner of the perspective. Click the connection name to  open the drop-down menu where you can open the Remote Connections view or switch between  connections.</p>
-<p align="center"><img src="../images/tab_remote_conns.png"></p>
-<p class="figure">Figure 2. Remote Connections tab </p>
+<p>When the view is closed or another perspective opened, a small display  appears in the trim area in the lower-right corner of the workspace showing the current active remote connection. Click the connection name to  open the drop-down menu where you can open the Remote Connections view or switch between  connections.</p>
+<p align="center"><img src="../images/trim_remote_conns.png" width="212" height="44"></p>
+<p class="figure">Figure 2. Available remote connection trim indicator</p>
 <h3>Remote Connections view toolbar icons</h3>
 <p>The following commands appear on the toolbar within the Remote Connections view: </p>
 <table width="100%"  border="0" cellpadding="2" cellspacing="0">
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_install_tab.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_install_tab.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -10,9 +10,9 @@
 <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 </head>
 <body bgcolor="#FFFFFF">
-<h2>Install Remote Agents pane</h2>
+<h2>Install Remote Agents</h2>
 <p>Use  the <strong>Install remote agents</strong> pane to select the latest remote agent version  to download and install to the device. </p>
-<p align="center"><img src="../images/wnd_new_connection_wizard_03.png" width="456" height="554"></p>
+<p align="center"><img src="../images/tab_new_conn_install_agent.png" width="464" height="554"></p>
 <p class="figure">Figure 2 - New Connection wizard Install remote agents page</p>
 <p>Table 1. Install Remote Agents pane</p>
 <table width="100%"  border="0" cellpadding="2" cellspacing="0">
@@ -22,7 +22,7 @@
   </tr>
   <tr>
     <td><strong>Install remote agents</strong></td>
-    <td><p>A list of the most current versions of remote agents sorted by SDK and version. Select the version most compatable with the device. For example, a device running S60 3.2.0 needs a version of the TRK software compiled for that SDK, which in the image above is Application TRK 3.0.4. </p>
+    <td><p>A list of the most current versions of remote agents sorted by SDK and version. Select the version most compatable with the device. For example, a device running S60 5.0 needs a version of the TRK software compiled for that SDK, which in the image above is Application TRK 3.2.6. </p>
         <p>Additional information about the selected entry is displayed to the right to help you choose the correct version of TRK for the target device. </p></td>
   </tr>
   <tr>
@@ -32,15 +32,18 @@
   <tr>
     <td><strong>Install</strong></td>
     <td><p>Click <strong>Install</strong> to download and install the TRK selected in the Install remote agents list. A progress bar is shown if the install operation requires more than a few seconds to complete. </p>
-        <p class="note"><strong>NOTE</strong> The SIS and SISX file types must be associated with an installer application like Nokia PC Suite in order to install them onto the device. Use the Save command above to perform a manual install to the device if you don't have an installer application. </p></td>
+      <p class="note"><b>NOTE</b> Drivers installed by PC Suite or Ovi Suite are required in order for Install to download a remote agent onto the target device.</p>
+    <p class="note"><strong>NOTE</strong> The SIS and SISX file types must be associated with an installer application like Nokia PC Suite or Ovi Suite in order to install them onto the device. Use the Save command above to perform a manual install to the device if you don't have an installer application. </p></td>
   </tr>
 </table>
 <p></p>
 <h5>Related references</h5>
 <ul>
   <li><a href="wnd_on_device_setup.htm">On-Device Connections</a></li>
-  <li><a href="wnd_on_device_check_tab.htm">Set Connection Settings </a></li>
+  <li><a href="wnd_new_connection_wizard.htm">Setup Connection</a></li>
+  <li><a href="#CONN_SET">Test Connection</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>
+<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_connection_wizard.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_connection_wizard.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -5,38 +5,42 @@
 <meta http-equiv="Content-Style-Type" content="text/css" />
 <meta name="keywords" content="Check TRK, TRK, Install TRK"
 ><meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>New Connection Wizard</title>
+<title>Setup Connection</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 </head>
 <body bgcolor="#FFFFFF">
-<h2>New Connection Wizard</h2>
-<p>Use  the <strong>Remote Connections</strong> view to monitor, create, edit, or remove  common remote connection settings.</p>
-<ul>
-  <li><a href="#CONN_EDIT">Edit connection name and type</a></li>
-  <li><a href="#CONN_SET">Set Connection Settings pane</a></li>
-  <li><a href="#INSTALL">Install	Remote Agents pane</a></li>
-</ul>
-<h3><strong><a name="CONN_EDIT" id="INSTALL3"></a></strong>Edit connection name and type</h3>
-<p>Use the <b>Edit connection name and type</b> page to assign a name and connection type to the new connection setup.</p>
-<p align="center"><img src="../images/wnd_new_connection_wizard_01.png" width="456" height="554"></p>
-<p class="figure">Figure 1 - New Connection wizard Edit connection name and type page</p>
-<p>Table 1. Edit connection name and type page - options</p>
+<h2>Setup Connection</h2>
+<p>Use the <b>Edit Connection</b> page to assign a connection type, name, and connection settings to the new connection setup.</p>
+<p align="center"><img src="../images/tab_new_conn_setup_conn.png" width="464" height="554"></p>
+<p class="figure">Figure 1 - New Connection wizard Setup Connection tab</p>
+<p>Table 1. Setup Connection page - options</p>
 <table width="100%"  border="0" cellpadding="2" cellspacing="0">
   <tr>
     <th width="28%" scope="col">Item</th>
     <th width="59%" scope="col">Explanation</th>
   </tr>
   <tr>
+    <td><strong>Connection Type</strong></td>
+    <td><p>Select the type of connection and its supported services from the drop down list of options. The types of connections include:</p>
+      <ul>
+        <li>Bluetooth - serial port connection through Bluetooth</li>
+        <li>Serial - serial port connection through a COM serial port</li>
+        <li>USB - serial port connection through USB that  supports TRK 3.x</li>
+      </ul>
+      <p>And the supported services may include:</p>
+      <ul>
+        <li>TRK</li>
+        <li>Tracing</li>
+        <li>and others</li>
+    </ul></td>
+  </tr>
+  <tr>
     <td><strong>Connection Name</strong></td>
     <td><p>Enter a name for the connection.</p>    </td>
   </tr>
   <tr>
-    <td><strong>Connection Type</strong></td>
-    <td>Select the type of connection this setup will use.</td>
-  </tr>
-  <tr>
-    <td><strong>Supported Services</strong></td>
+    <td><strong>Connection Settings</strong></td>
     <td><p>Shows a list of services supported by the connection type chosen.</p>
       <ul>
         <li>Bluetooth - serial port connection through Bluetooth</li>
@@ -45,84 +49,13 @@
     </ul></td>
   </tr>
 </table>
-<h3><strong><a name="CONN_SET" id="INSTALL2"></a></strong>Set Connection Settings pane</h3>
-<p>Use  the <b>Set Connection Settings</b> pane to compare the version of remote agent installed on the device with the latest version available for Carbide. In this pane you can:</p>
-<ul>
-  <li>Set  the device OS used by the device and supported by the selected remote agent</li>
-  <li>Allow easy serial port selection when connecting to a device </li>
-  <li>Verify that you have the latest remote agent installed on a device</li>
-</ul>
-<p align="center"><img src="../images/wnd_new_connection_wizard_02.png" width="456" height="554"></p>
-<p class="figure">Figure 2 - New Connection wizard Serial Connection Settings page</p>
-<p>Table 2. Serial Connection Setting page - Set Connection Settings tab</p>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="30%" scope="col">Item</th>
-    <th width="59%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><strong>Serial Port </strong></td>
-    <td>A dropdown list of serial ports with known identifiers for selecting the communication port used by the PC to communicate with the device. A named COM port (<span class="code">COM4 - BthModem0</span>) indicates an active port. Unnamed port numbers have usually not been opened and assigned by the PC.</td>
-  </tr>
-  <tr>
-    <td><b>Baud Rate</b></td>
-    <td>a dropdown list of baud rates common to serial connections.</td>
-  </tr>
-  <tr>
-    <td><strong>Device OS </strong></td>
-    <td><p>A dropdown list of device OSes that are supported by the remote  agent  software. Select the OS used by the device before running a check. </p></td>
-  </tr>
-  <tr>
-    <td><b>Select a service to test</b></td>
-    <td>Click to select a listed service for testing.</td>
-  </tr>
-  <tr>
-    <td><strong>Test Service Status</strong></td>
-    <td><p>Click <strong>Test Service Status</strong> to query the remote agent software on the device for its version number. It then compares the version number found with the latest version available for Carbide. A progress bar will appear should the Test Service Status version operation requires more than a few seconds.</p>
-        <p class="note"><strong>NOTE</strong> The PC must have an internet connection to perform a remote agent version check.</p>
-      <p>Once the comparison is complete the Status text is updated with the result and further instructions as required.</p>
-      <p align="center"><img src="../images/wnd_on_device_setup_install_new_version.png" width="466" height="67"></p>
-      <p align="left">If a connection fails, the errors normally fall into these two categories: </p>
-      <ul>
-          <li><strong>connection failure</strong> - this usually indicates the chosen COM port  is not open. Try selecting a different COM port, specifically one with a name attached to it (<span class="code">COM4 - BthModem0</span>) for the type of connection you are using (USB or Bluetooth). Repeat as necessary until you get a successful response. </li>
-        <li><strong>remote agent not responding</strong> - this indicates that the COM port is open but the remote agent is not responding. First, verify that remote agent is up and running on the device. Second, the remote agent may be listening on a different COM port, so choose another named COM port and try again.</li>
-      </ul>
-    <p align="left">&nbsp;</p></td>
-  </tr>
-</table>
-<h3><strong><a name="INSTALL" id="INSTALL"></a>Install Remote Agents</strong> pane</h3>
-<p>Use  the <strong>Install Remote Agents</strong> pane to select the latest remote agent version  to download and install to the device. </p>
-<p align="center"><img src="../images/wnd_new_connection_wizard_03.png" width="456" height="554"></p>
-<p class="figure">Figure 2 - New Connection wizard Bluetooth Settings page</p>
-<p>Table 3. Serial Connection Setting page - Install Remote Agents tab</p>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="30%" scope="col">Item</th>
-    <th width="59%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><strong>Install remote agents</strong></td>
-    <td><p>A list of the most current versions of remote agents sorted by SDK and version. Select the version most compatable with the device. For example, a device running S60 3.1.0 needs a version of the TRK software compiled for that SDK, which in the image above is Application TRK 2.8.7. </p>
-        <p>Additional information about the selected entry is displayed to the right to help you choose the correct version of TRK for the target device. </p>
-    <p class="note"><b>NOTE</b> Requires a network connection to query the remote agent site.</p></td>
-  </tr>
-  <tr>
-    <td><strong>Save</strong></td>
-    <td>Click <strong>Save</strong> to store a local copy of the currently selected TRK to disk. You can then manually install the file to your devices using the method of your choice. </td>
-  </tr>
-  <tr>
-    <td><strong>Install</strong></td>
-    <td><p>Click <strong>Install</strong> to download and install the TRK selected in the Install latest TRK list. A progress bar is shown if the install operation requires more than a few seconds to complete. </p>
-        <p class="note"><strong>NOTE</strong> The SIS and SISX file types must be associated with an installer application like Nokia PC Suite in order to install them onto the device. Use the Save command above to perform a manual install to the device if you don't have an installer application. </p></td>
-  </tr>
-</table>
 <h5>Related references</h5>
 <ul>
-  <li><a href="wnd_new_conn_wiz_add.htm">Adding and deleting connections</a></li>
-  <li><a href="wnd_new_conn_wiz_edit.htm">Editing connections</a></li>
-  <li><a href="view_remote_connection.htm">Remote Connections view</a></li>
+  <li><a href="wnd_on_device_setup.htm">On-Device Connections</a></li>
+  <li><a href="#CONN_SET">Test Connection</a></li>
+  <li><a href="#INSTALL">Install Remote Agents</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>
+<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_on_device_check_tab.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_on_device_check_tab.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -5,30 +5,21 @@
 <meta http-equiv="Content-Style-Type" content="text/css" />
 <meta name="keywords" content="Check TRK, TRK, Install TRK"
 ><meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Initiate Service Testing</title>
+<title>Test Connection</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-<style type="text/css">
-<!--
-.style1 {
-	font-family: Arial, Helvetica, sans-serif;
-	font-weight: bold;
-}
--->
-</style>
 </head>
 <body bgcolor="#FFFFFF">
-<h2>Initiate Service Testing</h2>
-<p>Use  the <b>Set Connection Settings</b> pane to compare the version of remote service installed on the device with the latest version available for Carbide. A remote service is any software on the device that can communicate with Carbide. This includes TRK, Performance Investigator, and other services. In this pane you can:</p>
-<ul>
-  <li>Specify the Connection Settings to connect to the device</li>
-  <li>Set  the device OS used by the device and supported by the remote service</li>
+<h2>Test Connection</h2>
+<p>Use  the <b>Set Connection Settings</b> pane to compare the version of remote service installed on the device with the latest version available for Carbide. A remote service is any software on the device that can communicate with Carbide. This includes TRK, Trace, Performance Investigator, and other services. In this pane you can:</p>
+<ul><li>Set  the device OS used by the device and supported by the remote service</li>
+  <li>Verify that Carbide can communicate with the remote service via the chosen connection setting</li>
   <li>Verify that you have the latest version of the remote service  installed on the device</li>
 </ul>
-<p>Options presented may differ based on the connection setting type chosen.</p>
-<p align="center"><img src="../images/wnd_on_device_setup_check_trk.png" width="456" height="554"></p>
-<p class="figure">Figure 1 - Set Connection Settings pane in the New Connection dialog </p>
-<h5>Table 1<span class="figure"> Set Connection Settings</span> pane &mdash; items</h5>
+<p>Options presented may differ based on the type of connection setting  chosen.</p>
+<p align="center"><img src="../images/tab_new_conn_test_conn.png" width="464" height="554"></p>
+<p class="figure">Figure 1 - Test Connection  pane in the New Connection dialog </p>
+<h5>Table 1<span class="figure"> Test Connection </span> pane &mdash; items</h5>
 <table width="100%"  border="0" cellpadding="2" cellspacing="0">
   <tr>
     <th width="29%" scope="col">Item</th>
@@ -39,15 +30,11 @@
     <td><p>A dropdown list of device OSes that are supported by the TRK debug agent  software. Select the OS used by the device before running a check. </p>    </td>
   </tr>
   <tr>
-    <td><strong>Serial Port </strong></td>
-    <td>A dropdown list of serial ports with known identifiers for selecting the communication port used by the PC to communicate with the device. A named COM port (<span class="code">COM4 - BthModem0</span>) indicates an active port. Unnamed port numbers have usually not been opened and assigned by the PC.</td>
-  </tr>
-  <tr>
     <td><strong>Select a service to test</strong></td>
     <td>Select the remote service type to query on the remote device.</td>
   </tr>
   <tr>
-    <td><span class="style1">Initiate service testing</span></td>
+    <td><b>Initiate service testing</b></td>
     <td><p>Click <b>Initiate service testing</b> to query the  remote software on the device for its version number. It then compares the version number found with the latest version available for Carbide. A progress bar will appear when the operation requires more than a few seconds.</p>
       <p class="note"><strong>NOTE</strong> The PC must have an internet connection to perform a remote service version check.</p>
       <p>Once the comparison is complete the Status text is updated with the result and further instructions as required.</p>
@@ -56,15 +43,16 @@
       <ul>
         <li><strong>connection failure</strong> - this usually indicates the chosen COM port  is not open. Try selecting a different COM port, specifically one with a name attached to it (<span class="code">COM4 - BthModem0</span>) for the type of connection you are using (USB or Bluetooth). Repeat as necessary until you get a successful response. </li>
         <li><strong>Service not responding</strong> - this indicates that the COM port is open but the remote service is not responding. First, verify that remote service is up and running on the device. Second, the remote service may be listening on a different COM port, so choose another named COM port and try again.</li>
-      </ul>      
-      </td>
+      </ul>      </td>
   </tr>
 </table>
 <h5>Related references</h5>
 <ul>
   <li><a href="wnd_on_device_setup.htm">On-Device Connections</a></li>
-  <li><a href="wnd_new_conn_install_tab.htm">Install Remote Agents</a> </li>
+  <li><a href="wnd_new_connection_wizard.htm">Setup Connection</a></li>
+  <li><a href="#INSTALL">Install	Remote Agents</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>
+<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_on_device_setup.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_on_device_setup.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -11,18 +11,21 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>On-Device Connections </h2>
-<p>Use the <strong>New Connection</strong> wizard to verify and update Carbide software services on a device. Click the <strong>Help &gt; On-Device Connections...</strong> menu option to open. Currently, the only service available is TRK, but look for others in future releases. The following tabs are present:</p>
+<p>Use the <strong>New Connection</strong> wizard to verify and update Carbide software services on a device. Click the <strong>Help &gt; On-Device Connections...</strong> menu option to open. Current services available include TRK, Tracing, and others. The following tabs are present:</p>
 <ul>
-  <li><strong><a href="wnd_on_device_check_tab.htm">Set Connection Settings</a></strong> &#8212; queries the device to determine if the latest version of the remote agent is installed  </li>
-  <li><strong><a href="wnd_new_conn_install_tab.htm">Install remote agent</a></strong> &#8212; downloads and installs the latest version of the remote agent to the device </li>
+  <li><a href="wnd_new_connection_wizard.htm">Setup Connection</a> - define connection type, name and settings</li>
+  <li><a href="#CONN_SET">Test Connection</a> - verify connection operates as intended</li>
+  <li><a href="#INSTALL">Install	Remote Agents</a> - download and install remote agents</li>
 </ul>
-<p align="center"><img src="../images/wnd_new_connection_wizard_02.png" width="456" height="554"></p>
+<p align="center"><img src="../images/tab_new_conn_setup_conn.png" width="464" height="554"></p>
 <p class="figure">Figure 1 - New Connection dialog</p>
 <h5>Related references</h5>
 <ul>
-  <li><a href="wnd_on_device_check_tab.htm">Set  Connection Settings </a></li>
-  <li><a href="wnd_new_conn_install_tab.htm">Install remote agents</a></li>
+  <li><a href="wnd_new_connection_wizard.htm">Setup Connection</a></li>
+  <li><a href="#CONN_SET">Test Connection</a></li>
+  <li><a href="#INSTALL">Install	Remote Agents</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>
+<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_disassembly.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_disassembly.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -23,61 +23,84 @@
   <li>Reposition the PC  using the various move commands (Figure 1) by first selecting the line to move to, then select the command from the context menu.</li>
   <li>Set breakpoints at the start of any assembler instruction by right-clicking the left hand column to view the context menu options (Figure 2) </li>
 </ul>
-<p>Figure 1 shows the Dissassembly view and the PC context menu that appears when you right-click in the data pane. Right-clicking  the left border opens the breakpoint context menu.</p>
-<p align="center"><img src="images/view_disassembly.png" width="555" height="272" alt="" /></p>
-<p class="figure">Figure 1 - Repositioning the PC in the Disassembly view</p>
-<p class="figure"><img src="images/view_disassm_breakpoint.png" width="506" height="172" alt="" /></p>
-<p class="figure">Figure 2 - Setting Breakpoints in the Disassembly view </p>
-<h5>Table 1. Disassembly view &mdash;context menu</h5>
+<p>Figure 1 shows the <b>Dissassembly</b> view stopped at a breakpoint.</p>
+<p align="center"><img src="images/view_disassembly.png" width="785" height="202" alt="" /></p>
+<p class="figure">Figure 1 - Disassembly view</p>
+<p>Figure 2 shows the context menu that appears when you right-click in the Dissassembly pane. Right-clicking  the left border opens the breakpoint context menu in Figure 3.</p>
+<p class="figure"><img src="images/view_disassembly_menu.png" width="232" height="133"></p>
+<p class="figure">Figure 2 - Disassembly pane context menu</p>
+<h5>Table 1. Disassembly pane &mdash; context menu</h5>
 <table width="88%"  border="0" cellpadding="2" cellspacing="0">
   <tr>
-      <th width="26%" scope="col">Item</th>
-      <th width="8%" scope="col">Icon</th>
-      <th width="66%" scope="col">Explanation</th>
+    <th width="26%" scope="col">Item</th>
+    <th width="8%" scope="col">Icon</th>
+    <th width="66%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><b>Run to Line </b></td>
+    <td><center>
+      <img src="images/icon_dis_run_to_line.png" width="18" height="18">
+    </center></td>
+    <td>Select <b>Run to Line</b> to execute the program from the currently executed line (the green line) to the selected line (the blue line).</td>
   </tr>
-    <tr>
-      <td><b>Run to Line </b></td>
-      <td><center>
-        <img src="images/icon_dis_run_to_line.png" width="18" height="18">
-      </center>      </td>
-      <td>Select <b>Run to Line</b> to execute the program from the currently executed line (the green line) to the selected line (the blue line).</td>
+  <tr>
+    <td><b>Move to Line</b></td>
+    <td><center>
+      <img src="images/icon_dis_move_to_line.png" width="19" height="15">
+    </center></td>
+    <td><p>Select <b>Move to Line</b> to move the program counter to the selected line  (the blue line) skipping all intermediate lines but not resume execution. This enables you to skip suspect code and continue stepping through your program.</p>
+        <p class="note"><span class="style1">WARNING</span> Using this command can leave a program in an unstable state. Use at your own risk.</p></td>
+  </tr>
+  <tr>
+    <td><b>Resume at Line </b></td>
+    <td><center>
+      <img src="images/icon_dis_resume_at_line.png" width="18" height="14">
+    </center></td>
+    <td><p>Select <b>Resume at Line</b> to begin program execution at the selected line   (the blue line), skipping all lines between it and the currently executed line  (the green line). </p>
+        <p class="note"><span class="style1">WARNING</span> Using this command can leave a program in an unstable state. Use at your own risk.</p></td>
+  </tr>
+  <tr>
+    <td><b>ABLD</b></td>
+    <td>&nbsp;</td>
+    <td>Use the <a href="menus/abld.htm">ABLD</a> menu option to invoke an specific <span class="code">abld</span> command on the selected project or file.</td>
   </tr>
-    <tr>
-      <td><b>Move to Line</b></td>
-      <td><center>
-        <img src="images/icon_dis_move_to_line.png" width="19" height="15">
-      </center>
-      </td>
-      <td><p>Select <b>Move to Line</b> to move the program counter to the selected line  (the blue line) skipping all intermediate lines but not resume execution. This enables you to skip suspect code and continue stepping through your program.</p>
-      <p class="note"><span class="style1">WARNING</span> Using this command can leave a program in an unstable state. Use at your own risk.</p></td>
-    </tr>
-    <tr>
-      <td><b>Resume at Line </b></td>
-      <td><center>
-        <img src="images/icon_dis_resume_at_line.png" width="18" height="14">
-      </center>      </td>
-      <td><p>Select <b>Resume at Line</b> to begin program execution at the selected line   (the blue line), skipping all lines between it and the currently executed line  (the green line). </p>
-      <p class="note"><span class="style1">WARNING</span> Using this command can leave a program in an unstable state. Use at your own risk.</p></td>
-    </tr>
-    <tr>
-      <td><b>Toggle Breakpoint </b></td>
-      <td><center>
-      </center>      </td>
-      <td>Right-click in left-hand column of the Disassembly view and select this option to toggle the breakpoint state between <a href="../tasks/breakpoints/pgm_bp_setting.htm">setting</a> and <a href="../tasks/breakpoints/pgm_bp_clearing.htm">removing</a> the breakpoint. </td>
-    </tr>
-    <tr>
-      <td><b>Disable/Enable Breakpoint </b></td>
-      <td><center>
-      </center>      </td>
-      <td>Right-click in left-hand column of the Disassembly view and select the breakpoint option shown as determined by the current state of the breakpoint.</td>
-    </tr>
-    <tr>
-      <td><b>Breakpoint Properties </b></td>
-      <td><center>
-      </center>      </td>
-      <td>Select this option to open the Breakpoint Properties dialog. </td>
-    </tr>
+  <tr>
+    <td><b>Freeze Exports</b></td>
+    <td><center>
+      <img src="images/icon_freeze_exports.png" width="19" height="18">
+    </center>
+    </td>
+    <td>Calls the appropriate <span class="code">abld</span> command  to generate a .def file.</td>
+  </tr>
+  <tr>
+    <td><b>Build All Configurations</b></td>
+    <td><center>
+      <img src="images/icon_build_all_configs.png" width="20" height="18">
+    </center>
+    </td>
+    <td>Click <b>Build All Configurations</b> to build all enabled build configurations in the current project.</td>
+  </tr>
+  <tr>
+    <td><b>Toggle Breakpoint </b></td>
+    <td><center>
+    </center></td>
+    <td>Right-click in left-hand column of the Disassembly view and select this option to toggle the breakpoint state between <a href="../tasks/breakpoints/pgm_bp_setting.htm">setting</a> and <a href="../tasks/breakpoints/pgm_bp_clearing.htm">removing</a> the breakpoint. </td>
+  </tr>
+  <tr>
+    <td><b>Disable/Enable Breakpoint </b></td>
+    <td><center>
+    </center></td>
+    <td>Right-click in left-hand column of the Disassembly view and select the breakpoint option shown as determined by the current state of the breakpoint.</td>
+  </tr>
+  <tr>
+    <td><b>Breakpoint Properties </b></td>
+    <td><center>
+    </center></td>
+    <td>Select this option to open the <b>Breakpoint Properties</b> dialog. </td>
+  </tr>
 </table>
+<p class="figure"><img src="images/view_disassm_breakpoint.png" width="785" height="202" alt="" /></p>
+<p class="figure">Figure 3 - Setting Breakpoints in the Disassembly view </p>
 <div class="step">
   <h4>Opening the Disassembly view </h4>
   <ul>
@@ -96,6 +119,6 @@
 <ul><li><a href="../concepts/breakpoints.htm">Breakpoints</a></li>
   <li><a href="../debugger/debug/cmds_reposition_pc.htm">Repositioning the Program Counter</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>
+<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_expressions.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_expressions.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -9,19 +9,19 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Expressions View </h2>
-<p>  The <b>Expressions</b> view helps you monitor and manipulate these  items:</p>
+<p>  Use the <b>Expressions</b> view to monitor and manipulate:</p>
 <ul>
   <li>global and local variables</li>
   <li>structure members</li>
   <li>array elements</li>
 </ul>
-<p>The Expressions view displays these columns: </p>
+<p>The Expressions view displays these panes: </p>
 <ul>
-  <li>Expression column&#8212;Lists expressions and expression hierarchies. Click the hierarchical controls to expand or collapse the expression view.</li>
-  <li>Value column&#8212;Shows the current value of each corresponding expression. Double-click a value to change it.</li>
+  <li>Expression pane (left) &#8212; Lists expressions and expression hierarchies. Click the hierarchical controls to expand or collapse the expression view.</li>
+  <li>Value pane (right) &#8212; Shows the current value of each corresponding expression. Double-click a value to change it.</li>
 </ul>
-<p>Figure 1 shows the Expressions view. Table 1 explains items in view.</p>
-<p align="center"><img src="images/view_expressions.png" width="439" height="144" /></p>
+<p>Figure 1 shows the <b>Expressions</b> view.</p>
+<p align="center"><img src="images/view_expressions.png" width="571" height="202" /></p>
 <p class="figure">Figure 1 - Expressions view </p>
 <h5>Table 1. Expressions view &mdash;items </h5>
 <table width="88%"  border="0" cellpadding="2" cellspacing="0">
@@ -46,6 +46,11 @@
       <td>Collapses all expanded expressions into the top level. </td>
     </tr>
     <tr>
+      <td><b>New Watch Expression</b></td>
+      <td>&nbsp;</td>
+      <td>Click to open the <b>Add Watch Expression</b> dialog.</td>
+    </tr>
+    <tr>
       <td><b>Remove Selected Expression </b></td>
       <td><div align="center"><img src="../images/icons/var_remove_selected_globals_icon.png" width="18" height="16" /></div></td>
       <td>Click to remove all currently selected expressions from the expressions list. </td>
@@ -55,15 +60,22 @@
       <td><div align="center"><img src="../images/icons/var_remove_all_globals_icon.png" width="19" height="19" /></div></td>
       <td>Click to remove all expressions from the expressions list. </td>
     </tr>
+    <tr>
+      <td><b>Refresh</b></td>
+      <td><center>
+      </center>
+      </td>
+      <td>Click to refresh view display.</td>
+    </tr>
 </table>
-  <h4>Opening the Expressions View </h4>
+<h4>Opening the Expressions View </h4>
   <p>Use the Expressions view to inspect frequently used variables as their values change during a debugging session.</p>
   <div class="step">
   <h4>Opening an Expressions view </h4>
   <ul>
     <li>Select Window &gt; Show View &gt; Expressions</li>
     <li>OR</li>
-    <li>Right-click a variable in the <a href="view_variables.htm">Variables</a> or editor view and choose the Add Watchpoint command </li>
+    <li>Right-click a variable in the <a href="view_variables.htm">Variables</a> or editor view and choose the Add Watchpoint (C/C++) menu item</li>
     <p>An Expressions view appears in the current perspective.</p>
   </ul>
 </div>
@@ -72,7 +84,7 @@
   <li><a href="../debugger/variables/adding_expressions.htm">Adding &amp; Removing Expressions</a></li>
   <li><a href="../debugger/variables/editing_expressions.htm">Editing Expressions</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>
+<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_global_variables.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_global_variables.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -10,7 +10,7 @@
 <body bgcolor="#FFFFFF">
 <h2>Global Variables Window</h2>
 <p>The Global Variables window shows all global and static variables for each process that you debug. You can open separate Global Variables windows for each process in the same build target. Use the window to observe changes in variable values as the program executes.</p>
-<p>Figure 1  shows the Global Variables window. Table 1  explains the items in the window.</p>
+<p>Figure 1  shows the Global Variables window.</p>
 <p class="figure">Figure 1 Global Variables window</p>
 <h5>Table 1 Global Variables window&mdash;items </h5>
 <table width="84%"  border="0" cellpadding="2" cellspacing="0">
@@ -19,11 +19,11 @@
     <th width="72%" scope="col">Explanation</th>
   </tr>
   <tr>
-    <td>File</td>
+    <td><b>File</b></td>
     <td>Lists source files that declare global or static variables. Click a source file to view its static variables. Click Global Variables to view all global variables declared in the program.</td>
   </tr>
   <tr>
-    <td>Variables</td>
+    <td><b>Variables</b></td>
     <td>Lists variables according to the file selected in the File pane. Double-click a variable to display it in a separate Variable window.</td>
   </tr>
 </table>
@@ -47,7 +47,7 @@
     <p>Repeat these steps for each process that has global variables that you want to examine.</p>
   </ol>
 </div>
-<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
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_mem_array.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_mem_array.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -9,7 +9,7 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Array Window</h2>
-<p> An Array window allows manipulation of a contiguous block of memory, displayed as an array of elements. The window lists array contents sequentially, starting at
+<p> The <b>Array</b> window allows manipulation of a contiguous block of memory, displayed as an array of elements. The window lists array contents sequentially, starting at
 element 0.</p>
 <p>The Array window title shows the base address bound to the array. The base address can bind to an address, a variable, or a register. An array bound to a local variable closes after the routine that defines the variable returns to the calling routine.</p>
 <p>For array elements cast as structured types, a hierarchical control appears to the left of each element. Use these hierarchical controls to expand or collapse the display of each element&rsquo;s contents.</p>
@@ -70,7 +70,7 @@
 </div>
 <p class="note"><b>TIP</b> Drag and drop a register or variable name into an Array window to set the base address. Use the View Memory As command to interpret memory displayed in an Array window as a different type.</p>
 <p>Alternatively, use a contextual menu to open an Array window, as explained in Table 2.</p>
-<h5>Table 2 Opening an Array window by using a contextual menu </h5>
+<h5>Table 2 Opening an Array window by using a context menu </h5>
 <table width="77%"  border="0" cellpadding="2" cellspacing="0">
   <tr>
     <th width="31%" scope="col">On this host&hellip;</th>
@@ -91,7 +91,7 @@
 </table>
 <p><br />
 </p>
-<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
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_memory_wnd.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_memory_wnd.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -18,8 +18,8 @@
 </ul>
 <p>You can configure your output to display traditional, hexadecimal, ascii and/or signed/unsigned decimal. You can also set the size of the rendering columns. </p>
 <p class="note"><b>CAUTION</b> Arbitrarily changing memory contents could degrade the stability of the IDE, another program, or the operating system itself. Understand the consequences of manipulating memory.</p>
-<p>Figure 1 shows the Memory view. Table 1  explains the items in the view.</p>
-<p align="center"><img src="../images/views/view_memory.png" width="826" height="235" /></p>
+<p>Figure 1 shows the Memory view.</p>
+<p align="center"><img src="../images/views/view_memory.png" width="639" height="250" /></p>
 <p class="figure">Figure 2 - Memory view showing a memory rendering in traditional format</p>
 <h5>Table 1 Memory view&mdash;items </h5>
 <table width="100%"  border="0" cellpadding="2" cellspacing="0">
@@ -39,6 +39,11 @@
     <td>Pin memory view.</td>
   </tr>
   <tr>
+    <td><b>Refresh</b></td>
+    <td>&nbsp;</td>
+    <td>Click to refresh the memory display.</td>
+  </tr>
+  <tr>
     <td><b>Toggle Memory Monitors Pane </b></td>
     <td><div align="center"><img src="images/view_mem_toggle_pane_btn.png" width="19" height="17" /></div></td>
     <td>Toggles the current Memory monitors view between showing only a Memory Monitor pane and a Memory Monitor and Memory Rendering pane. </td>
@@ -75,14 +80,14 @@
   </tr>
 </table>
 <p align="left">Each memory monitor rendering pane can be configured independently. Right-click in the Renderings pane to see the rendering options available. The options presented in the context menu may differ if you have not chosen the Traditional rendering view (Figure 2). </p>
-<p align="center"><img src="images/menu_mem_rendering_options.png" width="446" height="340"></p>
+<p align="center"><img src="images/menu_mem_rendering_options.png" width="198" height="270"></p>
 <p class="figure">Figure 2 - Rendering pane options </p>
 <h5>Related tasks</h5>
 <ul>
   <li><a href="../tasks/memory/memory_monitor_adding.htm"> Adding a Memory Monitor</a></li>
   <li><a href="../tasks/memory/memory_rendering_adding.htm">Adding a Memory Rendering </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>
+<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_mifdef_editor.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_mifdef_editor.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -8,18 +8,16 @@
 
 <h2>MBM/MIF Editor</h2>
 	  
-	 <p>The MIF Editor allows you to create or edit the <span class="code">.mif</span> files list of scalable icons (<span class="code">.svg</span>)
+	 <p>The <b>MIF Editor</b> allows you to create or edit the <span class="code">.mif</span> files list of scalable icons (<span class="code">.svg</span>)
      included in  a S60 v3.0 and later GUI projects as well as standard <span class="code">.bmp</span> files. A .mif file is a MSX Interchange Format (MIF) file that should be built by the project. MIF files replace the functionality of AIF (and MBM) files.</p>
-	 <p class="note"><b>NOTE</b> This editor is only supported by the S60 3.0  and later SDKs.</p>
-	 <p class="note"><b>NOTE</b> For resources that are included after creating a project, you should ensure that the output location is set correctly by viewing the file properties. The output location is set to &quot;{EPOCROOT}\epoc32\include&quot; by default, so if an alternate location is required you can set this in the file properties.</p>
-	 <p>The MIF Editor appears when a MIF  file is
-	   opened for editing. To open the editor double-click on a .mif file in the Symbian Project Navigator view (figure 1), or select a scalable icon makefile (for example, Icons_scalable_dc.mk), right-click and select the Add MBM/MIF Entry command.</p>
-	 <p>&nbsp;</p>
-	 <p align="center" class="Image"><img src="../tasks/projects/images/mif_file_symprojnav.png" width="299" height="292"></p>
-		<p class="figure">Figure 1 - MIF File in Symbian Project Navigator</p>
-		<p>&nbsp;</p>
-		<p><img src="../tasks/projects/images/MBM_MIF_editor.png" width="900" height="600"> </p>
-		<p class="figure">Figure 2 - MBM/MIF Editor</p>
+   <p class="note"><b>NOTE</b> This editor is only supported by the S60 3.0  and later SDKs.</p>
+	 <p class="note"><b>NOTE</b> For resources that are included after creating a project, you should ensure that the output location is set correctly by viewing the file properties. The output location is set to &quot;<span class="code">{EPOCROOT}\epoc32\include</span>&quot; by default, so if an alternate location is required you can set this in the file properties.</p>
+   <p align="center" class="Image"><img src="../tasks/projects/images/mif_file_symprojnav.png" width="299" height="292"></p>
+		<p class="figure">Figure 1 - MIF File in the Symbian Project Navigator view</p>
+   <p>The <b>MIF Editor</b> appears when a MIF  file is
+   opened for editing. To open the editor double-click on a .mif file in the <a href="view_sym_proj_nav.htm">Symbian Project Navigator</a> view (figure 1), or select a scalable icon makefile (for example, <span class="code">Icons_scalable_dc.mk</span>), right-click and select the <b>Add MBM/MIF Entry</b> command.</p>
+   <p align="center"><img src="../tasks/projects/images/MBM_MIF_editor.png" width="900" height="600"> </p>
+   <p class="figure">Figure 2 - MBM/MIF Editor</p>
 		<h5>Table 1. MBM/MIF Editor &mdash;Items</h5>
 		<table width="94%"  border="0" cellpadding="2" cellspacing="0">
           <tr>
@@ -28,7 +26,7 @@
           </tr>
           <tr>
             <td><b>Target File </b></td>
-            <td><p>Specifies the EPOCROOT relative path for the compiled images. Click the Default button to set the target file based on the SDK and project name. </p></td>
+            <td><p>Specifies the <span class="code">EPOCROOT</span> relative path for the compiled images. Click the Default button to set the target file based on the SDK and project name. </p></td>
           </tr>
           <tr>
             <td><b>Header File </b></td>
@@ -64,15 +62,15 @@
           </tr>
           <tr>
             <td><b>Add From Project </b></td>
-            <td>Click this button to open an Add Images from Project dialog to reference available images in the project.</td>
+            <td>Click this button to open the <b>Add Images from Project</b> dialog to reference available images in the project.</td>
           </tr>
           <tr>
             <td><b>Add From Filesystem </b></td>
-            <td>Click this button to open an Add Images From Filesystem dialog to locate and reference existing images in the filesystem or copy images to the project.</td>
+            <td>Click this button to open the <b>Add Images From Filesystem</b> dialog to locate and reference existing images in the filesystem or copy images to the project.</td>
           </tr>
           <tr>
             <td><b>Remove</b></td>
-            <td>Select an image and click Remove to remove image entry from the list. This does not delete file from directory.</td>
+            <td>Select an image and click <b>Remove</b> to remove image entry from the list. This does not delete file from directory.</td>
           </tr>
           <tr>
             <td><b>Color depth </b></td>
@@ -101,7 +99,7 @@
           </tr>
         </table>
 		<p>&nbsp;</p>
-   <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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_registers.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_registers.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -16,7 +16,7 @@
   <li><a href="../tasks/registers/mem_reg_data_views.htm">view</a> documentation for individual registers (depending on the register)</li>
 </ul>
 <p>Figure 1 shows a sample Registers view.</p>
-<p align="center"><img src="../concepts/images/ARM_registers.PNG" width="648" height="276" /></p>
+<p align="center"><img src="images/view_registers.png" width="367" height="370"></p>
 <p class="figure">Figure 1 - Registers View </p>
 <h5>Table 1. <span class="figure">Registers</span> view&mdash;items </h5>
 <table width="88%"  border="0" cellpadding="2" cellspacing="0">
@@ -57,7 +57,7 @@
   <li><a href="../tasks/registers/mem_reg_viewing.htm">Viewing Register Values </a></li>
   <li><a href="../tasks/registers/mem_reg_changing.htm">Changing Register Values</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>
+<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.doc.user/html/reference/view_signals_wnd.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_signals_wnd.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -11,39 +11,37 @@
 <h2>Signals View</h2>
 <p>  The Signals view of the Debug perspective lets you view the signals defined on the selected debug target and how the debugger handles each one.</p>
 <p class="note"><b>NOTE</b> Currently Carbide.c++ does not  support this CDT feature.</p>
-<p>&nbsp;</p>
 <p>Figure 1 shows the Signals view.</p>
 <p align="center"><img src="../images/views/view_signals.png" width="500" height="205" /></p>
 <p class="figure">Figure 1 - Signals view</p>
 <h5>Table 1 Signals view&mdash;items </h5>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+<table width="76%"  border="0" cellpadding="2" cellspacing="0">
   <tr>
-    <th width="36%" scope="col">Item</th>
-    <th width="64%" scope="col">Explanation</th>
+    <th width="22%" scope="col">Item</th>
+    <th width="78%" scope="col">Explanation</th>
   </tr>
   <tr>
-    <td>Name</td>
+    <td><b>Name</b></td>
     <td>Displays the name of the signal.</td>
   </tr>
   <tr>
-    <td>Pass</td>
+    <td><b>Pass</b></td>
     <td>Where &quot;yes&quot; is displayed, the debugger lets your program see the signal. Your program can handle the signal, or else it may terminate if the signal is fatal and not handled.</td>
   </tr>
   <tr>
-    <td>Suspend</td>
+    <td><b>Suspend</b></td>
     <td>Where &quot;yes&quot; is displayed, the debugger suspends your program when this signal is handled.</td>
   </tr>
   <tr>
-    <td>Description</td>
+    <td><b>Description</b></td>
     <td>Displays a description of the signal.</td>
   </tr>
 </table>
-<p>&nbsp;</p>
 <h5>Related reference </h5>
 <ul>
   <li> <a href="../debugger/debug/viewing_debug.htm">Debug view</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>
+<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_symbian_kernel.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_symbian_kernel.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -29,6 +29,9 @@
   <li><a href="#Library">Libraries</a></li>
 </ul>
 <p class="note"><b>NOTE</b>  Information for the Chunks and Libraries tabs is not available when debugging with the TRK debug agent.</p>
+<h4><a name="overview" id="overview"></a>Overview Tab</h4>
+<p>This tab (shown in Figure 1) provides a tree view of ownership  of all processes, threads, and chunks in the OS. 
+  In contrast, the other tabs provide a flat list of corresponding kernel objects such as process, thread, chunk, library, etc.</p>
 <p align="center"><img src="images/view_symbianOSkernel.png" width="602" height="300" alt="" /></p>
 <p class="figure">Figure 1. Symbian OS Data view</p>
 <h5>Table 1 - Symbian OS Data view toolbar buttons </h5>
@@ -71,9 +74,6 @@
     <td class="Cell">Click the <b>Collaps All</b> command to collapse all of the currently elements in the view.</td>
   </tr>
 </table>
-<h4><a name="overview" id="overview"></a>Overview Tab</h4>
-<p>This tab (shown in Figure 1) provides a tree view of ownership  of all processes, threads, and chunks in the OS. 
-In contrast, the other tabs provide a flat list of corresponding kernel objects such as process, thread, chunk, library, etc.</p>
 <h4><a name="processes" id="processes"></a>Processes</h4>
 <p>The Processes tab (Figure 2) provides a flat list of corresponding kernel objects. 
 Click a column title to sort the list by the title attribute in alternating ascending and descending order. For example, you may choose to sort the process list by Name, ID, or by Priority. </p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_system_browser.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_system_browser.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -9,7 +9,7 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>System Browser View</h2>
-<p>  The System Browser view shows system level information about processes executing on various machines, like the host computer or the hardware under debugger control. The <span class="note">view</span> shows this information:</p>
+<p>  The <b>System Browser</b> view shows system level information about processes executing on various machines, like the host computer or the hardware under debugger control. The <span class="note">view</span> shows this information:</p>
 <ul>
   <li>running processes</li>
   <li>tasks for selected processes</li>
@@ -17,36 +17,36 @@
 </ul>
 <p>Click on the expand icon for a process to view all tasks assigned to the selected process. Processes under debugger control appear in bold. Double-click a task to open it in a new Thread window, or choose the task name and click the Stack Crawl View button.</p>
 <p>Table 1  explains items in the window.</p>
-<p class="note"><b>NOTE</b> If the System Browser view does not show processes for a sepcific machine, you will need to start a debugging session for that machine. For example, you might need to debug a project that runs on external hardware in order to see executing processes for that hardware.</p>
+<p class="note"><b>NOTE</b> If the System Browser view does not show processes for a specific machine, you will need to start a debugging session for that machine. For example, you might need to debug a project that runs on external hardware in order to see executing processes for that hardware.</p>
 <h5>Table 1 System Browser <span class="note">view</span>&mdash;items </h5>
 <table width="79%"  border="0" cellpadding="2" cellspacing="0">
   <tr>
-    <th width="25%" scope="col">Item</th>
-    <th width="21%" scope="col">Icon</th>
+    <th width="30%" scope="col">Item</th>
+    <th width="16%" scope="col">Icon</th>
     <th width="54%" scope="col">Explanation</th>
   </tr>
   <tr>
-    <td>Attach to Process</td>
+    <td><b>Attach to Process</b></td>
     <td>&nbsp;</td>
     <td>Click to have the debugger control the selected process.</td>
   </tr>
   <tr>
-    <td>Stack Crawl <span class="note">view</span></td>
+    <td><b>Stack Crawl view</b></td>
     <td>&nbsp;</td>
     <td>Click to open a Thread window for the selected process.</td>
   </tr>
   <tr>
-    <td>Refresh</td>
+    <td><b>Refresh</b></td>
     <td>&nbsp;</td>
     <td>This icon indicates that information for selected item is periodically updated. Click this icon to toggle between refresh and no refresh.</td>
   </tr>
   <tr>
-    <td>No Refresh</td>
+    <td><b>No Refresh</b></td>
     <td>&nbsp;</td>
     <td>This icon indicates that information is not updated for the selected item.</td>
   </tr>
   <tr>
-    <td>Expand</td>
+    <td><b>Expand</b></td>
     <td>&nbsp;</td>
     <td>Click to expand a process and list related tasks.</td>
   </tr>
@@ -56,7 +56,7 @@
   <li><a href="../tasks/processes/opening_system_browser.htm">Opening a System Browser View</a> </li>
   <li><a href="../tasks/processes/attach_debugger_to_process.htm">Attaching Debugger to a Process</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>
+<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_build_prefs.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_build_prefs.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -128,12 +128,11 @@
     <td>Check this box to enable  an edit box to specify the make engine to use, for example, eMake  from Electric Cloud.</td>
   </tr>
 </table>
-<p>&nbsp;</p>
 <h5>Related references</h5>
 <ul>
   <li><a href="build_properties/pane_project_settings.htm">Carbide Project Settings </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>
+<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_carbide_pref.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_carbide_pref.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -15,7 +15,7 @@
 <p align="center"><img src="images/carbide_preferences.png" width="627" height="544" alt="" /></p>
 <p class="figure">Figure 1 - Carbide.c++ preferences page </p>
 <h5>Table 1 Carbide.c++ Preferences &mdash;items</h5>
-<table width="700"  border="0" cellpadding="2" cellspacing="0">
+<table width="850"  border="0" cellpadding="2" cellspacing="0">
   <tr>
     <th width="29%" scope="col">Item</th>
     <th width="57%" scope="col">Explanation</th>
@@ -56,7 +56,7 @@
   <li><a href="../tasks/sdks/sdk_platform_filter.htm">Platform Filtering Preferences</a></li>
   <li><a href="SDKPreferences.html">SDK Preferences</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>
+<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_debug_configuration.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_debug_configuration.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -4,17 +4,18 @@
 <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>Debug Window</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+<title>Carbide Debug dialog</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
 <body bgcolor="#FFFFFF">
-<h2>Debug Window</h2>
-<p>The <b>Debug</b> or launch configuration window provides C/C++ debugger options. A <a href="../projects/launch/launch_configs_overview.htm">launch configuration</a> defines the settings used by the Carbide debugger to launch and debug programs. A project must have at least one debug launch configuration in order to debug a project and can have many more. </p>
-<p>By default, Carbide creates a debug launch configuration the first time you launch the debugger based on current project settings. If additional information is required, like a port ID, the <a href="../projects/launch/wiz_new_launch_config.htm">New Launch Configuration Wizard</a>  appears asking for the additional information. </p>
-<p>The tabs in the window vary depending upon the currently selected launch configuration.</p>
-<p align="center" class="figure"><img src="images/wnd_debug_overview.png" width="864" height="471"><br />
-Figure 1 - Debug or launch configuration window (Symbian OS emulation view)</p>
-<h5>Table 1. Debug window &mdash; common items</h5>
+<h2>Debug dialog </h2>
+<p>Use the <b>Debug</b>  dialog to create, edit, and manage a project's <a href="launch_configs_overview.htm">launch configurations</a>. A <b>launch configuration</b> defines the settings used by the Carbide debugger to launch (Run) or debug programs. A project must have at least one  launch configuration in order to debug a project and can have many more. Projects that have no launch configuration  invoke the <a href="wiz_new_launch_config.htm">New Launch Configuration Wizard</a> when either the <b>Run</b> or <b>Debug</b> command is selected. </p>
+<p>Select the <b>Run &gt; Debug Configuration...</b> menu option to open the <b>Debug</b> dialog.</p>
+<p>The tabs shown in the <b>Debug</b> dialog vary depending upon the  type of launch configuration highlighted in the configurations list. See <a href="launch_configs_overview.htm">Launch Configuration Overview</a> for more information on the various launch configuration types. </p>
+<p>Click <b>Debug</b> to start a new debug session using the selected launch configuration. </p>
+<p align="center" class="figure"><img src="../images/wnd_debug_emulation_launch_config.png" width="658" height="403"></p>
+<p align="center" class="figure"> Figure 1 - Debug dialog (Symbian OS Emulation configuration shown)</p>
+<h5>Table 1. Debug dialog &mdash; common items</h5>
 <table width="94%"  border="0" cellpadding="2" cellspacing="0">
   <tr>
     <th width="7%" scope="col">Icon</th>
@@ -51,30 +52,15 @@
           <li>Filter Deleted/Unavailable Projects</li>
           <li>Filter Configuration Types</li>
           <li>Apply Window Working Set(s)</li>
-          <li><a href="trk/panel_filter.htm">Filtering Preferences...</a></li>
+          <li><a href="../../reference/trk/panel_filter.htm">Filtering Preferences...</a></li>
       </ul></td>
   </tr>
 </table>
-<div class="step">
-  <h4>To open the Debug window </h4>
-  <ul>
-    <li>Select the Run &gt; Open Debug Dialog... menu item</li>
-  </ul>
-  <ol>
-    The Debug window (Figure 1) appears.</ol>
-  <ul>
-    <li>Select Run &gt; Open Run Dialog...  to open a Run window to create a launch configuration for a release build.</li>
-  </ul>
-</div>
-<h5>Other references</h5>
+<h4>Other references</h4>
 <ul>
-  <li><a href="perspective_debug.htm">Debug Perspective</a></li>
-  <li><a href="../tasks/projects/prj_debug_config.htm">Creating a Launch Configuration</a></li>
-  <li><a href="../projects/launch/emulation.htm">Emulator overview</a></li>
-  <li><a href="../projects/launch/run_mode.htm">Run-mode overview</a></li>
-  <li><a href="../projects/launch/stop_mode.htm">Stop-mode overview</a>  </li>
+  <li><a href="launch_configs_overview.htm">Launch Configuration Overview</a></li>
+  <li><a href="pages_overview.htm">Configuration Pages</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>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/release_notes.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/release_notes.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -12,11 +12,11 @@
 .style1 {font-family: "Courier New", Courier, mono}
 .style5 {color: #FF0000}
 .style6 {font-weight: bold}
-  .style8 {color: #000000; font-weight: bold; }
+.style8 {color: #000000; font-weight: bold; }
   </style>
 </head>
 <body bgcolor="#ffffff">
-<h2>Carbide.c++ Release Notes 2.5.0</h2>
+<h2>Carbide.c++ Release Notes 2.6.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,25 +35,38 @@
 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.5.0 </h3>
+<h3><a name="whatsNew" id="whatsNew"></a>What's New in 2.6.0 </h3>
 <p>The following features for Symbian  development are provided within Carbide.c++:</p>
 <ul>
-  <li><b>RVCT 4.0 (ARMv5)</b> supported</li>
-  <li><b>SmartInstaller for Qt</b> supported</li>
+  <li><b>Nada </b> supported &mdash; ???</li>
 </ul>
-<h4><a name="240" id="210222"></a>2.4.0</h4>
+<h4><a name="new250" id="new"></a>2.5.0</h4>
+<ul>
+  <li><b>Plug-and-Play (PnP) On-device Debugging </b> supported &mdash; debugging a target device just got easier. Using a USB cable, connect the PC to the target device, then launch Carbide.c++. Carbide locates the connected device and creates a remote connection setup to communicate with it. Build the program and launch it on the device to start the debugging session. Refer to <a href="#pnpIssues">Known PnP Issues</a> for details if you experience problems.</li>
+  <li><b>PnP Phone Launch Wizard</b> - If the project does not already have a launch configuration, the PnP Launch Wizard makes it easy to create one for <a href="projects/launch/launch_phone.htm">phones</a>. In addition the new <a href="projects/launch/wnd_config_launch_config.htm">Configure Launch Configuration</a> dialog provides a quick summary of the remote connection for easy review and modification.</li>
+  <li><b>Carbide  automatically detects TRK on target phones and devices</b> - Carbide  now detects the presence of either Application or System TRK on a connected device when TRK 3.2.6 or later are installed. Earlier TRK versions  do not support this recognition feature.</li>
+  <li><b>TRK improvements</b> - TRK continues to evolve and now includes these improvements:
+    <ul>
+        <li>Both Application and System TRK v3.2.6 support PnP debugging. Update and install  using the <b>Help &gt; On Device Connections &gt; Install Remote Agents</b> pane in the <b>New Connection</b> dialog.</li>
+      <li><span class="code">VERSION3</span> command now supported</li>
+    </ul>
+  </li>
+  <li><b>RVCT 4.0 (ARMv5)</b> builds and some limited debugging is supported</li>
+  <li><b>Symbian ^3 SDK</b> now supported</li>
+</ul>
+<h4><a name="new240" id="new240"></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/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="230" id="21022"></a>2.3.0</h4>
+<h4><a name="new230" id="new230"></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>
   <li>Single file compiles on Raptor are now supported.</li>
 </ul>
-<h4><a name="220" id="2102"></a>2.2.0</h4>
+<h4><a name="new220" id="new220"></a>2.2.0</h4>
 <ul>
   <li><b>Eclipse 3.5 </b>&#8212; The Eclipse 3.5 project (Galileo) provides the foundation, or integration platform, on which  Carbide.c++  is built. See <a href="PLUGINS_ROOT/org.eclipse.platform.doc.user/whatsNew/platform_whatsnew.html">What's New in 3.5</a> for more information.</li>
   <li><b>CDT 6.0 </b>&#8212; The final version of CDT included as part of the Galileo release. See the <a href="http://wiki.eclipse.org/CDT/User/NewIn60">CDT 6.0 News and Noteworthy</a> page for more information.</li>
@@ -61,7 +74,7 @@
   <li><b>SBSv2 arguments field</b> - added a text field to the <a href="reference/wnd_build_prefs.htm">Build &gt; SBSv2</a> panel to allow parameter passing to Raptor builds.</li>
   <li><b>Carbide.c++ News Reader</b> - now uses  the proxy data provided by Eclipse when creating help connections.</li>
 </ul>
-<h4><a name="210" id="210"></a>2.1.0</h4>
+<h4><a name="new210" id="new210"></a>2.1.0</h4>
 <ul>
   <li><b>Performance improvements</b> - the following areas of Carbide have been optimized to improve performance:
     <ul>
@@ -175,6 +188,26 @@
  style="vertical-align: top; text-align: center; font-weight: bold; ">Workaround</th>
     </tr>
     <tr align="center">
+      <td colspan="2" bgcolor="#FFFFCC"><b><a name="pnpIssues" id="pnpIssues"></a>KNOWN PnP ISSUES in 2.5</b></td>
+    </tr>
+    <tr align="center">
+      <td><div align="left">Connecting multiple devices</div></td>
+      <td><div align="left">If multiple devices are plugged into USB, Carbide sometimes cannot determine the USB personality of either or both devices. Carbide will log an error that says the &quot;getting/setting of USB personality&quot; was not supported and no connection is created. The work-around is to plug only one device in.</div></td>
+    </tr>
+    <tr align="center">
+      <td><div align="left">Multiple same error warnings</div></td>
+      <td><div align="left">
+        <p>If a single device is plugged in, and Carbide logs the same error, this is an indication that either </p>
+        <p>A. the PCSuite/OVISuite drivers are not up-to-date or </p>
+        <p>B. the device does not support switching to PC/OVI Suite mode from its current mode </p>
+        <p>For case A, try installing a later version of PCSuite. For case B, set the default USB mode to PC/OVI Suite mode in the settings on the device or selecting PC/OVI Suite mode when the device asks which USB mode to select.</p>
+        </div></td>
+    </tr>
+    <tr align="center">
+      <td><div align="left">PC Suite fails to send updates</div></td>
+      <td><div align="left">On some devices, when unplugging and plugging back in the same USB mode, PC Suite will fail to notify that the device disconnected and the personality switch bubble will not pop up. As a work-around, change the default mode and plug in the device again.</div></td>
+    </tr>
+    <tr align="center">
       <td colspan="2" bgcolor="#FFFFCC"><a name="CRITICAL_ITEMS"></a><span class="style8">CRITICAL ITEMS</span></td>
     </tr>
     <tr>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/AddingClasses.html	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/AddingClasses.html	Tue Apr 13 15:55:45 2010 -0500
@@ -16,12 +16,11 @@
 		  or select <b>New &gt; Class</b> from the project&prime;s pop-up
 	    menu where you want the new class to reside. </p> 
      <p>
-	    The New C++ Class wizard then appears. 
-     </p> 
+	    The <b>New C++ Class</b> wizard appears.</p> 
 	  </li> 
 	  <li> 
 	    <p>
-		   Specify the folder when the class should be created by typing the		    <b>Source Folder</b> name or by clicking <b>Browse</b> and
+		   Specify the folder where the class should be created by typing the		    <b>Source Folder</b> name or by clicking <b>Browse</b> and
 	    selecting the source folder. </p> 
 		  
 	     <p align="center" class="Image"><img src="../images/newclasswiz.gif" alt="" width="500" height="568"  border="0" /></p>
@@ -40,7 +39,7 @@
 	    <p>
 		   Click <b>Add</b> to choose the <b>Base Classes</b> from which the class has to be derived</p> 
 		  
-	     <p align="center" class="Image"><img src="../images/choosebaseclass.gif" alt="" width="306" height="565"  border="0" /></p>
+	     <p align="center" class="Image"><img src="images/wnd_chooseBaseClass.png" width="309" height="565"></p>
        <p>To select a base type you are looking for, do the following: </p>
       <ol type="a">
       <li>Type the search string to locate the class, struct and other low-level types you are looking for</li>
@@ -63,7 +62,6 @@
 			   class in new header and source files with default names. Otherwise, deselect
 			   the Use Default checkbox, and enter the Header and Source file names. Click Browse to select the Header and Source files, if you want to
         add the class declaration and definition to existing files. </p> 
-
      <li>
 	       Click Finish to create a C++ class according to the
         specification, or click Cancel to cancel the task.</li> 
@@ -73,7 +71,7 @@
 	   <ul>
          <li><a href="../reference/NewClassWizard.html">New C++ Classs Wizard</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>
+<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/AddinganSDK.html	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/AddinganSDK.html	Tue Apr 13 15:55:45 2010 -0500
@@ -21,7 +21,7 @@
 	   </li> 
 		<div class="Figure">
 
-			 <p class="Image"><img src="../images/SDKPreferences.png" width="696" height="583" /></p>
+			 <p class="Image"><img src="../images/SDKPreferences.png" width="740" height="546" /></p>
  
 		  
 </div> 
@@ -38,7 +38,7 @@
 <ul>
        <li><a href="../reference/SDKPreferences.html">SDK Preferences</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>
+<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/AppInfoFile.html	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/AppInfoFile.html	Tue Apr 13 15:55:45 2010 -0500
@@ -6,7 +6,7 @@
    <h2>Creating an AIF File</h2>
    
    <p>
-	  The AIF Definition File wizard creates a file that
+	  The <b>AIF Definition File</b> wizard creates a file that
 		specifies an AIF file to be built as part of the project. An AIF file is a
 		Symbian OS application information file, which describes an application's icons
    and properties. For more information, see <a href="../concepts/AIFDefWizard.html">Concepts &gt;AIF File</a>.</p>
@@ -18,9 +18,9 @@
    <ol> 
 	  <li> 
 	    <p>
-		   Open the MMP file associated with the project in the Symbian Project Navigator (double-click on .mmp file or right-click and select Open).</p> 
+		   Open the MMP file associated with the project in the <a href="../reference/view_sym_proj_nav.htm">Symbian Project Navigator</a> (double-click on MMP file or right-click and select <b>Open</b>).</p> 
 	    
-	     <p align="center" class="Image"><img src="projects/images/AIF_editor_mmp_symprojnav.png" width="271" height="261" /></p>
+        <p align="center" class="Image"><img src="projects/images/AIF_editor_mmp_symprojnav.png" width="271" height="261" /></p>
      </li>
 		 <p class="figure">Figure 1 - MMP File in Symbian Project Navigator</p>
 	  <li>The MMP editor opens.</li> 
@@ -52,7 +52,7 @@
    <ul>
      <li> <a href="../reference/AIFEditor.html">AIF Editor</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>
+   <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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/CreatingNewProjects.html	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/CreatingNewProjects.html	Tue Apr 13 15:55:45 2010 -0500
@@ -1,53 +1,45 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
-  <title>Creating New Projects in Tasks</title>
+  <title>Creating New Projects</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
 <body>
 <h2>Creating New Projects</h2>
   <div class="Bodytext">
-    <p> A new Symbian OS C++ project can be created using the <b>New Project
-    Wizard</b>. A number of templates are available that support different SDKs and executable types. </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="sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
+    <p>New  projects are created using the <b>New Project Wizard</b>. Carbide includes a number of templates that make creating projects for different SDKs and executables quick and easy.</p>
+    <p class="note"><b>NOTE</b> You must have  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="sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
     <p class="note"><b>NOTE</b> When creating or importing projects the sources and SDK must be on the same drive. This is due to many of the internal SDK tools using an implicit working drive to calculate paths (e.g. \epoc32\tools). Avoid spaces in SDK paths since this will also cause problems.</p>
-    <h3>Creating New Symbian OS C++ Projects</h3>
     <div class="step">
-      <ol>
-      <li style="font-weight: normal;"> Select <b>File
-&gt; New &gt; Symbian OS C++ Project</b> to invoke the <b>New Project</b> wizard.</li>
-      <div align="center">
-        <p><img src="../images/step1.png" width="506" height="318" alt="" ></p>
-        <p>&nbsp;</p>
-      </div>
-      <li style="font-weight: normal;">The <b>New Symbian OS C++ Project</b> wizard appears. Select a template related to an installed SDK. Select the &quot;Filter templates based on enabled SDKs&quot; option to list only SDKs enabled in the <a href="../reference/SDKPreferences.html">SDK Preferences panel</a>. Unselect this option to list  SDKs that can be used with Carbide. Click Next.</li>
-      <p>A project template provides an initial set of source files and project settings appropriate for the project type that you have chosen. The text at the bottom of the window provides a brief description of each template. The project type determines the type of program that you are writing.</p>
-      <p class="note"><b>NOTE</b><b> </b>If the selected template requires user input, additional wizard pages will collect data from the user before creating the project. </p>
-      <p align="center"><img src="../images/step2.png" width="500" height="567" alt="" > </p>
-      <p align="center">&nbsp;</p>
-      <li style="font-weight: normal;">Enter a name for your project. 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. Enter the path in the <b>Location</b> field or click Browse button to locate the directory. Click <b>Next</b>.</li>
-      <p align="center"><span class="Image"><img src="images/new_proj_name_location.png" alt="new project" width="500" height="400"></span></p>
-      <p class="note"><strong>NOTE</strong> There will be two builders available in Carbide, one for SBSv1 (current version of Symbian Build System) and  one for SBSv2 (newer version). The Builder option will only be displayed when a SBSv2  installation is detected.</p>
-      <p class="Image">SBSv2  only works with recent versions of Symbian OS9.5. Both  SBSv1 and SBSv2 are GNU make based build systems.&nbsp; SBSv1 uses Perl to generate make files,  while SBSv2 uses Python. Select the appropriate builder for your project.</p>
-      When building for  SBSv2, the builder will set EPOCROOT to the absolute path (including drive  letter) to the kit for the active build configuration.&nbsp; It will also add the path to the sbs bin  directory to the start of the PATH variable.&nbsp;  This is derived from the SBS_HOME environment variable.
-      <p class="Image">For SBSv2, all  build configurations (platform/target), including the built-in platforms  (WISNCW, ARMV5), are declared in xml files in the \sbs\lib\config directory.  The Build  Configurations selection page will display only those kits  known to support SBSv2.<span class="Image"><br>
+    <h3>Creating New Symbian OS C++ Projects</h3>
+    <ol>
+      <li class="step">Select <b>File &gt; New &gt; Symbian OS C++ Project</b> to invoke the <b>New Project</b> wizard.</span></li>
+        <p><img src="../images/step1.png" width="546" height="142" alt="" ></p>
+        <li>The <b class="step">New Symbian OS C++ Project</b> wizard appears. Select a template related to an installed SDK.</li>
+      <p>A project template provides the initial source files and project settings appropriate for the chosen project type. A brief description of each template appears below the list. The project type determines the type of program that you are writing.</p>
+      <p class="note"><b>NOTE</b> If the selected template requires user input, additional wizard pages will collect data from the user before creating the project.</p>
+      <p>Checkmark the <b>Filter templates based on enabled SDKs</b> option to only list  SDKs enabled in the <a href="../reference/SDKPreferences.html">SDK Preferences</a> panel. Uncheck this option to list  SDKs that can be used with Carbide. Click <b>Next</b>.</p>
+      <p align="center"><img src="../images/step2.png" width="500" height="567" alt="" ></p>
+      <li>Enter a name for your project. </li>
+      <p>Checkmark the <b>Use default location</b> option to save the project in the current workspace by default or uncheck it to save to another location. Enter the path in the <b>Location</b> field or click <b>Browse</b> button to locate the directory. Click <b>Next</b>.</p>
+      <p align="center"><span class="Image"><img src="images/new_proj_name_location.png" alt="new project" width="500" height="567"></span><span class="Image"><br>
       </span></p>
-      <li style="font-weight: normal;">Select the <b>SDKs and Build Configurations</b>. Enable the <b>Filter SDKs based on selected template</b> option to show only the build configurations based on the SDK template you previously selected. Uncheck this option to show all enabled SDKs and their related build configurations.</li>
-    
-  <p align="center"><img src="../images/step4.png" width="500" height="500" alt="" ></p>
-      <p class="Image">The Symbian OS SDKs wizard page shows a tree of the SDKs that are available to be used, and for each
-        SDK, the type of builds that can be done. You can select a single SDK
-        if you are developing the program for just one version of a platform,
-      or multiple SDKs if you intend to build your program for multiple build platforms or SDK versions.</p>
-      <p> The build configuration allows you to choose the compiler(s) to
-      do the build, and whether debug and/or release builds are required. For this example we recommend using the Emulator Debug version as the <a href="../concepts/build_configurations.htm">build configuration</a>. Later, you can <a href="projects/prj_set_build_tgt.htm">switch</a> to another build configuration to create the project for a specific device.</p>
-      <li span style="font-weight: normal;">Click <b>Next</b> to set project properties in the <b>Basic Settings</b> page: </li>
-    <div align="center"><img src="../images/step5.png" width="500" height="500" alt="" >        </div>
-    <blockquote>
+      <li>Select the <b>SDKs and Build Configurations</b>. </li>
+      <p>Checkmark the <b>Filter SDKs based on selected template</b> option to only show  build configurations based on the selected SDK template, or uncheck to show all enabled SDKs and their related build configurations.</p>
+      <p align="center"><img src="../images/step4.png" width="500" height="567" alt="" ></p>
+      <p class="Image">The Symbian OS SDKs wizard page shows a tree of the SDKs and the type of builds available within that SDK. Select a single SDK
+        if the program you are developing is for just one version of a platform,
+      or select multiple SDKs to build the program for multiple build platforms or SDK versions.</p>
+      <p> The build configuration allows you to specify the compiler(s) to
+        do the build, and whether debug and/or release builds are required. For this example we recommend using the Emulator Debug version as the <a href="../concepts/build_configurations.htm">build configuration</a>. Later, you can <a href="projects/prj_set_build_tgt.htm">switch</a> to another build configuration to create the project for a specific device.</p>
+      <p> Click <b>Next</b>.</p>
+      <li>Set the project properties in the <b>Basic Settings</b> page. </li>
+      <div align="center"><img src="../images/step5.png" width="500" height="567" alt="" >        </div>
+      <blockquote>
         <p align="left" class="note"><b>NOTE</b> The basic properties for a project may change based on the template selected for a particular project type. </p>
         <p align="left" style="font-weight: normal;">Fill in the applicable fields, which
               may include UID2, UID3, Vendor ID, Author, Support Email, Copyright
-        notice and&nbsp; Target Type for console EXEs.</p>
+        notice and Target Type for console EXEs.</p>
     
   <p>Application UID (or UID3) is used to uniquely identify the binary (EXE or DLL) within the system. The purpose of UID 3 is to prevent one executable from interfering the operation of another executable.</p>
       <p>    A Vendor ID (VID) is a unique identifier for the organization that is supplying the program. In versions of Symbian OS with platform security, a program can read a VID at runtime to check that a binary comes from a particular source. In most cases, the VID should be zero, meaning that source of the executable is not required for any security checks.</p>
@@ -59,30 +51,27 @@
           <li>For static interface DLLs, the UID 2 is always 0x1000008d</li>
           <li>For polymorphic DLLs, the UID2 is defined by the framework which is being implemented</li>
         </ul>
-      Author, Copyright notice, and Text to be shown are used in comments created by the wizard in the source code.    </blockquote>
-    <blockquote>
+      Author, Copyright notice, and Text to be shown are used in comments created by the wizard in the source code.    
       <p><span style="font-weight: normal;"> For more information on UIDs
           and Vendor IDs, see </span><a
  href="https://www.symbiansigned.com/app/page/uidfaq"
  style="font-weight: normal;">Symbian Signed</a>,
           <span style="font-weight: normal;">which allocates these values.</span>        </p>
-    </blockquote>
-    
-    <li span style="font-weight: normal;">
+      </blockquote>
+      <li span style="font-weight: normal;">
         Click <b>Next</b> to move to the <b>Project Directories</b> page.</li>
         <div class="Figure">
-          <p align="center" class="Image"><img src="../images/step6.png" width="500" height="500" alt="" ><br>
+          <p align="center" class="Image"><img src="../images/step6.png" width="500" height="567" alt="" ><br>
           </p>
-          <p class="note" style="font-weight: normal;"> <b>NOTE</b> The project directories depends on the template
-      selected. That is, the directories required to store project data may
-      change based on the template selected. </p>
+          <p class="note" style="font-weight: normal;"> <b>NOTE</b> The project directories depends on the selected template. That is, the directories required to store project data may
+      change based on the template used. </p>
         </div>
-      <li style="font-weight: normal;">Accept the defaults or enter the names for Include and Source folders to be created under the project root directory. Generated files will be copied to these directories.      </li>
-      <li style="font-weight: normal;"> Click <b>Finish</b> to create the project, which will generate the necessary files for the project based
-      on the template selected and show them in the <a href="../reference/view_cpp_projects.htm">C/C++ Projects view</a>.</li>
+      <p>Accept the defaults or enter the names for Include and Source folders to be created under the project root directory. Generated files will be copied to these directories.</p>
+      <li> Click <b>Finish</b> to create the project.</li>
+      <p>This generates the necessary files for the project based on the template selected and show them in the <a href="../reference/view_cpp_projects.htm">Project Explorer</a> view.</p>
     </ol>
     <blockquote>
-      <p align="center"><img src="../images/step7.png" width="273" height="301" alt="" > </p>
+      <p align="center"><img src="../images/step7.png" width="277" height="339" alt="" > </p>
     </blockquote>
   </div>
   <blockquote>
@@ -106,7 +95,7 @@
     <li><a href="start/carbide_debugging.htm">Debugging a Symbian OS Program</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>
+<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/CreatingProjectsToc.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/CreatingProjectsToc.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -11,7 +11,7 @@
 	   <li><a href="ImportingProjects.html">Importing Projects from a BLD.INF File</a></li>
 	   <li><a href="projects/prj_build_multi_projects.htm">Importing Projects with Inter-Dependencies</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>
+<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/EmulatorToc.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/EmulatorToc.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -7,9 +7,9 @@
 	 <p>The topics include:</p>
 	 <ul>
 	   <li><a href="projects/prj_build_cmd_line.htm">Setting Environment for x86 Compiler </a></li>
-	   <li><a href="../reference/wnd_carbide_pref_x86.htm">Unseting Built-in Environment </a></li>
+	   <li><a href="../reference/wnd_carbide_pref_x86.htm">Unsetting Built-in Environment </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>
+<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/ExportingtoMMP_BLDinf.html	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/ExportingtoMMP_BLDinf.html	Tue Apr 13 15:55:45 2010 -0500
@@ -33,7 +33,7 @@
        </li> 
 	    <li>Select <span class="code">Symbian MMP/Bld.Inf</span> and click
 		    <span class="code">Next</span> to go to the <span class="code">Symbian Projects</span> page: 
-	      </p> 
+	      <p></p> 
 	      <div class="Figure">
 		      
 	         <p class="Image"><a name=""><img src="../images/export2.gif" alt="" width="470" height="550"  border="0"></a></p>
@@ -92,16 +92,16 @@
 		    file based on the chosen build configuration. If more than one build
 		    configuration which require different build settings are chosen, guard macros
 		    are used to determine the build settings. For example, if you want to change
-		    the <span class="code">SECUREID</span> option for all the <code>EKA2</span> build
+		    the <span class="code">SECUREID</span> option for all the <code>EKA2 build
 		    configurations, the wizard will append the following lines into the
-		    <span class="code">MMP</span> file:	      </p> 
+		    <span class="code">MMP</span> file:	      </code></p><code> 
 	      <p class="CodeBlock">#if def EKA2<br>&nbsp;&nbsp;SECUREID 0x00301<br>#endif</p> 
 	      <p>
-	         Where <code>EKA2</span> is the guard macro for all the build
+	         Where <code>EKA2 is the guard macro for all the build
 		      configurations designed for the EKA2 kernel. The above <span class="code">MMP</span> file
-		      statements check whether the <code>EKA2</span> guard macro is defined, and if
-		      it is, change the <code>SECUREID</span> option accordingly.	      </p> 
-	    </li> 
+		      statements check whether the <code>EKA2 guard macro is defined, and if
+		      it is, change the <code>SECUREID option accordingly.	      </code></code></code></p> 
+	    </code></li><code><code><code><code> 
 	    <li> 
 		    Click <span class="code">Next</span> to go to the <span class="code">MMP File and Bld.inf
 		      File</span> page: 
@@ -168,9 +168,9 @@
             <span class="code">epoc32\include</span> directory. 
           <p>
              Note that the contents of the <span class="code">PRJ_EXPORTS</span> list is
-              exactly the same as it appears in the <code>PRJ_EXPORTS</span> section of the
-             <span class="code">Bld.Inf</span> file.          </p> 
-        </li>
+              exactly the same as it appears in the <code>PRJ_EXPORTS section of the
+             <span class="code">Bld.Inf</span> file.          </code></p> 
+        </li><code>
         <li> 
             If you want to modify or delete any entry from the
             <span class="code">PRJ_EXPORTS</span> list, select the entry and click
@@ -189,7 +189,7 @@
             contents if required.        </li>
         <li> 
             Click <span class="code">Finish</span> to complete the export process. The
-            wizard will create the managed <span class="code">MMP</span> file and <code class="filename">Bld.inf</span>
+            wizard will create the managed <span class="code">MMP</span> file and <code class="filename">Bld.inf
             file in their specified locations.
           <p>
              A managed <span class="code">MMP</span> file contains the same content as a
@@ -223,9 +223,9 @@
 		    You will be notified in case of any errors during the updated
 		    process, which results in not creating the <span class="code">MMP</span> or
 		    <span class="code">Bld.Inf</span> files.</p> 
-        </li>
-     </ol>
-   </div>
+        </code></li>
+     </code></code></code></code></code></ol>
+   </div><code><code><code><code><code><code class="filename">
      <p>
        The following <span class="code">MMP</span> file generated by the wizard, shows how
        its content is organised using managed sections:       </p>
@@ -266,6 +266,6 @@
      /*&amp; END_LINKAGE_INFORMATION &amp;*/</p>
    <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>
+   </code></code></code></code></code></code></body>
 </html>
    
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/Multi-BitmapFile.html	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/Multi-BitmapFile.html	Tue Apr 13 15:55:45 2010 -0500
@@ -14,11 +14,11 @@
    </div>
 	 <ol> 
 		<li> 
-		 In the Symbian Project Navigator view double-click  a .mmp file (Figure 1) to open the <b>MMP Editor</b> (Figure 2).
-		   <p align="center"><img src="projects/images/AIF_editor_mmp_symprojnav.png" width="271" height="261" /></p>
+		 In the <a href="../reference/view_sym_proj_nav.htm">Symbian Project Navigato</a>r view double-click  a .mmp file (Figure 1) to open the <b>MMP Editor</b> (Figure 2).
+	      <p align="center"><img src="projects/images/AIF_editor_mmp_symprojnav.png" width="271" height="261" /></p>
 		   <p align="center" class="figure">Figure 1- MMP File </p>
 	   </li>
-	    <li>
+       <li>
        In the <b>Sources</b> tab under the <b>Resources</b> group, select <b>Bitmaps</b> </li>
 
 	    <p align="center"><img src="projects/images/mmpeditor_addbitmap.png" width="581" height="383" /></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/RmvngandVwngPropsosSDK.html	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/RmvngandVwngPropsosSDK.html	Tue Apr 13 15:55:45 2010 -0500
@@ -27,7 +27,7 @@
 	   </li>
 		<div class="Figure">
 
-		   <p class="Image"><img src="../images/SDKPreferences.png" width="696" height="583" /></p>
+		   <p class="Image"><img src="../images/SDKPreferences.png" width="740" height="546" /></p>
 	   </div>
 		<p class="note"><b>NOTE</b> SDKs shown in <span class="style2">red</span> indicate a problem, for example no <span class="style1">EPOCROOT</span>. </p>
 
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -9,61 +9,28 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Run Mode On-Device Debugging</h2>
-<p>To implement run mode on-device debugging the following tasks need to be completed.</p>
+<p>Run mode on-device debugging enables you to download and launch a project on a phone or target device and debug it using the Carbide debugger. Before you can do that, some setup requirements are required. Once the setup is done, Carbide can then use plug-and-play (PnP) with USB to create a remote connection that connects  with the TRK agent on the target device to download, launch, and debug the program.</p>
 <ol>
-  <li><b>Install device connection software</b></li>
-  <li><a href="run_mode_debug_01.htm">Install Perl</a></li>
-  <li><a href="run_mode_debug_02.htm">Install an SDK</a></li>
-  <li><a href="run_mode_debug_03.htm">Setup environment variables</a></li>
-  <li><a href="run_mode_debug_04.htm">Setup a virtual drive for Techview and Cust Kits</a></li>
-  <li><a href="run_mode_debug_05.htm">Set the default kit in Devices.xml </a></li>
-  <li><a href="run_mode_debug_06.htm">Install the SISX file on the target device</a></li>
-  <li><a href="run_mode_debug_07.htm">Configure TRK connection on the device</a></li>
-  <li><a href="run_mode_debug_08.htm">Create a launch configuration</a></li>
+  <li><b>Setup system and development requirements</b> (below)</li>
+  <li><a href="../trk/trk_installation_instr.htm">Install</a> Application or System TRK v3.2.6 or later on the target device</li>
+  <li><a href="../trk/trk_connection_usb.htm">Connect</a> USB cable to phone or target device for PnP connectivity</li>
+  <li><a href="../CreatingProjectsToc.htm">Create</a> or <a href="../ImportingProjects.html">import</a> a project in the Carbide C/C++ workspace</li>
+  <li><a href="../projects/prj_build.htm">Build</a> the project</li>
+  <li><a href="../../debugger/debug/cmds_starting.htm">Debug</a> the project on  a <a href="../../projects/launch/launch_phone.htm">phone</a> or <a href="../../projects/launch/launch_board.htm"> target device</a></li>
 </ol>
 <div class="step">
-<h4><a name="runInstall" id="runInstall">	</a>Install Device Connection Software</h4>
-<p>The two choices for connecting are Bluetooth and PC Suite. </p>
-<h5>BlueTooth</h5>
-<ol>
-  <li>System requirements: </li>
+  <h4><a name="runInstall" id="runInstall2"> </a>Setup  system and development requirements</h4>
+  <p>All of the following requirements are required to build, communicate, and control programs on a phone or target device.</p>
   <ul>
-    <li>Administration rights on your computer</li>
-    <li> BT dongle attached to your computer</li>
-    <li>Bluetooth installer to install the drivers</li>
+    <li>Install <a href="../trk/trk_install_pcsuite.htm">PC Suite</a> or <a href="http://nds1.nokia.com/files/support/global/phones/software/Nokia_Ovi_Suite_webinstaller_ALL.exe">Ovi Suite</a> on your PC to ensure the correct drivers are installed for connecting to the phone or target device.</li>
+    <li>Install the correct version of <a href="run_mode_debug_01.htm">Perl</a> on your PC to support Symbian OS builds</li>
+    <li>Install a supported <a href="run_mode_debug_02.htm">SDK</a> and make sure its the default</li>
+    <li><a href="run_mode_debug_03.htm">Configure</a> the environmental variables</li>
+    <li>(Optional) <a href="run_mode_debug_04.htm">Setup</a> a virtual drive to use Techview and Cust Kits</li>
   </ul>
-  <li>Install the Bluetooth dongle to a USB port</li>
-  <li>Install the drivers from the Bluetooth CD</li>
-  <li>Click on the Bluetooth icon in your system tray and run the Bluetooth setup</li>
-  <li>Right click on the Bluetooth icon in the System tray and select Advanced Configuration</li>
-  <li>Click the Accessibility tab
-    <ol type="a">
-      <li>Check the option &ldquo;Let other Bluetooth devices discover this computer&rdquo;</li>
-        <li>Set the option under &ldquo;Allow&rdquo; to &ldquo;All Devices&rdquo;</li>
-      </ol>
-    </li>
-</ol>
-<p class="note"><b>NOTE</b> The Nokia PC image includes the Microsoft Bluetooth drivers which do not support serial emulation over Bluetooth. You need to download and install the drivers provided by the Bluetooth manufacturer to connect to a device. </p>
-<h5>Nokia PC Suite 6.8</h5>
-<ol>
-  <li>Install <a href="http://www.nokiausa.com/support/pcsuite/main.html%20or%20http://europe.nokia.com/A4144903">PC Suite</a> (or later version)    
-    <p>Launch the PC Suite installer and follow the onscreen instructions to install the software. When finished, a <b>Get Connected</b> wizard should appear</p>
-  </li>
-  <li> Press Next</li>
-  <li>In the &quot;Select your connection type&quot; window select &quot;Cable Connection&quot; and press Next</li>
-  <li>You will be prompted to connect the phone via the USB cable</li>
-  <li>Connect the phone and continue with  onscreen instructions</li>
-  <li>After installation your  phone should be listed</li>
-  <li>Click Finish</li>
-  <li>Select PC suite on your phone</li>
-  <p>The Nokia PC Suite window should appear</p>
-  <li>Select the Manage Connections icon</li>
-  <li>Uncheck all the connections available</li>
-  <li>Click Ok</li>
-  <p>PC Suite is now ready to use.</p>
-</ol>
+  <p>Once you've setup your environment, its time to verify that the TRK agent is on the phone or target device.</p>
 </div>
-<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_01.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_01.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -4,34 +4,27 @@
 <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>Debugger Settings</title>
+<title>Installing PERL</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
 <body bgcolor="#FFFFFF">
-<h2>Run Mode On-Device Debugging</h2>
-<p>To implement run mode on-device debugging the following tasks need to be completed.</p>
-<ol>
-  <li><a href="run_mode_debug.htm">Install device connection software</a></li>
-  <li><b>Install Perl</b></li>
-  <li><a href="run_mode_debug_02.htm">Install an SDK</a></li>
-  <li><a href="run_mode_debug_03.htm">Setup environment variables</a></li>
-  <li><a href="run_mode_debug_04.htm">Setup a virtual drive for Techview and Cust Kits</a></li>
-  <li><a href="run_mode_debug_05.htm">Set the default kit in Devices.xml </a></li>
-  <li><a href="run_mode_debug_06.htm">Install the SISX file on the target device</a></li>
-  <li><a href="run_mode_debug_07.htm">Configure TRK connection on the device</a></li>
-  <li><a href="run_mode_debug_08.htm">Create a launch configuration</a></li>
-</ol>
+<h2>Installing PERL</h2>
+<p>PERL is required for many Symbian OS utilities and commands.</p>
 <div class="step">
-<h4><a name="runPerl" id="runPerl"> </a>Install PERL</h4>
+<h4><a name="runPerl" id="runPerl"> </a>Installing PERL</h4>
 <ul>
   <li>Install ActivePERL version 5.6.1 b638</li>
 </ul>
 <blockquote>
   <p>Software can be downloaded from: <a href="http://www.activestate.com/Products/ActivePerl/">http://www.activestate.com/Products/ActivePerl/</a>.</p>
   <p class="note"><b>NOTE</b> Later releases of Perl are not yet supported by the Symbian utilities and can cause unknown compiling errors. </p>
-</blockquote>
+  </blockquote>
 </div>
-<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>
+<h5>Other references</h5>
+<ul>
+  <li><a href="run_mode_debug.htm">Run Mode On-Device Debugging</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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_02.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_02.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -4,40 +4,58 @@
 <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>Debugger Settings</title>
+<title>Installing an SDK</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
 <body bgcolor="#FFFFFF">
-<h2>Run Mode On-Device Debugging</h2>
-<p>To implement run mode on-device debugging the following tasks need to be completed.</p>
-<ol>
-  <li><a href="run_mode_debug.htm">Install device connection software</a></li>
-  <li><a href="run_mode_debug_01.htm">Install Perl</a></li>
-  <li><b>Install an SDK</b></li>
-  <li><a href="run_mode_debug_03.htm">Setup environment variables</a></li>
-  <li><a href="run_mode_debug_04.htm">Setup a virtual drive for Techview and Cust Kits</a></li>
-  <li><a href="run_mode_debug_05.htm">Set the default kit in Devices.xml </a></li>
-  <li><a href="run_mode_debug_06.htm">Install the SISX file on the target device</a></li>
-  <li><a href="run_mode_debug_07.htm">Configure TRK connection on the device</a></li>
-  <li><a href="run_mode_debug_08.htm">Create a launch configuration</a></li>
-  </ol>
+<h2>Installing an SDK</h2>
+<p>To create projects an SDK must be installed. If more than one SDK is installed one must be specified as the default.</p>
 <div class="step">
-<h4><a name="runSDK" id="runSDK"> </a>Install an SDK</h4>
-<p>The following SDKs can be downloaded from forum Nokia at: <a href="http://www.forum.nokia.com/Tools_Docs_and_Code/">http://www.forum.nokia.com/</a>.</p>
-<ul>
-  <li>Install at least one of the following SDKs:</li>
+<h4><a name="runSDK" id="runSDK"> </a>Installing an SDK</h4>
+<p>The following SDKs can be downloaded from Nokia at: <a href="http://www.forum.nokia.com/Tools_Docs_and_Code/">http://www.forum.nokia.com/</a>.</p>
+<ol>
+  <li>Install at least one of the following SDKs using the install directions that accompany the SDK:
+    <ul>
+      <li>Series 60 5.0</li>
+      <li>Qt for S60</li>
+      <li>Series80</li>
+      <li>Series 60 cust kits</li>
+      <li>Techview Development kits</li>
+    </ul>
+  </li>
+  <li>Set the default SDK to use for projects
+    <ol type="A">
+      <li>In Carbide.c++
+        <ol type="i">
+          <li>Click Window &gt; Preferences &gt; Carbide.c++ &gt; SDK Preferences to open the SDK Preferences panel</li>
+          <li>Select the SDK and click SDK Properties to open the SDK Properties dialog</li>
+          <li>Set the Default SDK value to Yes</li>
+          <li>Close all the dialogs</li>
+        </ol>
+      </li>
+      <li>In a command-line prompt:
+        <ol type="i">
+          <li>Set the default device devkit by typing on the command line:<br>
+            <br />
+  &gt; <span class="code">devices &ndash;setdefault @device id: name</span></li>
+          <p>The device id and name can be found in the devices.xml file. For example, for a Techview 9.2 kit you might type<br>
+              <br />
+            <span class="code">&gt; devices &ndash;setdefault @ SymbianOS_92_2006_wk40:com.symbian.techview</span></p>
+          <li>Now ensure the default device is set by entering:<br>
+            <br />
+  &gt; <span class="code">devices</span></li>
+          </ol>
+      </li>
+      <li>Make sure the correct SDK default is set.</li>
+      </ol>
+  </li>
+  </ol>
+  </div>
+
+<h5>Other references</h5>
 <ul>
-  <li> Series 60 5.0</li>
-  <li> Series 60 3.0</li>
-  <li>Series80</li>
-  <li>Series 60 cust kits </li>
-  <li>Techview Development kits
-    </p>
-  </li>
+  <li><a href="run_mode_debug.htm">Run Mode On-Device Debugging</a>  </li>
 </ul>
-</ul>
-</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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_03.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_03.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -4,25 +4,14 @@
 <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>Debugger Settings</title>
+<title>Configuring Environment Variables</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
 <body bgcolor="#FFFFFF">
-<h2>Run Mode On-Device Debugging</h2>
+<h2>Configuring Environment Variables</h2>
 <p>To implement run mode on-device debugging the following tasks need to be completed.</p>
-<ol>
-  <li><a href="run_mode_debug.htm">Install device connection software</a></li>
-  <li><a href="run_mode_debug_01.htm">Install Perl</a></li>
-  <li><a href="run_mode_debug_02.htm">Install an SDK</a></li>
-  <li><b>Setup environment variables</b></li>
-  <li><a href="run_mode_debug_04.htm">Setup a virtual drive for Techview and Cust Kits</a></li>
-  <li><a href="run_mode_debug_05.htm">Set the default kit in Devices.xml </a></li>
-  <li><a href="run_mode_debug_06.htm">Install the SISX file on the target device</a></li>
-  <li><a href="run_mode_debug_07.htm">Configure TRK connection on the device</a></li>
-  <li><a href="run_mode_debug_08.htm">Create a launch configuration</a></li>
-  </ol>
 <div class="step">
-<h4><a name="runEnvVars" id="runEnvVars"> </a>Setup Environment Variables</h4>
+<h4><a name="runEnvVars" id="runEnvVars"> </a>Configuring Environment Variables</h4>
 <ol>
   <li>Set EPOCROOT variable
     <ol type="a">
@@ -50,7 +39,11 @@
   </li>
   </ol>
 </div>
-<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>
+<h5>Other references</h5>
+<ul>
+  <li><a href="run_mode_debug.htm">Run Mode On-Device Debugging</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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_04.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_04.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -4,26 +4,14 @@
 <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>Debugger Settings</title>
+<title>Setup a Virtual Drive for Techview and Cust Kits</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
 <body bgcolor="#FFFFFF">
-<h2>Run Mode On-Device Debugging</h2>
-<p>To implement run mode on-device debugging the following tasks need to be completed.</p>
-<ol>
-  <li><a href="run_mode_debug.htm">Install device connection software</a></li>
-  <li><a href="run_mode_debug_01.htm">Install Perl</a></li>
-  <li><a href="run_mode_debug_02.htm">Install an SDK</a></li>
-  <li><a href="run_mode_debug_03.htm">Setup environment variables</a></li>
-  <li><b>Setup a virtual drive for Techview and Cust Kits</b></li>
-  <li><a href="run_mode_debug_05.htm">Set the default kit in Devices.xml </a></li>
-  <li><a href="run_mode_debug_06.htm">Install the SISX file on the target device</a></li>
-  <li><a href="run_mode_debug_07.htm">Configure TRK connection on the device</a></li>
-  <li><a href="run_mode_debug_08.htm">Create a launch configuration</a></li>
-  </ol>
+<h2>Setup a Virtual Drive for Techview and Cust Kits (optional)</h2>
+<p>Techview Kits and cust kits have kernel components, kernel extensions and device drivers that are typically built on a virtual drive. So if you want to debug them the debugger will need to load files from the virtual drive that the binaries were built on. If you do not know the virtual drive the kit was built on you should first pick a drive letter randomly.</p>
 <div class="step">
   <h4><a name="runVirDrive" id="runVirDrive"> </a>Setup a Virtual Drive for Techview and Cust Kits</h4>
-<p>Techvew Kits and cust kits have kernel components, kernel extensions and device drivers that are typically built on a virtual drive. So if you want to debug them the debugger will need to load files from the virtual drive that the binaries were built on. If you do not know the virtual drive the kit was built on you should first pick a drive letter randomly.</p>
   <ol>
     <li>To subst a drive, type on a command line:<br />
     &gt; subst <span class="question">drive_letter:</span> <span class="question">path_to_kit<br />
@@ -37,7 +25,11 @@
     <li>Make sure when you set up your default SDK in the Carbide IDE that you use the virtual drive.</li>
   </ol>
 </div>
-<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>
+<h5>Other references</h5>
+<ul>
+  <li><a href="run_mode_debug.htm">Run Mode On-Device Debugging</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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_05.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_05.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -4,7 +4,7 @@
 <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>Debugger Settings</title>
+<title>Run Mode On-Device Debugging</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
 <body bgcolor="#FFFFFF">
@@ -37,7 +37,7 @@
     <li>Make sure the correct default is set.</li>
   </ol>
 </div>
-<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_06.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_06.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -4,7 +4,7 @@
 <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>Debugger Settings</title>
+<title>Run Mode On-Device Debugging</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
 <body bgcolor="#FFFFFF">
@@ -64,7 +64,7 @@
     <li>Select the green arrow pointing from My Computer to My Device. The SISX file should then be transferred to the device and installed.</li>
   </ol>
 </div>
-<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_07.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_07.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -4,7 +4,7 @@
 <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>Debugger Settings</title>
+<title>Run Mode On-Device Debugging</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
 <body bgcolor="#FFFFFF">
@@ -70,7 +70,7 @@
     </ol>
   </ol>
   </div>
-<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_08.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_08.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -4,7 +4,7 @@
 <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>Debugger Settings</title>
+<title>Run Mode On-Device Debugging</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
 <body bgcolor="#FFFFFF">
@@ -181,7 +181,7 @@
   <p align="center"><img src="images/Debug_Config_filetransfer_run.png" width="595" height="280" /></p>
   <p class="figure">Figure 9. Debug windows File Transfer pane </p>
 </div>
-<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug_launchcfg.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug_launchcfg.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -8,14 +8,12 @@
 <style type="text/css">
 <!--
 .style1 {font-size: 1em}
-.style5 {font-size: 1em; font-family: Verdana, Ariel, Helvetica, sans-serif; }
-.style7 {font-size: 1em; font-weight: bold; }
 -->
 </style>
 </head>
 <body bgcolor="#FFFFFF" dir="ltr">
 <h2> Defining a Stop Mode Debug Configuration</h2>
-<p>After installing all necessary software such as Perl, JTAG, compilers, Devkits and SDKs and creating your project, you will need to define a Debug launch configuration for your project. For this example, we'll define a Trace32 launch configuration. For new projects that do not have a launch configuration, a New Launch Configuration Wizard will appear and allow you to define settings. You can also cancel the wizard and define a launch configuration from the following instructions.</p>
+<p>After installing all necessary software such as Perl, JTAG, compilers, Devkits and SDKs and creating your project, you will need to define a Debug launch configuration for your project. For this example, we will define a Trace32 launch configuration. For new projects that do not have a launch configuration, a New Launch Configuration Wizard will appear and allow you to define settings. You can also cancel the wizard and define a launch configuration from the following instructions.</p>
 <div class="step">
   <h4>Define a Launch Configuration </h4>
   <ol>
@@ -51,11 +49,11 @@
         <th width="62%" scope="col">Explanation</th>
       </tr>
       <tr>
-        <td><span class="style7">Project</span></td>
+        <td>Project</td>
         <td><p>The project to associate with this debug launch configuration. Click Browse to select a different project.</p></td>
       </tr>
       <tr>
-        <td><span class="style7">Executable</span></td>
+        <td>Executable</td>
         <td><span
  style="font-weight: normal;">This is the name of the executable that is linked to the project. </span>Click <b>Browse</b> to select a different executable.</td>
       </tr>
@@ -71,17 +69,13 @@
             <th width="62%" scope="col">Explanation</th>
       </tr>
       <tr>
-        <td><span class="style5">
-          <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-          </span>
-          <p class="style5"><b>Trace32 Executable</b></p></td>
+        <td><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+          <p><font face="Georgia, serif"><font size="2" style="font-size: 9pt"><b>Trace32 Executable</b></font></font></p></td>
             <td><p>Specify the path to the Trace32 executable. The default path assumes that the Trace32 executable is installed in the default location: C:\T32\T32marm.exe.</p></td>
       </tr>
       <tr>
-        <td><span class="style5">
-          <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-          </span>
-          <p class="style5"><b>Trace32 Configuration File</b></p></td>
+        <td><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+          <p><font face="Georgia, serif"><font size="2" style="font-size: 9pt"><b>Trace32 Configuration File</b></font></font></p></td>
             <td>Specify the path to the config.t32 file or other custom configuration file. The default path assumes that the Trace32 configuration file is installed in the default location: C:\T32\config.t32.
               <p>For arm11 processors copy the trace32 configuration file for non-ARM11 processor (config_arm11.t32) to your C:\T32 folder and specify it in the edit box.</p>
               <p>You can modify the config.t32 file to support UDP (User Datagram Protocol) connections by adding the following lines: <br />
@@ -91,21 +85,17 @@
                 PORT=20000</p></td>
       </tr>
       <tr>
-        <td><span class="style5">
-          <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-          </span>
-          <p class="style5">
+        <td><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+          <p><font face="Georgia, serif"><font size="2" style="font-size: 9pt">
             <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-            <b>Trace32 Initialization Script</b></p></td>
+            <b>Trace32 Initialization Script</b></font></font></p></td>
             <td><p>Specify the path to the initialization <span class="code">cmm</span> file. This script will be run in T32 after connecting to T32. You can specify your own scripts for the targets used.</p></td>
       </tr>
       <tr>
-        <td><span class="style5">
-          <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-          </span>
-          <p class="style5"><b>
+        <td><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+          <p><b><font size="2" style="font-size: 9pt">
             <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-            View messages between Carbide and Trace32</b></p></td>
+            </font></b><font face="Georgia, serif"><font size="2" style="font-size: 9pt"><b>View messages between Carbide and Trace32</b></font></font></p></td>
             <td>Enable to log communications with Trace32 to the console window.</td>
       </tr>
     </table>
@@ -129,27 +119,27 @@
       </tr>
       <tr>
         <td>
-          <span class="style5">
+          <span class="style1">
           <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
           </span>
-        <p class="style5"><b>Target Initialization File</b></p></td>
+        <p class="style1"><font face="Georgia, serif"><b>Target Initialization File</b></font></p></td>
         <td><p>Check this box to have the debugger run an initialization script when the debug session starts. For example, if a target device requires initialization for the debugger to be able to read and write memory or registers, you can specify an initialization script here. Click Browse to select a script file using a standard file selection dialog box.</p>
-            <p>When using T32, most of the initialization is done in the CMM script file. With other debug protocols you can specify the initialization file, which can be run after connecting to the target.</p></td>
+            <p>When using T32, most of the initialization is done in the CMM script file. With other debug protocols you  specify the initialization file, which can be run after connecting to the target.</p></td>
       </tr>
       <tr>
         <td>
-          <span class="style5">
+          <span class="style1">
           <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
           </span>
-        <p class="style5"><b>Memory Configuration File</b></p></td>
+        <p class="style1"><b><font face="Georgia, serif">Memory Configuration File</font></b></p></td>
         <td>Controls whether the debugger uses a memory configuration file when a debug session starts. The Carbide debugger uses this configuration file to know which memory is accessible, readable, and writable on the target.</td>
       </tr>
       <tr>
         <td>
-          <span class="style5">
+          <span class="style1">
           <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
           </span>
-        <p class="style5"><b>Reset target at the start of each debug session</b></p></td>
+        <p class="style1"><b><font face="Georgia, serif">Reset target at the start of each debug session</font></b></p></td>
         <td>Forces the Carbide IDE to reset the target at the start of each debug session. This ensures that the debugging session uses the most up-to-date program code.</td>
       </tr>
       <tr>
@@ -174,8 +164,7 @@
         <th width="62%" scope="col">Explanation</th>
       </tr>
       <tr>
-        <td>
-          <span class="style1">
+        <td><span class="style1">
           <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
           </span>
           <p class="style1"><font face="Georgia, serif">
@@ -185,8 +174,7 @@
           <p class="note"><b>NOTE</b> The address entered in this field must match the start address specified in the source code used to build the Symbian OS ROM image to be debugged. The Start address must match the Download address.</p></td>
       </tr>
       <tr>
-        <td>
-          <span class="style1">
+        <td><span class="style1">
           <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
           </span>
           <p class="style1"><font face="Georgia, serif">
@@ -195,8 +183,7 @@
         <td>Select this option to have the debugger halt the program at the address specified in Start Address once the target initialization is done and the OS is downloaded; if the user has chosen to download the OS. You can then step through start-up code or run the target in bare-board mode.</td>
       </tr>
       <tr>
-        <td>
-          <span class="style1">
+        <td><span class="style1">
           <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
           </span>
           <p class="style1"><font face="Georgia, serif">
@@ -206,10 +193,9 @@
         <td>Select this option to have the debugger start the code at the address specified in Start Address once the target initialization is done. If you have breakpoints set, the debugger stops at the first breakpoint encountered. You can click the Break button to halt the device.</td>
       </tr>
       <tr>
-        <td>
-          <span class="style1">
+        <td><span class="style1">
           <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-          </span>
+            </span>
           <p class="style1"><font face="Georgia, serif">
               <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
               
@@ -218,10 +204,9 @@
         <td>Check the Parse ROM Log File option and specify the information that the debugger needs in order to show detailed stack information, set breakpoints, and show source level debugging information for ROM images. In the first text field, browse to or enter the full path and name of the log file that corresponds to the ROM image on the target device. This log file is generated by default when the ROM image is built.</td>
       </tr>
       <tr>
-        <td>
-          <span class="style1">
+        <td><span class="style1">
           <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-          </span>
+            </span>
           <p class="style1"><font face="Georgia, serif">
               <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
               <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
@@ -230,10 +215,9 @@
             <p class="note"><b>NOTE</b> Always include the epoc32 folder in this path.</p></td>
       </tr>
       <tr>
-        <td>
-          <span class="style1">
+        <td><span class="style1">
           <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-          </span>
+            </span>
           <p class="style1"><font face="Georgia, serif">
               <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
               <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
@@ -244,10 +228,9 @@
             <p class="note"><b>NOTE</b> You cannot perform source-level debugging on components that do not include symbolic information.</p></td>
       </tr>
       <tr>
-        <td>
-          <span class="style1">
+        <td><span class="style1">
           <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-          </span>
+            </span>
           <p class="style1"><b>
               <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
               </b><font face="Georgia, serif">
@@ -258,8 +241,7 @@
             <p class="note"> <b>NOTE</b> Selecting this option will affect debugging performance. When the debugger needs to load a module (DLL, EXE, etc.) it will stop the target, read information from it, then restart it.</p></td>
       </tr>
       <tr>
-        <td>
-          <span class="style1">
+        <td><span class="style1">
           <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
           </span>
           <p class="style1"><b>
@@ -270,20 +252,18 @@
         <td>Controls the logging of communication with Trace32. Enable to log communications with Trace32 to the console window.</td>
       </tr>
       <tr>
-        <td>
-          <span class="style1">
+        <td><span class="style1">
           <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
           </span>
-        <p class="style1"><font face="Georgia, serif"><b>Download Address (hex) </b></font></p></td>
+          <p class="style1"><font face="Georgia, serif"><b>Download Address (hex) </b></font></p></td>
         <td><p>Enter the physical address in memory at which the debugger should place the ROM image. This address is target-specific. The address should be in hexadecimal format with the 0x prefix. For example, 0x000FFF00 is a valid entry.</p>
           <p class="note"> <b>NOTE</b> The address entered in this field must match the download address specified in the source code used to build the Symbian OS ROM image to be debugged. If you leave this field blank, the debugger does not download the ROM image to the device at the beginning of the debug session. The Download address must match the Start address.</p></td>
       </tr>
       <tr>
-        <td>
-          <span class="style1">
+        <td><span class="style1">
           <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
           </span>
-        <p class="style1"><font face="Georgia, serif"><b>Ask for download at the start of each debug session</b></font></p></td>
+          <p class="style1"><font face="Georgia, serif"><b>Ask for download at the start of each debug session</b></font></p></td>
         <td>Check this box to have the debugger display a dialog box at the beginning of every debug session that lets you choose whether or not you want the debugger to download the ROM image to the device.</td>
       </tr>
     </table>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/eventpoints_disabling.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/eventpoints_disabling.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -22,7 +22,7 @@
 </p>
   </ol>
 </div>
-<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>
+<d<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/eventpoints_enabling.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/eventpoints_enabling.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -21,7 +21,7 @@
     <li>The disabled eventpoint icon changes to its original eventpoint icon. The enabled eventpoint icon indicates that the eventpoint will perform its specified action.</li>
   </ol>
 </div>
-<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; 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/eventpoints/log_point_clear.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/log_point_clear.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -9,7 +9,7 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Log Point</h2>
-<p>  A Log Point logs or speaks a string or expression. A Log Point can also record messages to the Log window. You can configure the message that appears in the log window.</p>
+<p>  A <b>Log Point</b> logs or speaks a string or expression. A Log Point can also record messages to the Log window. You can configure the message that appears in the log window.</p>
 <h5>Related tasks</h5>
 <ul>
   <li><a href="pause_point_set.htm">Setting a Pause Point</a></li>
@@ -24,7 +24,7 @@
     <li>Click Debug &gt; Clear Eventpoint &gt; Clear Log Point.</li>
   </ol>
 </div>
-<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; 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>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/log_point_set.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/log_point_set.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -9,7 +9,7 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Log Point</h2>
-<p>  A Log Point logs or speaks a string or expression. A Log Point can also record messages to the Log window. You can configure the message that appears in the log window.</p>
+<p>  A <b>Log Point</b> logs or speaks a string or expression. A Log Point can also record messages to the Log window. You can configure the message that appears in the log window.</p>
 <h5>Related tasks</h5>
 <ul>
   <li><a href="pause_point_set.htm">Setting a Pause Point</a></li>
@@ -34,7 +34,7 @@
   </ol>
 </div>
 <p>Example use: If you want to display the value of a variable each time some code is executed, set a log point, check the Log Message and Treat as expression boxes and enter the variable name in the edit box, then click OK.</p>
-<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; 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>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/pause_point_clear.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/pause_point_clear.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -9,7 +9,7 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Pause Point</h2>
-<p>  A Pause Point suspends program execution long enough to refresh debugger data. For example, without setting a pause point, you must wait for the debugger to halt program execution before it can refresh data. Setting a Pause Point, however, lets you pause the debugging session to give the debugger time to refresh the data.</p>
+<p>  A <b>Pause Point</b> suspends program execution long enough to refresh debugger data. For example, without setting a pause point, you must wait for the debugger to halt program execution before it can refresh data. Setting a Pause Point, however, lets you pause the debugging session to give the debugger time to refresh the data.</p>
 <h5>Related tasks</h5>
 <ul>
   <li><a href="log_point_set.htm">Setting a Log Point</a></li>
@@ -28,7 +28,7 @@
   </ol>
 </div>
   <p></p>
-<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; 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>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/pause_point_set.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/pause_point_set.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -9,7 +9,7 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Pause Point</h2>
-<p>  A Pause Point suspends program execution long enough to refresh debugger data. For example, without setting a pause point, you must wait for the debugger to halt program execution before it can refresh data. Setting a Pause Point, however, lets you pause the debugging session to give the debugger time to refresh the data.</p>
+<p>  A <b>Pause Point</b> suspends program execution long enough to refresh debugger data. For example, without setting a pause point, you must wait for the debugger to halt program execution before it can refresh data. Setting a Pause Point, however, lets you pause the debugging session to give the debugger time to refresh the data.</p>
 <h5>Related tasks</h5>
 <ul>
   <li><a href="log_point_set.htm">Setting a Log Point</a></li>
@@ -26,7 +26,7 @@
 </div>
   <p></p>
   <p></p>
-<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; 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>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/trace_collection_clear.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/trace_collection_clear.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -9,7 +9,7 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Clearing a Trace Collection</h2>
-<p>Clear a  Trace Collection  eventpoint when you are finished collecting trace data.</p>
+<p>Clear a  <b>Trace Collection</b>  eventpoint when you are finished collecting trace data.</p>
 <div class="step">
   <h4>Clearing a Trace Collection On Eventpoint</h4>
     <p>To clear a Trace Collection  eventpoint, follow these steps:</p>
@@ -19,7 +19,7 @@
     <li>Click Debug &gt; Clear Eventpoint &gt; Clear Trace Collection On</li>
   </ol>
 </div>
-<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; 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/eventpoints/trace_collection_off.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/trace_collection_off.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -9,7 +9,7 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Trace Collection Off</h2>
-<p>  A Trace Collection Off eventpoint stops the collection of trace data. This eventpoint is useful when you want trace collection to stop when program execution reaches a line of source code that you specify.</p>
+<p>  A <b>Trace Collection Off</b> eventpoint stops the collection of trace data. This eventpoint is useful when you want trace collection to stop when program execution reaches a line of source code that you specify.</p>
 <div class="step">
   <h4>Setting a Trace Collection Off Eventpoint</h4>
   <p>To set a Trace Collection Off eventpoint, follow these steps:</p>
@@ -18,7 +18,7 @@
     <li>Click Debug &gt; Set Eventpoint &gt; Set Trace Collection Off</li>
   </ol>
 </div>
-<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; 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/eventpoints/trace_collection_on.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/trace_collection_on.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -9,16 +9,16 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Trace Collection On</h2>
-<p>A Trace Collection On eventpoint starts the collection of trace data. This eventpoint is useful when you want trace collection to start when program execution reaches a line of source code that you specify.</p>
+<p>A <b>Trace Collection On</b> eventpoint starts the collection of trace data. This eventpoint is useful when you want trace collection to start when program execution reaches a line of source code that you specify.</p>
 <div class="step">
   <h4>Setting a Trace Collection On Eventpoint</h4>
-  <p>To set a Trace Collection On eventpoint, follow these steps:</p>
+  <p>To set a Trace Collection On eventpoint, follow these ssteps:</p>
   <ol>
     <li>Click the cursor on the line of source code at which you want to set the Trace Collection On eventpoint</li>
     <li>Click Debug &gt; Set Eventpoint &gt; Set Trace Collection On</li>
   </ol>
 </div>
-<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; 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>
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/images/wnd_chooseBaseClass.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/index.html	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/index.html	Tue Apr 13 15:55:45 2010 -0500
@@ -54,6 +54,6 @@
 
 <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>
+   </div></body>
    </html>
    
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/processes/open_log_view.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/processes/open_log_view.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -9,18 +9,20 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Opening a Log View</h2>
-<p>Use the<a href="../../reference/debugger_settings.htm"> Debugger Settings</a> preference panel to enable the message logging option. The Log view records these types of messages for a program during a debugging session:</p>
+<p>Use the <a href="../../reference/debugger_settings.htm">Debugger Settings</a> preference panel to enable the message logging option. The Log view records these types of messages for a program during a debugging session:</p>
 <ul>
   <li>the start of new tasks</li>
   <li>routine entry and exit</li>
   <li>Windows: DLL loading and unloading, and debug <span class="code">printf()</span> messages</li>
 </ul>
-<p>Select the Log System Messages option in the Debugger Settings target settings preference panel.</p>
-<p>Select Project &gt; Debug.</p>
+<p>Select the <b>Log System Messages</b> option in the <b>Debugger Settings</b> target settings preference panel.</p>
+<ul>
+  <li>Select <b>Project &gt; Debug</b></li>
+</ul>
 <ol>
-  <p>The Log view appears. It allows you to select, copy, and save logged text to a file for later analysis. </p>
+  <p>The <a href="../../reference/view_log.  <p>The <a href="../../reference/view_log.htm">Log</a> view appears. It allows you to select, copy, and save logged text to a file for later analysis. </p>
 </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>
+<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_build.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_build.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -24,7 +24,7 @@
 <div class="step">
   <h4>Building a Project</h4>
   <ul>
-    <li>Right-click the project name in the C/C++ Projects view and select Build Project (Figure 1) </li>
+    <li>Right-click the project name in the Project Explorer view and select Build Project (Figure 1) </li>
   </ul>
   <ol>
     <p></p>
@@ -39,7 +39,7 @@
   </ul>
   <ul>
     <li>Click the Build icon in the tool bar (Figure 2) to build the current build configuration </li>
-    <p align="center"><img src="images/wnd_build_config_select_tgt.png" width="321" height="69" /></p>
+    <p align="center"><img src="images/wnd_build_config_select_tgt.png" width="341" height="128" /></p>
     <p class="figure">Figure 2 - Build icon </p>
     <p>or
     </p>
@@ -48,16 +48,16 @@
     <li>Select a build configuration using the Build icon&#8217;s dropdown list in the tool bar (Figure 2)</li>
   </ul>
   <ol>
-    <p>Carbide.c++ builds the project. During the build a build dialog will appear on screen and a task bar is shown at the bottom right of the perspective when the build is run in the background. All output as the build progresses is shown in the Console view and all build errors and warnings appear in the Problems view.</p>
+    <p>Carbide.c++ builds the project. A build dialog  and a task bar appear during a build process. All build output  is shown in the Console view while build errors and warnings appear in the Problems view.</p>
     <p>Whether a full build or incremental build is requested, Carbide forwards the request to the SDK make system. The SDK make system determines if anything needs to be
-      built. So Carbide will always check that makefiles are up-to-date and
-    check dependencies.</p>
-    <p>A project is also built if you make a change to a project and then click <b>Debug</b>. It may be useful to automatically save modified resources before a manual build process by enabling the <b>Save automatically before build</b> option in the <b>Window &gt; Preferences &gt; General &gt;</b> <img src="../../images/command_link.png" width="16" height="12"> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Workbench)")'> Workspace</a> preference panel. </p>
+      built. Carbide  always checks that makefiles are up-to-date and
+    dependencies present.</p>
+    <p>Project is also built if you make a change to it and then click <b>Debug</b>. It may be useful to automatically save modified resources before a manual build process by enabling the <b>Save automatically before build</b> option in the <b>Window &gt; Preferences &gt; General &gt;</b> <img src="../../images/command_link.png" width="16" height="12"> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Workbench)")'> Workspace</a> preference panel. </p>
     <p class="note"><b>NOTE</b> If you want to turn off building before launching, uncheck the <b>Build (if required) before launching</b> option in the <b>Window &gt; Preferences &gt; Run/Debug &gt;<img src="../../images/command_link.png" width="16" height="12"> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.debug.ui.LaunchingPreferencePage)")'> Launching</a></b> preference panel.</p>
   </ol>
-  <p>When performing a build, output is displayed in the Console window. If you do not want to clear the console before each build you need to uncheck the option <span class="code">Always clear console before building</span> in the Build Console panel. This option is enabled by default. You can access this panel by selecting <b>Window &gt; Preferences &gt; C/C++ &gt;<img src="../../images/command_link.png" width="16" height="12"> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.cdt.ui.preferneces.CBuildConsolePreferernces)")'> Build Console</a></b> preference panel (figure 2).</p>
-  <p>Not clearing the console can be useful when you are performing multiple builds, such as a regular project build, building a project package (.pkg) file, and building a ROM image. For example, if you do not clear the console before each build, then a subsequent build will not overwrite information from a previous build.</p>
-<p align="center"><img src="images/build_console.png" width="532" height="451" /></p>
+  <p>When performing a build, output is displayed in the Console window. If you do not want to clear the console before each build you need to uncheck the option <b>Always clear console before building</b> in the <b>Build Console</b> panel. This option is enabled by default. You can access this panel by selecting <b>Window &gt; Preferences &gt; C/C++ &gt;<img src="../../images/command_link.png" width="16" height="12"> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.cdt.ui.preferneces.CBuildConsolePreferernces)")'> Build Console</a></b> preference panel (figure 2).</p>
+  <p>Not clearing the console is useful when you are performing multiple builds, such as a regular project build, building a project package (.pkg) file, and building a ROM image. For example, if you do not clear the console before each build, then a subsequent build will not overwrite information from a previous build.</p>
+<p align="center"><img src="images/build_console.png" width="562" height="446" /></p>
 <p align="left" class="figure">Figure 4 - Build Console Preference Panel</p>
 <p>&nbsp;</p>
 </div>
@@ -77,7 +77,7 @@
     <li><a href="../../reference/menus/build_pkg_file.htm">Build Package (.pkg) File</a></li>
     <li><a href="../ImportingProjects.html">Importing BLD.INF Files</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>
+  <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.doc.user/html/tasks/projects/prj_creating_sis_file.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_creating_sis_file.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -38,7 +38,7 @@
     <td><b>SIS Properties </b></td>
     <td><div align="center">
       <p align="left">Complete the PKG File, and Signing Options settings in the <a href="../../reference/build_properties/wnd_sis_properties.htm">SIS Properties</a> dialog. By default, SIS files are output in the directory of the original SIS file.</p>
-      <p><img src="../../reference/images/wnd_sis_properties.png" width="455" height="452"></p>
+      <p><img src="../../reference/images/wnd_sis_properties.png" width="375" height="452"></p>
       <p class="figure">Figure 2 - SIS Properties dialog </p>
       </div></td>
   </tr>
@@ -57,7 +57,7 @@
 <ul>
   <li><a href="../start/carbide_deploying.htm">Manually Deploying Programs to Devices</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>
+<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.doc.user/html/tasks/projects/prj_debug_config.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_config.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -18,42 +18,40 @@
 </ul>
 <div class="step">
 <h4>Creating a Default Launch Configuration</h4>
-<p class="note"><b>NOTE</b> Carbide.c++ only creates a new default launch configuration when it cannot find one in the project. If the project already contains a launch configuration, Carbide.c++ launches that instead. </p>
+<p class="note"><b>NOTE</b> Carbide only creates a new default launch configuration when it cannot find one in the project. If the project already contains a launch configuration, Carbide launches that instead. </p>
 <ul>
   <li>Click the <b>Run</b> (<img src="../../images/icons/btn_run.png" alt="Run icon" width="16" height="16" align="middle" />) or <b>Debug</b> (<img src="../../images/icons/btn_debug.png" width="17" height="16" align="middle" alt="Debug icon"/>) icon in the tool bar
     <p>or</p>
   </li>
   <li>Choose Select <b>Run &gt; Run</b> menu option to launch the project or <b>Run &gt; Debug</b> menu option to debug the project</li>
-  <p>Carbide.c++ creates a default launch configuration for the project and begins running or debugging the project. If the project already has a defined launch configuration, clicking Run or Debug uses it instead of creating a new one. There are two possible scenarios when creating a default launch configuration: </p>
+  <p>Carbide creates a default launch configuration for the project that is used to run or debug the project. If the project already has a defined launch configuration, clicking <b>Run</b> or <b>Debug</b> uses it instead of creating a new one. There are two possible scenarios when creating a default launch configuration: </p>
   <ul>
-    <li><b>for emulator targets </b> - an emulator launch configuration is created based on the project settings </li>
+    <li><b>for emulator targets</b> <b> - an emulator launch configuration is created based on the project settings </b></li>
     <li><b>for target devices</b> - the <a href="../../projects/launch/wiz_new_launch_config.htm">New Launch Configuration Wizard</a> appears asking for additional information</li>
   </ul>
 </ul>
 </div>
-  <p class="note"><b>NOTE</b> To see if a project already has a launch configuration, open a Run or Debug window using the <b>Run &gt; Open Run Dialog...</b> or <b>Run &gt; Open Debug Dialog...</b> menu items. 
-    
-  </p>
-  <p>In the event that the default launch configuration settings need to be changed, it is possible to edit them in the <a href="../../reference/wnd_debug_configuration.htm">Debug</a> window, or create a new launch configuration for the project that deviates from the default settings.</p>
+  <p class="note"><b>NOTE</b> To see if a project already has a launch configuration, open a Run or Debug window using the <b>Run &gt; Run As</b> or <b>Run &gt;  Debug As</b> menu items.  </p>
+<p>In the event that the default launch configuration settings must be changed, edit them in the <a href="../../reference/wnd_debug_configuration.htm">Debug</a> window, or simply create a new launch configuration for the project that deviates from the default settings.</p>
 <div class="step">
 <h4>Creating a Custom Launch Configuration </h4>
 <ol>
   <li>Open the Run or Debug launch configuration window
     <ul>
-      <li>Select the Run> <b>Open Run Dialog</b>... or <b>Run &gt; Open Debug Dialog... </b> menu item
+      <li>Select the Run> <b>Run As</b> or <b>Run &gt; Debug As </b> menu item
         <p>The appropriate Run or <a href="../../reference/wnd_debug_configuration.htm">Debug</a> launch configuration window appears (Figure 1).</p>
       </li>
    </ul>
-  <p align="center"><img src="images/wnd_launch_configuration_blank.png" width="709" height="455" alt="Undefined launch configuration"/> </p>
+  <p align="center"><img src="images/wnd_launch_configuration_blank.png" width="736" height="505" alt="Undefined launch configuration"/> </p>
   <p class="figure">Figure 1 - Initial blank Debug launch configuration window</p>
   </li>
   <li>Select a type of launch configuration (for example, Symbian OS Emulation), then click the New launch configuration icon to create a new
     configuration of that type.
     <p>A new configuration appears in the Configuration list under the
       appropriate section  using the project name and target to create the configuration name.</p>
-  <p class="note"><b>NOTE</b> By default, when you click New, the project information is used to fill in the Project and Process to launch text boxes. You normally should not have to edit these for a run/debug a project. If a bld.inf has multiple MMPS then the first executable named in the list of MMP files is used to fill in the executable field.  Therefore, for projects with multiple MMPs you may need to change the executable field.    </p>
+  <p class="note"><b>NOTE</b> Project information is used to fill in the <b>Project</b> and <b>Process to launch</b> text boxes by default when you click <b>New</b>. You  should not have to edit these for a normal run/debug project. If a <span class="code">bld.inf</span> has multiple MMP files listed, then the first executable  in the list  is used to fill in the executable field.  Therefore, for projects with multiple MMPs you may need to change the executable field.    </p>
   </li>
-  <p align="center"><img src="images/run_config_new.png" width="787" height="489" alt="New launch configuration" /> </p>
+  <p align="center"><img src="images/run_config_new.png" width="819" height="539" alt="New launch configuration" /> </p>
     <p class="figure">Figure 2 - New launch configuration with name and settings filled in (emulator)</p>
   
   <li>View the information to define the project and executable
@@ -94,7 +92,7 @@
     <li><a href="prj_build.htm">Building Projects</a></li>
     <li><a href="prj_debug_dlls.htm">Debugging DLLs</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>
+<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.doc.user/html/tasks/projects/prj_debug_console.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_console.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -24,7 +24,7 @@
 </ul>
 <blockquote>
   <p>In the <a href="prj_debug_config.htm">Debug</a> window or <a href="prj_debug_config.htm">launch configuration</a>, simply point both the <b>Executable</b>   and  <b>Remote process to launch</b> options to the application. This launches the  application when you start a debug session from the application project.</p>
-  <p align="center"><img src="../../reference/images/panel_trk_main.png" width="639" height="323" /></p>
+  <p align="center"><img src="../../reference/images/panel_trk_main.png" width="593" height="251" /></p>
   <p align="left" class="figure">Figure 2 - Assign Executable and Remote Process</p>
 </blockquote>
 <h5>Related concepts</h5>
@@ -43,7 +43,7 @@
     <li><a href="../../reference/ProjectDirectories.html">Project Directories</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>
+<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.doc.user/html/tasks/sdks/sdk_search.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/sdk_search.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -10,7 +10,7 @@
 <body bgcolor="#FFFFFF">
 <h2>Searching for SDKs</h2>
 <p>  Use the <a href="../../reference/SDKPreferences.html">SDK Preferences panel</a> to search for installed Symbian OS SDKs.</p>
-<p align="center"><img src="../../images/SDKPreferences.png" width="696" height="583" /></p>
+<p align="center"><img src="../../images/SDKPreferences.png" width="740" height="546" /></p>
 <p class="figure">Figure 1. SDK Preferences panel</p>
 <div class="step">
   <h4>Searching for SDKs </h4>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_debugging.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_debugging.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -10,38 +10,28 @@
 <body bgcolor="#FFFFFF">
 <h2>Debugging a Symbian OS Program</h2>
 <p>Use the Carbide.c++ debugger to debug a compiled Symbian OS program in an emulator or on-device. The same process works for other emulators and target devices as well.</p>
-<p class="note"><b>NOTE</b> This example uses an emulator. The steps are identical for on-device debugging, although a .sym file is not needed for emulator builds.</p>
+<p class="note"><b>NOTE</b> This example uses the emulator included with the S60 5th Edition SDK. The steps are identical for on-device debugging, although a <span class="code">.sym</span> file is not needed for emulator builds.</p>
 <div class="step">
   <h4>Debugging a Symbian OS program</h4>
-<p class="note"><b>NOTE</b> You can only debug compiled programs. Use the <a href="../projects/prj_build.htm">Build Project</a> command to compile project sources into a binary file if you do not already have an executable in the project. You will also need a symbolics ( .sym) file for debugging on a target device. Ensure that a .sym file has been created. If you are importing an existing application, you may have to rebuild the application and create a related .sym file. Make sure a .sym file has been created in the output directory.</p>
+<p class="note"><b>NOTE</b> You can only debug compiled programs. Use the <a href="../projects/prj_build.htm">Build Project</a> command to compile project sources into a binary file if you do not already have an executable in the project. A symbolics (<span class="code">.sym</span>) file is also required for debugging on a target device. Ensure that a <span class="code">.sym</span> file has been created. If you are importing an existing application, you may have to rebuild the application and create a related <span class="code">.sym</span> file. Make sure a <span class="code">.sym</span> file has been created in the output directory.</p>
   <ol>
-    <li>Set a breakpoint in the HelloCarbide program</li>
-    <p>Open the \src\<span class="code">CHelloCarbideAppUI.cpp</span> file and <a href="../breakpoints/pgm_bp_setting.htm">set a breakpoint</a> in the <span class="code">HandleCommandL</span> routine.</p>
-    <p align="center"><img src="images/debug_set_breakpoint.png" width="602" height="238" /></p>
-  <p class="figure">Figure 1 - Breakpoint set in <span class="code">CHelloCarbideAppUI</span>::HandleCommandL routine. </p>
-  <li>Launch the Carbide.c++ debugger and S60 EPOC Emulator</li>
-  <p><a href="../../debugger/debug/cmds_starting.htm">Start</a> the Carbide debugger which launches the S60 EPOC Emulator and installs the HelloCarbide application. For on-device debugging, your application will be installed on your target device.</p>
-  <p align="center"><img src="images/debug_s60_emulator_launch.png" width="293" height="391" /></p>
-  <p class="figure"><span class="figure">Figure 2 - S60 Emulator launches</span></p>
-  <li>Open the Installed directory within the S60 Emulator or your target device </li>
-    Use  the S60 Emulator controls to locate and open the Installation directory. Select Open from the Options menu (Figure 3).
-    <p align="center"><img src="images/debug_s60_emulator_02.png" width="352" height="168" /></p>
-    <p class="figure">Figure 3 - Open the Installed directory </p>
-    <li>Launch the HelloCarbide application</li>
-    <p>Use the S60 Emulator or target device controls to launch the HelloCarbide application (Figure 4).
-  </p>
-    <p align="center"><img src="images/debug_s60_emulator_03.png" width="122" height="106" /></p>
-  <p class="figure">Figure 4 - Launch the HelloCarbide application </p>
-  <p>The HelloCarbide application launches (Figure 5). </p>
-    <p align="center"><img src="images/debug_s60_emulator_04.png" width="293" height="391" /></p>
-    <p class="figure">Figure 5 - HelloCarbide application running on S60 Emulator </p>
-    <li>Click the Options soft-key on the S60 Emulator to display the Select menu.</li>
-	<li>Choose the Message menu item and press the Select soft-key to send a message  (Figure 6).</li>
-	<p></p><p align="center"><img src="images/debug_s60_emulator_05.png" width="384" height="254" /></p>
-  <p class="figure">Figure 6 - Send Message to HelloCarbide application </p>
-  <p>The <span class="code">HandleCommandL</span> breakpoint  is hit in the program and control returns to the Carbide.c++ debugger (Figure 7). You can now set additional breakpoints, examine variables, or use the<a href="../../debugger/debug/viewing_debug.htm"> Debug view</a> buttons to control the program. </p>
-  <p align="center"><img src="images/debug_s60_emulator_06.png" width="602" height="238" /></p>
-  <p class="figure">Figure 7 - Back in the CHelloCarbideAppUI::HandleCommandL routine</p>
+    <li>Set a breakpoint in the MyProject program</li>
+    <p>Open the <span class="code">\src\MyProjectAppUI.cpp</span> file and <a href="../breakpoints/pgm_bp_setting.htm">set a breakpoint</a> in the <span class="code">HandleCommandL</span> routine.</p>
+    <p align="center"><img src="images/debug_set_breakpoint.png" width="707" height="253" /></p>
+  <p class="figure">Figure 1 - Breakpoint set in MyProjectAppUI::HandleCommandL routine. </p>
+  <li>Launch the Carbide debugger and S60 SDK Emulator</li>
+  <p><a href="../../debugger/debug/cmds_starting.htm">Start</a> the Carbide debugger which launches the S60 SDK Emulator, installs and launches the executable. For on-device debugging, the application is installed on the target device.</p>
+  <p>The HelloCarbide application launches (Figure 2). </p>
+    <p align="center"><img src="images/debug_s60_emulator_04.png" width="465" height="811" /></p>
+    <p class="figure">Figure 2 - MyProject application running on S60 Emulator </p>
+    <p class="note"><b>NOTE</b> For SDKs prior to the S60 5th Edition it may be necessary to locate the installed application and manually launch it in the emulator or on the target device.</p>
+    <li>Click the Options soft-key on the S60 Emulator to display the Options menu.</li>
+	<li>Choose the Message menu item and press the Select soft-key to send a message  (Figure 3).</li>
+	<p></p><p align="center"><img src="images/debug_s60_emulator_05.png" width="465" height="458" /></p>
+  <p class="figure">Figure 3 - Send Message to MyProject application </p>
+  <p>The <span class="code">HandleCommandL</span> breakpoint  is hit in the program and control returns to the Carbide debugger (Figure 4). You can now set additional breakpoints, examine variables, or use the <a href="../../debugger/debug/viewing_debug.htm">Debug</a> view buttons to control the program. </p>
+  <p align="center"><img src="images/debug_s60_emulator_06.png" width="686" height="276" /></p>
+  <p class="figure">Figure 4 - Back in the CMyProjectAppUI::HandleCommandL routine</p>
   </ol>
   <p>That's it for this basic introduction to debugging with Carbide.c++.</p>
 </div>
@@ -55,7 +45,7 @@
     <li><a href="../projects/prj_build.htm">Building Projects</a></li>
     <li><a href="../projects/prj_debug_config.htm">Creating a Launch Configuration</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>
+  <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.doc.user/html/tasks/start/carbide_requirements.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_requirements.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -26,12 +26,12 @@
     <td rowspan="2" valign="middle"><p>An SDK or OS developer kit (DevKit) including:</p>
       <ul><li>9.x or higher for Platform Security </li>
     </ul></td>
-    <td height="65"><p>Targets: S60 5th and 3rd Ed., Qt, UIQ</p>
+    <td height="65"><p>Targets: S60 5th Ed., Qt</p>
       <p>Debugger: Emulators, on-device debugging</p>
     <p>UI Designer: create graphical interfaces quickly using standard UI components</p></td>
   </tr>
   <tr>
-    <td><p>Targets: S60 5th and 3rd Ed., Qt, UIQ</p>
+    <td><p>Targets: S60 5th Ed., Qt</p>
     <p>Debugger: Emulators, on-device debugging, device debugging in ROM, kernel debugging </p>
     <p>Performance Investigator: application performance data, memory usage, power usage, button event reporting </p></td>
   </tr>
@@ -42,7 +42,7 @@
     <th width="27%" scope="row">Hardware</th>
     <td width="73%"><ul>
         <li>x86-based personal computer </li>
-        <li>1800MHz</li>
+        <li>2GHz</li>
         <li> 1GB of RAM minimum, recommend 2GB or more</li>
         <li>CD-ROM drive </li>
         </ul>
@@ -50,8 +50,8 @@
   </tr>
   <tr>
     <th scope="row">Operating System </th>
-    <td><p>Microsoft&reg; Windows&reg; XP (Service Pack 2) recommended, Microsoft&reg; Windows&reg; Vista&reg; supported </p>
-        <p class="note"><b>NOTE</b> While Carbide.c++ supports many different OS configurations, only the ones listed here provide for optimal Symbian development. </p>
+    <td><p>Microsoft&reg; Windows&reg; XP (Service Pack 2/3) recommended, Microsoft&reg; Windows&reg; Vista&reg; and Microsoft&reg; Windows&reg; 7 supported </p>
+      <p class="note"><b>NOTE</b> While Carbide.c++ supports many different OS configurations, only the ones listed here provide for optimal Symbian development. </p>
         <p class="note"><b>NOTE</b> If you experience any VM issues, see the <a href="../../hints_tips.htm#VMissues">Tips &amp; Hints</a> page for info on modifying Carbide's default memory setup. </p></td>
   </tr>
   <tr>
@@ -63,7 +63,6 @@
               <li>S60 5th Edition</li>
               <li>S60 3rd Edition, FP1</li>
               <li>S60 3rd Edition, MR </li>
-              <li>S60 3rd Edition </li>
             </ul>
         </li>
         <li>Qt
@@ -72,12 +71,6 @@
             <li>Qt SDK for S60</li>
           </ul>
         </li>
-        <li>UIQ SDKs (<a href="http://www.uiq.com/">www.uiq.com</a>)
-          <ul>
-            <li>UIQ 3.1 </li>
-            <li>UIQ 3.0</li>
-          </ul>
-        </li>
       </ul>
       <ul><li>Perl (<a href="http://www.activestate.com">www.activestate.com</a>)
     (required)              
@@ -91,8 +84,8 @@
   <tr>
     <th scope="row">Disk Space </th>
     <td><ul>
-        <li>700 MB for Carbide.c++</li>
-        <li>Up to 1.5 GB for each S60 SDK installation</li>
+        <li>800 MB for Carbide.c++</li>
+        <li>Up to 2.0 GB for each S60 SDK installation</li>
     </ul></td>
   </tr>
 </table>
@@ -100,7 +93,7 @@
 <ul>
   <li> <a href="carbide_overview.htm">Carbide.c++ Overview</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>
+<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
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/start/images/p2_available_sw.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/start/images/p2_install_details_01.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/start/images/p2_install_details_02.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/start/images/p2_review_licenses.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_carbide_setup.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_carbide_setup.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -20,7 +20,7 @@
 <div class="step">
   <h4>Defining a Customized  Launch Configuration </h4>
   <ol>
-    <li>Choose the Run &gt; Open Debug Dialog... menu item </li>
+    <li>Choose the Run &gt; Debug As menu item </li>
     <p>The <a href="../../reference/wnd_debug_configuration.htm">Debug</a> window appears.</p>
     <li>Select a Configuration type for on-device debugging and click New</li>
     <p>Choose the <b>Symbian OS Application TRK </b> or <b>System TRK</b> configuration based on which debug agent is installed on the device, then click <b>New</b>. A new debug launch configuration appears in the Configuration list and the Main tab appears. </p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_connection_bluetooth.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_connection_bluetooth.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -43,11 +43,7 @@
   <ul>
     <li><a href="../../projects/launch/page_main.htm">Debug Window (On-device Debugging) Overview</a></li>
   </ul>
-  <h5>Related tasks</h5>
-  <ul>
-    <li><a href="trk_install_bluetooth.htm">Installing On-device Debug Agents using Bluetooth </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>
+<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_connection_usb.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_connection_usb.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -14,42 +14,28 @@
   <li>DKU-2</li>
   <li>CA-53 </li>
 </ul>
+<p>Carbide uses plug-and-play (PnP) to create a remote connection  for the phone or target device once it's plugged in. Once a remote connection is created the <a href="../../reference/trk/view_remote_connection.htm">Remote Connections</a> view appears  in Carbide. In addition, the current available connection is shown  in the  workspace's lower-right trim area. </p>
+<p align="center"><img src="../../reference/images/trim_remote_conns.png" width="212" height="44"></p>
+<p class="figure">Figure 1. Current available connection shown in workspace trim area</p>
+<p class="note"><b>NOTE</b> PC Suite or Ovi Suite must be installed on your PC for the following steps to work.</p>
 <div class="step">
   <h4>Setting up a USB Connection for On-device Debugging </h4>
   <ol>
-    <li>Install the latest USB connectivity software, for example, S60 devices use Nokia PC Suite</li>
-    <li>Connect the USB connectivity cable  to your PC and then the target device</li>
-    <li>For S60 devices, select PC-Suite from the USB Mode list when the target device is connected</li>
-    <li>Download the Application TRK or System TRK SISX file to the device</li>
-    <li>On the PC 
-    (optional)</li>
-  </ol>
-  <ol>
-    <ol type="a">
-      <li>Open the Windows Computer Management (Windows XP) </li>
-      <p>Right-click <b>My Computer</b> and select <b>Manage</b> from the context menu to open the <b>Computer Management</b> window. Select <b>System Tools &gt; Device Manager &gt; Ports (COM &amp; LPT)</b> to display all active ports. </p>
-      <li>Locate the S60 Phone USB (COMx) item in the list (Figure 2) </li>
-      <p align="center"><img src="../../reference/images/wnd_win_device_mgr.png" width="502" height="339" /></p>
-      <p class="figure">Figure 2. Device Manager showing Ports (COM &amp; LPT) section</p>
-      <li>The USB COM Port number should match the COM port used in the <a href="../../projects/launch/page_connection.htm">Connections</a> tab of the TRK launch
-      configuration.</li>
-      <li>Close the Device Manager window</li>
-    </ol>
+    <li>Connect the USB connectivity cable  to your PC and then the phone or target device</li>
+    <li>On the phone or target device,  select PC-Suite from the USB Mode options when asked</li>
+    <li>In Carbide.c++, verify the current available connection is shown in the Remote Connections view or the indicator in the trim area</li>
   </ol>
 </div>
 <h5>Related concepts</h5>
 <ul>
-  <li><a href="../../concepts/trk.htm">On-device Debugging </a></li>
+  <li><a href="../../concepts/trk.htm">On-device Debugging</a></li>
+  <li><a href="../debugger/run_mode_debug.htm">Run Mode On-Device Debugging</a></li>
 </ul>
 <h5>Related references</h5>
 <ul>
   <li><a href="../../projects/launch/page_main.htm">Debug Window (On-device Debugging) Overview</a></li>
 </ul>
-<h5>Related tasks</h5>
-<ul>
-  <li><a href="trk_install_usb.htm">Installing On-device Debug Agents using USB</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>
+<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_installation_instr.htm	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_installation_instr.htm	Tue Apr 13 15:55:45 2010 -0500
@@ -9,13 +9,14 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Installing an On-device Debug Agent </h2>
-<p>To use any version of the on-device debug agent on a target device it must be installed. We highly recommend using the  <a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Connections</a> dialog to help connect and verify that the latest version of TRK is installed on the device. Or, to manage this manually, follow the instructions to install the TRK debug agent software  using <a href="trk_install_bluetooth.htm">Bluetooth</a> or <a href="trk_install_usb.htm">USB</a>.</p>
+<p>To use any version of the on-device debug agent on a target device it must be installed. We highly recommend using the  <a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Connections</a> dialog to help connect and verify that the latest version of TRK (3.2.6+) is installed on the device, especially to support plug-and-play (PnP) connections. </p>
+<p>Refer to the <a href="trk_connection_bluetooth.htm">Bluetooth Connection Setup</a> page for more information on using Bluetooth or the <a href="trk_connection_usb.htm">USB Connection Setup</a> page if using USB.</p>
 <h5>Related references </h5>
 <ul>
   <li><a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Connections</a></li>
   <li><a href="../../concepts/trk.htm">On-Device Debugging </a></li>
   <li><a href="../../projects/launch/page_main.htm">Debug Window (On-device Debugging) Overview</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>
+<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>
--- a/core/com.nokia.carbide.cpp.doc.user/index.xml	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/index.xml	Tue Apr 13 15:55:45 2010 -0500
@@ -340,22 +340,10 @@
 	   <topic href="html/reference/INF_Editor_addedit_mmp.html" />
 	</entry>
 
-	<entry keyword="installation">
-	   <topic href="html/tasks/trk/trk_install_pcsuite.htm" label="PC Suite"/>
-	   <topic href="html/tasks/trk/trk_install_bluetooth.htm" label="Bluetooth"/>
-	   <topic href="html/tasks/trk/trk_install_usb.htm" label="USB"/>
-	</entry>
-
 	<entry keyword="Installation Pane">
 	   <topic href="html/reference/trk/panel_trk_installation.htm"/>
 	</entry>
 
-	<entry keyword="Installing On-device Debug Agents">
-	   <topic href="html/tasks/trk/trk_installation_instr.htm" label="Overview"/>
-	   <topic href="html/tasks/trk/trk_install_bluetooth.htm" label="Bluetooth"/>
-	   <topic href="html/tasks/trk/trk_install_usb.htm" label="USB"/>
-	</entry>
-
 <!-- J -->
 <!-- K -->
 <!-- L -->
@@ -473,6 +461,14 @@
 	</entry>
 
 <!-- N -->
+
+	<entry keyword="New Connection">
+	   <topic href="html/reference/trk/wnd_new_connection_wizard.htm"/>
+	   <topic href="html/reference/trk/wnd_on_device_check_tab.htm"/>
+	   <topic href="html/reference/trk/wnd_new_conn_install_tab.htm"/>
+       <topic href="html/reference/trk/view_remote_connection.htm" />
+	</entry>
+
 <!-- O -->
 
    <entry keyword="On-device Connections">
@@ -568,6 +564,10 @@
 	   <topic href="html/tasks/start/carbide_requirements.htm"/>
 	</entry>
 
+	<entry keyword="Remote Connections view">
+	    <topic href="html/reference/trk/view_remote_connection.htm" />
+	</entry>
+
 	<entry keyword="ROM Build Settings">
 	   <topic href="html/reference/ROM_build_settings.html"/>
 	</entry>
@@ -576,6 +576,7 @@
 	   <topic href="html/debugger/debug/cmds_starting.htm"/>
 	</entry>
 
+
 <!-- S -->
 
 	<entry keyword="SDKs">
@@ -727,6 +728,7 @@
 		<topic href="html/reference/view_mifdef_editor.htm" />
 		<topic href="html/reference/view_module_wnd.htm" />
 	    <topic href="html/concepts/registers.htm" />
+	    <topic href="html/reference/trk/view_remote_connection.htm" />
 	    <topic href="html/reference/view_signals_wnd.htm" label="Symbols" />
 	    <topic href="html/reference/view_symbian_kernel.htm" />
 	    <topic href="html/reference/view_sym_proj_nav.htm" />
--- a/core/com.nokia.carbide.cpp.doc.user/intro/tutorialsCarbideExtContent.xml	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/intro/tutorialsCarbideExtContent.xml	Tue Apr 13 15:55:45 2010 -0500
@@ -29,7 +29,7 @@
 			
 			<link 
 				label="Create a run mode debugging application" 
-				url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_example_trk.htm"  
+				url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug.htm"  
 				id="carbide-sample" 
 				style-id="content-link">
 				<text>Learn how create and build an application and debug it on a device using the App TRK on-device debug agent.</text>
--- a/core/com.nokia.carbide.cpp.doc.user/intro/whatsnew_IntroExt.xml	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/intro/whatsnew_IntroExt.xml	Tue Apr 13 15:55:45 2010 -0500
@@ -10,7 +10,7 @@
 		  
 		<group style-id="content-group" id="carbide-cpp">
        		<link 
-       		label="Carbide.c++ Release Notes (2.5)" 
+       		label="Carbide.c++ Release Notes (3.0b)" 
        		url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/release_notes.htm" 
        		id="carbide-link" 
        		style-id="content-link">
--- a/core/com.nokia.carbide.cpp.doc.user/plugin.xml	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/plugin.xml	Tue Apr 13 15:55:45 2010 -0500
@@ -14,11 +14,23 @@
             file="tocRelease.xml"
             primary="false"/> -->
 	   
+	 	<!-- Prebuilt Index -->
 		<index path="index" />
    </extension>
   
 	
-	<!-- Carbide.c++ cheatsheets extension -->
+<!-- =================================================================================== -->
+<!-- Manual Index                                                                        -->
+<!-- =================================================================================== -->
+	
+ <extension point="org.eclipse.help.index">
+    <index file="html/index.xml"/>
+ </extension>
+
+
+<!-- =================================================================================== -->
+<!-- Cheatsheets extension                                                               -->
+<!-- =================================================================================== -->
 	
    <extension
          point="org.eclipse.ui.cheatsheets.cheatSheetContent">
@@ -221,13 +233,6 @@
 	</extension>
 
 
-<!-- =================================================================================== -->
-<!-- Manual Index                                                                        -->
-<!-- =================================================================================== -->
-	
- <extension point="org.eclipse.help.index">
-    <index file="index.xml"/>
- </extension>
 
 <!-- =================================================================================== -->
 <!-- Universal intro extensions to show content in welcome pages                         -->
--- a/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml	Mon Apr 12 14:47:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml	Tue Apr 13 15:55:45 2010 -0500
@@ -2,20 +2,28 @@
 <?NLS TYPE="org.eclipse.help.toc"?>
 <toc label="Introduction" href="html/concepts/Introduction.html"  >
   <topic label="Carbide.c++ Overview" 			href="html/tasks/start/carbide_overview.htm" >
-    <topic label="System Requirements" 			href="html/tasks/start/carbide_requirements.htm" />
+    <topic href="html/tasks/start/carbide_requirements.htm" label="System Requirements">
+       <topic href="html/tasks/debugger/run_mode_debug_01.htm" label="Installing PERL">
+       </topic>
+       <topic href="html/tasks/debugger/run_mode_debug_02.htm" label="Installing an SDK">
+       </topic>
+       <topic href="html/tasks/debugger/run_mode_debug_03.htm" label="Configuring environment variables">
+       </topic>
+       <topic href="html/tasks/debugger/run_mode_debug_04.htm" label="Setting up a virtual drive">
+       </topic>
+    </topic>
     <topic label="Carbide Help" 				href="html/tasks/start/carbide_help.htm" />
     <topic label="Supported Target Types"		href="html/concepts/build_targets.htm" />
     <topic label="Supported SDKs" 		    	href="html/sos_references.htm" />
     <topic label="Updating Carbide" 			href="html/tasks/start/carbide_updating.htm" />
     <topic label="Tour of the UI"				href="html/concepts/tour.html" />
     <topic label="Concepts" 					href="html/concepts/concepts.htm" />
-    <topic label="Application Emulator Debug Example"  	href="html/tasks/start/carbide_example.htm" >
-      <topic label="1. Creating New Projects" 		        	href="html/tasks/CreatingNewProjects.html" />
-      <topic label="2. Building Projects and Symbian Components" 	href="html/tasks/projects/prj_build.htm" />
-      <topic label="3. Creating a Launch Configuration"			href="html/tasks/projects/prj_debug_config.htm" />
-      <topic label="4. Debugging a Symbian OS Program" 			href="html/tasks/start/carbide_debugging.htm" />
-    </topic>
-    <topic label="DLL Emulator Example" href="html/concepts/SampleExampleProjectCreate.html" />
+	<topic label="Application Emulator Example"  				href="html/tasks/start/carbide_example.htm" >
+	  <topic label="1. Creating New Projects" 		        	href="html/tasks/CreatingNewProjects.html" />
+	  <topic label="2. Building Projects and Symbian Components" 	href="html/tasks/projects/prj_build.htm" />
+	  <topic label="3. Creating a Launch Configuration"			href="html/tasks/projects/prj_debug_config.htm" />
+	  <topic label="4. Debugging a Symbian OS Program" 			href="html/tasks/start/carbide_debugging.htm" />
+	</topic>
   </topic>
   <topic label="Carbide Menus " 					href="html/reference/menus/menus.htm" >
     <topic label="ABLD Actions" 				href="html/reference/menus/abld.htm" />
@@ -231,6 +239,69 @@
       <topic href="html/debugger/debug/cmds_other.htm" label="Other useful commands"></topic>
       <topic href="html/debugger/debug/cmds_reposition_pc.htm" label="Reposition the program counter"></topic>
     </topic>
+    
+    <topic href="html/reference/trk/wnd_on_device_setup.htm" label="On-Device Connections" >
+      <topic href="html/reference/trk/wnd_new_connection_wizard.htm" label="Setup Connection" />
+      <topic href="html/reference/trk/wnd_on_device_check_tab.htm" label="Test Connections" />
+      <topic href="html/reference/trk/wnd_new_conn_install_tab.htm" label="Install Remote Agents" />
+      <topic label="Remote Connections view"			href="html/reference/trk/view_remote_connection.htm" />
+      <topic href="html/reference/trk/exporting_remote_conns.htm" label="Exporting remote connections"></topic>
+      <topic href="html/reference/trk/importing_remote_conns.htm" label="Importing remote connections"></topic>
+    </topic>
+	
+       <topic label="Debugging with an emulator"				href="html/projects/launch/launch_emulator.htm" >
+			<topic label="Executable Selection"					href="html/projects/launch/wiz_new_launch_config.htm#EXE_SEL" />
+			<topic label="Build Options Selection"				href="html/projects/launch/wiz_new_launch_config.htm#BLD_OPT" />
+			<topic label="New Launch Configuration"				href="html/projects/launch/wiz_new_launch_config.htm#FINISH" />
+			<topic label="Other project options" 					href="html/tasks/EmulatorToc.htm">
+			  <topic label="Setting Environment for x86 Compiler"	href="html/tasks/projects/prj_build_cmd_line.htm" />
+			  <topic label="Unsetting Built-in Environment"	        href="html/reference/wnd_carbide_pref_x86.htm" />
+			</topic>
+    		<topic label="DLL Emulator Example" href="html/concepts/SampleExampleProjectCreate.html" />
+       </topic>
+       
+    <topic label="Run mode projects"  href="html/projects/launch/pnp_debug_overview.htm" >
+      <topic label="Run Mode Overview"  			href="html/tasks/start/carbide_overview_trk.htm" ></topic>
+      <topic href="html/concepts/autotargeting.htm" label="Auto-Targeting of Executables"></topic>
+	   <topic href="html/projects/launch/launch_phone.htm" label="Debugging a phone">
+          <topic label="Configure launch configuration"		href="html/projects/launch/wnd_config_launch_config.htm" />
+          <topic label="Remote connection setting"			href="html/projects/launch/wnd_change_connection.htm" />
+          <topic label="Debug process settings"				href="html/projects/launch/wnd_change_debug_process.htm" />
+          <topic label="Other settings"						href="html/projects/launch/wnd_change_other_settings.htm" />
+       </topic>
+      <topic href="html/tasks/debugger/run_mode_debug.htm" label="Run Mode Example">
+      </topic>
+        
+      <topic href="html/tasks/projects/prj_debug_dlls.htm" label="Debugging DLLs"></topic>
+      <topic href="html/tasks/projects/prj_import_exe.htm" label="Importing a Symbian Executable"></topic>
+      <topic href="html/tasks/processes/attach_debugger_to_process.htm" label="Attaching to a Symbian OS Process"></topic>
+      <topic href="html/tasks/start/carbide_debugging.htm" label="Debugging a Symbian OS Program"></topic>
+      <topic href="html/concepts/arm_registers.htm" label="Registers"></topic>
+      <topic href="html/reference/view_symbian_kernel.htm" label="Symbian OS Data View"></topic>
+        
+    </topic>
+    
+    <topic label="Stop mode projects" 				href="html/tasks/StopModeToc.htm">
+       <topic href="html/projects/launch/launch_board.htm" label="Debugging a reference board">
+       </topic>
+      <topic label="Stop Mode Debug Example" 				href="html/tasks/debugger/stop_mode_debug.htm" >
+        <topic label="1. On-Device Debugging Preconditions" href="html/tasks/debugger/stop_mode_debug_precond.htm" />
+        <topic label="2. Trace32 Support" 					href="html/projects/launch/trace32.htm" >
+          <topic label="Main" 								href="html/projects/launch/page_main.htm" />
+          <topic label="Connection" 						href="html/projects/launch/page_connection.htm" />
+          <topic label="Debugger" 							href="html/projects/launch/page_debugger.htm" />
+          <topic label="ROM Image" 							href="html/projects/launch/page_rom_image.htm" />
+          <topic label="Executables" 						href="html/projects/launch/page_executables.htm" />
+          <topic label="Source" 							href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_srce.htm" />
+          <topic label="Commmon" 							href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_comm.htm/" />
+        </topic>
+        <topic label="4. Using Soft Attach"	 href="html/tasks/debugger/soft_attach_debug.htm" />
+      </topic>
+      <topic label="Building a ROM Image File"            href="html/reference/ROM_build_settings.html" />
+      <topic label="ARM Registers" 						href="html/concepts/arm_registers.htm" />
+      <topic label="Symbian OS Data View"					href="html/reference/view_symbian_kernel.htm" />
+      <topic label="Toggle HW Breakpoint"           		href="html/reference/menus/hardware_breakpoints.htm" />
+    </topic>
     <topic href="html/debugger/breakpoints/breakpoints.htm" label="Breakpoints">
       <topic label="Viewing breakpoints" href="html/debugger/breakpoints/viewing_breakpoints.htm" />
       <topic label="Breakpoint status indicators" href="html/debugger/breakpoints/resolving_breakpoints.htm" />
@@ -260,65 +331,16 @@
         <topic label="Editing expressions" 					href="html/debugger/variables/editing_expressions.htm" />
       </topic>
     </topic>
-    <topic href="html/reference/trk/wnd_new_connection_wizard.htm" label="On-Device Connections Overview" >
-      <topic label="Remote Connections view"			href="html/reference/trk/view_remote_connection.htm" />
-      <topic href="html/reference/trk/wnd_new_conn_wiz_edit.htm" label="Adding, editing, and deleting connections" />
-      <topic href="html/reference/trk/exporting_remote_conns.htm" label="Exporting remote connections"></topic>
-      <topic href="html/reference/trk/importing_remote_conns.htm" label="Importing remote connections"></topic>
-    </topic>
-    <topic label="Emulator projects" 					href="html/tasks/EmulatorToc.htm">
-      <topic label="Setting Environment for x86 Compiler"		href="html/tasks/projects/prj_build_cmd_line.htm" />
-      <topic label="Unsetting Built-in Environment"	        href="html/reference/wnd_carbide_pref_x86.htm" />
-    </topic>
-    <topic label="Run mode projects" 						href="html/tasks/RunModeToc.htm">
-      <topic label="Run Mode Overview"  			href="html/tasks/start/carbide_overview_trk.htm" ></topic>
-      <topic href="html/concepts/autotargeting.htm" label="Auto-Targeting of Executables"></topic>
-      <topic href="html/tasks/start/carbide_example_trk.htm" label="Run Mode Debug Example">
-        <topic href="html/tasks/trk/trk_preconditions.htm" label="1. Preconditions to On-Device Debugging"></topic>
-        <topic href="html/tasks/trk/trk_installation_instr.htm" label="2. Installing an On-Device Debug Agent"></topic>
-        <topic href="html/tasks/projects/working_with_sis_pkg_files.htm" label="3. Creating a PKG File"></topic>
-        <topic href="html/tasks/projects/prj_creating_sis_file.htm" label="4. Creating a .SIS File"></topic>
-        <topic href="html/tasks/start/carbide_deploying.htm" label="5. Deploying Programs"></topic>
-        <topic href="html/tasks/trk/trk_carbide_setup.htm" label="6. Launch Configuration Setup">
-          <topic href="html/reference/trk/panel_trk_overview.htm" label="Debug (On-device Debugging) Overview"></topic>
-        </topic>
-        <topic href="html/tasks/projects/prj_debug_config.htm" label="7. Debugging Applications">
-          <topic href="html/tasks/projects/prj_debug_dlls.htm" label="Debugging DLLs"></topic>
-          <topic href="html/tasks/projects/prj_import_exe.htm" label="Importing a Symbian Executable"></topic>
-          <topic href="html/tasks/processes/attach_debugger_to_process.htm" label="Attaching to a Symbian OS Process"></topic>
-          <topic href="html/tasks/start/carbide_debugging.htm" label="Debugging a Symbian OS Program"></topic>
-          <topic href="html/concepts/arm_registers.htm" label="Registers"></topic>
-          <topic href="html/reference/view_symbian_kernel.htm" label="Symbian OS Data View"></topic>
-        </topic>
-      </topic>
-      <topic label="Troubleshooting" 						href="html/tasks/trk/trk_troubleshooting.htm"/>
-    </topic>
-    <topic label="Stop mode projects" 				href="html/tasks/StopModeToc.htm">
-      <topic label="Stop Mode Debug Example" 					href="html/tasks/debugger/stop_mode_debug.htm" >
-        <topic label="1. On-Device Debugging Preconditions" href="html/tasks/debugger/stop_mode_debug_precond.htm" />
-        <topic label="2. Trace32 Support" 					href="html/projects/launch/trace32.htm" >
-          <topic label="Main" 							href="html/projects/launch/page_main.htm" />
-          <topic label="Connection" 						href="html/projects/launch/page_connection.htm" />
-          <topic label="Debugger" 						href="html/projects/launch/page_debugger.htm" />
-          <topic label="ROM Image" 						href="html/projects/launch/page_rom_image.htm" />
-          <topic label="Executables" 						href="html/projects/launch/page_executables.htm" />
-          <topic label="Source" 							href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_srce.htm" />
-          <topic label="Commmon" 							href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_comm.htm/" />
-        </topic>
-        <topic label="4. Using Soft Attach"	 href="html/tasks/debugger/soft_attach_debug.htm" />
-      </topic>
-      <topic label="Building a ROM Image File"            href="html/reference/ROM_build_settings.html" />
-      <topic label="ARM Registers" 						href="html/concepts/arm_registers.htm" />
-      <topic label="Symbian OS Data View"					href="html/reference/view_symbian_kernel.htm" />
-      <topic label="Toggle HW Breakpoint"           		href="html/reference/menus/hardware_breakpoints.htm" />
-    </topic>
     <topic label="Debugging variations"                     href="html/concepts/debugger_about.htm" >
       <topic label="Emulation Debugging"			        href="html/concepts/emulators.htm" />
       <topic label="Debugging DLLs"						href="html/tasks/projects/prj_debug_dlls.htm" />
       <topic label="Debugging in ROM"		                href="html/tasks/projects/prj_debug_rom.htm" />
       <topic label="Importing Symbian Executables"		href="html/tasks/projects/prj_import_exe.htm" />
     </topic>
-  </topic>
+
+      <topic label="Troubleshooting" 						href="html/tasks/trk/trk_troubleshooting.htm"/>
+    </topic>
+    
   <topic href="html/reference/search/wnd_system_search.htm" label="System Search">
     <topic label="System Search view"      		href="html/reference/search/view_system_search.htm" />
     <topic label="System Search preferences"    href="html/reference/search/wnd_system_search_prefs.htm" />