added Install Extension view page and related images and links
authorfturovic <frank.turovich@nokia.com>
Wed, 09 Jun 2010 11:26:26 -0500
changeset 1448 e1fbef8f8f8c
parent 1443 97d5a41dc05a
child 1449 a0ba21f7cb12
added Install Extension view page and related images and links
core/com.nokia.carbide.cpp.doc.user/book.css
core/com.nokia.carbide.cpp.doc.user/html/concepts/CarbidePerspective.html
core/com.nokia.carbide.cpp.doc.user/html/concepts/SampleExampleProjectCreate.html
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/contextual_menus.htm
core/com.nokia.carbide.cpp.doc.user/html/concepts/images/workbench.png
core/com.nokia.carbide.cpp.doc.user/html/concepts/tour.html
core/com.nokia.carbide.cpp.doc.user/html/concepts/watchpoints.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/images/context_menu_remote_conn_view.png
core/com.nokia.carbide.cpp.doc.user/html/reference/images/icon_install_extensions.png
core/com.nokia.carbide.cpp.doc.user/html/reference/images/icon_show_overview.png
core/com.nokia.carbide.cpp.doc.user/html/reference/images/view_install_extensions.png
core/com.nokia.carbide.cpp.doc.user/html/reference/images/view_remote_connections.png
core/com.nokia.carbide.cpp.doc.user/html/reference/images/view_show_overview_popup.png
core/com.nokia.carbide.cpp.doc.user/html/reference/images/wnd_new_connection_wizard_01.png
core/com.nokia.carbide.cpp.doc.user/html/reference/images/wnd_new_connection_wizard_02.png
core/com.nokia.carbide.cpp.doc.user/html/reference/images/wnd_new_connection_wizard_03.png
core/com.nokia.carbide.cpp.doc.user/html/reference/trk/exporting_remote_conns.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/trk/importing_remote_conns.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_settings_pane.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_wiz_add.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_wiz_edit.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/view_install_extensions.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_install_bluetooth.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_install_pcsuite.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_install_usb.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_overview.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_preconditions.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_troubleshooting.htm
core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml
--- a/core/com.nokia.carbide.cpp.doc.user/book.css	Tue Jun 08 12:00:34 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/book.css	Wed Jun 09 11:26:26 2010 -0500
@@ -101,7 +101,7 @@
 	}
 	
 th	{
-	background-color: #ffd62c;
+	background-color: #E6E6E6;
 	}
 
 div.ol.p	{
@@ -120,7 +120,7 @@
 	
 div h5, div h4	{
 	padding:5px 0px 5px 12px;
-	background-color: #FFCC00;
+	background-color: #E6E6E6;
 	font-weight:bold;
 	color: #000000;
 	}
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/CarbidePerspective.html	Tue Jun 08 12:00:34 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/CarbidePerspective.html	Wed Jun 09 11:26:26 2010 -0500
@@ -1,48 +1,43 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
-<title>Carbide.c++ perspective</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-   <body>
-     <h2>Carbide.c++ perspective</h2>
-
-	  
-	 <p>
-	 The <img src="../images/command_link.png" width="16" height="12" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=com.nokia.carbide.cpp.CarbideCppPerspective)")'>Carbide C/C++</a> perspective is a set of tools and layout of views provided for Symbian OS development. This perspective is designed to work with Symbian OS C++ projects. The commonly used views include:</p>
-	 <ul>
-	   <li><a href="../reference/view_cpp_projects.htm">Project Explorer</a> view -   display<span><span>s   C/C++ projects located in the current workspace</span></span></li>
-	   <li><a href="../reference/view_sym_proj_nav.htm">Symbian Project Navigator</a> view - shows all files that belong to the
-		  current build configuration </li>
-		<li><a href="../hints_tips.htm">Editor</a> view - one or more source code editor windows </li> 
-	   <li><a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_outline_view.htm">Outline</a> view -   displays an outline of a structured C/C++ file that is currently open in the editor view </li>
-		<li><a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_problems_view.htm">Problems</a> view - displays build errors </li>
-		<li><a href="../reference/view_log.htm">Console</a> view -   shows the output of a process and allows you to provide keyboard input to a 
-process</li>
-        <li><a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_properties_view.htm">Properties</a> view -   displays property names and basic properties of a selected resource</li>
-	    <li><a href="PLUGINS_ROOT/org.eclipse.platform.doc.user/reference/ref-31.htm">Tasks</a> view - <span>displays </span>tasks that you manually add</li>
-	    <li><b>Include Browser</b> view  -  visualizes the include relations among files</li>
-	    <li><a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_call_hierarchy_view.htm">Call Hierarchy</a> view - explore call-graphs by means of a tree</li>
-	    <li><b>Type Hierarchy</b> view - presents inheritance relations and members of type</li>
-        <li><a href="../reference/view_executables.htm">Executables</a> view - provides a dynamic list of executables and their related source files</li>
-     </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="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
-     &gt; <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_o_views.htm">C/C++ Views and Editors</a></b>.</p>
-	 <p>
-		For more details on the Symbian OS Build Configurations, see 
-	 <a href="build_configurations.htm">Active Configurations</a>. </p>
-	 <h5>Related references</h5>
-	 <ul>
-	   <li>  <a href="../reference/perspective_debug.htm">Debug	Perspective</a></li>
-       <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; 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>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
+<title>Carbide.c++ perspective</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+   <body>
+     <h2>Carbide.c++ perspective</h2>
+
+	  
+	 <p>
+	 The <img src="../images/command_link.png" width="16" height="12" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=com.nokia.carbide.cpp.CarbideCppPerspective)")'>Carbide C/C++</a> perspective is a set of tools and layout of views provided for Symbian OS development. This perspective is designed to work with Symbian OS C++ projects. The commonly used views include:</p>
+	 <ul>
+	   <li><a href="../reference/view_cpp_projects.htm">Project Explorer</a> view -   display<span><span>s   C/C++ projects located in the current workspace</span></span></li>
+	   <li><a href="../reference/view_sym_proj_nav.htm">Symbian Project Navigator</a> view - shows all files that belong to the
+		  current build configuration </li>
+		<li><a href="../hints_tips.htm">Editor</a> view - one or more source code editor windows </li> 
+	   <li><a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_outline_view.htm">Outline</a> view -   displays an outline of a structured C/C++ file that is currently open in the editor view </li>
+		<li><a href="../reference/view_install_extensions.htm">Install Extensions</a> view - displays a list of installable plug-ins</li>
+		<li><a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_problems_view.htm">Problems</a> view - displays build errors </li>
+		<li><a href="../reference/view_log.htm">Console</a> view -   shows the output of a process and allows you to provide keyboard input to a 
+process</li>
+        <li><a href="../reference/view_executables.htm">Executables</a> view - provides a dynamic list of executables and their related source files</li>
+	    <li><a href="../reference/trk/view_remote_connection.htm">Remote Connections</a> view &ndash; use to monitor, create, edit, or remove  common  connection settings</li>
+	 </ul>
+     <p align="center"><img src="images/workbench.png" width="1052" height="800" /></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
+     &gt; <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_o_views.htm">C/C++ Views and Editors</a></b>.</p>
+	 <p>
+		For more details on the Symbian OS Build Configurations, see 
+	 <a href="build_configurations.htm">Active Configurations</a>. </p>
+	 <h5>Related references</h5>
+	 <ul>
+	   <li>  <a href="../reference/perspective_debug.htm">Debug	Perspective</a></li>
+       <li><a href="../reference/view_cpp_projects.htm">Project Explorer</a> view</li>
+       <li><a href="../reference/view_sym_proj_nav.htm">Symbian Project Navigator</a> view </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/SampleExampleProjectCreate.html	Tue Jun 08 12:00:34 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/SampleExampleProjectCreate.html	Wed Jun 09 11:26:26 2010 -0500
@@ -1,45 +1,45 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<title>Simple Example Project in Getting Started</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/></head>
-<body>
-<h2>Simple DLL Example</h2>
-
-   <p>
-	  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>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<title>Simple Example Project in Getting Started</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/></head>
+<body>
+<h2>Simple DLL Example</h2>
+
+   <p>
+	  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="409" height="503" 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="430" height="319"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="403" height="397" 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="403" height="397" 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="271" height="345"  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>
    
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/build_configurations.htm	Tue Jun 08 12:00:34 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/build_configurations.htm	Wed Jun 09 11:26:26 2010 -0500
@@ -1,56 +1,56 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Active Build Configuration</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Active  Build Configuration</h2>
-<p>Use the <b>Active  Configuration</b> option in the <a href="../reference/build_properties/pane_build_config.htm">Carbide Build Configurations</a> panel to specify the build target. Since a project can contain one or more build targets, the active  configuration defines  which build configuration to use when the project is run or debugged. A launch configuration consists of the following:</p>
-<ul>
-  <li>a project</li>
-  <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="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>
-<h5>Table 1 Carbide Build Configuration items </h5>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="20%" scope="col">Item</th>
-    <th width="71%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td width="20%"><b>Active Configuration </b></td>
-    <td>The <b>Active Configuration</b> drop down list allows you to <a href="../tasks/projects/prj_set_build_tgt.htm">select</a> a configuration that is currently available for the selected project. The entries in the related sub-panes will change according to the selected configuration. The Configuration name consists of a target name and an SDK identifier in brackets.</td>
-  </tr>
-  <tr>
-    <td width="20%"><b>Manage...</b></td>
-    <td>Click the <b>Manage</b>... button to <a href="../tasks/projects/prj_new_build_config.htm">add</a> a new SDK/Configuration or remove an existing configuration.</td>
-  </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 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, 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>
-<ul>
-  <li><a href="../reference/build_properties/pane_build_config.htm">Carbide Build Configurations</a> </li>
-  <li><a href="../tasks/projects/prj_set_build_tgt.htm">Setting an Active Configuration</a></li>
-  <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; 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>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Active Build Configuration</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Active  Build Configuration</h2>
+<p>Use the <b>Active  Configuration</b> option in the <a href="../reference/build_properties/pane_build_config.htm">Carbide Build Configurations</a> panel to specify the build target. Since a project can contain one or more build targets, the active  configuration defines  which build configuration to use when the project is run or debugged. A launch configuration consists of the following:</p>
+<ul>
+  <li>a project</li>
+  <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>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>
+<h5>Table 1 Carbide Build Configuration items </h5>
+<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="20%" scope="col">Item</th>
+    <th width="71%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td width="20%"><b>Active Configuration </b></td>
+    <td>The <b>Active Configuration</b> drop down list allows you to <a href="../tasks/projects/prj_set_build_tgt.htm">select</a> a configuration that is currently available for the selected project. The entries in the related sub-panes will change according to the selected configuration. The Configuration name consists of a target name and an SDK identifier in brackets.</td>
+  </tr>
+  <tr>
+    <td width="20%"><b>Manage...</b></td>
+    <td>Click the <b>Manage</b>... button to <a href="../tasks/projects/prj_new_build_config.htm">add</a> a new SDK/Configuration or remove an existing configuration.</td>
+  </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 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, 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>
+<ul>
+  <li><a href="../reference/build_properties/pane_build_config.htm">Carbide Build Configurations</a> </li>
+  <li><a href="../tasks/projects/prj_set_build_tgt.htm">Setting an Active Configuration</a></li>
+  <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; 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	Tue Jun 08 12:00:34 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/build_targets.htm	Wed Jun 09 11:26:26 2010 -0500
@@ -1,71 +1,71 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Supported Target Types</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-<style type="text/css">
-<!--
-.style1 {color: #999999}
--->
-</style>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Supported Target Types</h2>
-<p> Carbide.c++ supports a variety of build targets based upon the SDKs and which version of the Carbide tools used by the project. The table below identifies which build targets are possible for a specific SDK.</p>
-<p class="note"><b>NOTE</b> Check the <a href="../reference/SDKPreferences.html">SDK Preferences</a> page to see if an SDK you have installed and whether its build configurations are supported.</p>
-<h5>Table 1. Supported  target types for all versions of Carbide.c++ </h5>
-<table width="87%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="17%" rowspan="2" valign="middle" scope="col">Target Types </th>
-    <th colspan="2" scope="col">Platform Security<br />
-(S60 3.2, S60 5.0) </th>
-  </tr>
-  <tr>
-    <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>
-  <tr>
-    <td>APP (DLL) </td>
-    <td bgcolor="#FFFFCC"><div align="center"><span class="style2"></span></div></td>
-    <td bgcolor="#FFFFCC"><div align="center"><span class="style1"><span class="style2"></span></span></div></td>
-  </tr>
-  <tr>
-    <td>DLL</td>
-    <td><div align="center">Yes</div></td>
-    <td><div align="center">Yes</div></td>
-  </tr>
-  <tr>
-    <td>EXE (console) </td>
-    <td><div align="center">Yes</div></td>
-    <td><div align="center">Yes</div></td>
-  </tr>
-  <tr>
-    <td>EXE (OS 9.1 GUI) </td>
-    <td bgcolor="#FFFFFF"><div align="center">Yes</div></td>
-    <td><div align="center">Yes</div></td>
-  </tr>
-  <tr>
-    <td>Polymorphic DLL </td>
-    <td><div align="center">Yes</div></td>
-    <td><div align="center">Yes</div></td>
-  </tr>
-  <tr>
-    <td>STDLIB</td>
-    <td><div align="center">Yes</div></td>
-    <td><div align="center">Yes</div></td>
-  </tr>
-</table>
-<h5>Related tasks</h5>
-<ul>
-  <li><a href="../tasks/sdks/sdk_add_custkits.htm">Adding Symbian Custom Kits</a></li>
-  <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; 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>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Supported Target Types</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+<style type="text/css">
+<!--
+.style1 {color: #999999}
+-->
+</style>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Supported Target Types</h2>
+<p> Carbide.c++ supports a variety of build targets based upon the SDKs and which version of the Carbide tools used by the project. The table below identifies which build targets are possible for a specific SDK.</p>
+<p class="note"><b>NOTE</b> Check the <a href="../reference/SDKPreferences.html">SDK Preferences</a> page to see if an SDK you have installed and whether its build configurations are supported.</p>
+<h5>Table 1. Supported  target types for all versions of Carbide.c++ </h5>
+<table width="87%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="17%" rowspan="2" valign="middle" scope="col">Target Types </th>
+    <th colspan="2" scope="col">Platform Security<br />
+(S60 3.2, S60 5.0, Symbian ^3) </th>
+  </tr>
+  <tr>
+    <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>
+  <tr>
+    <td>APP (DLL) </td>
+    <td bgcolor="#FFFFCC"><div align="center"><span class="style2"></span></div></td>
+    <td bgcolor="#FFFFCC"><div align="center"><span class="style1"><span class="style2"></span></span></div></td>
+  </tr>
+  <tr>
+    <td>DLL</td>
+    <td><div align="center">Yes</div></td>
+    <td><div align="center">Yes</div></td>
+  </tr>
+  <tr>
+    <td>EXE (console) </td>
+    <td><div align="center">Yes</div></td>
+    <td><div align="center">Yes</div></td>
+  </tr>
+  <tr>
+    <td>EXE (OS 9.1 GUI) </td>
+    <td bgcolor="#FFFFFF"><div align="center">Yes</div></td>
+    <td><div align="center">Yes</div></td>
+  </tr>
+  <tr>
+    <td>Polymorphic DLL </td>
+    <td><div align="center">Yes</div></td>
+    <td><div align="center">Yes</div></td>
+  </tr>
+  <tr>
+    <td>STDLIB</td>
+    <td><div align="center">Yes</div></td>
+    <td><div align="center">Yes</div></td>
+  </tr>
+</table>
+<h5>Related tasks</h5>
+<ul>
+  <li><a href="../tasks/sdks/sdk_add_custkits.htm">Adding Symbian Custom Kits</a></li>
+  <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; 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/contextual_menus.htm	Tue Jun 08 12:00:34 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/contextual_menus.htm	Wed Jun 09 11:26:26 2010 -0500
@@ -21,7 +21,7 @@
 </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="236" height="260" /></p>
+<p align="center"><img src="images/breakpt_popup_menu.png" width="155" height="187" /></p>
 <p class="figure">Figure 1 - Example context menu in Breakpoints view </p>
 <div class="step">
   <h4>Using Context Menus</h4>
Binary file core/com.nokia.carbide.cpp.doc.user/html/concepts/images/workbench.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/tour.html	Tue Jun 08 12:00:34 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/tour.html	Wed Jun 09 11:26:26 2010 -0500
@@ -75,8 +75,8 @@
   <ul>
        <li> 
 	     <p>
-		    Configure the SDKs that are available for use with Carbide.c++ in the	       SDK Preferences settings. Select Window
-         &gt; Preferences, expand the Carbide.c++ group and select SDK Preferences.</p> 
+		    Configure the SDKs that are available for use with Carbide.c++ in the	       SDK Preferences settings. Select <strong>Window
+         &gt; Preferences</strong>, expand the Carbide.c++ group and select SDK Preferences.</p> 
 	     <p>
 		    For more information, see <a href="../tasks/RmvngandVwngPropsosSDK.html">SDK Properties</a>.</p> 
        </li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/watchpoints.htm	Tue Jun 08 12:00:34 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/watchpoints.htm	Wed Jun 09 11:26:26 2010 -0500
@@ -5,7 +5,7 @@
 <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>
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/context_menu_remote_conn_view.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/icon_install_extensions.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/icon_show_overview.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/view_install_extensions.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/view_remote_connections.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/view_show_overview_popup.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/wnd_new_connection_wizard_01.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/wnd_new_connection_wizard_02.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/wnd_new_connection_wizard_03.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/exporting_remote_conns.htm	Tue Jun 08 12:00:34 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/exporting_remote_conns.htm	Wed Jun 09 11:26:26 2010 -0500
@@ -29,7 +29,7 @@
 </ol>
 <h5>Related references</h5>
 <ul>
-  <li><a href="wnd_on_device_setup.htm">On-Device Setup</a></li>
+  <li><a href="wnd_on_device_setup.htm">On-Device Connections</a></li>
   <li><a href="wnd_new_conn_install_tab.htm">Install latest TRK</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/reference/trk/importing_remote_conns.htm	Tue Jun 08 12:00:34 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/importing_remote_conns.htm	Wed Jun 09 11:26:26 2010 -0500
@@ -29,7 +29,7 @@
 </ol>
 <h5>Related references</h5>
 <ul>
-  <li><a href="wnd_on_device_setup.htm">On-Device Setup</a></li>
+  <li><a href="wnd_on_device_setup.htm">On-Device Connections</a></li>
   <li><a href="wnd_new_conn_install_tab.htm">Install latest TRK</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/reference/trk/view_remote_connection.htm	Tue Jun 08 12:00:34 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/view_remote_connection.htm	Wed Jun 09 11:26:26 2010 -0500
@@ -24,9 +24,8 @@
   <li>Serial &mdash; mainly for boards with a serial interface</li>
   <li>Bluetooth &mdash; available for  debug support </li>
   <li>USB &mdash; available for both debug and trace support </li>
-  <li>Platform Simulator (PlatSim) &mdash; Nokia's device simulator</li>
 </ul>
-<p>The columns in the Remote Connections view include:</p>
+<p>The columns in the <strong>Remote Connections</strong> view include:</p>
 <ul>
   <li>Connection/Services - connection name defined by you and remote agent type</li>
   <li>Type - connection type, i.e. Bluetooth, USB, TCP/IP, etc.</li>
@@ -107,8 +106,8 @@
   </tr>
 </table>
 <h3>Remote Connections view context menu options</h3>
-<p>Based on the current selection, one or more of the following commands appear on the context menu when you right-click within the Remote Connections view. For example, if no connections are defined, only the <b>New Connection</b> command is available on the context menu. Right-click on a connection name and the additional <b>Enable Service Testing</b> and <b>Disable Service Testing</b> are available.</p>
-<p align="center"><img src="../images/context_menu_remote_conn_view.png" width="211" height="104"></p>
+<p>Based on the current selection, one or more of the following commands appear on the context menu when you right-click within the Remote Connections view. For example, if no connections are defined, only the <b>New Connection</b> command is available on the context menu. </p>
+<p align="center"><img src="../images/context_menu_remote_conn_view.png" width="246" height="141"></p>
 <p class="figure">Figure 3 - Remote Connections context menu</p>
 <table width="100%"  border="0" cellpadding="2" cellspacing="0">
   <tr>
@@ -117,47 +116,42 @@
     <th width="59%" scope="col">Explanation</th>
   </tr>
   <tr>
-    <td><span class="style1">New Connection</span></td>
+    <td><span class="style1">New Connection...</span></td>
     <td><center>
       <img src="../images/icon_remote_connection_new.png" width="20" height="18">
     </center>    </td>
     <td>Select to open the New  Connection wizard to add a connection.</td>
   </tr>
   <tr>
-    <td><span class="style1">Rename Connection</span></td>
+    <td><span class="style1">Rename</span></td>
     <td>&nbsp;</td>
     <td>Select to rename the currently selected connection.</td>
   </tr>
   <tr>
-    <td><span class="style1">Edit Connection Settings</span></td>
+    <td><span class="style1">Edit  Settings...</span></td>
     <td><center>
       <img src="../images/icon_remote_connection_edit.png" width="19" height="19">
     </center>    </td>
-    <td><p>Select to edit the selected remote connection.</p></td>
+    <td><p>Select to edit the selected remote connection settings.</p></td>
   </tr>
   <tr>
-    <td><span class="style1">Delete Connection</span></td>
+    <td><span class="style1">Delete</span></td>
     <td><center>
       <img src="../images/icon_remote_connection_delete.png" width="17" height="16">
     </center>    </td>
     <td><p>Select to delete the selected connection from the connection list.</p></td>
   </tr>
   <tr>
-    <td><span class="style1">Connection Documentation</span></td>
+    <td><span class="style1">Help for...</span></td>
     <td><center>
         <img src="../images/icon_remote_connection_docs.png" width="19" height="17">
     </center></td>
-    <td>Select to open the Help view with connection information.</td>
+    <td>Select to open the Help view for connection information.</td>
   </tr>
   <tr>
-    <td><span class="style1">Disable Service Testing</span></td>
+    <td><span class="style1">Make Current</span></td>
     <td>&nbsp;</td>
-    <td>Select to disable the connection testing. This releases the port so other connection services can use it. </td>
-  </tr>
-  <tr>
-    <td><span class="style1">Enable Service Testing</span></td>
-    <td>&nbsp;</td>
-    <td>Select to re-enable testing of the connection.</td>
+    <td>Make the selected connection the current connection.</td>
   </tr>
 </table>
 <h5>Related references</h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_settings_pane.htm	Tue Jun 08 12:00:34 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_settings_pane.htm	Wed Jun 09 11:26:26 2010 -0500
@@ -11,8 +11,8 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Install Remote Agents pane</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>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/tab_new_conn_install_agent.png" alt="" width="464" height="554"></p>
 <p class="figure">Figure 2 - New Connection wizard Serial Connection Settings page</p>
 <p>Table 3. Serial Connection Setting page - Install Remote Agents tab</p>
 <table width="100%"  border="0" cellpadding="2" cellspacing="0">
@@ -21,7 +21,7 @@
     <th width="59%" scope="col">Explanation</th>
   </tr>
   <tr>
-    <td><strong>Install remote agents</strong></td>
+    <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></td>
   </tr>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_wiz_add.htm	Tue Jun 08 12:00:34 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_wiz_add.htm	Wed Jun 09 11:26:26 2010 -0500
@@ -19,7 +19,7 @@
 </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 align="center"><img src="../images/wnd_new_connection_wizard_01.png" width="464" height="560"></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>
 <table width="100%"  border="0" cellpadding="2" cellspacing="0">
@@ -28,16 +28,16 @@
     <th width="59%" scope="col">Explanation</th>
   </tr>
   <tr>
-    <td><strong>Connetion Name</strong></td>
+      <td><strong>Connection Type</strong></td>
+      <td>Select the type of connection this setup will use.</td>
+  </tr>
+  <tr>
+    <td><strong>Connection Name</strong></td>
     <td><p>Enter a name for the connection.</p>    </td>
   </tr>
   <tr>
-    <td><strong>Conection Type</strong></td>
-    <td>Select the type of connection this setup will use.</td>
-  </tr>
-  <tr>
-    <td><strong>Supported Services</strong></td>
-    <td><p>Shows a list of services supported by the connection type chosen.</p>    </td>
+    <td><strong>Connection Settings</strong></td>
+    <td><p>Select the connection port to use for this connection setting.</p>    </td>
   </tr>
 </table>
 <h3><strong><a name="CONN_SET" id="INSTALL2"></a></strong>Set Connection Settings pane</h3>
@@ -47,7 +47,7 @@
   <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 align="center"><img src="../images/wnd_new_connection_wizard_02.png" width="464" height="560"></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">
@@ -56,24 +56,16 @@
     <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>
+    <td><strong>Device OS (used to determine installer version)</strong></td>
+    <td>Select the OS used on the device.</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 Check TRK version operation requires more than a few seconds.</p>
+    <td><strong>Initiate Service Testing</strong></td>
+    <td><p>Click <strong>Initiate Service Testing</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 Check TRK 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>
@@ -87,7 +79,7 @@
 </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 align="center"><img src="../images/wnd_new_connection_wizard_03.png" width="464" height="560"></p>
 <p class="figure">Figure 2 - New Connection wizard Serial Connection Settings page</p>
 <p>Table 3. Serial Connection Setting page - Install Remote Agents tab</p>
 <table width="100%"  border="0" cellpadding="2" cellspacing="0">
@@ -96,8 +88,8 @@
     <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>
+    <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 5.x 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>
@@ -113,7 +105,7 @@
 <p>&nbsp;</p>
 <h5>Related references</h5>
 <ul>
-  <li><a href="wnd_on_device_setup.htm">On-Device Setup</a></li>
+  <li><a href="wnd_on_device_setup.htm">On-Device Connections</a></li>
   <li><a href="wnd_new_conn_install_tab.htm">Install latest TRK</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/reference/trk/wnd_new_conn_wiz_edit.htm	Tue Jun 08 12:00:34 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_wiz_edit.htm	Wed Jun 09 11:26:26 2010 -0500
@@ -113,7 +113,7 @@
 <p>&nbsp;</p>
 <h5>Related references</h5>
 <ul>
-  <li><a href="wnd_on_device_setup.htm">On-Device Setup</a></li>
+  <li><a href="wnd_on_device_setup.htm">On-Device Connections</a></li>
   <li><a href="wnd_new_conn_install_tab.htm">Install latest TRK</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/reference/view_install_extensions.htm	Wed Jun 09 11:26:26 2010 -0500
@@ -0,0 +1,70 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Install Extensions view</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Install Extensions  view</h2>
+<p>The <strong>Install Extensions</strong> view enables the user to locate and install Carbide plug-ins into a core Carbide.c++ installation. The Install Extensions view links to an online site that lists  available plug-ins for installation. Plug-ins are grouped by type for </p>
+<p>The <strong>Install Extensions</strong> view appears as part of the <a href="../concepts/CarbidePerspective.html">C/C++ Perspective</a>. It can be added to a perspective by clicking <strong>Window &gt; Show View &gt; Install Extensions</strong>.</p>
+<p align="center"><img src="images/view_install_extensions.png" width="491" height="426"></p>
+<p class="figure">Figure 1. Install Extensions  view</p>
+<p>Click on the <img src="images/icon_show_overview.png" alt="Show Overview icon" width="18" height="18" align="absmiddle"> (Show Overview) icon to show an information popup with additional information on the selected plug-in.</p>
+<p align="center"><img src="images/view_show_overview_popup.png" width="748" height="402"></p>
+<p class="figure">Figure 2. Install Extensions Plug-in Information popup </p>
+<h5>Table 1 <span class="figure">Install Extensions</span> view&mdash;items </h5>
+<table width="83%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="30%" scope="col">Item</th>
+    <th width="70%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><b>Find</b></td>
+    <td><p>Filters the plug-ins shown in the view to a subset of the complete list.</p>      </td>
+  </tr>
+  <tr>
+    <td><b>Show Installed</b></td>
+    <td>Toggles the plug-ins shown in the view between those that are currently installed and plug-ins available for installation.</td>
+  </tr>
+</table>
+<h2>Install Extensions view toolbar options</h2>
+<h5>Table 1 <span class="figure">Install Extensions</span> view&mdash; toolbar options </h5>
+<table width="83%"  border="0" cellpadding="2" cellspacing="0">
+    <tr>
+        <th width="29%" scope="col">Item</th>
+        <th width="8%" scope="col"><div align="center">Icon</div></th>
+        <th width="63%" scope="col">Explanation</th>
+    </tr>
+    <tr>
+        <td><b>Refresh</b></td>
+        <td><div align="center"><img src="../images/icons/btn_restart.png" width="20" height="18"></div></td>
+        <td><p>Refreshes the plug-in list.</p></td>
+    </tr>
+    <tr>
+        <td><b>Install Checked Items</b></td>
+        <td><div align="center"><img src="images/icon_install_extensions.png" width="17" height="18"></div></td>
+        <td>Click to download and install all plug-ins that are checked in the plug-in list.</td>
+    </tr>
+    <tr>
+        <td><strong>View Menu</strong></td>
+        <td><div align="center"><img src="../debugger/images/icon_menu_white.png" width="12" height="12"></div></td>
+        <td><p>Additional options include:</p>
+            <ul>
+                <li>Check All Items</li>
+                <li>Uncheck All Items</li>
+                <li>Advanced Install... &ndash; launches the <strong>Install New Software</strong> wizard.</li>
+        </ul></td>
+    </tr>
+</table>
+<h5>Related references </h5>
+<ul>
+  <li><a href="../concepts/CarbidePerspective.html">Carbide C/C++ perspective</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/tasks/trk/trk_install_bluetooth.htm	Tue Jun 08 12:00:34 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_install_bluetooth.htm	Wed Jun 09 11:26:26 2010 -0500
@@ -38,7 +38,7 @@
   <h5>Related references</h5>
   <ul>
     
-  <li><a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Setup </a></li>
+  <li><a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Connections </a></li>
   <li><a href="../../projects/launch/page_main.htm">Debug Window (On-device Debugging) Overview</a></li>
   </ul>
 <h5>Related tasks</h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_install_pcsuite.htm	Tue Jun 08 12:00:34 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_install_pcsuite.htm	Wed Jun 09 11:26:26 2010 -0500
@@ -42,7 +42,7 @@
 <h5>Related reference</h5>
 <ul>
   
-  <li><a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Setup </a></li>
+  <li><a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Connections </a></li>
   <li><a href="../../projects/launch/page_main.htm">Debug Window (On-device Debugging) Overview</a></li>
 </ul>
 <h5>Related tasks</h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_install_usb.htm	Tue Jun 08 12:00:34 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_install_usb.htm	Wed Jun 09 11:26:26 2010 -0500
@@ -40,7 +40,7 @@
 </ul>
 <h5>Related reference</h5>
 <ul>
-  <li><a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Setup </a></li>
+  <li><a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Connections </a></li>
   <li><a href="../../projects/launch/page_main.htm">Debug Window (On-device Debugging) Overview</a></li>
 </ul>
 <h5>Related tasks</h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_overview.htm	Tue Jun 08 12:00:34 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_overview.htm	Wed Jun 09 11:26:26 2010 -0500
@@ -19,7 +19,7 @@
 <h5>Related references </h5>
 <ul>
   <li><a href="../../projects/launch/page_main.htm">Debug Window (On-device Debugging) Overview</a></li>
-  <li><a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Setup </a></li>
+  <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>
 </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/trk/trk_preconditions.htm	Tue Jun 08 12:00:34 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_preconditions.htm	Wed Jun 09 11:26:26 2010 -0500
@@ -22,11 +22,11 @@
         <li>Nokia PC Suite (or equivilent software) for connecting and installing applications to the device </li>
       </ul>
     </li>
-    <li>Download and install the current TRK SISX file using the <a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Setup</a> dialog</li>
+    <li>Download and install the current TRK SISX file using the <a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Connections</a> dialog</li>
     <p>The Application TRK debug agents are stored If not, install it now using the <a href="../../projects/launch/wiz_new_launch_config.htm">On-Device Connections &gt; New Connection Wizard &gt; Install remote agents</a> pane.</p>
     <p class="note"><b>NOTE</b> The Application TRK versions included with Carbide is for CE versions of devices only. They are not intended for use with RnD devices. </p>
     <li>Specify the communication method with the on-target device during the debug session</li>
-  <p>Start the Application TRK or System TRK on the device. During startup of TRK on the device you must specify the communication method the on-device agent uses to debug the device. Currently, those methods include <a href="trk_connection_bluetooth.htm">Bluetooth</a> and <a href="trk_connection_usb.htm">USB</a> or a null serial cable. For Bluetooth, you must pair the device with the PC and a valid serial port assigned. For USB, A USB cable must connect the PC to the device and a valid serial port assigned. Use <a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Setup</a> dialog to make the identification and connection setup quick and easy. </p>
+  <p>Start the Application TRK or System TRK on the device. During startup of TRK on the device you must specify the communication method the on-device agent uses to debug the device. Currently, those methods include <a href="trk_connection_bluetooth.htm">Bluetooth</a> and <a href="trk_connection_usb.htm">USB</a> or a null serial cable. For Bluetooth, you must pair the device with the PC and a valid serial port assigned. For USB, A USB cable must connect the PC to the device and a valid serial port assigned. Use <a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Connections</a> dialog to make the identification and connection setup quick and easy. </p>
   </ol>
 </div>
 <h5>Related concepts</h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_troubleshooting.htm	Tue Jun 08 12:00:34 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_troubleshooting.htm	Wed Jun 09 11:26:26 2010 -0500
@@ -113,7 +113,7 @@
   <p>Check that Carbide.c++ and your USB Virtual COM port or BT Serial Port agree on the port settings.</p>
 </blockquote>
 <ul>
-  <li>Use the <a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Setup</a> dialog to quickly  determine if you can communicate with the device in the <strong>Check TRK version</strong> pane </li>
+  <li>Use the <a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Connections</a> dialog to quickly  determine if you can communicate with the device in the <strong>Check TRK version</strong> pane </li>
   <li>Open your Bluetooth or USB cable's connection settings: Start -&gt; Settings -&gt; Control panel -&gt; System -&gt; Hardware -&gt; Device Manager. In the Device Manager dialog, click open the Ports directory, then you will see all the com ports available on the machine. Here you will be able to see the COM port for Bluetooth or USB. Sometimes you will have two COM ports for Bluetooth, so you might have to try specifying either of them. </li>
   <li>In the Carbide tools, <a href="../projects/prj_debug_config.htm">open</a> the launch configuration associated with the target device and verify that you have specified the correct launch configuration for TRK. For example, the launch configuration should be either Symbian OS Application TRK or Symbian OS System TRK configuration. </li>
   <li>In the Carbide tools, <a href="../projects/prj_debug_config.htm">open</a> the launch configuration associated with the target device. In the Connections tab make sure you specify the same COM port number as in the device manager. For Bluetooth, if two ports are listed in the device manager, then you need to try to both, to see which one works. For USB, don't select the COM port assigned to the serial port. Always select the COM port assigned to the virtual COM port ID for the phone that is specified in the Device Manager. </li>
--- a/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml	Tue Jun 08 12:00:34 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml	Wed Jun 09 11:26:26 2010 -0500
@@ -39,21 +39,28 @@
     <topic label="Open Command Window"			href="html/reference/menus/open_cmd_window.htm" />
     <topic label="Preprocess" 					href="html/reference/menus/preprocess_source.htm" />
     <topic label="Run CodeScanner"				href="html/reference/menus/run_codescanner.htm" />
-    <topic label="Run Leavescan"				href="html/reference/menus/run_leavescan.htm" />
-    <topic label="S60 UI Designer"				href="html/reference/menus/s60_ui_designer.htm" />
     <topic label="Show in Explorer"				href="html/reference/menus/open_explorer_window.htm" />
     <topic label="Symbian OS C++ Class"			href="html/tasks/projects/prj_adding_symbian_class.htm"  />
     <topic label="Symbian OS C++ Project"		href="html/tasks/CreatingNewProjects.html" />
     <topic label="Symbian OS MMP File"			href="html/reference/NewMMP_wizard.html" />
-    <topic label="Toggle HW Breakpoint"          href="html/reference/menus/hardware_breakpoints.htm" />
+    <topic label="Toggle HW Breakpoint"         href="html/reference/menus/hardware_breakpoints.htm" />
     <topic label="Update Projects"          	href="html/reference/olderproject_updater.html" />
   </topic>
+  <topic label="Carbide Views " 				href="html/reference/menus/menus.htm" >
+      <topic label="Carbide.c++ News view"			href="html/reference/view_carbide_news.htm" />
+      <topic label="Executables view"				href="html/reference/view_executables.htm" />
+      <topic label="Install Extensions"	        	href="html/reference/view_install_extensions.htm" />
+      <topic label="Project Explorer view"			href="html/reference/view_cpp_projects.htm" />
+      <topic label="Remote Connections view"		href="html/reference/trk/view_remote_connection.htm" />
+      <topic label="Symbian Project Navigator view"	href="html/reference/view_sym_proj_nav.htm" />
+  </topic>
   <topic label="Project management" >
-    <topic label="Carbide C/C++ perspective" 		    href="html/concepts/CarbidePerspective.html" >
+    <topic label="Carbide C/C++ perspective" 		href="html/concepts/CarbidePerspective.html" >
       <topic label="Carbide.c++ News view"			href="html/reference/view_carbide_news.htm" />
-      <topic label="Executables view"					href="html/reference/view_executables.htm" />
+      <topic label="Executables view"				href="html/reference/view_executables.htm" />
+      <topic label="Install Extensions"	        	href="html/reference/view_install_extensions.htm" />
       <topic label="Project Explorer view"			href="html/reference/view_cpp_projects.htm" />
-      <topic label="Remote Connections view"			href="html/reference/trk/view_remote_connection.htm" />
+      <topic label="Remote Connections view"		href="html/reference/trk/view_remote_connection.htm" />
       <topic label="Symbian Project Navigator view"	href="html/reference/view_sym_proj_nav.htm" />
       <topic label="Workspace Information"	        href="html/concepts/workspaces.htm" />
     </topic>