--- a/core/com.nokia.carbide.cpp.doc.user/book.css	Mon Sep 13 13:17:04 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/book.css	Mon Sep 13 15:00:09 2010 -0500
@@ -12,7 +12,7 @@
 /* 20091007 added verdana and ariel to list to match SFO website fonts choices */
 body, p, table, li {
 	font-family: Verdana, Ariel, Helvetica, sans-serif;
-	font-size: 0.9em;
+	font-size: 1.0em;
 	font-weight: normal;
 }
 

Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/page_debug_main.png has changed

Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/page_debugger_emulation.png has changed

Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/page_debugger_run_mode.png has changed

Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/page_debugger_stop_mode.png has changed

Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/page_installation.png has changed

Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/page_main_run_mode.png has changed

Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/page_main_stop_mode.png has changed

Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/page_rom_log.png has changed

Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/page_x86_exceptions.png has changed

--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_debugger.htm	Mon Sep 13 13:17:04 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_debugger.htm	Mon Sep 13 15:00:09 2010 -0500
@@ -16,7 +16,7 @@
 </ul>
 <h3><a name="emulator_mode" id="emulator_mode"></a>Emulation Debugger page </h3>
 <p>The <b>Symbian OS <a href="emulation.htm">Emulation</a></b> launch configurations the <b>Debugger</b> page to specify  entry point breaks and which  logs to output to the Console view.</p>
-<p align="center"><img src="images/page_debugger_emulation.png" width="638" height="205"></p>
+<p align="center"><img src="images/page_debugger_emulation.png" width="685" height="219"></p>
 <p class="figure">Figure 1 - Debugger page showing emulation options </p>
 <h5>Table 1. Debugger page &mdash; emulation options </h5>
 <table width="94%"  border="0" cellpadding="2" cellspacing="0">
@@ -49,7 +49,7 @@
 </table>
 <h3><a name="trk_runmode" id="trk_runmode"></a>Run-mode Debugger page </h3>
 <p>In a run-mode launch configuration like <b><a href="run_mode.htm">Application TRK</a></b>, you can specify an entry break point and how messages are handled as well as define the default instruction set. </p>
-<p align="center"><img src="images/page_debugger_run_mode.png" width="686" height="247"></p>
+<p align="center"><img src="images/page_debugger_run_mode.png" width="660" height="174"></p>
 <p class="figure">Figure 2 - Debugger page showing run-mode options  </p>
 <h5>Table 2. Debugger page &mdash; run-mode  options </h5>
 <table width="94%"  border="0" cellpadding="2" cellspacing="0">
@@ -64,32 +64,12 @@
   <tr>
     <td><b>View program output </b></td>
     <td><p>Enable to direct standard output messages to the   <b>TRK Program Output Console</b> in the <a href="../../reference/view_console.htm">Console</a> view. </p>
-      <p class="note"><b>NOTE</b> In the <span class="code">epoc.ini</span> file the option <span class="code">LogToFile</span> must also be set to <span class="code">1</span>.</p>
-    </td>
-  </tr>
-  <tr>
-    <td><b>View messages between Carbide and debug agent </b></td>
-    <td><p>When checked, show the communications between Carbide and the target device in  the <b> TRK Communication Log Console</b> of the Console view.  </p>
-      <p class="note"><b>NOTE</b> You can pin the TRK Communication Log view so that it does not lose focus. </p></td>
-  </tr>
-  <tr>
-    <td><b>Message retry delay (ms) </b></td>
-    <td>Enter the delay time in milliseconds (ms) between 100 and 10000 the debugger should wait for a response. The default Message Retry Delay value is 2000. </td>
-  </tr>
-  <tr>
-    <td><p><b>Default Instructon Set </b></p>        </td>
-    <td><p>Specifies the default instruction set to use if the debugger cannot determine the processor mode in order to set breakpoints and to disassemble code. The options are: </p>
-        <ul>
-          <li>Auto (examine code at  current PC location) </li>
-          <li>ARM (32-bit) </li>
-          <li>THUMB (16-bit) </li>
-        </ul>
-      <p>By default the Instruction Set option uses ARM 32-bit.</p></td>
+      <p class="note"><b>NOTE</b> In the <span class="code">epoc.ini</span> file the option <span class="code">LogToFile</span> must also be set to <span class="code">1</span>.</p>    </td>
   </tr>
 </table>
 <h3><a name="trk_stopmode" id="trk_stopmode"></a>Stop-mode Debugger page </h3>
 <p>In  stop-mode launch configurations like <b><a href="stop_mode.htm">System TRK</a></b>,<b> </b>and <a href="attach_process.htm"><b>Attach to Process</b></a>, use the <b>Startup Options</b> to  attach to a target and debug or run from the specified start address. Then use <b>Target Options</b> to specify the target's processor type,  and set which initialization and memory configuration files to use in the debug session. </p>
