# HG changeset patch
# User dadubrow
# Date 1242835092 18000
# Node ID 4ba2a4d74f9be1d9e2a0c679ef5d35362e89d10b
# Parent  ee2f99c3afcb4dcfee8107675b689a9a41d33119# Parent  5376c680dd66c39eee72937c35df1d2395d2ff2b
merge commit

diff -r ee2f99c3afcb -r 4ba2a4d74f9b core/com.nokia.carbide.cpp.doc.user/html/cheatsheets/install_remote_agent.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/cheatsheets/install_remote_agent.xml	Wed May 20 10:58:12 2009 -0500
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<cheatsheet
+      title="Installing Remote Agents">
+   <intro>
+      <description>
+         A remote agent is required on a device in order to communicate with Carbide while debugging. Follow the steps below to learn how to download and install the latest remote agent for your target device.
+      </description>
+   </intro>
+   <item
+         href="/com.nokia.carbide.cpp.doc.user/html/reference/trk/view_remote_connection.htm"
+         title="Select a remote connection">
+      <description>
+         In the <b>Remote Connections</b> view select the connection setting used to communicate with the remote device.
+      </description>
+      <subitem
+            label="Right-click the connection setting used to communicate with the device and select Edit Connection Settings.">
+      </subitem>
+      <subitem
+            label="Click Next to open the Settings page.">
+      </subitem>
+   </item>
+   <item
+         href="/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_install_tab.htm"
+         title="Select the appropriate remote agent">
+      <description>
+         Choose the remote agent that matches the OS on the target device.
+      </description>
+      <subitem
+            label="In the remote agents list, select the remote agent that most closely matches the OS on the target device.">
+      </subitem>
+      <subitem
+            label="Click Save to download and save the remote agent for installation later. This step is optional as the immediate installation step below is recommended."
+            skip="true">
+      </subitem>
+      <subitem
+            label="Click Install to download and immediately install the selected remote agent to the target device.">
+      </subitem>
+   </item>
+</cheatsheet>
diff -r ee2f99c3afcb -r 4ba2a4d74f9b core/com.nokia.carbide.cpp.doc.user/plugin.xml
--- a/core/com.nokia.carbide.cpp.doc.user/plugin.xml	Wed May 20 10:57:14 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/plugin.xml	Wed May 20 10:58:12 2009 -0500
@@ -43,13 +43,20 @@
 		 <cheatsheet
 		   composite="true"
 		   category="com.nokia.carbide.trk.cheatsheets"
-           contentFile="html/cheatsheets/trk_appTrk_Using_cs.xml"
+           contentFile="html/cheatsheets/new_remote_conn.xml"
            id="com.nokia.carbide.cpp.doc.user.new_remote_connection"
            name="Creating On-device Connections"/>
 
 		 <cheatsheet
 		   composite="true"
 		   category="com.nokia.carbide.trk.cheatsheets"
+           contentFile="html/cheatsheets/install_remote_agent.xml"
+           id="com.nokia.carbide.cpp.doc.user.install_remote_agent"
+           name="Installing Remote Agents"/>
+
+		 <cheatsheet
+		   composite="true"
+		   category="com.nokia.carbide.trk.cheatsheets"
            contentFile="html/cheatsheets/trk_appTrk_Using_cs.xml"
            id="com.nokia.carbide.cpp.doc.user.trk_appTRK_Using"
            name="Run Mode On-Device Debugging"/>