--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_phone.htm Thu Feb 25 10:20:24 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_phone.htm Thu Feb 25 10:28:28 2010 -0600
@@ -28,7 +28,7 @@
</ol>
</li>
<li>Review the launch configurations settings</li>
- <li>Click <b>Debug</b><b> to download and debug the project on the phone</b></li>
+ <li>Click <b>Debug</b> to download and debug the project on the phone</li>
</ol>
</div>
<h5>Other references</h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/EmulatorToc.htm Thu Feb 25 10:20:24 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/EmulatorToc.htm Thu Feb 25 10:28:28 2010 -0600
@@ -1,16 +1,16 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
-<title>Classes</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
- <body>
- <h2>Emulator Projects </h2>
- <p>The topics include:</p>
- <ul>
- <li><a href="projects/prj_build_cmd_line.htm">Setting Environment for x86 Compiler </a></li>
- <li><a href="../reference/wnd_carbide_pref_x86.htm">Unseting Built-in Environment </a></li>
- </ul>
-<div id="footer">Copyright © 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>
+<title>Classes</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+ <body>
+ <h2>Emulator Projects </h2>
+ <p>The topics include:</p>
+ <ul>
+ <li><a href="projects/prj_build_cmd_line.htm">Setting Environment for x86 Compiler </a></li>
+ <li><a href="../reference/wnd_carbide_pref_x86.htm">Unsetting Built-in Environment </a></li>
+ </ul>
+<div id="footer">Copyright © 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/tocCarbide.xml Thu Feb 25 10:20:24 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml Thu Feb 25 10:28:28 2010 -0600
@@ -223,17 +223,28 @@
<topic href="html/tasks/debugger/view_symbian_kernel_set.htm" label="Setting the Refresh Rate"></topic>
</topic>
</topic>
- <topic label="Debugging">
- <topic href="html/projects/launch/launch_emulator.htm" label="Debugging with an emulator">
+
+ <topic label="PnP Debugging" href="html/projects/launch/pnp_debug_overview.htm" >
+ <topic label="Debugging with an emulator" href="html/projects/launch/launch_emulator.htm" >
+ <topic label="Executable Selection" href="html/projects/launch/wiz_new_launch_config.htm#EXE_SEL" />
+ <topic label="Build Options Selection" href="html/projects/launch/wiz_new_launch_config.htm#BLD_OPT" />
+ <topic label="New Launch Configuration" href="html/projects/launch/wiz_new_launch_config.htm#FINISH" />
+ <topic label="Other project options" href="html/tasks/EmulatorToc.htm">
+ <topic label="Setting Environment for x86 Compiler" href="html/tasks/projects/prj_build_cmd_line.htm" />
+ <topic label="Unsetting Built-in Environment" href="html/reference/wnd_carbide_pref_x86.htm" />
+ </topic>
</topic>
+
<topic href="html/projects/launch/launch_phone.htm" label="Debugging a phone">
+ <topic label="Configure launch configuration" href="html/projects/launch/wnd_config_launch_config.htm" />
+ <topic label="Remote connection setting" href="html/projects/launch/wnd_change_connection.htm" />
+ <topic label="Debug process settings" href="html/projects/launch/wnd_change_debug_process.htm" />
+ <topic label="Other settings" href="html/projects/launch/wnd_change_other_settings.htm" />
</topic>
+
<topic href="html/projects/launch/launch_board.htm" label="Debugging a reference board">
</topic>
- <topic label="Emulator projects" href="html/tasks/EmulatorToc.htm">
- <topic label="Setting Environment for x86 Compiler" href="html/tasks/projects/prj_build_cmd_line.htm" />
- <topic label="Unsetting Built-in Environment" href="html/reference/wnd_carbide_pref_x86.htm" />
- </topic>
+
<topic label="Run mode projects" href="html/tasks/RunModeToc.htm">
<topic label="Run Mode Overview" href="html/tasks/start/carbide_overview_trk.htm" ></topic>
<topic href="html/concepts/autotargeting.htm" label="Auto-Targeting of Executables"></topic>