diff -r c7e4f77e6b70 -r aac450e0c99e core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml
--- a/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml	Thu Sep 02 13:19:32 2010 -0500
@@ -31,6 +31,7 @@
 		  <topic label="Creating DLL Projects" 						href="html/projects/tutorials/new_proj_dll_example_01.htm" />
 		  <topic label="Building the DLL Project" 					href="html/projects/tutorials/new_proj_dll_example_02.htm" />
 		  <topic label="Debugging a DLL Project"					href="html/projects/tutorials/new_proj_dll_example_03.htm" />
+      	  <topic label="Debugging DLLs with Any Process"			href="html/tasks/projects/prj_debug_dlls_any_process.htm" />
 		</topic>
 		<topic label="Remote Target Debugging (Run-mode)"			href="html/projects/tutorials/run_mode_debug_example_00.htm" >
 		  <topic label="Connect remote device to PC" 				href="html/projects/tutorials/run_mode_debug_example_01.htm" />
@@ -106,7 +107,6 @@
       <topic label="Debugger"							href="html/reference/pref_carb_debugger.htm" />
       <topic label="Diagnostic Logs"          			href="html/reference/pref_carb_diagnostic_logs.htm" />
       <topic label="Preprocess"							href="html/reference/pref_carb_preprocess.htm" />
-      <topic label="SDK Preferences (deprecated)"                  	href="html/reference/pref_carb_sdk_preference.html" />
       <topic label="Symbian Filtering Preferences"		href="html/tasks/sdks/sdk_platform_filter.htm" />
       <topic label="Symbian SDKs"						href="html/reference/pref_carb_symbian_sdk.htm" />
       <topic label="Code Styles"						href="html/reference/pref_cpp_code_style.htm" >
@@ -116,13 +116,10 @@
     </topic>
     <topic label="Working with SDKs"					href="html/tasks/WorkingwithSDKs.html" >
       <topic label="Symbian SDKs"						href="html/reference/pref_carb_symbian_sdk.htm" />
-      <topic label="Adding an SDK"					href="html/tasks/sdks/sdk_add.htm" >
-        <topic label="Adding SDKs"					href="html/tasks/sdks/sdk_add.htm" />
-      </topic>
+      <topic label="Build Configuration Filtering"		href="html/tasks/sdks/sdk_platform_filter.htm" />
+      <topic label="Adding an SDK"					href="html/tasks/sdks/sdk_add.htm" />
       <topic label="Searching for SDKs"				href="html/tasks/sdks/sdk_search.htm" />
       <topic label="Viewing SDK Properties"			href="html/tasks/sdks/sdk_view_properties.htm" />
-      <topic label="Editing SDK Properties"			href="html/tasks/RmvngandVwngPropsosSDK.html" />
-      <topic label="Adding Symbian Custom Kits"		href="html/tasks/sdks/sdk_add_custkits.htm" />
     </topic>
     <topic label="Creating projects" 								href="html/tasks/CreatingProjectsToc.htm" >
       <topic label="Project Templates" 					    	href="html/concepts/templates.htm" />
@@ -132,7 +129,7 @@
       <topic label="N-Gage Projects" 								href="html/concepts/ngage_projects.htm" />
     </topic>
     <topic label="C/C++ Project and File Properties"	href="html/reference/ProjectPreferences.html" >
-      <topic label="Build Configurations"					href="html/reference/build_properties/pane_build_config.htm" >
+      <topic label="Build Configurations"					href="html/reference/build_properties/prop_carb_build_config.htm" >
         <topic label="SIS Builder" 							href="html/reference/build_properties/pane_build_config_sis.htm" >
           <topic label="SIS Properties"						href="html/reference/build_properties/wnd_sis_properties.htm" />
         </topic>
@@ -142,8 +139,8 @@
         <topic label="Paths and Symbols"						href="html/reference/build_properties/pane_build_config_paths.htm" />
         <topic label="ROM Builder"								href="html/reference/ROM_build_settings.html" />
       </topic>
-      <topic label="Macro Settings"						href="html/reference/build_properties/pane_macro_settings.htm" />
-      <topic label="Project Settings"						href="html/reference/build_properties/pane_project_settings.htm" />
+      <topic label="Macro Settings"							href="html/reference/build_properties/prop_carb_macro_settings.htm" />
+      <topic label="Project Settings"						href="html/reference/build_properties/prop_carb_project_settings.htm" />
     </topic>
     <topic label="Building projects"  						href="html/concepts/build_system.htm" >
       <topic label="Active Build Configuration"				href="html/concepts/build_configurations.htm" />
@@ -278,7 +275,7 @@
     -->
         
       <topic href="html/tasks/projects/prj_debug_dlls.htm" label="Debugging DLLs"></topic>
-      <topic href="html/tasks/processes/attach_debugger_to_process.htm" label="Attaching to a Symbian OS Process"></topic>
+      <topic href="html/tasks/processes/attach_to_process.htm" label="Attaching to a Process"></topic>
       <topic href="html/tasks/start/carbide_debugging.htm" label="Debugging a Symbian OS Program"></topic>
       <topic href="html/reference/view_sym_os_data_overview.htm" label="Symbian OS Data View"></topic>
         
@@ -323,9 +320,11 @@
       </topic>
     </topic>
     <topic label="Debugging variations"                     href="html/concepts/debugger_about.htm" >
+      <topic label="Attaching to a Process"					href="html/tasks/processes/attach_to_process.htm" />
+      <topic label="Auto-Targeting of Executables"			href="html/concepts/autotargeting.htm" />
+      <topic label="Debugging DLLs"							href="html/tasks/projects/prj_debug_dlls.htm" />
+      <topic label="Debugging in ROM"		                href="html/tasks/projects/prj_debug_rom.htm" />
       <topic label="Emulation Debugging"			        href="html/concepts/emulators.htm" />
-      <topic label="Debugging DLLs"						href="html/tasks/projects/prj_debug_dlls.htm" />
-      <topic label="Debugging in ROM"		                href="html/tasks/projects/prj_debug_rom.htm" />
     </topic>
 
       <topic label="Troubleshooting" 						href="html/tasks/trk/trk_troubleshooting.htm"/>