implemented initial new connection dialog changes RCL_2_4
authorfturovic <frank.turovich@nokia.com>
Mon, 12 Apr 2010 15:34:40 -0500
branchRCL_2_4
changeset 1204 06cdb02ae450
parent 1203 35847a7cd071
child 1206 60fe1ef817c3
implemented initial new connection dialog changes
core/com.nokia.carbide.cpp.doc.user/html/reference/images/tab_new_conn_install_agent.png
core/com.nokia.carbide.cpp.doc.user/html/reference/images/tab_new_conn_setup_conn.png
core/com.nokia.carbide.cpp.doc.user/html/reference/images/tab_new_conn_test_conn.png
core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_install_tab.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_connection_wizard.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_on_device_check_tab.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_on_device_setup.htm
core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/tab_new_conn_install_agent.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/tab_new_conn_setup_conn.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/tab_new_conn_test_conn.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_install_tab.htm	Mon Apr 12 14:10:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_install_tab.htm	Mon Apr 12 15:34:40 2010 -0500
@@ -10,9 +10,9 @@
 <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 </head>
 <body bgcolor="#FFFFFF">
-<h2>Install Remote Agents pane</h2>
-<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>
+<h2>Install Remote Agents</h2>
+<p>Use  the <strong>Install Remote Agents</strong> pane to select the latest remote agent version  to download and install to the device. </p>
+<p align="center"><img src="../images/tab_new_conn_install_agent.png" width="464" height="554"></p>
 <p class="figure">Figure 2 - New Connection wizard Install remote agents page</p>
 <p>Table 1. Install Remote Agents pane</p>
 <table width="100%"  border="0" cellpadding="2" cellspacing="0">
@@ -22,7 +22,7 @@
   </tr>
   <tr>
     <td><strong>Install remote agents</strong></td>
-    <td><p>A list of the most current versions of remote agents sorted by SDK and version. Select the version most compatable with the device. For example, a device running S60 5.0 needs a version of the TRK software compiled for that SDK, which in the image above is Application TRK 3.1.2. </p>
+    <td><p>A list of the most current versions of remote agents sorted by SDK and version. Select the version most compatable with the device. For example, a device running S60 5.0 needs a version of the TRK software compiled for that SDK, which in the image above is Application TRK 3.2.6. </p>
         <p>Additional information about the selected entry is displayed to the right to help you choose the correct version of TRK for the target device. </p></td>
   </tr>
   <tr>
@@ -40,8 +40,10 @@
 <h5>Related references</h5>
 <ul>
   <li><a href="wnd_on_device_setup.htm">On-Device Connections</a></li>