-<p align="center"><img src="images/page_debugger_stop_mode.png" width="642" height="401"></p>
+<p align="center"><img src="images/page_debugger_stop_mode.png" width="578" height="174"></p>
 <p class="figure">Figure 3 - Debugger page showing stop-mode options  </p>
 <h5>Table 3. Debugger page &mdash; stop-mode  options </h5>
 <table width="94%"  border="0" cellpadding="2" cellspacing="0">
@@ -104,43 +84,14 @@
     <td><p>When checked, break at the specified entry point entered into the text field. For .EXE targets, the default entry point is set to <span class="code">E32Main</span>. By default, the <b>Break at entry point</b> option is unchecked for all other target types.</p></td>
   </tr>
   <tr>
-    <td rowspan="5"><b>Startup Options </b></td>
-    <td><b>Soft attach </b></td>
-    <td>Enable the <b>Soft attach</b> option to attach a debug session to a target and debug from the specified start address instead of the target's default start address. When enabled the downloaded image option is ignored. </td>
-  </tr>
-  <tr>
+      <td rowspan="2"><b>Startup Options</b></td>
     <td><b>Debug from start address </b></td>
     <td>Enable the <b>Debug from start addres</b>s option to debug from the target's default start address. </td>
   </tr>
   <tr>
-    <td><b>Run from start address </b></td>
+      <td><b>Run from start address </b></td>
     <td>Enable the <b>Run from start addres</b>s option to run from the target's default start address. </td>
   </tr>
-  <tr>
-    <td><b>Start address (hex) </b></td>
-    <td>Enter in hexidecimal format (<span class="code">0x0</span>) the starting address to use during the debug session. </td>
-  </tr>
-  <tr>
-    <td><b>Reset target at the start of each debug session </b></td>
-    <td>Forces the Carbide IDE to reset the target at the start of each debug session. This ensures that the debugging session uses the most up-to-date program code.</td>
-  </tr>
-  
-  <tr>
-    <td><b>Target Options </b></td>
-    <td><b>Target Processor </b></td>
-    <td>A drop down with a list of all supported processors. The process selection should help in determining the memory model. This will in turn help determine the base address and the offsets for the Symbian OS kernel aware information.</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td><b>Target initialization file </b></td>
-    <td><p>Check this box to have the debugger run an initialization script when the debug session starts. For example, if a target device requires initialization for the debugger to be able to read and write memory or registers, you can specify an initialization script here.</p>
-    <p> Click Browse to select a script file using a standard file selection dialog box. When using T32, most of the initialization is done in the CMM script file. With other debug protocols you  specify the initialization file, which can be run after connecting to the target. </p></td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td><b>Memory configuration file </b></td>
-    <td>Controls whether the debugger uses a memory configuration file when a debug session starts. The Carbide debugger uses this configuration file to know which memory is accessible, readable, and writable on the target.</td>
-  </tr>
 </table>
 
 <h4>Other references</h4>

--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_installation.htm	Mon Sep 13 13:17:04 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_installation.htm	Mon Sep 13 15:00:09 2010 -0500
@@ -10,7 +10,7 @@
 <body >
 <h2>Installation page</h2>
 <p>The  <b>Installation</b> page specifies the .sis file to install on the target device when using <a href="run_mode.htm">Application TRK</a>. This is required when using the TRK debug agent with 9.x based SDK&rsquo;s.</p>
-<p align="center"><img src="images/page_installation.png" width="686" height="284" /></p>
+<p align="center"><img src="images/page_installation.png" width="670" height="301" /></p>
 <p class="figure">Figure 1. Installation page</p>
 <h5>Table 1. Installation page &mdash;items </h5>
 <table width="94%"  border="0" cellpadding="2" cellspacing="0">
@@ -39,14 +39,6 @@
     <td><b>Install to drive </b></td>
     <td>A list of common drives where files may be installed to. The default drive setting is <span class="code">C</span>. </td>
   </tr>
