--- a/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml	Mon Aug 09 09:15:52 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml	Mon Aug 09 14:26:09 2010 -0500
@@ -204,7 +204,6 @@
         <topic label="Attach to Process"			href="html/projects/launch/attach_process.htm" />
         <topic label="Emulation"					href="html/projects/launch/emulation.htm" />
         <topic label="System TRK"					href="html/projects/launch/stop_mode.htm" />
-        <topic label="Trace32"						href="html/projects/launch/trace32.htm" />
         <anchor id="launch_config_ANCHOR"/>
       </topic>
       <topic label="Configuration panes"				href="html/projects/launch/pages_overview.htm" >
@@ -294,17 +293,8 @@
        <topic href="html/projects/launch/launch_board.htm" label="Debugging a reference board">
        </topic>
       <topic label="Stop Mode Debug Example" 				href="html/tasks/debugger/stop_mode_debug.htm" >
-        <topic label="1. On-Device Debugging Preconditions" href="html/tasks/debugger/stop_mode_debug_precond.htm" />
-        <topic label="2. Trace32 Support" 					href="html/projects/launch/trace32.htm" >
-          <topic label="Main" 								href="html/projects/launch/page_main.htm" />
-          <topic label="Connection" 						href="html/projects/launch/page_connection.htm" />
-          <topic label="Debugger" 							href="html/projects/launch/page_debugger.htm" />
-          <topic label="ROM Image" 							href="html/projects/launch/page_rom_image.htm" />
-          <topic label="Executables" 						href="html/projects/launch/page_executables.htm" />
-          <topic label="Source" 							href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_srce.htm" />
-          <topic label="Commmon" 							href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_comm.htm/" />
-        </topic>
-        <topic label="4. Using Soft Attach"	 href="html/tasks/debugger/soft_attach_debug.htm" />
+        <topic label="On-Device Debugging Preconditions" href="html/tasks/debugger/stop_mode_debug_precond.htm" />
+        <topic label="Using Soft Attach"	 href="html/tasks/debugger/soft_attach_debug.htm" />
       </topic>
       <topic label="Building a ROM Image File"            href="html/reference/ROM_build_settings.html" />
       <topic label="ARM Registers" 						href="html/concepts/arm_registers.htm" />
@@ -356,8 +346,14 @@
   </topic>
   <topic href="html/tasks/carbide_tools.htm" label="Creating Carbide Tools" />
   <topic href="html/tasks/custom/carb_customizing.htm" label="Customizing Carbide">
+     <topic href="html/tasks/custom/carb_custom_styles.htm" label="Code Styles">
+     </topic>
+     <topic href="html/tasks/custom/carb_custom_editors.htm" label="Editors">
+     </topic>
      <topic href="html/tasks/custom/carb_custom_menus.htm" label="Toolbars and Menus">
      </topic>
+     <topic href="html/tasks/custom/carb_custom_keys.htm" label="Shortcut Keys">
+     </topic>
      <topic href="html/tasks/custom/carb_export_setup.htm" label="Sharing Carbide Setups">
      </topic>
   </topic>