removed old SDK pref page and fixed link, then added new cheatsheet
authorfturovic <frank.turovich@nokia.com>
Thu, 26 Aug 2010 10:40:47 -0500
changeset 1893 e29df1745269
parent 1892 2009dcd074b0
child 1894 0909e3336f6d
removed old SDK pref page and fixed link, then added new cheatsheet
core/com.nokia.carbide.cpp.doc.user/html/cheatsheets/getStarted_cs.xml
core/com.nokia.carbide.cpp.doc.user/html/cheatsheets/how_to_find_n_add_extentions.xml
core/com.nokia.carbide.cpp.doc.user/html/debugger.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_dll_example_00.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_dll_example_01.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_from_template_00.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/qt_help/qt_creating_projs_06.htm
core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_importing_projs_04.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/images/icon_periodic_testing.png
core/com.nokia.carbide.cpp.doc.user/html/reference/images/view_remote_connections.png
core/com.nokia.carbide.cpp.doc.user/html/reference/pref_carb_sdk_preference.html
core/com.nokia.carbide.cpp.doc.user/html/reference/pref_carb_symbian_sdk.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/trk/view_remote_connection.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/CreatingNewProjects.html
core/com.nokia.carbide.cpp.doc.user/html/tasks/WorkingwithSDKs.html
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/stop_mode_debug.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug_precond.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/images/wnd_sdk_platform_filter_sbsv2.png
core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/sdk_add.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/sdk_platform_filter.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/sdk_search.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/sdk_view_properties.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_example.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_overview_trk.htm
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/html/cheatsheets/getStarted_cs.xml	Thu Aug 26 09:57:08 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/cheatsheets/getStarted_cs.xml	Thu Aug 26 10:40:47 2010 -0500
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cheatsheet title="Creating and debugging an application project">
-   <intro>
- Follow these steps to create and debug a Symbian project and using an emulator. using the S60 EPOC Emulator.
-   </intro>
-   <item title="Verify a Symbian SDK is available" dialog="true" skip="true" href="/com.nokia.carbide.cpp.doc.user/html/reference/SDKPreferences.html">
-      <description>
-         Use the SDK Preferences panel to verify a supported Symbian SDK is installed. If not, you&apos;ll need to download a supported SDK and install it before continuing.
-      </description>
-      <command serialization="org.eclipse.ui.window.preferences(preferencePageId=com.nokia.carbide.cpp.sdk.ui.preferences.SDKPreferencePage)" confirm="false">
-      </command>
-   </item>
-   <item title="Create a Symbian OS project" dialog="true" skip="true" href="/com.nokia.carbide.cpp.doc.user/html/tasks/CreatingNewProjects.html">
-      <description>
-         Use the New Project wizard to create a Symbian OS project. We named our example HelloCarbide.
-      </description>
-      <command serialization="org.eclipse.ui.newWizard(newWizardId=org.eclipse.ui.wizards.new.project)" confirm="false">
-      </command>
-   </item>
-   <item title="Build the project" dialog="true" skip="true" href="/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_build.htm">
-      <description>
-         If you don&apos;t see an EXE file in the C/C++ Projects view, build the project to create one.
-      </description>
-      <command serialization="org.eclipse.ui.project.buildAll" confirm="false">
-      </command>
-   </item>
-   <item title="Set a breakpoint" dialog="true" skip="true" href="/com.nokia.carbide.cpp.doc.user/html/tasks/breakpoints/pgm_bp_setting.htm">
-      <description>
-         Open  the CHelloCarbideAppUI file and set a breakpoint in the HandleCommandL routine.
-      </description>
-   </item>
-   <item title="Launch the debugger" dialog="true" skip="true" href="/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/work_debug_act_debug.htm">
-      <description>
-         The first time Carbide.c++ launches a project it creates a debug launch configuration using preset project settings. It then switches to the Debug perspective, launches the S60 EPOC Emulator, and waits for a breakpoint to be hit. When it does, control is returned to the Carbide debugger.
-      </description>
-      <command serialization="org.eclipse.debug.ui.commands.DebugLast" confirm="false">
-      </command>
-   </item>
-   <item title="Resume the debugger" dialog="true" skip="false" href="/com.nokia.carbide.cpp.doc.user/html/debugger/debug/cmds_resuming.htm">
-      <description>
-         Click Resume in the Debug view to pass control back to the emulator.
-      </description>
-      <command serialization="org.eclipse.debug.ui.commands.Resume" confirm="false">
-      </command>
-   </item>
-</cheatsheet>
+<?xml version="1.0" encoding="UTF-8"?>
+<cheatsheet title="Creating and debugging an application project">
+   <intro>
+ Follow these steps to create and debug a Symbian project and using an emulator. using the S60 EPOC Emulator.
+   </intro>
+   <item title="Verify a Symbian SDK is available" dialog="true" skip="true" href="/com.nokia.carbide.cpp.doc.user/html/reference/pref_carb_symbian_sdk.htm">
+      <description>
+         Use the SDK Preferences panel to verify a supported Symbian SDK is installed. If not, you&apos;ll need to download a supported SDK and install it before continuing.
+      </description>
+      <command serialization="org.eclipse.ui.window.preferences(preferencePageId=com.nokia.carbide.cpp.sdk.ui.preferences.SDKPreferencePage)" confirm="false">
+      </command>
+   </item>
+   <item title="Create a Symbian OS project" dialog="true" skip="true" href="/com.nokia.carbide.cpp.doc.user/html/tasks/CreatingNewProjects.html">
+      <description>
+         Use the New Project wizard to create a Symbian OS project. We named our example HelloCarbide.
+      </description>
+      <command serialization="org.eclipse.ui.newWizard(newWizardId=org.eclipse.ui.wizards.new.project)" confirm="false">
+      </command>
+   </item>
+   <item title="Build the project" dialog="true" skip="true" href="/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_build.htm">
+      <description>
+         If you don&apos;t see an EXE file in the C/C++ Projects view, build the project to create one.
+      </description>
+      <command serialization="org.eclipse.ui.project.buildAll" confirm="false">
+      </command>
+   </item>
+   <item title="Set a breakpoint" dialog="true" skip="true" href="/com.nokia.carbide.cpp.doc.user/html/tasks/breakpoints/pgm_bp_setting.htm">
+      <description>
+         Open  the CHelloCarbideAppUI file and set a breakpoint in the HandleCommandL routine.
+      </description>
+   </item>
+   <item title="Launch the debugger" dialog="true" skip="true" href="/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/work_debug_act_debug.htm">
+      <description>
+         The first time Carbide.c++ launches a project it creates a debug launch configuration using preset project settings. It then switches to the Debug perspective, launches the S60 EPOC Emulator, and waits for a breakpoint to be hit. When it does, control is returned to the Carbide debugger.
+      </description>
+      <command serialization="org.eclipse.debug.ui.commands.DebugLast" confirm="false">
+      </command>
+   </item>
+   <item title="Resume the debugger" dialog="true" skip="false" href="/com.nokia.carbide.cpp.doc.user/html/debugger/debug/cmds_resuming.htm">
+      <description>
+         Click Resume in the Debug view to pass control back to the emulator.
+      </description>
+      <command serialization="org.eclipse.debug.ui.commands.Resume" confirm="false">
+      </command>
+   </item>
+</cheatsheet>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/cheatsheets/how_to_find_n_add_extentions.xml	Thu Aug 26 10:40:47 2010 -0500
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<cheatsheet
+      title="Find and Add Extensions">
+`	<intro>
+    	<description>
+			You can add functionality to Carbide by installing additional extensions.
+    	</description>
+	</intro>
+  <item
+        skip="true"
+        title="Open the Carbide.c++ Portal view">
+     <description>
+        Use the <b>Carbide.c++ Portal > Customize</b> tab to find, download, and install extensions.
+     </description>
+      <command
+            required="false"
+            serialization="org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.makeFast=com.nokia.carbide.discovery.ui.portalEditor)"/>
+  </item>
+</cheatsheet>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger.htm	Thu Aug 26 09:57:08 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger.htm	Thu Aug 26 10:40:47 2010 -0500
@@ -34,7 +34,7 @@
   <tr>
       <td colspan="2"><div align="center" class="style1">Carbide.c++ User Guide
       </div>
-        <p align="center" class="titleSmall">Version 3.0.0, June, 2010</p></td>
+        <p align="center" class="titleSmall">Version 3.0.0, Sept, 2010</p></td>
   </tr>
 </table>
 <p align="center">&nbsp;</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_dll_example_00.htm	Thu Aug 26 09:57:08 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_dll_example_00.htm	Thu Aug 26 10:40:47 2010 -0500
@@ -15,7 +15,7 @@
     <li><a href="new_proj_from_template_02.htm">Building</a> an executable based on the project sources</li>
     <li><a href="new_proj_dll_example_03.htm">Debugging</a> the DLL using  the Carbide debugger</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 installed 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> There must be at least one recognized SDK installed before you can create a project. See the <a href="../../../reference/pref_carb_symbian_sdk.htm">Symbian SDKs panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have installed 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>
 <h4>Other references</h4>
 <ul>
     <li><a href="new_proj_from_template_00.htm">Emulator Application Projects</a></li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_dll_example_01.htm	Thu Aug 26 09:57:08 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_dll_example_01.htm	Thu Aug 26 10:40:47 2010 -0500
@@ -15,7 +15,7 @@
     <li><a href="new_proj_dll_example_02.htm">Building</a> the DLL object code based on the project sources</li>
     <li><a href="new_proj_dll_example_03.htm">Debugging</a> the DLL using  the Carbide debugger</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 installed 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> There must be at least one recognized SDK installed before you can create a project. See the <a href="../../../reference/pref_carb_symbian_sdk.htm">Symbian SDKs panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have installed 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>
 <hr>
 <p>In this tutorial you'll create a simple DLL project using the <strong>New Symbian OS C++ Project</strong> wizard, attach it to the HelloWorld project created <a href="new_proj_from_template_00.htm">here</a>, then debug it.</p>
 <div class="step">
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_from_template_00.htm	Thu Aug 26 09:57:08 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_from_template_00.htm	Thu Aug 26 10:40:47 2010 -0500
@@ -16,7 +16,7 @@
     <li><a href="new_proj_from_template_03.htm">Defining</a> a launch configuration for running or debugging the application</li>
     <li><a href="new_proj_from_template_04.htm">Controlling and debugging</a> the running program using  the Carbide debugger</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 installed 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> There must be at least one recognized SDK installed before you can create a project. See the <a href="../../../reference/pref_carb_symbian_sdk.htm">Symbian SDKs panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have installed 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>
 <h4>Other references</h4>
 <ul><li><a href="new_proj_from_template_00.htm">DLL Projects</a></li>
     <li><a href="run_mode_debug_example_00.htm">Remote Target Debugging (Run-mode)</a></li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_01.htm	Thu Aug 26 09:57:08 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_01.htm	Thu Aug 26 10:40:47 2010 -0500
@@ -18,7 +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/pref_carb_sdk_preference.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>
+<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/pref_carb_sdk_preference.html">Symbian SDKs 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	Thu Aug 26 09:57:08 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_02.htm	Thu Aug 26 10:40:47 2010 -0500
@@ -18,7 +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/pref_carb_sdk_preference.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to <a href="../tasks/sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
+<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/pref_carb_sdk_preference.html">Symbian SDKs panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to <a href="../tasks/sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
 <h3>Select type of Qt project</h3>
 <p>Use the<b> Select a type of project</b> page in the <b>New Qt Project Wizard</b> to choose a Qt project template that will be used to generate the new project, then click <b>Next</b>. Note that the templates shown are filtered to </p>
 <p align="center"><img src="images/qt_wiz_01_project_type.png" width="500" height="500"></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_03.htm	Thu Aug 26 09:57:08 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_03.htm	Thu Aug 26 10:40:47 2010 -0500
@@ -19,7 +19,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/pref_carb_sdk_preference.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to <a href="../tasks/sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
+<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/pref_carb_sdk_preference.html">Symbian SDKs panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to <a href="../tasks/sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
 <h3><b>Enter project name and  location</b></h3>
 <p>Use the <b>New Qt Symbian OS C++ Project</b> page in the <b>Qt Project Wizard</b> to define the projects name and where it should be saved, then click <b>Next</b>. In Qt projects, the name of the project folder must match the project name. </p>
 <p align="center"><img src="images/qt_wiz_02_project_name.png" width="500" height="500"></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_04.htm	Thu Aug 26 09:57:08 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_04.htm	Thu Aug 26 10:40:47 2010 -0500
@@ -20,7 +20,7 @@
   <li><a href="qt_creating_projs_06.htm">Set application UID</a></li>
 </ol>
 <p class="note"><b>NOTE</b> If everything is built correctly, the <span class="code">QtCore.lib</span> should be in your SDK's <span class="code">&lt;platform&gt; &lt;target&gt; UDEB</span> directory.  If this library is missing, then the SDK will not show up as a supported SDK-target in the build configurations. </p>
-<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../reference/pref_carb_sdk_preference.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to <a href="../tasks/sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
+<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/pref_carb_sdk_preference.html">Symbian SDKs panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to <a href="../tasks/sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
 <h3><b>Select SDKs for build targets</b></h3>
 <p>Use the <b>Build Targets</b> page of the <b>Qt Project Wizard</b> to select one or more Qt SDKs to include in the project, then click <b>Next</b>.</p>
 <p align="center"><img src="images/qt_wiz_03_build_targets.png"></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_05.htm	Thu Aug 26 09:57:08 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_05.htm	Thu Aug 26 10:40:47 2010 -0500
@@ -19,7 +19,7 @@
   <li><b>Select Qt modules to include in project</b></li>
   <li><a href="qt_creating_projs_06.htm">Set application UID</a></li>
 </ol>
-<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../reference/pref_carb_sdk_preference.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to <a href="../tasks/sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
+<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/pref_carb_sdk_preference.html">Symbian SDKs panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to <a href="../tasks/sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
 <h3><b>Select Qt modules to include in project</b></h3>
 <p>Use the <b>Qt Modules</b> page to select one or more Qt modules to include with the project, then click <b>Next</b>.</p>
 <p align="center"><img src="images/qt_wiz_04_qt_modules.png" width="500" height="500"></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_06.htm	Thu Aug 26 09:57:08 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_06.htm	Thu Aug 26 10:40:47 2010 -0500
@@ -18,7 +18,7 @@
   <li><a href="qt_creating_projs_05.htm">Select Qt modules to include in project</a></li>
   <li><b>Set application UID</b></li>
 </ol>
-<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../reference/pref_carb_sdk_preference.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to <a href="../tasks/sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
+<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/pref_carb_sdk_preference.html">Symbian SDKs panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to <a href="../tasks/sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
 <h3><b>Set application UID</b></h3>
 <p>Use the <b>Basic Settings</b> page of the <b>Qt Project Wizard </b>to define an Application UID to the executable. Click <b>Random</b> to generate a  unique UID for program testing purposes. Click <b>Finish</b> when ready to create the project.</p>
 <p align="center"><img src="images/qt_wiz_05_basic_settings.png"></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_importing_projs_04.htm	Thu Aug 26 09:57:08 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_importing_projs_04.htm	Thu Aug 26 10:40:47 2010 -0500
@@ -18,7 +18,7 @@
   <li><b>Choose build targets</b></li>
 </ol>
 <p class="note"><b>NOTE</b> If everything is built correctly, the <span class="code">QtCore.lib</span> should be in your SDK's <span class="code">&lt;platform&gt; &lt;target&gt; UDEB</span> directory.  If this library is missing, then the SDK will not show up as a supported SDK-target in the build configurations. </p>
-<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../reference/pref_carb_sdk_preference.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to <a href="../tasks/sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
+<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/pref_carb_sdk_preference.html">Symbian SDKs panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to <a href="../tasks/sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
 <h3>Select .pro file to import</h3>
 <p>Use the<b> Build Targets </b> page in the <b>File Import Wizard</b> to select which SDKs and build configurations to associate with the project,  then click <b>Finish</b>. The <span class="code">.pro</span> file is imported and a new project created in the <a href="../reference/view_proj_explorer.htm">Project Explorer</a> view.</p>
 <p align="center"><img src="images/qt_import_03_build_targets.png"></p>
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/icon_periodic_testing.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/view_remote_connections.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/pref_carb_sdk_preference.html	Thu Aug 26 09:57:08 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html><head>
-<title>SDK Preferences</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">
-<!--
-.style2 {
-	color: #FF0000;
-	font-weight: bold;
-}
-.style3 {color: #EE0000}
--->
-</style>
-</head>
-   <body>
-   <div class="Head1">
-<h2>SDK Preferences (<span class="style3">deprecated</span>)</h2>
-</div>
-Use the <img src="../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=com.nokia.carbide.cpp.sdk.ui.preferences.SDKPreferencePage)")'>
-SDK Preferences</a> page in the <b>Preferences</b> window to control which installed SDKs are available to projects during an import.  To
-	 access SDK preferences preference panel, select <b>Window &gt; Preferences &gt; Carbide.c++ &gt; SDK Preferences</b>. 
-	 <p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project.  If the SDK you have installed is not recognized, you may still be able to add it to the Discovered Symbian OS SDK list. See <a href="../tasks/start/carbide_requirements.htm">Carbide.c++ Requirements</a> for a list of supported SDKs. </p>
-   <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>
-   </div>
-   <table cellpadding="2" cellspacing="0"
-border="0">
-	 <tr valign="top"><th width="221" class="Cell">Name</th><th width="584" class="Cell">Function</th></tr>
-         <tr valign="top">
-           <td class="Cell"><b>Available Symbian OS SDK's</b></td>
-           <td class="Cell"><p>Lists all the installed and recognized SDKs supported by the IDE. Only SDKs supported by the IDE are included in the list. </p>
-             <p>Checked SDKs indicate build configurations available for creating projects. Unchecked SDKs are not displayed when creating new projects. </p>
-             <p>SDKs shown in <span class="style2">red</span>  indicate  a problem, usually no <span class="code">EPOCROOT</span> or missing build configurations. </p>
-           <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>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>
-         <tr valign="top">
-           <td class="Cell"><b>Listen for devices.xml changes outside of Carbide </b></td>
-           <td class="Cell">Enable of have  Carbide  issue an alert prompting you to rescan your SDKs when changes to the <span class="code">devices.xml</span> file are made outside of  Carbide. When disabled the <span class="code">devices.xml</span> file is not scanned for changes. </td>
-         </tr>
-         <tr valign="top">
-           <td class="Cell"><p><b>Rescan All SDKs</b></p>           </td>
-           <td class="Cell"><p>Click to <a href="../tasks/sdks/sdk_search.htm">rescan</a>  the drive  for newly installed SDKs. The devices.xml file is scanned for SDKs and the list of available SDKs is updated if the devices.xml file has changed.</p>
-             <p class="note"><b>NOTE</b> Carbide.c++ scans for available SDKs each time it is started.</p></td>
-        </tr>
-   </table>
-   <h5>Related tasks</h5>
-	 <ul>
-       
-       <li><a href="../tasks/WorkingwithSDKs.html">Working with SDKs</a></li>
-       <li><a href="../tasks/sdks/sdk_add.htm">Adding an SDK</a></li>
-       <li><a href="../tasks/RmvngandVwngPropsosSDK.html">SDK Properties</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/reference/pref_carb_symbian_sdk.htm	Thu Aug 26 09:57:08 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/pref_carb_symbian_sdk.htm	Thu Aug 26 10:40:47 2010 -0500
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd">
 <html><head>
-<title>Symbian SDK</title>
+<title>Symbian SDKs</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">
@@ -15,7 +15,7 @@
 </head>
    <body>
 <h2>Symbian SDKs</h2>
-Use the <img src="../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=com.nokia.carbide.cpp.sdk.ui.preferences.SDKPreferencePage)")'>
+Use the <img src="../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=com.nokia.carbide.cpp.sdk.ui.sdk_prefs_page)")'>
 Symbian SDK</a> page in the <b>Preferences</b> window to control which installed SDKs are available to projects during an import.  To
 	 access SDK preferences preference panel, select <b>Window &gt; Preferences &gt; Carbide.c++ &gt; Symbian SDKs</b>. 
    <p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project.  If the SDK you have installed is not recognized, you may still be able to add it to the Discovered Symbian OS SDK list. See <a href="../tasks/start/carbide_requirements.htm">Carbide.c++ Requirements</a> for a list of supported SDKs. </p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/view_remote_connection.htm	Thu Aug 26 09:57:08 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/view_remote_connection.htm	Thu Aug 26 10:40:47 2010 -0500
@@ -71,6 +71,11 @@
     </center>    </td>
     <td><p>Click to edit the selected remote connection.</p>    </td>
   </tr>
+  <tr>
+      <td><strong>View menu</strong></td>
+      <td><div align="center"><img src="../images/icon_menu_white.png" alt="View menu" width="12" height="12"></div></td>
+      <td>Select the connection types to monitor for remote connections.</td>
+  </tr>
 </table>
 <h3>Remote Connections view Status icons</h3>
 <p>The following status indicators appear in the Remote Connections view: </p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/CreatingNewProjects.html	Thu Aug 26 09:57:08 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/CreatingNewProjects.html	Thu Aug 26 10:40:47 2010 -0500
@@ -8,7 +8,7 @@
 <h2>Creating New Symbian OS C++ Projects</h2>
   <div class="Bodytext">
     <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/pref_carb_sdk_preference.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> You must have  at least one recognized SDK installed before you can create a project. See the <a href="../reference/pref_carb_sdk_preference.html">Symbian SDKs 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>
     <div class="step">
     <h3>Creating New Symbian OS C++ Projects</h3>
@@ -18,7 +18,7 @@
         <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/pref_carb_sdk_preference.html">SDK Preferences</a> panel. Uncheck this option to list  SDKs that can be used with Carbide. Click <b>Next</b>.</p>
+      <p>Checkmark the <b>Filter templates based on enabled SDKs</b> option to only list  SDKs enabled in the <a href="../reference/pref_carb_sdk_preference.html">Symbian SDKs panel</a>. 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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/WorkingwithSDKs.html	Thu Aug 26 09:57:08 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/WorkingwithSDKs.html	Thu Aug 26 10:40:47 2010 -0500
@@ -8,7 +8,7 @@
 		which of the installed SDKs to work with. From the chosen SDK, Symbian OS
 		plug-ins pick-up information such as header files, import libraries,
    documentation and other SDK specific information.</p>
-  <p>You can add and manage SDKs in the SDK Preferences panel. The <a href="../reference/pref_carb_sdk_preference.html">SDK Preferences</a> panel lists all
+  <p>You can add and manage SDKs in the Symbian SDKs panel. The <a href="../reference/pref_carb_sdk_preference.html">Symbian SDKs panel</a> lists all
     available SDKs and allows you to rescan the drive for newly installed and supported SDKs or remove an existing SDK.
     The changes in SDK Preferences are applicable to all projects under that
     workspace.</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_02.htm	Thu Aug 26 09:57:08 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_02.htm	Thu Aug 26 10:40:47 2010 -0500
@@ -25,7 +25,7 @@
     <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>Click Window &gt; Preferences &gt; Carbide.c++ &gt; SDK Preferences to open the Symbian SDKs 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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug.htm	Thu Aug 26 09:57:08 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug.htm	Thu Aug 26 10:40:47 2010 -0500
@@ -11,7 +11,7 @@
 <p>This example shows how to create and build an application and debug it on a device using JTAG debug software and Lauterbach hardware.</p>
 <p>The basic steps include:</p>
 <ul>
-  <li>Verify that your SDK or customer kit is recognized in the <a href="../../reference/pref_carb_sdk_preference.html">SDK preferences</a> panel.</li>
+  <li>Verify that your SDK or customer kit is recognized in the <a href="../../reference/pref_carb_sdk_preference.html">Symbian SDKs panel</a>.</li>
   <li>Create project or <a href="../ImportingProjects.html">Import</a> the project's bld.inf file into Carbide.c++</li>
 <li>Specify your <a href="../../reference/ROM_build_settings.html">ROM build settings</a> for the selected project</li>
   <li><a href="../projects/prj_build.htm">Build</a> your Project with the ARMV5 Debug Build Configuration</li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug_precond.htm	Thu Aug 26 09:57:08 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug_precond.htm	Thu Aug 26 10:40:47 2010 -0500
@@ -18,7 +18,7 @@
 <li>Install Board Support Package (BSP) for your target board</li>
 <li>Install JTAG software and drivers</li>
 <li>Connect JTAG interface between PC and hardware</li>
-<li>Verify that your SDK or customer kit is recognized in the <a href="../../reference/pref_carb_sdk_preference.html">SDK preferences</a> panel.</li>
+<li>Verify that your SDK or customer kit is recognized in the <a href="../../reference/pref_carb_sdk_preference.html">Symbian SDKs panel</a>.</li>
 <li>Build your <a href="../../reference/ROM_build_settings.html">ROM Image</a></li>
 </ul>
 </div>
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/images/wnd_sdk_platform_filter_sbsv2.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/sdk_add.htm	Thu Aug 26 09:57:08 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/sdk_add.htm	Thu Aug 26 10:40:47 2010 -0500
@@ -47,12 +47,12 @@
 <div class="step">
   <h4>Adding  SDKs to Carbide.c++ </h4>
   <ol>
-    <li>Click  Add  New SDK in the <a href="../../reference/pref_carb_sdk_preference.html">SDK Preferences panel </a></li>
+    <li>Click  Add  New SDK in the <a href="../../reference/pref_carb_sdk_preference.html">Symbian SDKs panel </a></li>
     <p>The <b>Add New SDK</b> window (Figure 1) appears.</p>
     <li>Enter SDK name, EPOCROOT, and additional information</li>
     <p>Enter the requested information in the appropriate fields.</p>
     <li>Click OK  </li>
-    <p>The <b>Add New SDK</b> window closes and the SDK is added to the <b>Available Symbian OS SDKs</b> list in the <b>SDK Preferences</b> panel. </p>
+    <p>The <b>Add New SDK</b> window closes and the SDK is added to the <b>Available Symbian OS SDKs</b> list in the <b>Symbian SDKs panel</b>. </p>
   </ol>
 </div>
 
@@ -65,7 +65,7 @@
 </ul>
 <h5>Related references </h5>
 <ul>
-  <li><a href="../../reference/pref_carb_sdk_preference.html">SDK Preferences Panel</a></li>
+  <li><a href="../../reference/pref_carb_sdk_preference.html">Symbian SDKs panel</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>
 
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/sdk_platform_filter.htm	Thu Aug 26 09:57:08 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/sdk_platform_filter.htm	Thu Aug 26 10:40:47 2010 -0500
@@ -4,17 +4,17 @@
 <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>SDK Platform Filter</title>
+<title>Build Configuration Filtering</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 </head>
 <body >
-<h2> Platform Filtering Preferences </h2>
-<p> Use the <img src="../../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=com.nokia.carbide.cpp.sdk.ui.preferences.BuildPlatformFilterPage)")'>
-Platform Filtering Preferences</a> tabs in the <b>Preferences</b> window to select which platforms are visible when creating new projects or build configurations. </p>
+<h2> Build Configuration Filtering </h2>
+<p> Use the <img src="../../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=com.nokia.carbide.cpp.sdk.ui.sdk_platform_filter_page)")'>
+Build Configuration Filtering</a> preference panel in the <b>Preferences</b> window to select which platforms are visible when creating new projects or build configurations. </p>
 <h3>SBSv2 tab</h3>
 <p>Use the <strong>SBSv2</strong> tab to select  configurations for that build system. SBSv2 is the prefered build system for the most current SDKs.</p>
-<p align="center"><img src="images/wnd_sdk_platform_filter_sbsv2.png" alt="SBSv2 tab" width="719" height="554"></p>
+<p align="center"><img src="images/wnd_sdk_platform_filter_sbsv2.png" alt="SBSv2 tab" width="719" height="646"></p>
 <p align="center" class="figure">Figure 1. Platform Filtering Preferences page (SBSv2 tab)</p>
 <h5>Table 1 <span class="figure">Platform Filtering Preferences</span> &mdash; SBSv2 items</h5>
 <table width="100%"  border="0" cellpadding="2" cellspacing="0">
@@ -23,21 +23,25 @@
         <th width="57%" scope="col">Explanation</th>
     </tr>
     <tr>
-        <td><b>SBSv2 Configuration Filter</b></td>
+        <td><b>Default Configurations</b></td>
         <td><p>Select platform build targets to be displayed for OS 9.5 and later when creating new projects and build configurations. BSF&rsquo;s  are gone in SBSv2.&nbsp; All build  configurations (platform/target), including the built-in platforms (WISNCW,  ARMV5), are declared in xml files in the <span class="code">\sbs\lib\config</span> directory.</p>
-                <p>Build targets include:</p>
-            <ul>
-                    <li>armv5_udeb</li>
-                <li>armv5_urel</li>
-                <li>armv6_udeb</li>
-                <li>armv6_urel</li>
-                <li>armv7_udeb</li>
-                <li>armv7_urel</li>
-                <li>armv9e_udeb</li>
-                <li>armv9e_urel</li>
-                <li>winscw_udeb</li>
-                <li>winscw_urel</li>
-            </ul></td>
+            </td>
+    </tr>
+    <tr>
+        <td><strong>Product Variant Configurations</strong></td>
+        <td>Lists all the known variants created for the selected build configuration.</td>
+    </tr>
+    <tr>
+        <td><strong>Rescan Default Configurations</strong></td>
+        <td>Click to rescan for sbs and build configurations in the installed SDKs.</td>
+    </tr>
+    <tr>
+        <td><strong>Add Variant</strong></td>
+        <td>Adds a variant build to the selected build configuration. SDK must support variant builds for this to work.</td>
+    </tr>
+    <tr>
+        <td><strong>Remove Variant</strong></td>
+        <td>Removes the selected variant from the list of available variants.</td>
     </tr>
     <tr>
         <td><strong>Refresh</strong></td>
@@ -79,7 +83,7 @@
 <h4>Related references </h4>
 <ul>
   <li><a href="../WorkingwithSDKs.html">Working with SDKs</a></li>
-  <li><a href="../../reference/pref_carb_sdk_preference.html">SDK Preferences Panel </a> </li>
+  <li><a href="../../reference/pref_carb_sdk_preference.html">Symbian SDKs panel </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>
 
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/sdk_search.htm	Thu Aug 26 09:57:08 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/sdk_search.htm	Thu Aug 26 10:40:47 2010 -0500
@@ -9,13 +9,13 @@
 </head>
 <body >
 <h2>Searching for SDKs</h2>
-<p>  Use the <a href="../../reference/pref_carb_sdk_preference.html">SDK Preferences panel</a> to search for installed Symbian OS SDKs.</p>
+<p>  Use the <a href="../../reference/pref_carb_sdk_preference.html">Symbian SDKs panel</a> to search for installed Symbian OS SDKs.</p>
 <p align="center"><img src="../../images/SDKPreferences.png" width="740" height="546" /></p>
-<p class="figure">Figure 1. SDK Preferences panel</p>
+<p class="figure">Figure 1. Symbian SDKs panel</p>
 <div class="step">
   <h4>Searching for SDKs </h4>
   <ul>
-    <li>Click Rescan All SDKs in the <a href="../../reference/pref_carb_sdk_preference.html">SDK Preferences panel </a></li>
+    <li>Click Rescan All SDKs in the <a href="../../reference/pref_carb_sdk_preference.html">Symbian SDKs panel </a></li>
   </ul>
   <ol>
     <p>Carbide rescans the hard drive searching for install SDKs, adding them to the <b>Available Symbian OS SDKs</b> list.</p>
@@ -28,7 +28,7 @@
   <li><a href="../WorkingwithSDKs.html">Working with SDKs</a></li>
   <li><a href="sdk_add.htm">Adding SDKs</a></li>
   <li><a href="sdk_view_properties.htm">View SDK Properties</a> </li>
-  <li><a href="../../reference/pref_carb_sdk_preference.html">SDK Preferences Panel</a></li>
+  <li><a href="../../reference/pref_carb_sdk_preference.html">Symbian SDKs panel</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>
 
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/sdk_view_properties.htm	Thu Aug 26 09:57:08 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/sdk_view_properties.htm	Thu Aug 26 10:40:47 2010 -0500
@@ -9,14 +9,14 @@
 </head>
 <body >
 <h2>SDK Properties</h2>
-<p> Use the <b>SDK Properties</b> window to examine the properties associated with the currently selected SDK in the <a href="../../reference/pref_carb_sdk_preference.html">SDK Preferences panel</a>. You can also use this window to <a href="sdk_add_custkits.htm">map</a> an unrecognized SDK to a known build configuration to use CustKits with a project.</p>
+<p> Use the <b>SDK Properties</b> window to examine the properties associated with the currently selected SDK in the <a href="../../reference/pref_carb_sdk_preference.html">Symbian SDKs panel</a>. You can also use this window to <a href="sdk_add_custkits.htm">map</a> an unrecognized SDK to a known build configuration to use CustKits with a project.</p>
 <p class="note"><b>NOTE</b> The SDK Properties dialog box serves as a devices.xml editor for the OEM or Professional Developer edition of Carbide.c++.</p>
 <p align="center"><img src="images/wnd_sdk_properties.png" width="418" height="375" alt="SDK Properties window" /></p>
 <p class="figure">Figure 1. SDK properties window </p>
 <div class="step">
   <h4>Viewing and Modifying SDK Properties </h4>
   <ol>
-    <li>Select an SDK in the Available Symbian OS SDKs list  in the <a href="../../reference/pref_carb_sdk_preference.html">SDK Preferences panel </a></li>
+    <li>Select an SDK in the Available Symbian OS SDKs list  in the <a href="../../reference/pref_carb_sdk_preference.html">Symbian SDKs panel </a></li>
     <li>Click SDK Properties
     <p>The <b>SDK Properties </b> window (Figure 1) appears. You can now review an SDKs properties and make modifications if your Carbide.c++ edition supports SDK modification.</p>
     <p class="note"><b>NOTE</b> Changes are directly applied to the devices.xml file.</p></li>
@@ -29,7 +29,7 @@
   <li><a href="../WorkingwithSDKs.html">Working with SDKs</a></li>
   <li><a href="sdk_add.htm">Adding SDKs</a></li>
   <li><a href="sdk_search.htm">Searching SDKs</a></li>
-  <li><a href="../../reference/pref_carb_sdk_preference.html">SDK Preferences Panel </a> </li>
+  <li><a href="../../reference/pref_carb_sdk_preference.html">Symbian SDKs panel </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>
 
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_example.htm	Thu Aug 26 09:57:08 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_example.htm	Thu Aug 26 10:40:47 2010 -0500
@@ -17,7 +17,7 @@
   <li>Using a <a href="carbide_debugging.htm">debugger</a> to interactively control the program in the emulator </li>
 </ul>
 <p>Follow the steps to successfully create the HelloCarbide program and debug it on the S60 Emulator. </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/pref_carb_sdk_preference.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have installed 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> There must be at least one recognized SDK installed before you can create a project. See the <a href="../../reference/pref_carb_sdk_preference.html">Symbian SDKs panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have installed 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>
 <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/tasks/start/carbide_overview_trk.htm	Thu Aug 26 09:57:08 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_overview_trk.htm	Thu Aug 26 10:40:47 2010 -0500
@@ -13,7 +13,7 @@
 <p>This example shows how to create and build an application and debug it on a device using the Application TRK on-device debug agent. Click this link to the <img src="../../images/command_link.png" width="16" height="12" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.cheatsheets.openCheatSheet(cheatSheetId=com.nokia.carbide.cpp.doc.user.trk_appTRK_Using)")'>HelloCarbide</a> cheatsheet that provides links to detailed steps. The majority of steps are identical to the ones used to create a program and debug in an emulator, with some minor variations.</p>
 <p>See the <a href="carbide_example_trk.htm">Run Mode Debug Example</a> for a walkthrough of the following steps which include:</p>
 <ol>
-  <li>Verify that your SDK or customer kit is recognized in the <a href="../../reference/pref_carb_sdk_preference.html">SDK preferences</a> panel.</li>
+  <li>Verify that your SDK or customer kit is recognized in the <a href="../../reference/pref_carb_sdk_preference.html">Symbian SDKs panel</a>.</li>
   <li>Create a project by <a href="../ImportingProjects.html">importing</a> a Bld.inf  </li>
   <li>Verify that all the symbolics for the binaries are visible in the <a href="../../reference/view_executables.htm">Executables</a> view</li>
   <li><a href="../projects/prj_creating_sis_file.htm">Manage</a> the project's PKG file, being sure to:
--- a/core/com.nokia.carbide.cpp.doc.user/plugin.xml	Thu Aug 26 09:57:08 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/plugin.xml	Thu Aug 26 10:40:47 2010 -0500
@@ -47,6 +47,13 @@
 		 <cheatsheet
            composite="false"
 		   category="com.nokia.carbide.how_to.cheatsheets"
+           contentFile="html/cheatsheets/how_to_find_n_add_extensions.xml"
+           id="com.nokia.carbide.cpp.doc.user.add_extensions"
+           name="Find and Add Extensions"/>
+
+		 <cheatsheet
+           composite="false"
+		   category="com.nokia.carbide.how_to.cheatsheets"
            contentFile="html/cheatsheets/how_to_customize_code_styles.xml"
            id="com.nokia.carbide.cpp.doc.user.customize_code_styles"
            name="Customize Code Styles"/>
--- a/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml	Thu Aug 26 09:57:08 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml	Thu Aug 26 10:40:47 2010 -0500
@@ -115,7 +115,6 @@
       </topic>
     </topic>
     <topic label="Working with SDKs"					href="html/tasks/WorkingwithSDKs.html" >
-      <topic label="SDK Preferences (deprecated)"					href="html/reference/SDKPreferences.html" />
       <topic label="Symbian SDKs"						href="html/reference/pref_carb_symbian_sdk.htm" />
       <topic label="Adding an SDK"					href="html/tasks/sdks/sdk_add.htm" >
         <topic label="Adding SDKs"					href="html/tasks/sdks/sdk_add.htm" />