-  <tr>
-    <td><b>Partial upgrade sis/sisx path</b></td>
-    <td>Shows the path to the partial upgrade SIS file once it has been created.</td>
-  </tr>
-  <tr>
-    <td><b>Open SIS Builder settings...</b></td>
-    <td>Click to open the <a href="../../reference/build_properties/wnd_sis_properties.htm">SIS Builder</a> page of the Carbide Build Configurations properties panel where you can enable the partial upgrade feature for subsequent builds.</td>
-  </tr>
 </table>
 
 <h4>Other references</h4>

--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_main.htm	Mon Sep 13 13:17:04 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_main.htm	Mon Sep 13 15:00:09 2010 -0500
@@ -18,7 +18,7 @@
 <h3><a name="emulator_mode" id="emulator_mode"></a>Emulation Main page </h3>
 <p>The <b>Symbian OS <a href="emulation.htm">Emulation</a></b> launch configuration uses the <b>Main</b> page to define the process to be launched by the emulator. </p>
 <p>The behavior that occurs when launching a debug session varies based upon the <a href="page_main.htm">SDK</a>. Normally, <a href="../../debugger/debug/cmds_starting.htm">starting</a> a debug session launches the emulator (<span class="code">epoc.exe</span>) and you must then navigate to your application and open it. However, starting a debug session for an .exe file will, in most cases, launch the .exe directly. This starts the emulator and then opens your application automatically. Note that some SDKs do not support this behavior. In those cases you must still open your application in the emulator manually.</p>
-<p align="center"><img src="images/page_debug_main.png" width="562" height="249"></p>
+<p align="center"><img src="images/page_debug_main.png" width="611" height="322"></p>
 <p class="figure">Figure 1. Main page (<i>Emulation shown</i>) </p>
 <h5>Table 1. Emulator Main page &mdash;items </h5>
 <table width="94%"  border="0" cellpadding="2" cellspacing="0">
@@ -52,7 +52,7 @@
 
 <h3><a name="run_mode" id="run_mode"></a>Run-mode Main page </h3>
 <p>The <b>Symbian OS <a href="run_mode.htm">Application TRK </a></b> launch configuration uses the <b>Main</b> page to defines the project and the process to launch on the target device. </p>
-<p align="center"><img src="images/page_main_run_mode.png" width="545" height="345"></p>
+<p align="center"><img src="images/page_main_run_mode.png" width="585" height="365"></p>
 <p class="figure">Figure 2 - Main page (<i>Application TRK shown</i>) </p>
 <h5>Table 2.  Run-mode Main page &mdash;items </h5>
 <table width="94%"  border="0" cellpadding="2" cellspacing="0">
@@ -89,7 +89,7 @@
 </table>
 <h3><a name="stop_mode" id="stop_mode"></a>Stop-mode Main page </h3>
 <p>The <b>Symbian OS <a href="stop_mode.htm">System TRK</a></b> launch configurations uses the <b>Main</b> page to defines the project and the executable to launch on the target device. </p>
-<p align="center"><img src="images/page_main_stop_mode.png" width="556" height="301"></p>
+<p align="center"><img src="images/page_main_stop_mode.png" width="604" height="385"></p>
 <p class="figure">Figure 3. Main page</p>
 <h5>Table 3. Stop-mode Main page &mdash; items</h5>
 <table width="94%"  border="0" cellpadding="2" cellspacing="0">
@@ -125,6 +125,6 @@
 </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>
 <h5>&nbsp;</h5>
-</b>
+
 </body>
 </html>
\ No newline at end of file

--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_rom_log.htm	Mon Sep 13 13:17:04 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_rom_log.htm	Mon Sep 13 15:00:09 2010 -0500
@@ -8,8 +8,8 @@
 </head>
 <body bgcolor="#FFFFFF" dir="ltr">
 <h2> ROM Log page</h2>
-<p>Use the <b>ROM Log</b> page ina <a href="stop_mode.htm">Sysem TRK</a> launch configuration to specify where the ROM log file is stored and the Epoc32 directory. </p>
-<p align="center"><img src="images/page_rom_log.png" width="590" height="213"></p>
+<p>Use the <b>ROM Log</b> page in a <a href="stop_mode.htm">System TRK</a> launch configuration to specify where the ROM log file is stored and the Epoc32 directory. </p>
+<p align="center"><img src="images/page_rom_log.png" width="570" height="193"></p>
 <p class="figure">Figure 1. ROM Log page </p>
 <h5>Table 1. ROM Log page&mdash;items </h5>
 <table width="100%"  border="0" cellpadding="2" cellspacing="0">