-  <li><a href="wnd_on_device_check_tab.htm">Set Connection Settings </a></li>
+  <li><a href="wnd_new_connection_wizard.htm">Setup Connection</a></li>
+  <li><a href="#CONN_SET">Test Connection</a></li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>
+  License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_connection_wizard.htm	Mon Apr 12 14:10:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_connection_wizard.htm	Mon Apr 12 15:34:40 2010 -0500
@@ -1,128 +1,61 @@
-<!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="keywords" content="Check TRK, TRK, Install TRK"
-><meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>New Connection Wizard</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>New Connection Wizard</h2>
-<p>Use  the <strong>Remote Connections</strong> view to monitor, create, edit, or remove  common remote connection settings.</p>
-<ul>
-  <li><a href="#CONN_EDIT">Edit connection name and type</a></li>
-  <li><a href="#CONN_SET">Set Connection Settings pane</a></li>
-  <li><a href="#INSTALL">Install	Remote Agents pane</a></li>
-</ul>
-<h3><strong><a name="CONN_EDIT" id="INSTALL3"></a></strong>Edit connection name and type</h3>
-<p>Use the <b>Edit connection name and type</b> page to assign a name and connection type to the new connection setup.</p>
-<p align="center"><img src="../images/wnd_new_connection_wizard_01.png" width="456" height="554"></p>
-<p class="figure">Figure 1 - New Connection wizard Edit connection name and type page</p>
-<p>Table 1. Edit connection name and type page - options</p>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="28%" scope="col">Item</th>
-    <th width="59%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><strong>Connection Name</strong></td>
-    <td><p>Enter a name for the connection.</p>    </td>
-  </tr>
-  <tr>
-    <td><strong>Connection Type</strong></td>
-    <td>Select the type of connection this setup will use.</td>
-  </tr>
-  <tr>
-    <td><strong>Supported Services</strong></td>
-    <td><p>Shows a list of services supported by the connection type chosen.</p>
-      <ul>
-        <li>Bluetooth - serial port connection through Bluetooth</li>
-        <li>Serial - serial port connection through a COM serial port</li>
-        <li>USB - serial port connection through USB that  supports TRK 3.x</li>
-    </ul></td>
-  </tr>
-</table>
-<h3><strong><a name="CONN_SET" id="INSTALL2"></a></strong>Set Connection Settings pane</h3>
-<p>Use  the <b>Set Connection Settings</b> pane to compare the version of remote agent installed on the device with the latest version available for Carbide. In this pane you can:</p>
-<ul>
-  <li>Set  the device OS used by the device and supported by the selected remote agent</li>
-  <li>Allow easy serial port selection when connecting to a device </li>
-  <li>Verify that you have the latest remote agent installed on a device</li>
-</ul>
-<p align="center"><img src="../images/wnd_new_connection_wizard_02.png" width="456" height="554"></p>
-<p class="figure">Figure 2 - New Connection wizard Serial Connection Settings page</p>
-<p>Table 2. Serial Connection Setting page - Set Connection Settings tab</p>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="30%" scope="col">Item</th>
-    <th width="59%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><strong>Serial Port </strong></td>
-    <td>A dropdown list of serial ports with known identifiers for selecting the communication port used by the PC to communicate with the device. A named COM port (<span class="code">COM4 - BthModem0</span>) indicates an active port. Unnamed port numbers have usually not been opened and assigned by the PC.</td>
-  </tr>
-  <tr>
-    <td><b>Baud Rate</b></td>
-    <td>a dropdown list of baud rates common to serial connections.</td>
-  </tr>
-  <tr>
-    <td><strong>Device OS </strong></td>
-    <td><p>A dropdown list of device OSes that are supported by the remote  agent  software. Select the OS used by the device before running a check. </p></td>
-  </tr>
-  <tr>
-    <td><b>Select a service to test</b></td>
-    <td>Click to select a listed service for testing.</td>
-  </tr>
-  <tr>
-    <td><strong>Test Service Status</strong></td>
-    <td><p>Click <strong>Test Service Status</strong> to query the remote agent software on the device for its version number. It then compares the version number found with the latest version available for Carbide. A progress bar will appear should the Test Service Status version operation requires more than a few seconds.</p>
-        <p class="note"><strong>NOTE</strong> The PC must have an internet connection to perform a remote agent version check.</p>
-      <p>Once the comparison is complete the Status text is updated with the result and further instructions as required.</p>
-      <p align="center"><img src="../images/wnd_on_device_setup_install_new_version.png" width="466" height="67"></p>
-      <p align="left">If a connection fails, the errors normally fall into these two categories: </p>
-      <ul>
-          <li><strong>connection failure</strong> - this usually indicates the chosen COM port  is not open. Try selecting a different COM port, specifically one with a name attached to it (<span class="code">COM4 - BthModem0</span>) for the type of connection you are using (USB or Bluetooth). Repeat as necessary until you get a successful response. </li>
-        <li><strong>remote agent not responding</strong> - this indicates that the COM port is open but the remote agent is not responding. First, verify that remote agent is up and running on the device. Second, the remote agent may be listening on a different COM port, so choose another named COM port and try again.</li>
-      </ul>
-    <p align="left">&nbsp;</p></td>
-  </tr>
-</table>
-<h3><strong><a name="INSTALL" id="INSTALL"></a>Install Remote Agents</strong> pane</h3>
-<p>Use  the <strong>Install Remote Agents</strong> pane to select the latest remote agent version  to download and install to the device. </p>
-<p align="center"><img src="../images/wnd_new_connection_wizard_03.png" width="456" height="554"></p>
-<p class="figure">Figure 2 - New Connection wizard Bluetooth Settings page</p>
-<p>Table 3. Serial Connection Setting page - Install Remote Agents tab</p>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="30%" scope="col">Item</th>
-    <th width="59%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><strong>Install remote agents</strong></td>
-    <td><p>A list of the most current versions of remote agents sorted by SDK and version. Select the version most compatable with the device. For example, a device running S60 3.1.0 needs a version of the TRK software compiled for that SDK, which in the image above is Application TRK 2.8.7. </p>
-        <p>Additional information about the selected entry is displayed to the right to help you choose the correct version of TRK for the target device. </p>
-    <p class="note"><b>NOTE</b> Requires a network connection to query the remote agent site.</p></td>
-  </tr>
-  <tr>
-    <td><strong>Save</strong></td>
-    <td>Click <strong>Save</strong> to store a local copy of the currently selected TRK to disk. You can then manually install the file to your devices using the method of your choice. </td>
-  </tr>
-  <tr>
-    <td><strong>Install</strong></td>
-    <td><p>Click <strong>Install</strong> to download and install the TRK selected in the Install latest TRK list. A progress bar is shown if the install operation requires more than a few seconds to complete. </p>
-        <p class="note"><strong>NOTE</strong> The SIS and SISX file types must be associated with an installer application like Nokia PC Suite in order to install them onto the device. Use the Save command above to perform a manual install to the device if you don't have an installer application. </p></td>
-  </tr>
-</table>
-<h5>Related references</h5>
-<ul>
-  <li><a href="wnd_new_conn_wiz_add.htm">Adding and deleting connections</a></li>
-  <li><a href="wnd_new_conn_wiz_edit.htm">Editing connections</a></li>
-  <li><a href="view_remote_connection.htm">Remote Connections view</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!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="keywords" content="Check TRK, TRK, Install TRK"
+><meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Setup Connection</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Setup Connection</h2>
+<p>Use the <b>Edit Connection</b> page to assign a connection type, name, and connection settings to the new connection setup.</p>
+<p align="center"><img src="../images/tab_new_conn_setup_conn.png" width="464" height="554"></p>
+<p class="figure">Figure 1 - New Connection wizard Setup Connection tab</p>
+<p>Table 1. Setup Connection page - options</p>
+<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="28%" scope="col">Item</th>
+    <th width="59%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><strong>Connection Type</strong></td>
+    <td><p>Select the type of connection and its supported services from the drop down list of options. The types of connections include:</p>
+      <ul>
+        <li>Bluetooth - serial port connection through Bluetooth</li>
+        <li>Serial - serial port connection through a COM serial port</li>
+        <li>USB - serial port connection through USB that  supports TRK 3.x</li>
+      </ul>
+      <p>And the supported services may include:</p>
+      <ul>
+        <li>TRK</li>
+        <li>Tracing</li>
+        <li>and others</li>
+    </ul></td>
+  </tr>
+  <tr>
+    <td><strong>Connection Name</strong></td>
+    <td><p>Enter a name for the connection.</p>    </td>
+  </tr>
+  <tr>
+    <td><strong>Connection Settings</strong></td>
+    <td><p>Shows a list of services supported by the connection type chosen.</p>
+      <ul>
+        <li>Bluetooth - serial port connection through Bluetooth</li>
+        <li>Serial - serial port connection through a COM serial port</li>
+        <li>USB - serial port connection through USB that  supports TRK 3.x</li>
+    </ul></td>
+  </tr>
+</table>
+<h5>Related references</h5>
+<ul>
+  <li><a href="wnd_on_device_setup.htm">On-Device Connections</a></li>
+  <li><a href="#CONN_SET">Test Connection</a></li>
+  <li><a href="#INSTALL">Install	Remote Agents</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_on_device_check_tab.htm	Mon Apr 12 14:10:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_on_device_check_tab.htm	Mon Apr 12 15:34:40 2010 -0500
@@ -1,70 +1,58 @@
-<!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="keywords" content="Check TRK, TRK, Install TRK"
-><meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Initiate Service Testing</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-<style type="text/css">
-<!--
-.style1 {
-	font-family: Arial, Helvetica, sans-serif;
-	font-weight: bold;
-}
--->
-</style>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Initiate Service Testing</h2>
-<p>Use  the <b>Set Connection Settings</b> pane to compare the version of remote service installed on the device with the latest version available for Carbide. A remote service is any software on the device that can communicate with Carbide. This includes TRK, Performance Investigator, and other services. In this pane you can:</p>
-<ul>
-  <li>Specify the Connection Settings to connect to the device</li>
-  <li>Set  the device OS used by the device and supported by the remote service</li>
-  <li>Verify that you have the latest version of the remote service  installed on the device</li>
-</ul>
-<p>Options presented may differ based on the connection setting type chosen.</p>
-<p align="center"><img src="../images/wnd_on_device_setup_check_trk.png" width="456" height="554"></p>
-<p class="figure">Figure 1 - Set Connection Settings pane in the New Connection dialog </p>
-<h5>Table 1<span class="figure"> Set Connection Settings</span> pane &mdash; items</h5>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="29%" scope="col">Item</th>
-    <th width="57%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><strong>Device OS </strong></td>
-    <td><p>A dropdown list of device OSes that are supported by the TRK debug agent  software. Select the OS used by the device before running a check. </p>    </td>
-  </tr>
-  <tr>
-    <td><strong>Serial Port </strong></td>
-    <td>A dropdown list of serial ports with known identifiers for selecting the communication port used by the PC to communicate with the device. A named COM port (<span class="code">COM4 - BthModem0</span>) indicates an active port. Unnamed port numbers have usually not been opened and assigned by the PC.</td>
-  </tr>
-  <tr>
-    <td><strong>Select a service to test</strong></td>
-    <td>Select the remote service type to query on the remote device.</td>
-  </tr>
-  <tr>
-    <td><span class="style1">Initiate service testing</span></td>
-    <td><p>Click <b>Initiate service testing</b> to query the  remote software on the device for its version number. It then compares the version number found with the latest version available for Carbide. A progress bar will appear when the operation requires more than a few seconds.</p>
-      <p class="note"><strong>NOTE</strong> The PC must have an internet connection to perform a remote service version check.</p>
-      <p>Once the comparison is complete the Status text is updated with the result and further instructions as required.</p>
-      <p align="center"><img src="../images/wnd_on_device_setup_install_new_version.png" width="466" height="67"></p>
-      <p align="left">If a connection fails, the errors normally fall into these two categories: </p>
-      <ul>
-        <li><strong>connection failure</strong> - this usually indicates the chosen COM port  is not open. Try selecting a different COM port, specifically one with a name attached to it (<span class="code">COM4 - BthModem0</span>) for the type of connection you are using (USB or Bluetooth). Repeat as necessary until you get a successful response. </li>
-        <li><strong>Service not responding</strong> - this indicates that the COM port is open but the remote service is not responding. First, verify that remote service is up and running on the device. Second, the remote service may be listening on a different COM port, so choose another named COM port and try again.</li>
-      </ul>      
-      </td>
-  </tr>
-</table>
-<h5>Related references</h5>
-<ul>
-  <li><a href="wnd_on_device_setup.htm">On-Device Connections</a></li>
-  <li><a href="wnd_new_conn_install_tab.htm">Install Remote Agents</a> </li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</body>
-</html>
+<!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="keywords" content="Check TRK, TRK, Install TRK"
+><meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Test Connection</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Test Connection</h2>
+<p>Use  the <b>Set Connection Settings</b> pane to compare the version of remote service installed on the device with the latest version available for Carbide. A remote service is any software on the device that can communicate with Carbide. This includes TRK, Trace, Performance Investigator, and other services. In this pane you can:</p>
+<ul><li>Set  the device OS used by the device and supported by the remote service</li>
+  <li>Verify that Carbide can communicate with the remote service via the chosen connection setting</li>
+  <li>Verify that you have the latest version of the remote service  installed on the device</li>
+</ul>
+<p>Options presented may differ based on the type of connection setting  chosen.</p>
+<p align="center"><img src="../images/tab_new_conn_test_conn.png" width="464" height="554"></p>
+<p class="figure">Figure 1 - Test Connection  pane in the New Connection dialog </p>
+<h5>Table 1<span class="figure"> Test Connection </span> pane &mdash; items</h5>
+<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="29%" scope="col">Item</th>
+    <th width="57%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><strong>Device OS </strong></td>
+    <td><p>A dropdown list of device OSes that are supported by the TRK debug agent  software. Select the OS used by the device before running a check. </p>    </td>
+  </tr>
+  <tr>
+    <td><strong>Select a service to test</strong></td>
+    <td>Select the remote service type to query on the remote device.</td>
+  </tr>
+  <tr>
+    <td><b>Initiate service testing</b></td>
+    <td><p>Click <b>Initiate service testing</b> to query the  remote software on the device for its version number. It then compares the version number found with the latest version available for Carbide. A progress bar will appear when the operation requires more than a few seconds.</p>
+      <p class="note"><strong>NOTE</strong> The PC must have an internet connection to perform a remote service version check.</p>
+      <p>Once the comparison is complete the Status text is updated with the result and further instructions as required.</p>
+      <p align="center"><img src="../images/wnd_on_device_setup_install_new_version.png" width="466" height="67"></p>
+      <p align="left">If a connection fails, the errors normally fall into these two categories: </p>
+      <ul>
+        <li><strong>connection failure</strong> - this usually indicates the chosen COM port  is not open. Try selecting a different COM port, specifically one with a name attached to it (<span class="code">COM4 - BthModem0</span>) for the type of connection you are using (USB or Bluetooth). Repeat as necessary until you get a successful response. </li>
+        <li><strong>Service not responding</strong> - this indicates that the COM port is open but the remote service is not responding. First, verify that remote service is up and running on the device. Second, the remote service may be listening on a different COM port, so choose another named COM port and try again.</li>
+      </ul>      </td>
+  </tr>
+</table>
+<h5>Related references</h5>
+<ul>
+  <li><a href="wnd_on_device_setup.htm">On-Device Connections</a></li>
+  <li><a href="wnd_new_connection_wizard.htm">Setup Connection</a></li>
+  <li><a href="#INSTALL">Install	Remote Agents</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>
+  License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_on_device_setup.htm	Mon Apr 12 14:10:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_on_device_setup.htm	Mon Apr 12 15:34:40 2010 -0500
@@ -1,28 +1,31 @@
-<!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="keywords" content="Check TRK, TRK, Install TRK"
-><meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>On-Device Connections</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>On-Device Connections </h2>
-<p>Use the <strong>New Connection</strong> wizard to verify and update Carbide software services on a device. Click the <strong>Help &gt; On-Device Connections...</strong> menu option to open. Currently, the only service available is TRK, but look for others in future releases. The following tabs are present:</p>
-<ul>
-  <li><strong><a href="wnd_on_device_check_tab.htm">Set Connection Settings</a></strong> &#8212; queries the device to determine if the latest version of the remote agent is installed  </li>
-  <li><strong><a href="wnd_new_conn_install_tab.htm">Install remote agent</a></strong> &#8212; downloads and installs the latest version of the remote agent to the device </li>
-</ul>
-<p align="center"><img src="../images/wnd_new_connection_wizard_02.png" width="456" height="554"></p>
-<p class="figure">Figure 1 - New Connection dialog</p>
-<h5>Related references</h5>
-<ul>
-  <li><a href="wnd_on_device_check_tab.htm">Set  Connection Settings </a></li>
-  <li><a href="wnd_new_conn_install_tab.htm">Install remote agents</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</body>
-</html>
+<!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="keywords" content="Check TRK, TRK, Install TRK"
+><meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>On-Device Connections</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>On-Device Connections </h2>
+<p>Use the <strong>New Connection</strong> wizard to verify and update Carbide software services on a device. Click the <strong>Help &gt; On-Device Connections...</strong> menu option to open. Current services available include TRK, Tracing, and others. The following tabs are present:</p>
+<ul>
+  <li><a href="wnd_new_connection_wizard.htm">Setup Connection</a> - define connection type, name and settings</li>
+  <li><a href="#CONN_SET">Test Connection</a> - verify connection operates as intended</li>
+  <li><a href="#INSTALL">Install	Remote Agents</a> - download and install remote agents</li>
+</ul>
+<p align="center"><img src="../images/tab_new_conn_setup_conn.png" width="464" height="554"></p>
+<p class="figure">Figure 1 - New Connection dialog</p>
+<h5>Related references</h5>
+<ul>
+  <li><a href="wnd_new_connection_wizard.htm">Setup Connection</a></li>
+  <li><a href="#CONN_SET">Test Connection</a></li>
+  <li><a href="#INSTALL">Install	Remote Agents</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>
+  License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml	Mon Apr 12 14:10:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml	Mon Apr 12 15:34:40 2010 -0500
@@ -240,9 +240,11 @@
       <topic href="html/debugger/debug/cmds_reposition_pc.htm" label="Reposition the program counter"></topic>
     </topic>
     
-    <topic href="html/reference/trk/wnd_new_connection_wizard.htm" label="On-Device Connections Overview" >
+    <topic href="html/reference/trk/wnd_on_device_setup.htm" label="On-Device Connections" >
+      <topic href="html/reference/trk/wnd_new_connection_wizard.htm" label="Setup Connection" />
+      <topic href="html/reference/trk/wnd_on_device_check_tab.htm" label="Test Connections" />
+      <topic href="html/reference/trk/wnd_new_conn_install_tab.htm" label="Install Remote Agents" />
       <topic label="Remote Connections view"			href="html/reference/trk/view_remote_connection.htm" />
-      <topic href="html/reference/trk/wnd_new_conn_wiz_edit.htm" label="Adding, editing, and deleting connections" />
       <topic href="html/reference/trk/exporting_remote_conns.htm" label="Exporting remote connections"></topic>
       <topic href="html/reference/trk/importing_remote_conns.htm" label="Importing remote connections"></topic>
     </topic>