@@ -30,11 +30,6 @@
     <td><p>Specifies the epoc32 directory in which the ROM image and log files are stored. Since the log file may not contain full paths to the ROM components on the host PC, you need to enter this epoc32 directory.</p>
     <p class="note"><b>NOTE</b> Always include the epoc32 folder in this path.</p></td>
   </tr>
-  <tr>
-    <td><b>Log unresolved modules </b></td>
-    <td><p>Activate the  <b>Log unresolved modules </b> option to have the debugger output a list of components from the specified ROMBUILD log file that do not have debugger symbolic information. The list is displayed in the debugger console window at the beginning of the debug session.</p>
-      <p class="note"><b>NOTE</b> You cannot perform source-level debugging on components that do not include symbolic information.</p></td>
-  </tr>
 </table>
 <h4>Other references</h4>
 <ul>

--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_x86_exceptions.htm	Mon Sep 13 13:17:04 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_x86_exceptions.htm	Mon Sep 13 15:00:09 2010 -0500
@@ -10,7 +10,7 @@
 <body >
 <h2>x86 Exceptions page </h2>
 <p>  Use the <b>x86 Exceptions</b> page in the <a href="emulation.htm">Emulation</a> launch configuration to set  the x86 exceptions  the debugger should catch. If you want the debugger to catch all the exceptions, enable all of the options in this page. However, if you prefer to handle only certain exceptions, enable only those options that reflect the exceptions you want to handle.</p>
-<p align="center"><img src="images/page_x86_exceptions.png" width="627" height="270" /></p>
+<p align="center"><img src="images/page_x86_exceptions.png" width="622" height="277" /></p>
 <p align="center" class="figure">Figure 1 - x86 Exceptions page</p>
 <h5>Table 1. x86 Exceptions page &mdash;items </h5>
 <table width="800"  border="0" cellpadding="2" cellspacing="0">

--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_console.htm	Mon Sep 13 13:17:04 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_console.htm	Mon Sep 13 15:00:09 2010 -0500
@@ -9,7 +9,7 @@
 </head>
 <body >
 <h2>Console view </h2>
-<p>  The <b>Console</b> view display<span><span>s the output of a process and allows you to provide keyboard input to a process</span></span>. There are numerous consoles available, see the Open Console dropdown list for those available to you. Most are enabled from various project panels in Carbide. </p>
+<p>The <b>Console</b> view display<span><span>s the output of a process and allows you to provide keyboard input to a process</span></span>. There are numerous consoles available, see the Open Console dropdown list for those available to you. Most are enabled from various project panels in Carbide. </p>
 <p align="center"><img src="../images/views/view_console_build.png" width="778" height="203" /></p>
 <p class="figure">Figure 1 - Console view showing build console information</p>
 <p>To view <span class="code">RDebug::Printf</span> output in the <b>Console</b> view when targeting devices, ensure that the following <a href="../projects/launch/page_debugger.htm">Debugger</a> options are matched with settings in the <span class="code">epoc.ini</span> file. </p>

--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_carbide_setup.htm	Mon Sep 13 13:17:04 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_carbide_setup.htm	Mon Sep 13 15:00:09 2010 -0500
@@ -15,7 +15,7 @@
   <li><b>Symbian OS System TRK</b> (<i>not available in the Developer Edition</i>) &#8212;used to run or debug applications or ROM code on a target device using the System TRK on-device debug agent. System TRK is an application that runs on reference boards and prototype phones and allows you to debug your executables. The debugger will download files to the phone prior to launching.</li>
 </ul>
 <p>By default, you can click the <b>Debug</b> icon (<img src="../../projects/images/icon_debug.png" width="17" height="16" align="absmiddle">) in the toolbar to launch the <a href="../../projects/launch/wiz_new_launch_config.htm">New Launch Configuration Wizard</a>. This   creates a launch configuration for the project based on project information and any additional input required, like COM port selection. It is the recommended method for creating new launch configurations. Or, use the <a href="../../projects/launch/page_main.htm">Debug</a> window to create a customized  launch configuration. </p>
-<p align="center"><img src="../../reference/images/wnd_trk_debug_config.png" width="819" height="593" /></p>
+<p align="center"><img src="../../reference/images/wnd_trk_debug_config.png" width="859" height="629" /></p>
 <p class="figure">Figure 1. Debug launch configuration for on-device debugging   (<i>Application TRK shown</i>)</p>
 <div class="step">
   <h4>Defining a Customized  Launch Configuration </h4>