renamed files for consistency in naming
authorfturovic <frank.turovich@nokia.com>
Wed, 21 Jul 2010 13:50:58 -0500
changeset 1658 2a5c0df13bad
parent 1655 e17ab99b8f30
child 1660 a53047bc0aba
renamed files for consistency in naming
core/com.nokia.carbide.cpp.doc.user/html/concepts/CarbidePerspective.html
core/com.nokia.carbide.cpp.doc.user/html/concepts/build_configurations.htm
core/com.nokia.carbide.cpp.doc.user/html/concepts/build_system.htm
core/com.nokia.carbide.cpp.doc.user/html/concepts/build_targets.htm
core/com.nokia.carbide.cpp.doc.user/html/concepts/common_debug_actions.htm
core/com.nokia.carbide.cpp.doc.user/html/concepts/contextual_menus.htm
core/com.nokia.carbide.cpp.doc.user/html/concepts/cvs.htm
core/com.nokia.carbide.cpp.doc.user/html/concepts/debugger_about.htm
core/com.nokia.carbide.cpp.doc.user/html/concepts/ngage_projects.htm
core/com.nokia.carbide.cpp.doc.user/html/concepts/tour.html
core/com.nokia.carbide.cpp.doc.user/html/concepts/working_with_data.htm
core/com.nokia.carbide.cpp.doc.user/html/concepts/working_with_memory.htm
core/com.nokia.carbide.cpp.doc.user/html/concepts/workspaces.htm
core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/viewing_variables.htm
core/com.nokia.carbide.cpp.doc.user/html/debugger/watchpoints/setting_watchpoints.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_debugger.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/wnd_change_debug_process.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_dll_example_01.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_dll_example_02.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_from_template_01.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_from_template_02.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/run_mode_debug_example_04.htm
core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_01.htm
core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_02.htm
core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_03.htm
core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_04.htm
core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_05.htm
core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_06.htm
core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_importing_projs_04.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/INF_Editor.html
core/com.nokia.carbide.cpp.doc.user/html/reference/MMP_Editor.html
core/com.nokia.carbide.cpp.doc.user/html/reference/ProjectPreferences.html
core/com.nokia.carbide.cpp.doc.user/html/reference/ProjectTypeandSDK.html
core/com.nokia.carbide.cpp.doc.user/html/reference/SDKPreferences.html
core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_args.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_env.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_paths.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_sbsv2.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_sis.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_macro_settings.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_pkg_config.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_project_settings.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/prop_carb_build_config.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/prop_carb_macro_settings.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/prop_carb_project_settings.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/wnd_sis_properties.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/indexer.html
core/com.nokia.carbide.cpp.doc.user/html/reference/memory_rendering_options.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/menus/abld.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/menus/build_all_targets.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/menus/build_pkg_file.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/menus/build_symbian_comp.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/menus/clean_symbian_comp.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/menus/compile_source.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/menus/freeze_exports.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/menus/freeze_symbian_comp.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/menus/preprocess_source.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/olderproject_updater.html
core/com.nokia.carbide.cpp.doc.user/html/reference/perspective_debug.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/pref_carb_build.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/pref_carb_cpp.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/pref_carb_debugger.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/pref_carb_diagnostic_logs.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/pref_carb_preprocess.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/pref_carb_sdk_preferencea.html
core/com.nokia.carbide.cpp.doc.user/html/reference/pref_carb_x86_exceptions.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/pref_cpp_code_style.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/prefs_carb_carbide_news.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/prefs_carbide_news.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/view_carbide_news.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/view_console.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/view_cpp_projects.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/view_executables.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/view_log.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/view_memory.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/view_memory_wnd.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/view_module.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/view_module_wnd.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/view_proj_explorer.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/view_signals.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/view_signals_wnd.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/view_symbian_kernel.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_build_prefs.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_carbide_pref.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_carbide_pref_x86.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_debugger_prefs.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_diagnostic_logs_pref.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_pref_code_style.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_preprocess_prefs.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/AddinganSDK.html
core/com.nokia.carbide.cpp.doc.user/html/tasks/CreatingNewProjects.html
core/com.nokia.carbide.cpp.doc.user/html/tasks/EmulatorToc.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/ImportingProjects.html
core/com.nokia.carbide.cpp.doc.user/html/tasks/WorkingwithSDKs.html
core/com.nokia.carbide.cpp.doc.user/html/tasks/code_style_reformatting_sources.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/code_style_workspace.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug_precond.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/memory/memory_monitor_adding.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/memory/memory_monitor_removing.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/memory/memory_rendering_adding.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/memory/view_memory_show.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_clean.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_dlls.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_import_exe.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_new_build_config.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_preprocess.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_set_build_tgt.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/working_with_sis_pkg_files.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/sdk_add.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/sdk_platform_filter.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/sdk_search.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/sdk_view_properties.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_example.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_overview_trk.htm
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/CarbidePerspective.html	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/CarbidePerspective.html	Wed Jul 21 13:50:58 2010 -0500
@@ -9,14 +9,14 @@
 	 <p>
 	 The <img src="../images/command_link.png" width="16" height="12" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=com.nokia.carbide.cpp.CarbideCppPerspective)")'>Carbide C/C++</a> perspective is a set of tools and layout of views provided for Symbian OS development. This perspective is designed to work with Symbian OS C++ projects. The commonly used views include:</p>
 	 <ul>
-	   <li><a href="../reference/view_cpp_projects.htm">Project Explorer</a> view -   display<span><span>s   C/C++ projects located in the current workspace</span></span></li>
+	   <li><a href="../reference/view_proj_explorer.htm">Project Explorer</a> view -   display<span><span>s   C/C++ projects located in the current workspace</span></span></li>
 	   <li><a href="../reference/view_sym_proj_nav.htm">Symbian Project Navigator</a> view - shows all files that belong to the
 		  current build configuration </li>
 		<li><a href="../hints_tips.htm">Editor</a> view - one or more source code editor windows </li> 
 	   <li><a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_outline_view.htm">Outline</a> view -   displays an outline of a structured C/C++ file that is currently open in the editor view </li>
 		<li><a href="../reference/view_install_extensions.htm">Install Extensions</a> view - displays a list of installable plug-ins</li>
 		<li><a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_problems_view.htm">Problems</a> view - displays build errors </li>
-		<li><a href="../reference/view_log.htm">Console</a> view -   shows the output of a process and allows you to provide keyboard input to a 
+		<li><a href="../reference/view_console.htm">Console</a> view -   shows the output of a process and allows you to provide keyboard input to a 
 process</li>
         <li><a href="../reference/view_executables.htm">Executables</a> view - provides a dynamic list of executables and their related source files</li>
 	    <li><a href="../reference/trk/view_remote_connection.htm">Remote Connections</a> view &ndash; use to monitor, create, edit, or remove  common  connection settings</li>
@@ -32,7 +32,7 @@
 	 <h5>Related references</h5>
 	 <ul>
 	   <li>  <a href="../reference/perspective_debug.htm">Debug	Perspective</a></li>
-       <li><a href="../reference/view_cpp_projects.htm">Project Explorer</a> view</li>
+       <li><a href="../reference/view_proj_explorer.htm">Project Explorer</a> view</li>
        <li><a href="../reference/view_sym_proj_nav.htm">Symbian Project Navigator</a> view </li>
    </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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/build_configurations.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/build_configurations.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -9,12 +9,12 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Active  Build Configuration</h2>
-<p>Use the <b>Active  Configuration</b> option in the <a href="../reference/build_properties/pane_build_config.htm">Carbide Build Configurations</a> panel to specify the build target. Since a project can contain one or more build targets, the active  configuration defines  which build configuration to use when the project is run or debugged. A launch configuration consists of the following:</p>
+<p>Use the <b>Active  Configuration</b> option in the <a href="../reference/build_properties/prop_carb_build_config.htm">Carbide Build Configurations</a> panel to specify the build target. Since a project can contain one or more build targets, the active  configuration defines  which build configuration to use when the project is run or debugged. A launch configuration consists of the following:</p>
 <ul>
   <li>a project</li>
   <li>a <a href="../projects/launch/launch_configs_overview.htm">build  configuration</a> -  a project level configuration that includes an  SDK and any related files required to compile and build the project </li>
 </ul>
-<p>Build configurations are defined when the project is created. A project can have any number of build configurations and more  can be <a href="../tasks/projects/prj_new_build_config.htm">added</a> as necessary. Each build configuration can have its own combination of tool settings to precisely control how it is defined and built. Build configurations are maintained in the project Properties window in the Carbide Build Configurations panel. To open the panel, select a project in the <a href="../reference/view_cpp_projects.htm">Project Explorer</a> or <a href="../reference/view_sym_proj_nav.htm">Symbian Project Navigator</a> view and select <b>Project &gt; Properties</b> or right-click and select Properties.</p>
+<p>Build configurations are defined when the project is created. A project can have any number of build configurations and more  can be <a href="../tasks/projects/prj_new_build_config.htm">added</a> as necessary. Each build configuration can have its own combination of tool settings to precisely control how it is defined and built. Build configurations are maintained in the project Properties window in the Carbide Build Configurations panel. To open the panel, select a project in the <a href="../reference/view_proj_explorer.htm">Project Explorer</a> or <a href="../reference/view_sym_proj_nav.htm">Symbian Project Navigator</a> view and select <b>Project &gt; Properties</b> or right-click and select Properties.</p>
 <p align="center"><img src="images/build_configs.png" width="801" height="350"></p>
 <p>You can select a build configuration in the <b>Active Configuration</b> group or use the <b>Project &gt; Active  Configuration</b> menu option  to <a href="../tasks/projects/prj_set_build_tgt.htm">set</a> which build configuration to launch when running or debugging a program. The currently selected project can be launched by clicking the <b>Run</b> (<img src="../images/icons/btn_run.png" width="16" height="16" align="absmiddle" />) or <b>Debug</b> (<img src="../images/icons/btn_debug.png" width="17" height="16" align="absmiddle" />) control on the tool bar to launch the project with the currently active build configuration. When no project is selected the last project debugged will be launched.</p>
 <p>If no <a href="../projects/launch/launch_configs_overview.htm">launch configuration</a> is present in the project, one is created on initial launch. Subsequent launches of the project will use either the last launch configuration or if more than one launch configuration exists, it uses the most correct one.</p>
@@ -45,7 +45,7 @@
 <p>You can use the  <a href="../reference/wnd_debug_configuration.htm">Debug</a> window to edit the default build configuration names.</p>
 <h5>Other references </h5>
 <ul>
-  <li><a href="../reference/build_properties/pane_build_config.htm">Build Configurations</a> </li>
+  <li><a href="../reference/build_properties/prop_carb_build_config.htm">Build Configurations</a> </li>
   <li><a href="../tasks/projects/prj_set_build_tgt.htm">Setting an Active Configuration</a></li>
   <li><a href="../tasks/projects/prj_debug_config.htm">Creating Launch Configurations</a> </li>
   <li><a href="../tasks/projects/prj_new_build_config.htm">Adding/Removing Build Configurations</a></li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/build_system.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/build_system.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -28,7 +28,7 @@
 <h5>Other references </h5>
 <ul>
   <li><a href="../reference/menus/build_all_targets.htm">Build All Configurations</a></li>
-  <li><a href="../reference/build_properties/pane_build_config.htm">Carbide Build Configurations</a></li>
+  <li><a href="../reference/build_properties/prop_carb_build_config.htm">Carbide Build Configurations</a></li>
 </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>
 
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/build_targets.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/build_targets.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -15,7 +15,7 @@
 <body bgcolor="#FFFFFF">
 <h2>Supported Target Types</h2>
 <p> Carbide.c++ supports a variety of build targets based upon the SDKs and which version of the Carbide tools used by the project. The table below identifies which build targets are possible for a specific SDK.</p>
-<p class="note"><b>NOTE</b> Check the <a href="../reference/SDKPreferences.html">SDK Preferences</a> page to see if an SDK you have installed and whether its build configurations are supported.</p>
+<p class="note"><b>NOTE</b> Check the <a href="../reference/pref_carb_sdk_preferencea.html">SDK Preferences</a> page to see if an SDK you have installed and whether its build configurations are supported.</p>
 <h5>Table 1. Supported  target types for all versions of Carbide.c++ </h5>
 <table width="87%"  border="0" cellpadding="2" cellspacing="0">
   <tr>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/common_debug_actions.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/common_debug_actions.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -25,7 +25,7 @@
 <ul>
   <li><a href="../tasks/projects/prj_debug_config.htm">Debugger Configuration</a></li>
   <li><a href="../projects/launch/page_debugger.htm">Debugger Pane </a></li>
-  <li><a href="../reference/wnd_debugger_prefs.htm">Debugger Preferences</a></li>
+  <li><a href="../reference/pref_carb_debugger.htm">Debugger Preferences</a></li>
 </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>
 
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/contextual_menus.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/contextual_menus.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -15,8 +15,8 @@
   <li>Editor views - perform editing functions, format, compare, and a host of other file actions </li>
   <li><a href="../reference/view_breakpoints.htm">Breakpoints</a> view - enable, disable, remove, or select all breakpoints</li>
   <li><a href="../debugger/debug/viewing_debug.htm">Debug</a> view - restart, step into, over, or out of routines, terminate or suspend program execution </li>
-  <li><a href="../reference/view_memory_wnd.htm">Memory</a> view - add or remove memory monitors </li>
-  <li><a href="../reference/view_cpp_projects.htm">Project Explorer</a> view - manage projects, build, delete, freeze, run, debug, and other common project commands</li>
+  <li><a href="../reference/view_memory.htm">Memory</a> view - add or remove memory monitors </li>
+  <li><a href="../reference/view_proj_explorer.htm">Project Explorer</a> view - manage projects, build, delete, freeze, run, debug, and other common project commands</li>
   <li><a href="../reference/view_variables.htm">Variables</a> view - enable, disable, find, and change  the format or value of variables displayed</li>
 </ul>
 <p class="note"><b>TIP</b> Experiment using the context menu in various views to discover additional capabilities.</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/cvs.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/cvs.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -20,7 +20,7 @@
 </ul>
 <p>Other revision systems are also supported but require the downloading of an Eclipse plug-in to add that capability to Carbide. Visit the <a href="http://eclipse-plugins.2y.net">eclipse-plugins.2y.net</a> sites to locate the  plug-ins you need.</p>
 <h2>Using SCM in Carbide</h2>
-<p>The SCM you install normally adds its commands to the <strong>Team</strong> sub-menu in the <a href="../reference/view_cpp_projects.htm">Project Explorer</a> view's context menu (Figure 1). Some SCM's install their own menu to Carbide. If this is the case, refer to the documentation included with the plug-in for details.</p>
+<p>The SCM you install normally adds its commands to the <strong>Team</strong> sub-menu in the <a href="../reference/view_proj_explorer.htm">Project Explorer</a> view's context menu (Figure 1). Some SCM's install their own menu to Carbide. If this is the case, refer to the documentation included with the plug-in for details.</p>
 <p align="center"><img src="../reference/images/menu_team_commands.png" alt="Team commands" width="739" height="607"></p>
 <p class="figure">Figure 1. Team sub-menu</p>
 <div class="step">
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/debugger_about.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/debugger_about.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -41,7 +41,7 @@
 <ul>
   <li><a href="../tasks/projects/prj_debug_config.htm">Debugger Configuration</a></li>
   <li><a href="../projects/launch/page_debugger.htm">Debugger Pane </a></li>
-  <li><a href="../reference/wnd_debugger_prefs.htm">Debugger Preferences</a></li>
+  <li><a href="../reference/pref_carb_debugger.htm">Debugger Preferences</a></li>
 </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>
 
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/ngage_projects.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/ngage_projects.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -54,7 +54,7 @@
       <p align="center" class="figure">Figure 4 - <b>Builder</b> dialog with new N-Gage Builder defined </p>
   <li>Click OK to close the <b>Properties for <i>project_name</i></b> window</li>
   <li>Build the project and its SISX file by selecting the <b>Project &gt; Build Project</b> menu item</li>
-  <p>The <a href="../reference/view_log.htm">Console</a> view shows information as the project  and it's SISX file are built and then the build of the installation file (<span class="code">N-GAGE</span>).</p>
+  <p>The <a href="../reference/view_console.htm">Console</a> view shows information as the project  and it's SISX file are built and then the build of the installation file (<span class="code">N-GAGE</span>).</p>
     </ol>
 <h3>For On-device Debugging </h3>
 <h4>Deploying the N-Gage project   to a device </h4>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/tour.html	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/tour.html	Wed Jul 21 13:50:58 2010 -0500
@@ -37,7 +37,7 @@
 		<li> 
 		  <p>
 			 Create new Symbian OS projects using the New command, which is available on the File menu, and on the
-		  pop-up menus of the <a href="../reference/view_cpp_projects.htm">Project Explorer</a> and <a href="../reference/view_sym_proj_nav.htm">Symbian Project Navigator</a> views.</p> 
+		  pop-up menus of the <a href="../reference/view_proj_explorer.htm">Project Explorer</a> and <a href="../reference/view_sym_proj_nav.htm">Symbian Project Navigator</a> views.</p> 
 		  <p>
 			 For more information, see <a href="../tasks/CreatingNewProjects.html">Creating New Projects</a>. 
 		  </p> 
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/working_with_data.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/working_with_data.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -10,7 +10,7 @@
 <body bgcolor="#FFFFFF">
 <h2>Working with Debugger Data</h2>
 <p>  This section explains how to work with data that the Carbide.c++ debugger generates. The following windows show various types of debugger data.</p>
-<ul><li><a href="../reference/view_log.htm">Console view</a> &mdash;shows messages generated during the debugging session</li>
+<ul><li><a href="../reference/view_console.htm">Console view</a> &mdash;shows messages generated during the debugging session</li>
 </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>
 
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/working_with_memory.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/working_with_memory.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -11,7 +11,7 @@
 <h2>Working with Memory</h2>
 <p>  This section explains how to work with memory in a debugging session. Topics include:</p>
 <ul>
-  <li><a href="../reference/view_memory_wnd.htm">Memory</a> view &mdash;shows the memory that your project manipulates as it executes</li>
+  <li><a href="../reference/view_memory.htm">Memory</a> view &mdash;shows the memory that your project manipulates as it executes</li>
   <li><a href="../reference/view_registers.htm">Registers</a> view&mdash;shows the register contents of a processor</li>
 </ul>
 <h5>Related tasks</h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/workspaces.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/workspaces.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -18,7 +18,7 @@
 <body bgcolor="#FFFFFF">
 <h2>Workspace Information </h2>
 <p>A workspace is the default place to store and create resources like projects, folders, and files. These are then presented to the user in a perspective which enables the presentation and manipulation of the stored resources.</p>
-<p>When Carbide is launched it asks for a workspace to open (Figure 1). As you can have multiple workspaces, all independent from each other, choosing the workspace containing the projects to work on is important. Projects within a workspace are  shown in the Carbide workbench within the <a href="PLUGINS_ROOT/org.eclipse.platform.doc.user/concepts/cnav.htm">Project Explorer</a> and <a href="../reference/view_cpp_projects.htm">C/C++ Project</a> views. When you create a new project it is automatically added to the currently open workspace. You can import existing projects into a workspace from INF files.</p>
+<p>When Carbide is launched it asks for a workspace to open (Figure 1). As you can have multiple workspaces, all independent from each other, choosing the workspace containing the projects to work on is important. Projects within a workspace are  shown in the Carbide workbench within the <a href="PLUGINS_ROOT/org.eclipse.platform.doc.user/concepts/cnav.htm">Project Explorer</a> and <a href="../reference/view_proj_explorer.htm">C/C++ Project</a> views. When you create a new project it is automatically added to the currently open workspace. You can import existing projects into a workspace from INF files.</p>
 <p align="center"><img src="images/wnd_workspace_launcher.png" alt="Workspace Launcher dialog" width="630" height="291"></p>
 <p class="figure">Figure 1. Workspace Launcher dialog</p>
 <p class="note"><span class="style1">WARNING</span> Bld.inf imported projects are not copied, so do not delete the contents when deleting the project.</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/viewing_variables.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/viewing_variables.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -100,7 +100,7 @@
   </tr>
   <tr>
     <td><b>View Memory</b></td>
-    <td>Opens a <a href="../../reference/view_memory_wnd.htm">Memory</a> view on the selected variable so you can examine it.</td>
+    <td>Opens a <a href="../../reference/view_memory.htm">Memory</a> view on the selected variable so you can examine it.</td>
   </tr>
   <tr>
       <td><b>Format</b></td>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/watchpoints/setting_watchpoints.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/watchpoints/setting_watchpoints.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -11,7 +11,7 @@
 <h2>Setting and Removing Watchpoints</h2>
 <p>You create a watchpoint to monitor a value in a specified memory location. The debugger halts program execution on the line of source code that triggered the watchpoint. This is different than a breakpoint, which halts program execution prior to executing the line of source code on which the breakpoint is set.</p>
 <h4>Setting watchpoints</h4>
-<p>Right-click in the <a href="../breakpoints/viewing_breakpoints.htm">Breakpoints</a> view and choose the  <b>Add Watchpoint (C/C++)...</b> command to open the <b>Add Watchpoint</b> window. A watchpoint suspends program execution when the memory location that you specify is accessed with a write or read operation and it's based on the access setting. Use the <b>Add Watchpoint</b> window to specify the  memory location, its memory size, unit size, and define whether the watchpoint  triggers on a read, write, or on both operations. Watchpoints can also be added directly in the <a href="../../reference/view_variables.htm">Variables</a>, <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_outline_view.htm">Outline</a>, and the <a href="../../reference/view_memory_wnd.htm">Memory Rendering</a> views.</p>
+<p>Right-click in the <a href="../breakpoints/viewing_breakpoints.htm">Breakpoints</a> view and choose the  <b>Add Watchpoint (C/C++)...</b> command to open the <b>Add Watchpoint</b> window. A watchpoint suspends program execution when the memory location that you specify is accessed with a write or read operation and it's based on the access setting. Use the <b>Add Watchpoint</b> window to specify the  memory location, its memory size, unit size, and define whether the watchpoint  triggers on a read, write, or on both operations. Watchpoints can also be added directly in the <a href="../../reference/view_variables.htm">Variables</a>, <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_outline_view.htm">Outline</a>, and the <a href="../../reference/view_memory.htm">Memory Rendering</a> views.</p>
 <p align="center"><img src="../images/wnd_add_watchpoint.png" width="238" height="253"></p>
 <p align="center" class="figure">Figure 1. Add Watchpoint window </p>
 <h5>Table 1. Add Watchpoint options </h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_debugger.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_debugger.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -34,7 +34,7 @@
   </tr>
   <tr>
     <td><b>View program output </b></td>
-    <td><p>Enable to direct standard output messages to the   Emulation Program Output Console in the <a href="../../reference/view_log.htm">Console</a> view. </p>
+    <td><p>Enable to direct standard output messages to the   Emulation Program Output Console 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>
@@ -63,7 +63,7 @@
   </tr>
   <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_log.htm">Console</a> view. </p>
+    <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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/wnd_change_debug_process.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/wnd_change_debug_process.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -40,7 +40,7 @@
   </tr>
   <tr>
     <td><b>Modify SIS builder settings for build configuration</b></td>
-    <td>Opens the <a href="../../reference/build_properties/pane_build_config_sis.htm">SIS Builder</a> tab in the <a href="../../reference/build_properties/pane_build_config.htm">Build Configurations</a> panel in the project <b>Properties</b> window where you can edit, add, or remove SIS files associated with the project.</td>
+    <td>Opens the <a href="../../reference/build_properties/pane_build_config_sis.htm">SIS Builder</a> tab in the <a href="../../reference/build_properties/prop_carb_build_config.htm">Build Configurations</a> panel in the project <b>Properties</b> window where you can edit, add, or remove SIS files associated with the project.</td>
   </tr>
 </table>
 <h4>Other references</h4>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_dll_example_01.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_dll_example_01.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -50,7 +50,7 @@
         <li>(Optional) Click Next to provide Basic Settings like author, copyright and other info for your project.</li>
         <li>(Optional) Click Next to rename the Project Directories used to organize the project.</li>
         <li>Click Finish.<br>
-            <p>Carbide uses the selected project template and your settings to create the DLL project in the <a href="../../reference/view_cpp_projects.htm">Project Explorer</a> view.</p>
+            <p>Carbide uses the selected project template and your settings to create the DLL project in the <a href="../../reference/view_proj_explorer.htm">Project Explorer</a> view.</p>
             <p><img src="../images/new_dll_project_07.png" alt="DLL project in Project Explorer view"></p>
         </li>
     </ol>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_dll_example_02.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_dll_example_02.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -33,7 +33,7 @@
                     </li>
     </ol>
     <blockquote>
-        <p>Once compiling is complete use the <a href="../../reference/view_cpp_projects.htm">Project Explorer</a>, <a href="PLUGINS_ROOT//org.eclipse.cdt.doc.user/reference/cdt_u_problems_view.htm">Problems</a>, <a href="../../reference/view_log.htm">Console</a>, and <a href="../../reference/view_executables.htm">Executables</a> views to locate and resolve any problems generated during the build. See Step 2 <a href="new_proj_from_template_02.htm">here</a> for more details.</p>
+        <p>Once compiling is complete use the <a href="../../reference/view_proj_explorer.htm">Project Explorer</a>, <a href="PLUGINS_ROOT//org.eclipse.cdt.doc.user/reference/cdt_u_problems_view.htm">Problems</a>, <a href="../../reference/view_console.htm">Console</a>, and <a href="../../reference/view_executables.htm">Executables</a> views to locate and resolve any problems generated during the build. See Step 2 <a href="new_proj_from_template_02.htm">here</a> for more details.</p>
         <p><img src="../images/dll_build_project.png" alt="Project Explorer showing DLL project" width="257" height="281"></p>
     </blockquote>
 </div>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_from_template_01.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_from_template_01.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -49,7 +49,7 @@
         <li>(Optional) Click Next to provide Basic Settings like author, copyright and other info for your project.</li>
         <li>(Optional) Click Next to rename the Project Directories used to organize the project.</li>
         <li>Click Finish.<br>
-            <p>Carbide uses the selected project template and your settings to create a new project in the <a href="../../reference/view_cpp_projects.htm">Project Explorer</a> view.</p>
+            <p>Carbide uses the selected project template and your settings to create a new project in the <a href="../../reference/view_proj_explorer.htm">Project Explorer</a> view.</p>
         </li>
     </ol>
 </div>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_from_template_02.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_from_template_02.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -45,14 +45,14 @@
         </li>
     </ol>
     <blockquote>
-        <p>Choosing any of the above actions causes Carbide to build the selected project. A <strong>Build Project</strong> dialog  (below) and a progress bar appear during a lengthy build operation. All build output  is shown in a <a href="../../reference/view_log.htm">Console</a> view while build errors and warnings appear in the Problems view.</p>
+        <p>Choosing any of the above actions causes Carbide to build the selected project. A <strong>Build Project</strong> dialog  (below) and a progress bar appear during a lengthy build operation. All build output  is shown in a <a href="../../reference/view_console.htm">Console</a> view while build errors and warnings appear in the Problems view.</p>
         <p align="left"><img src="../images/dlg_build_project_progress.png" alt="Build Project progress dialog" width="532" height="233"></p>
         <p>Whether a full build or incremental build is requested, Carbide forwards the request to the SDK make system. The SDK make system determines if anything needs to be
             built. Carbide  always checks that makefiles are up-to-date and
             dependencies present.</p>
         <p>The project is also built if you make a change to it and then click <b>Debug</b>. It may be useful to automatically save modified resources before a manual build process by enabling the <b>Save automatically before build</b> option in the <b>Window &gt; Preferences &gt; General &gt;</b> <img src="../../images/command_link.png" width="16" height="12"> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Workbench)")'> Workspace</a> preference panel. </p>
         <p class="note"><b>NOTE</b> If you want to turn off building before launching, uncheck the <b>Build (if required) before launching</b> option in the <b>Window &gt; Preferences &gt; Run/Debug &gt;<img src="../../images/command_link.png" width="16" height="12"> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.debug.ui.LaunchingPreferencePage)")'> Launching</a></b> preference panel.</p>
-        <p>When performing a build, output is displayed in the <a href="../../reference/view_log.htm">Console</a> view. If you do not want to clear the console before each build you need to uncheck the option <b>Always clear console before building</b> in the <b> Console</b> panel. This option is enabled by default. You can access this panel by selecting <b>Window &gt; Preferences &gt; C/C++ &gt; Build &gt;<img src="../../images/command_link.png" width="16" height="12"> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.cdt.ui.preferneces.CBuildConsolePreferernces)")'> Console</a></b> preference panel (below).</p>
+        <p>When performing a build, output is displayed in the <a href="../../reference/view_console.htm">Console</a> view. If you do not want to clear the console before each build you need to uncheck the option <b>Always clear console before building</b> in the <b> Console</b> panel. This option is enabled by default. You can access this panel by selecting <b>Window &gt; Preferences &gt; C/C++ &gt; Build &gt;<img src="../../images/command_link.png" width="16" height="12"> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.cdt.ui.preferneces.CBuildConsolePreferernces)")'> Console</a></b> preference panel (below).</p>
         <p align="left"><img src="../images/pref_cdt_build_console.png" alt="Console preference panel" width="635" height="554"></p>
         <p>Not clearing the console is useful when you are performing multiple builds, such as a regular project build, building a project package (.pkg) file, and building a ROM image. For example, if you do not clear the console before each build, then a subsequent build will not overwrite information from a previous build.</p>
     </blockquote>
@@ -73,7 +73,7 @@
                	    <p><img src="../images/new_build_project_problems_view.png" alt="Executables view" width="797" height="210"></p>
                 </li>
                 <li>Examine the Console view for more specific details on  an error or warning message<br />
-                    <p>Use the <a href="../../reference/view_log.htm">Console</a> view to see where a specific problem occured during the build.</p>
+                    <p>Use the <a href="../../reference/view_console.htm">Console</a> view to see where a specific problem occured during the build.</p>
                	    <p><img src="../images/new_build_project_console_view.png" alt="Executables view" width="797" height="210"></p>
                 </li>
                 <li>Examine the Executables view for  missing source files<br />
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/run_mode_debug_example_04.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/run_mode_debug_example_04.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -34,7 +34,7 @@
                 <li>Examine and change variables and expressions in the <a href="../../debugger/variables/variables.htm">Variables</a> view.</li>
                 <li>Examine the stack in the <a href="../../debugger/debug/viewing_debug.htm">Debug</a> view</li>
                 <li>Review the assembler code in the <a href="../../reference/view_disassembly.htm">Disassembly</a> view</li>
-                <li>Examine memory usage in the <a href="../../reference/view_memory_wnd.htm">Memory</a> view</li>
+                <li>Examine memory usage in the <a href="../../reference/view_memory.htm">Memory</a> view</li>
             </ul>
         </li>
         </ol>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_01.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_01.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -18,7 +18,7 @@
   <li><a href="qt_creating_projs_05.htm">Select Qt modules to include in project</a></li>
   <li><a href="qt_creating_projs_06.htm">Set application UID</a></li>
 </ol>
-<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../reference/SDKPreferences.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to it to the Discovered Symbian OS SDK list.</p>
+<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../reference/pref_carb_sdk_preferencea.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to it to the Discovered Symbian OS SDK list.</p>
 <h3><b>Launch the New Qt Project Wizard</b></h3>
 <p>Select the <b>File &gt; New &gt; New Qt Project</b> menu item to open the <b>New Qt Symbian OS C++ Project</b> dialog.</p>
 <p align="center"><img src="images/qt_wiz_01_project_type.png" width="500" height="500"></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_02.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_02.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -18,7 +18,7 @@
   <li><a href="qt_creating_projs_05.htm">Select Qt modules to include in project</a></li>
   <li><a href="qt_creating_projs_06.htm">Set application UID</a></li>
 </ol>
-<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../reference/SDKPreferences.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to <a href="../tasks/sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
+<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../reference/pref_carb_sdk_preferencea.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to <a href="../tasks/sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
 <h3>Select type of Qt project</h3>
 <p>Use the<b> Select a type of project</b> page in the <b>New Qt Project Wizard</b> to choose a Qt project template that will be used to generate the new project, then click <b>Next</b>. Note that the templates shown are filtered to </p>
 <p align="center"><img src="images/qt_wiz_01_project_type.png" width="500" height="500"></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_03.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_03.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -19,7 +19,7 @@
   <li><a href="qt_creating_projs_05.htm">Select Qt modules to include in project</a></li>
   <li><a href="qt_creating_projs_06.htm">Set application UID</a></li>
 </ol>
-<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../reference/SDKPreferences.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to <a href="../tasks/sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
+<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../reference/pref_carb_sdk_preferencea.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to <a href="../tasks/sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
 <h3><b>Enter project name and  location</b></h3>
 <p>Use the <b>New Qt Symbian OS C++ Project</b> page in the <b>Qt Project Wizard</b> to define the projects name and where it should be saved, then click <b>Next</b>. In Qt projects, the name of the project folder must match the project name. </p>
 <p align="center"><img src="images/qt_wiz_02_project_name.png" width="500" height="500"></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_04.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_04.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -20,7 +20,7 @@
   <li><a href="qt_creating_projs_06.htm">Set application UID</a></li>
 </ol>
 <p class="note"><b>NOTE</b> If everything is built correctly, the <span class="code">QtCore.lib</span> should be in your SDK's <span class="code">&lt;platform&gt; &lt;target&gt; UDEB</span> directory.  If this library is missing, then the SDK will not show up as a supported SDK-target in the build configurations. </p>
-<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../reference/SDKPreferences.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to <a href="../tasks/sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
+<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../reference/pref_carb_sdk_preferencea.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to <a href="../tasks/sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
 <h3><b>Select SDKs for build targets</b></h3>
 <p>Use the <b>Build Targets</b> page of the <b>Qt Project Wizard</b> to select one or more Qt SDKs to include in the project, then click <b>Next</b>.</p>
 <p align="center"><img src="images/qt_wiz_03_build_targets.png"></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_05.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_05.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -19,7 +19,7 @@
   <li><b>Select Qt modules to include in project</b></li>
   <li><a href="qt_creating_projs_06.htm">Set application UID</a></li>
 </ol>
-<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../reference/SDKPreferences.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to <a href="../tasks/sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
+<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../reference/pref_carb_sdk_preferencea.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to <a href="../tasks/sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
 <h3><b>Select Qt modules to include in project</b></h3>
 <p>Use the <b>Qt Modules</b> page to select one or more Qt modules to include with the project, then click <b>Next</b>.</p>
 <p align="center"><img src="images/qt_wiz_04_qt_modules.png" width="500" height="500"></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_06.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_06.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -18,7 +18,7 @@
   <li><a href="qt_creating_projs_05.htm">Select Qt modules to include in project</a></li>
   <li><b>Set application UID</b></li>
 </ol>
-<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../reference/SDKPreferences.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to <a href="../tasks/sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
+<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../reference/pref_carb_sdk_preferencea.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to <a href="../tasks/sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
 <h3><b>Set application UID</b></h3>
 <p>Use the <b>Basic Settings</b> page of the <b>Qt Project Wizard </b>to define an Application UID to the executable. Click <b>Random</b> to generate a  unique UID for program testing purposes. Click <b>Finish</b> when ready to create the project.</p>
 <p align="center"><img src="images/qt_wiz_05_basic_settings.png"></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_importing_projs_04.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_importing_projs_04.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -18,9 +18,9 @@
   <li><b>Choose build targets</b></li>
 </ol>
 <p class="note"><b>NOTE</b> If everything is built correctly, the <span class="code">QtCore.lib</span> should be in your SDK's <span class="code">&lt;platform&gt; &lt;target&gt; UDEB</span> directory.  If this library is missing, then the SDK will not show up as a supported SDK-target in the build configurations. </p>
-<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../reference/SDKPreferences.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to <a href="../tasks/sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
+<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../reference/pref_carb_sdk_preferencea.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to <a href="../tasks/sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
 <h3>Select .pro file to import</h3>
-<p>Use the<b> Build Targets </b> page in the <b>File Import Wizard</b> to select which SDKs and build configurations to associate with the project,  then click <b>Finish</b>. The <span class="code">.pro</span> file is imported and a new project created in the <a href="../reference/view_cpp_projects.htm">Project Explorer</a> view.</p>
+<p>Use the<b> Build Targets </b> page in the <b>File Import Wizard</b> to select which SDKs and build configurations to associate with the project,  then click <b>Finish</b>. The <span class="code">.pro</span> file is imported and a new project created in the <a href="../reference/view_proj_explorer.htm">Project Explorer</a> view.</p>
 <p align="center"><img src="images/qt_import_03_build_targets.png"></p>
 <p class="figure">Figure 1. File Import wizard - Build Targets page</p>
 <table width="100%"  border="0" cellpadding="2" cellspacing="0">
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/INF_Editor.html	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/INF_Editor.html	Wed Jul 21 13:50:58 2010 -0500
@@ -10,7 +10,7 @@
    The <b>INF Editor</b> allows you to view and modify Symbian project files and export files to be included in building your application. The settings displayed are those active for the active build configuration. However, changes made in the INF editor can be applied globally to all build configurations. Changes made in the INF editor are automatically written to the project's .INF file. You can view the .inf file by selecting the bld.inf tab located along the bottom of the INF editor.</p>
 <p>
 	  The INF Editor is shown when an INF  file is
-   opened from the <a href="view_cpp_projects.htm">Project Explorer</a> view or <a href="view_sym_proj_nav.htm">Symbian Project Navigator</a> view by double-clicking on the file. The INF Editor is shown in Figure 1.</p>
+   opened from the <a href="view_proj_explorer.htm">Project Explorer</a> view or <a href="view_sym_proj_nav.htm">Symbian Project Navigator</a> view by double-clicking on the file. The INF Editor is shown in Figure 1.</p>
    <p align="center"><img src="images/inf_editor_overview.png" width="656" height="563" /></p>
    <p align="left" class="figure">Figure 1 - INF Editor</p>
    <p></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/MMP_Editor.html	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/MMP_Editor.html	Wed Jul 21 13:50:58 2010 -0500
@@ -10,7 +10,7 @@
    The MMP Editor <strong>Overview</strong> tab allows you to view and modify your project definitions.  Changes made in the MMP editor are automatically written to the project's .MMP file. You can view the .mmp file by selecting the <em>project_name</em>.mmp tab located along the bottom of the MMP editor.</p>
    <p>
 	  The MMP Editor is shown when an MMP  file is
-   opened from the <a href="view_cpp_projects.htm">Project Explorer</a> or <a href="view_sym_proj_nav.htm">Symbian Project Navigator</a> views. The MMP Editor is shown in Figure 1. MMP editor fields are validated for existing or correct entries. For example, if the UID 2 field is blank the label is highlighted in red. If an error exists in the mmp file, the line where the error occurs is marked and also displayed in the Problems view.</p>
+   opened from the <a href="view_proj_explorer.htm">Project Explorer</a> or <a href="view_sym_proj_nav.htm">Symbian Project Navigator</a> views. The MMP Editor is shown in Figure 1. MMP editor fields are validated for existing or correct entries. For example, if the UID 2 field is blank the label is highlighted in red. If an error exists in the mmp file, the line where the error occurs is marked and also displayed in the Problems view.</p>
    <p align="center"><img src="images/mmp_editor.png" width="675" height="406" /></p>
    <p align="left" class="figure">Figure 1 - MMP Editor Overview tab</p>
    <table cellpadding="2" cellspacing="0"
@@ -51,7 +51,7 @@
 	 <p>For other build types like GCCE you are  presented with the <b>Modified MMP Files Detected</b> dialog (Figure 2) and asked which build action to take for each MMP file that has changed. Set the build option for each listed MMP file and click <b>OK</b>.</p>
 	 <p align="center"><img src="images/wnd_modified_mmp_files.png" width="617" height="300"></p>
 	 <p align="left" class="figure">Figure 2 - Modified MMP Files Detected dialog </p>
-	 <p align="left">The options  are  identical to the workspace setting <b>Default action to take when MMP files are modified </b>option in the <b>Build</b> preference panel. Click the <b>Configure Workspace Settings...</b> to open the <a href="wnd_build_prefs.htm">Build</a><b> </b>preference panel to set the default build options for the workspace. The options  can also be modified at the  project level in the <b>Properties for &lt;<i>project</i>&gt; &gt; </b><a href="build_properties/pane_project_settings.htm">Carbide Project Settings</a> panel. </p>
+	 <p align="left">The options  are  identical to the workspace setting <b>Default action to take when MMP files are modified </b>option in the <b>Build</b> preference panel. Click the <b>Configure Workspace Settings...</b> to open the <a href="pref_carb_build.htm">Build</a><b> </b>preference panel to set the default build options for the workspace. The options  can also be modified at the  project level in the <b>Properties for &lt;<i>project</i>&gt; &gt; </b><a href="build_properties/prop_carb_project_settings.htm">Carbide Project Settings</a> panel. </p>
 	 <h5>Related references</h5>
        <ul>
       <li><a href="MMP_Editor_sources.html">MMP Editor Sources window</a></li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/ProjectPreferences.html	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/ProjectPreferences.html	Wed Jul 21 13:50:58 2010 -0500
@@ -9,14 +9,14 @@
 	 <p>
 		The<b>Properties for &lt;<i>project_name</i>&gt;</b><strong> </strong>window allows you to change a project's build configurations, macros, and other project settings.</p> 
 	 <p>
-		To change the settings for a project, right-click the project from the	   <a href="view_cpp_projects.htm">Project Explorer</a> or <a href="view_sym_proj_nav.htm">Symbian Project Navigator</a> views, and choose <b>Properties</b> from the context menu. The <b>Properties for &lt;<i>project_name</i>&gt;</b> window then show all the project settings. If
+		To change the settings for a project, right-click the project from the	   <a href="view_proj_explorer.htm">Project Explorer</a> or <a href="view_sym_proj_nav.htm">Symbian Project Navigator</a> views, and choose <b>Properties</b> from the context menu. The <b>Properties for &lt;<i>project_name</i>&gt;</b> window then show all the project settings. If
 		you alter the settings, then the settings are applied as
 	 defaults for all files in the project. </p>
    <p>The Carbide.c++ panels include:</p>
 <ul>
-	   <li><a href="build_properties/pane_build_config.htm">Build Configurations</a> </li>
-       <li><a href="build_properties/pane_macro_settings.htm">Macro Settings</a></li>
-  <li><a href="build_properties/pane_project_settings.htm">Project Settings</a></li>
+	   <li><a href="build_properties/prop_carb_build_config.htm">Build Configurations</a> </li>
+       <li><a href="build_properties/prop_carb_macro_settings.htm">Macro Settings</a></li>
+  <li><a href="build_properties/prop_carb_project_settings.htm">Project Settings</a></li>
   <li>other - additional panels may appear here as well. For example,  <b>CodeScanner</b>.   </li>
    </ul>
 <p align="center"><img src="images/carbide_build_config.png" width="786" height="693"></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/ProjectTypeandSDK.html	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/ProjectTypeandSDK.html	Wed Jul 21 13:50:58 2010 -0500
@@ -9,7 +9,7 @@
 <h2>Symbian OS SDKs</h2>
 </div>
 <div class="Bodytext">
-<p> You can set the SDKs and Build Configurations in this page. The available SDKs shown are determined by the settings in the <a href="SDKPreferences.html">SDK Preferences</a> page. </p>
+<p> You can set the SDKs and Build Configurations in this page. The available SDKs shown are determined by the settings in the <a href="pref_carb_sdk_preferencea.html">SDK Preferences</a> page. </p>
 <div class="Figure">
 <p align="center" class="Image"><img src="../images/step4.png" width="500" height="567"><br>
 </p>
@@ -53,7 +53,7 @@
   <h5>Related references</h5>
   <ul>
 <li><a href="../tasks/WorkingwithSDKs.html">Working with SDKs</a></li>
-<li><a href="SDKPreferences.html">SDK Preferences</a></li>
+<li><a href="pref_carb_sdk_preferencea.html">SDK Preferences</a></li>
   </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>
 
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/SDKPreferences.html	Wed Jul 21 11:32:00 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html><head>
-<title>SDK Preferences</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-<style type="text/css">
-<!--
-.style2 {
-	color: #FF0000;
-	font-weight: bold;
-}
--->
-</style>
-</head>
-   <body>
-   <div class="Head1">
-<h2>SDK Preferences</h2>
-</div>
-Use the <img src="../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=com.nokia.carbide.cpp.sdk.ui.preferences.SDKPreferencePage)")'>
-SDK Preferences</a> page in the <b>Preferences</b> window to control which installed SDKs are available to projects during an import.  To
-	 access SDK preferences preference panel, select <b>Window &gt; Preferences &gt; Carbide.c++ &gt; SDK Preferences</b>. 
-	 <p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project.  If the SDK you have installed is not recognized, you may still be able to add it to the Discovered Symbian OS SDK list. See <a href="../tasks/start/carbide_requirements.htm">Carbide.c++ Requirements</a> for a list of supported SDKs. </p>
-   <p class="note"><b>NOTE</b> This panel serves as a <span class="code">devices.xml</span> file editor. The <span class="code">devices.xml</span> file stores information about the installed SDKs used for Symbian OS development.</p>
-   <div class="Figure">
-
-	  <p align="center" class="Image"><img src="../images/SDKPreferences.png" width="740" height="546" alt="SDK preferences panel" /></p>
-     <p align="center" class="figure">Figure 1. SDK Preferences preference panel </p>
-   </div>
-   <table cellpadding="2" cellspacing="0"
-border="0">
-	 <tr valign="top"><th width="221" class="Cell">Name</th><th width="584" class="Cell">Function</th></tr>
-         <tr valign="top">
-           <td class="Cell"><b>Available Symbian OS SDK's</b></td>
-           <td class="Cell"><p>Lists all the installed and recognized SDKs supported by the IDE. Only SDKs supported by the IDE are included in the list. </p>
-             <p>Checked SDKs indicate build configurations available for creating projects. Unchecked SDKs are not displayed when creating new projects. </p>
-             <p>SDKs shown in <span class="style2">red</span>  indicate  a problem, usually no <span class="code">EPOCROOT</span> or missing build configurations. </p>
-           <p>Click on a SDK name to see its EPOCROOT location and build configuration status in the SDK Information area. </p></td>
-        </tr>
-         <tr valign="top">
-           <td class="Cell"><b>Remove SDK </b></td>
-           <td class="Cell">Click to remove the selected SDK from the Available Symbian OS SDK's list. </td>
-         </tr>
-         <tr valign="top">
-           <td class="Cell"><b>Add New SDK </b></td>
-           <td class="Cell"><p>Click to <a href="../tasks/sdks/sdk_add.htm">add</a> an SDK to the <b>Available Symbian OS SDKs</b> list.</p>           </td>
-     </tr>
-         <tr valign="top">
-           <td class="Cell"><b>SDK Properties</b></td>
-           <td class="Cell"><p>Click to view and edit the <a href="../tasks/sdks/sdk_view_properties.htm">properties</a> of the currently selected SDK in the <b>Available Symbian OS SDKs</b> list.</p>           </td>
-     </tr>
-         <tr valign="top">
-           <td class="Cell"><b>Listen for devices.xml changes outside of Carbide </b></td>
-           <td class="Cell">Enable of have  Carbide  issue an alert prompting you to rescan your SDKs when changes to the <span class="code">devices.xml</span> file are made outside of  Carbide. When disabled the <span class="code">devices.xml</span> file is not scanned for changes. </td>
-         </tr>
-         <tr valign="top">
-           <td class="Cell"><p><b>Rescan All SDKs</b></p>           </td>
-           <td class="Cell"><p>Click to <a href="../tasks/sdks/sdk_search.htm">rescan</a>  the drive  for newly installed SDKs. The devices.xml file is scanned for SDKs and the list of available SDKs is updated if the devices.xml file has changed.</p>
-             <p class="note"><b>NOTE</b> Carbide.c++ scans for available SDKs each time it is started.</p></td>
-        </tr>
-   </table>
-   <h5>Related tasks</h5>
-	 <ul>
-       
-       <li><a href="../tasks/WorkingwithSDKs.html">Working with SDKs</a></li>
-       <li><a href="../tasks/AddinganSDK.html">Adding an SDK</a></li>
-       <li><a href="../tasks/RmvngandVwngPropsosSDK.html">SDK Properties</a></li>
-  </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>
-
-   </body>
-   </html>
-   
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config.htm	Wed Jul 21 11:32:00 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<meta name="keywords" content="Active Configuration, SIS Builder, Environment, Arguments, Paths and Symbols, ROM Builder" >
-<title>Build Configurations</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Build Configurations </h2>
-<p>Use the <b> Build Configurations</b> panel to specify the project's <a href="../../concepts/build_configurations.htm">active build configuration</a> and its related build properties.  </p>
-<p align="center"><img src="../images/carbide_build_config.png" width="786" height="693" /></p>
-<p class="figure">Figure 1 - Carbide Build Configurations panel </p>
-<h5>Table 1  Build Configuration items </h5>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="20%" scope="col">Item</th>
-    <th width="71%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td width="20%"><b>Active Configuration </b></td>
-    <td>The <b>Active Configuration</b> drop down list allows you to <a href="../../tasks/projects/prj_set_build_tgt.htm">select</a> a configuration that is currently available for the selected project. The entries in the related sub-panes will change according to the selected configuration. The Configuration name consists of a target name and an SDK identifier in brackets.</td>
-  </tr>
-  <tr>
-    <td width="20%"><b>Manage...</b></td>
-    <td>Click the <b>Manage</b>... button to <a href="../../tasks/projects/prj_new_build_config.htm">add</a> a new SDK/Configuration or remove an existing configuration.</td>
-  </tr>
-  <tr>
-    <td><b>SIS Builder </b></td>
-    <td><p>The <a href="pane_build_config_sis.htm">SIS Builder</a> pane is used to specify a .pkg file and .sis file options to create an application .sis file. These settings apply to the currently selected Configuration.</p></td>
-  </tr>
-  <tr>
-    <td><b>SBSv2</b></td>
-    <td>The <a href="pane_build_config_sbsv2.htm">SBSv2</a> pane is used to define which build configuration variant to use.</td>
-  </tr>
-  <tr>
-    <td><b>Environment</b></td>
-    <td><p>The <a href="pane_build_config_env.htm">Environment</a> tab allows you to view the current User and System environment variables that will be used  when any abld command is invoked.</p></td>
-  </tr>
-  <tr>
-    <td><b>Paths and Symbols </b></td>
-    <td>The <a href="pane_build_config_paths.htm">Paths and Symbols</a> tab allows you to see which paths and symbols have been indexed for the project. </td>
-  </tr>
-  <tr>
-    <td><b>ROM Builder </b></td>
-    <td>The <a href="../ROM_build_settings.html">ROM Builder</a> tab  allows you to specify commands and a working directory for building a GUI ROM Image.</td>
-  </tr>
-</table>
-<h5>Other references</h5>
-<ul>
-  <li><a href="pane_build_config.htm">SIS Builder</a></li>
-  <li><a href="pane_build_config_sbsv2.htm">SBSv2</a></li>
-  <li><a href="../../concepts/build_configurations.htm">Active  Configuration</a></li>
-  <li><a href="../../tasks/projects/prj_build.htm">Building Projects</a></li>
-  <li><a href="../../tasks/projects/working_with_sis_pkg_files.htm">Creating a .PKG file</a></li>
-</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>
-
-</body>
-</html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_args.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_args.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -33,8 +33,8 @@
 </table>
 <h5>Other references </h5>
 <ul>
-  <li><a href="pane_build_config.htm">Build Configurations</a></li>
-  <li><a href="pane_build_config.htm">SIS Builder</a></li>
+  <li><a href="prop_carb_build_config.htm">Build Configurations</a></li>
+  <li><a href="prop_carb_build_config.htm">SIS Builder</a></li>
   <li><a href="pane_build_config_env.htm">Environment</a></li>
   <li><a href="pane_build_config_paths.htm">Paths and Symbols </a></li>
 </ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_env.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_env.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -51,8 +51,8 @@
 </table>
 <h5>Other references </h5>
 <ul>
-  <li><a href="pane_build_config.htm">Build Configurations</a></li>
-  <li><a href="pane_build_config.htm">SIS Builder</a></li>
+  <li><a href="prop_carb_build_config.htm">Build Configurations</a></li>
+  <li><a href="prop_carb_build_config.htm">SIS Builder</a></li>
   <li><a href="pane_build_config_sbsv2.htm">SBSv2</a></li>
   <li><a href="pane_build_config_paths.htm">Paths and Symbols </a></li>
   <li><a href="../ROM_build_settings.html">ROM Builder</a></li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_paths.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_paths.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -14,15 +14,15 @@
 <p>To change what appears in the list:</p>
 <ul>
   <li>In the <a href="../MMP_Editor.html">MMP Editor</a> - add macros, user, or system include  </li>
-  <li>Using the Macro File defined in the <a href="pane_macro_settings.htm">Macro Settings</a> panel </li>
+  <li>Using the Macro File defined in the <a href="prop_carb_macro_settings.htm">Macro Settings</a> panel </li>
 </ul>
-<p>You can also specify a macro file using the <a href="pane_macro_settings.htm">Macro Settings</a> page in the <b>Properties for <i>project</i></b> dialog. </p>
+<p>You can also specify a macro file using the <a href="prop_carb_macro_settings.htm">Macro Settings</a> page in the <b>Properties for <i>project</i></b> dialog. </p>
 <p align="center"><img src="../images/page_build_config_paths.png" width="558" height="456"></p>
 <p class="figure">Figure 1 - Paths and Symbols pane </p>
 <h5>Other references </h5>
 <ul>
-  <li><a href="pane_build_config.htm">Build Configurations</a></li>
-  <li><a href="pane_build_config.htm">SIS Builder</a></li>
+  <li><a href="prop_carb_build_config.htm">Build Configurations</a></li>
+  <li><a href="prop_carb_build_config.htm">SIS Builder</a></li>
   <li><a href="pane_build_config_sbsv2.htm">SBSv2</a></li>
   <li><a href="pane_build_config_env.htm">Environment</a></li>
   <li><a href="../ROM_build_settings.html">ROM Builder</a></li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_sbsv2.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_sbsv2.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -31,8 +31,8 @@
 </table>
 <h5>Other references </h5>
 <ul>
-  <li><a href="pane_build_config.htm">Carbide Build Configurations</a></li>
-  <li><a href="pane_build_config.htm">SIS Builder</a></li>
+  <li><a href="prop_carb_build_config.htm">Carbide Build Configurations</a></li>
+  <li><a href="prop_carb_build_config.htm">SIS Builder</a></li>
   <li><a href="pane_build_config_env.htm">Environment</a></li>
   <li><a href="pane_build_config_paths.htm">Paths and Symbols </a></li>
   <li><a href="../ROM_build_settings.html">ROM Builder</a></li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_sis.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_sis.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -1,70 +1,70 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>SIS Builder</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>SIS Builder </h2>
-<p>The<b> SIS Builder</b> pane is used to specify one or more .PKG  and .SIS file options to create  application and patch .SIS files. These settings apply to the currently selected Configuration. </p>
-<p>The SIS Builder list includes these columns:</p>
-<ul>
-  <li><b>Enabled</b> - a checkmark indicates  the SIS file is built during the build process, an unchecked file is not built </li>
-  <li><b>Partial upgrade</b> - a checkmark indicates that a partial upgrade .SIS  file should be built. Left unchecked, no partial upgrade .SIS file is generated. See <a href="#PUAnchor">Partial Upgrades Files</a> below for more information on this feature.</li>
-  <li><b>Unsigned SIS file</b> - names of the unsigned SIS files used by the project </li>
-  <li><b>Signed SIS file</b>  - names of the signed SIS files created by the project  </li>
-</ul>
-<p align="center"><img src="../images/carbide_build_config.png" width="795" height="692" /></p>
-<p class="figure">Figure 1 - SIS Builder pane</p>
-<h5>Table 1 <span class="figure">SIS Builder</span> items </h5>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="20%" scope="col">Item</th>
-    <th width="71%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><b>Add</b></td>
-    <td> Opens the <a href="wnd_sis_properties.htm">SIS Properties</a> window to add a  PKG file to the list. </td>
-  </tr>
-  <tr>
-    <td><b>Edit</b></td>
-    <td> Opens the selected SIS file in the <a href="wnd_sis_properties.htm">SIS Properties</a> window for editing.</td>
-  </tr>
-  <tr>
-    <td><b>Remove</b></td>
-    <td>Removes the selected SIS file from the list.</td>
-  </tr>
-  <tr>
-    <td><b>Move Up </b></td>
-    <td>Moves the selected SIS file up in the list order.</td>
-  </tr>
-  <tr>
-    <td><b>Move Down</b></td>
-    <td>Moves the selected SIS file down in the list order.</td>
-  </tr>
-</table>
-<h3><a name="PUAnchor" id="PUAnchor"></a>Partial Upgrade Files</h3>
-<p>The SIS Builder supports the generation of partial upgrade .SIS files. A dialog appears when a SIS file exceeds 250k in size that describes the partial upgrade feature with a link to the SIS Builder page. Partial upgrade files enable Carbide to generate and download to the device only those portions of the application that have changed, enabling faster debug cycles. It does this using the SIS partial upgrade (PU) flag to mark the SIS file as a replacement or addition to the original SIS file. Debugging of large applications using Application TRK is enhanced as the entire application no longer needs to be installed on the device each time a change is made. </p>
-<p>When the Partial update option is checked for a SIS file, both a complete and partial SIS files are generated. This ensures that the full SIS file is kept in sync with the partial upgrade SIS file. The partial upgrade SIS files are placed in the same folder as the full SIS file when stored in a project directory, or in the root of the project directory when the SIS file exists outside of the project. You can see where a partial upgrade file is created by examining the <b>Partial upgrade sis/sisx path</b> in the <a href="../../projects/launch/page_installation.htm">Installation</a> tab of the launch configuration. Links to the partial upgrade files are added to the project within the <a href="../view_cpp_projects.htm">Project Explorer</a> view.</p>
-<p class="note"><b>NOTE</b> Internally, the .PKG file format of a partial upgrade file is identical to a complete .PKG file with two exceptions, 1) the file list only includes the names of files changed, and 2) the PU flag is set.</p>
-<p>Partial upgrade files are deleted and only full SIS/SISX files are generated when:</p>
-<ul>
-  <li>the full SIS/SISX files do not already exist</li>
-  <li>the PKG file is changed</li>
-  <li>the Partial upgrade option is disabled</li>
-</ul>
-<h5>Other references</h5>
-<ul>
-  <li><a href="pane_build_config.htm">Carbide Build Configurations </a><a href="../../tasks/projects/working_with_sis_pkg_files.htm"></a></li>
-  <li><a href="pane_build_config_sbsv2.htm">SBSv2</a></li>
-  <li><a href="pane_build_config_env.htm">Environment</a></li>
-  <li><a href="pane_build_config_paths.htm">Paths and Symbols</a></li>
-  <li><a href="../ROM_build_settings.html">ROM Builder</a></li>
-</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>
-
-</body>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>SIS Builder</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>SIS Builder </h2>
+<p>The<b> SIS Builder</b> pane is used to specify one or more .PKG  and .SIS file options to create  application and patch .SIS files. These settings apply to the currently selected Configuration. </p>
+<p>The SIS Builder list includes these columns:</p>
+<ul>
+  <li><b>Enabled</b> - a checkmark indicates  the SIS file is built during the build process, an unchecked file is not built </li>
+  <li><b>Partial upgrade</b> - a checkmark indicates that a partial upgrade .SIS  file should be built. Left unchecked, no partial upgrade .SIS file is generated. See <a href="#PUAnchor">Partial Upgrades Files</a> below for more information on this feature.</li>
+  <li><b>Unsigned SIS file</b> - names of the unsigned SIS files used by the project </li>
+  <li><b>Signed SIS file</b>  - names of the signed SIS files created by the project  </li>
+</ul>
+<p align="center"><img src="../images/carbide_build_config.png" width="795" height="692" /></p>
+<p class="figure">Figure 1 - SIS Builder pane</p>
+<h5>Table 1 <span class="figure">SIS Builder</span> items </h5>
+<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="20%" scope="col">Item</th>
+    <th width="71%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><b>Add</b></td>
+    <td> Opens the <a href="wnd_sis_properties.htm">SIS Properties</a> window to add a  PKG file to the list. </td>
+  </tr>
+  <tr>
+    <td><b>Edit</b></td>
+    <td> Opens the selected SIS file in the <a href="wnd_sis_properties.htm">SIS Properties</a> window for editing.</td>
+  </tr>
+  <tr>
+    <td><b>Remove</b></td>
+    <td>Removes the selected SIS file from the list.</td>
+  </tr>
+  <tr>
+    <td><b>Move Up </b></td>
+    <td>Moves the selected SIS file up in the list order.</td>
+  </tr>
+  <tr>
+    <td><b>Move Down</b></td>
+    <td>Moves the selected SIS file down in the list order.</td>
+  </tr>
+</table>
+<h3><a name="PUAnchor" id="PUAnchor"></a>Partial Upgrade Files</h3>
+<p>The SIS Builder supports the generation of partial upgrade .SIS files. A dialog appears when a SIS file exceeds 250k in size that describes the partial upgrade feature with a link to the SIS Builder page. Partial upgrade files enable Carbide to generate and download to the device only those portions of the application that have changed, enabling faster debug cycles. It does this using the SIS partial upgrade (PU) flag to mark the SIS file as a replacement or addition to the original SIS file. Debugging of large applications using Application TRK is enhanced as the entire application no longer needs to be installed on the device each time a change is made. </p>
+<p>When the Partial update option is checked for a SIS file, both a complete and partial SIS files are generated. This ensures that the full SIS file is kept in sync with the partial upgrade SIS file. The partial upgrade SIS files are placed in the same folder as the full SIS file when stored in a project directory, or in the root of the project directory when the SIS file exists outside of the project. You can see where a partial upgrade file is created by examining the <b>Partial upgrade sis/sisx path</b> in the <a href="../../projects/launch/page_installation.htm">Installation</a> tab of the launch configuration. Links to the partial upgrade files are added to the project within the <a href="../view_proj_explorer.htm">Project Explorer</a> view.</p>
+<p class="note"><b>NOTE</b> Internally, the .PKG file format of a partial upgrade file is identical to a complete .PKG file with two exceptions, 1) the file list only includes the names of files changed, and 2) the PU flag is set.</p>
+<p>Partial upgrade files are deleted and only full SIS/SISX files are generated when:</p>
+<ul>
+  <li>the full SIS/SISX files do not already exist</li>
+  <li>the PKG file is changed</li>
+  <li>the Partial upgrade option is disabled</li>
+</ul>
+<h5>Other references</h5>
+<ul>
+  <li><a href="pane_build_config.htm">Carbide Build Configurations </a><a href="../../tasks/projects/working_with_sis_pkg_files.htm"></a></li>
+  <li><a href="pane_build_config_sbsv2.htm">SBSv2</a></li>
+  <li><a href="pane_build_config_env.htm">Environment</a></li>
+  <li><a href="pane_build_config_paths.htm">Paths and Symbols</a></li>
+  <li><a href="../ROM_build_settings.html">ROM Builder</a></li>
+</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>
+
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_macro_settings.htm	Wed Jul 21 11:32:00 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Macro Settings</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2> Macro Settings</h2>
-<p>  The <b> Macro Settings</b> properties page allows you to specify a file containing macros that CDT  uses to parse the source code. </p>
-<p align="center"><img src="../images/carbide_macro_settings.png" width="786" height="476"></p>
-<p class="figure">Figure 1 - Macros Settings panel </p>
-<h5>Table 1  <span class="figure">Macros Settings</span> items </h5>
-<table width="700"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="30%" scope="col">Item</th>
-    <th width="70%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td width="28%"><b>Macro File </b></td>
-    <td>Enter the macro file path and name into the text box or click <b>Browse</b> to locate a macro file. </td>
-  </tr>
-  <tr>
-    <td><b>Use preprocessor symbols from mmp MACRO statements for parsers </b></td>
-    <td>Your code will be parsed by the CDT indexer. Enable this option to use MMP macros during parsing. </td>
-  </tr>
-  <tr>
-    <td width="28%"><b>Show paths and symbols page... </b></td>
-    <td><p>Click to open the <a href="pane_build_config_paths.htm">Paths and Symbols</a> page under Carbide Build Configuration. </p>      </td>
-  </tr>
-</table>
-<h5>Related references </h5>
-<ul>
-  <li><a href="../../tasks/projects/prj_build.htm">Building Projects</a></li>
-  <li><a href="pane_build_config.htm">Build Configurations</a></li>
-</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>
-
-</body>
-</html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_pkg_config.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_pkg_config.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -44,7 +44,7 @@
 </ul>
 <h5>Related reference </h5>
 <ul>
-  <li><a href="pane_build_config.htm">Build Configurations</a></li>
+  <li><a href="prop_carb_build_config.htm">Build Configurations</a></li>
   <li><a href="pane_build_config_env.htm">Environment variables</a></li>
 </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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_project_settings.htm	Wed Jul 21 11:32:00 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,133 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Project Settings</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-<style type="text/css">
-<!--
-.style5 {font-family: Verdana, Ariel, Helvetica, sans-serif; font-weight: bold; }
--->
-</style>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Project Settings</h2>
-<p>  Use the <b>Project Settings </b>window to specify whether all components or selected subcomponents listed in a build information file (bld.inf) should be built for the currently selected project. You can also specify whether to perform a <span class="code">clean</span> or <span class="code">reallyclean</span> command on the project before building a project.</p>
-<p align="center"><img src="../images/carbide_proj_settings.png" width="672" height="679" /></p>
-<p class="figure">Figure 1 -  Project Settings</p>
-<h5>Table 1  Project Settings items </h5>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="29%" scope="col">Item</th>
-    <th width="57%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><b>Bld.inf file</b></td>
-    <td>This is the path to the bld.inf file that lists the makefile and mmp components.</td>
-  </tr>
-  <tr>
-    <td><b>Bld.inf</b></td>
-    <td>Select this option to ensure all components are built for the selected project. </td>
-  </tr>
-  <tr>
-    <td><b>Selected Components</b></td>
-    <td><p>Select this option to  specify which components of the bld.inf file to be built, including makefiles. The equivalent call to abld is <span class="code">abld build &lt;subcomponent&gt;</span>. Use the <b>Exclude extension makefiles</b> and <b>Exclude test components</b> options to manage the items that appear in the list. </p>
-      <p>Toggle the state of each component to set its build state to true or not. A checkmark indicates a component is built. Click on a column title to sort the items by that columns contents. </p>
-    </td>
-  </tr>
-  <tr>
-    <td><b>Exclude extension makefiles </b></td>
-    <td>Toggles the presense of extension makefiles in the Selected components list. </td>
-  </tr>
-  <tr>
-    <td><b>Exclude test components </b></td>
-    <td>Toggles the presense of test components in the Selected components list. </td>
-  </tr>
-  <tr>
-    <td><b>Enable project specific settings </b></td>
-    <td>Click to set project specific build settings. By default a project in the workspace uses the global build settings unless this option is enabled. See the <a href="../wnd_build_prefs.htm">Build</a> preference panel for details on these options. </td>
-  </tr>
-  <tr>
-    <td><b>Configure Workspace Settings... </b></td>
-    <td>Opens the <a href="../wnd_build_prefs.htm">Build</a> preference panel. </td>
-  </tr>
-</table>
-<p>&nbsp;</p>
-<p align="center"><img src="../images/carbide_proj_settings_sbsv1.png" alt="sbsv1 tab" width="444" height="143"></p>
-<p align="center" class="figure">Figure 2 - SBSv1 Tab</p>
-<h5 align="left">Table 2 Symbian Build System v1 tab </h5>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="29%" scope="col">Item</th>
-    <th width="57%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><span class="style5">Clean level </span></td>
-    <td><p>Specifies the level of clean to perform on  project files. The levels include:</p>
-      <ul>
-        <li>Level 0  (<span class="code">abld clean</span>) - removes all the intermediate files created during compilation, and all the executables and import libraries created by the linker</li>
-        <li>Level 1  (<span class="code">abld reallyclean</span>) - performs a <span class="code">clean</span> operation, but also removes all exported files and makefiles</li>
-        <li>Level 2  (<span class="code">abld reallyclean</span>, <span class="code">bldmake clean</span>) - performs  a <span class="code">reallyclean</span> operation and then removes all files created by bldmake</li>
-      </ul></td>
-  </tr>
-  <tr>
-    <td><span class="style5">Manage dependency tracking </span></td>
-    <td>If checked, the Symbian command line build system will not generate dependencies for source and resource files. These will be managed by Carbide. This can reduce build times. </td>
-  </tr>
-  <tr>
-    <td><b>Show a dialog to modify build actions when modified MMPs are detected </b></td>
-    <td><p>If checked, you will be asked what action to take before a build if a MMP file has been modified. </p>
-        <p>If not checked, the default action is taken for all modified mmp files. </p></td>
-  </tr>
-  <tr>
-    <td><b>Default action to take when mmp files are modified </b></td>
-    <td>Select either None, Link only, or Compile and Link.</td>
-  </tr>
-</table>
-<p align="left">&nbsp;</p>
-<p align="center"><img src="../images/carbide_proj_settings_sbsv2.png" alt="sbsv2 tab" width="423" height="176"></p>
-<p align="center" class="figure">Figure 3 - SBSv2 Tab</p>
-<h5 align="left">Table 3 Symbian Build System v2 tab (only visible for Projects created with SBSv2 builder) </h5>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="29%" scope="col">Item</th>
-    <th width="57%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><b>Clean level </b></td>
-    <td>Select the level of clean when cleaning a project.
-      <ul>
-        <li><strong>abld clean</strong> erases all files created by a corresponding abld target   command (all intermediate files created during compilation and all executables and import libraries created by the linker)</li>
-        <li><strong>abld reallyclean</strong> does what abld clean does, and also removes files   exported by abld export and makefiles generated by abld makefile, or the abld   test equivalents</li>
-      </ul></td>
-  </tr>
-  <tr>
-    <td><b>Keep going  </b></td>
-    <td><p>This build option tells a particular command to   keep going even if unrelated build steps report errors or files are missing.</p>    </td>
-  </tr>
-  <tr>
-    <td><b>Debug mode</b></td>
-    <td><p>This option generates symbolic debug information for release or debug builds,   independent of the compiler optimization level.</p>
-      <p>By default, the build system generates symbolic debug information only for   the debug builds. With this option, the generation of symbolic debug information   is extended to release builds to support debugging of release binaries on ARM   ABI compliant platforms.</p></td>
-  </tr>
-  <tr>
-      <td><strong>Additional SBSv2 arguments</strong></td>
-      <td>Enter any additional arguments to pass to <span class="code">sbs.bat</span>.</td>
-  </tr>
-  <tr>
-    <td><strong>Override default make engine </strong></td>
-    <td>Check this box to enable  an edit box to specify the <strong>Make engine</strong> to use, for example, eMake  from Electric Cloud.</td>
-  </tr>
-  <tr>
-      <td><strong>Make engine</strong></td>
-      <td>Enter the name of a different make engine to use when building.</td>
-  </tr>
-</table>
-<h4>Related tasks</h4>
-<ul><li><a href="../../tasks/projects/prj_build.htm">Building Projects</a></li>
-</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>
-</body>
-</html>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/prop_carb_build_config.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -0,0 +1,62 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<meta name="keywords" content="Active Configuration, SIS Builder, Environment, Arguments, Paths and Symbols, ROM Builder" >
+<title>Build Configurations</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Build Configurations </h2>
+<p>Use the <b> Build Configurations</b> panel to specify the project's <a href="../../concepts/build_configurations.htm">active build configuration</a> and its related build properties.  </p>
+<p align="center"><img src="../images/carbide_build_config.png" width="786" height="693" /></p>
+<p class="figure">Figure 1 - Carbide Build Configurations panel </p>
+<h5>Table 1  Build Configuration items </h5>
+<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="20%" scope="col">Item</th>
+    <th width="71%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td width="20%"><b>Active Configuration </b></td>
+    <td>The <b>Active Configuration</b> drop down list allows you to <a href="../../tasks/projects/prj_set_build_tgt.htm">select</a> a configuration that is currently available for the selected project. The entries in the related sub-panes will change according to the selected configuration. The Configuration name consists of a target name and an SDK identifier in brackets.</td>
+  </tr>
+  <tr>
+    <td width="20%"><b>Manage...</b></td>
+    <td>Click the <b>Manage</b>... button to <a href="../../tasks/projects/prj_new_build_config.htm">add</a> a new SDK/Configuration or remove an existing configuration.</td>
+  </tr>
+  <tr>
+    <td><b>SIS Builder </b></td>
+    <td><p>The <a href="pane_build_config_sis.htm">SIS Builder</a> pane is used to specify a .pkg file and .sis file options to create an application .sis file. These settings apply to the currently selected Configuration.</p></td>
+  </tr>
+  <tr>
+    <td><b>SBSv2</b></td>
+    <td>The <a href="pane_build_config_sbsv2.htm">SBSv2</a> pane is used to define which build configuration variant to use.</td>
+  </tr>
+  <tr>
+    <td><b>Environment</b></td>
+    <td><p>The <a href="pane_build_config_env.htm">Environment</a> tab allows you to view the current User and System environment variables that will be used  when any abld command is invoked.</p></td>
+  </tr>
+  <tr>
+    <td><b>Paths and Symbols </b></td>
+    <td>The <a href="pane_build_config_paths.htm">Paths and Symbols</a> tab allows you to see which paths and symbols have been indexed for the project. </td>
+  </tr>
+  <tr>
+    <td><b>ROM Builder </b></td>
+    <td>The <a href="../ROM_build_settings.html">ROM Builder</a> tab  allows you to specify commands and a working directory for building a GUI ROM Image.</td>
+  </tr>
+</table>
+<h5>Other references</h5>
+<ul>
+  <li><a href="prop_carb_build_config.htm">SIS Builder</a></li>
+  <li><a href="pane_build_config_sbsv2.htm">SBSv2</a></li>
+  <li><a href="../../concepts/build_configurations.htm">Active  Configuration</a></li>
+  <li><a href="../../tasks/projects/prj_build.htm">Building Projects</a></li>
+  <li><a href="../../tasks/projects/working_with_sis_pkg_files.htm">Creating a .PKG file</a></li>
+</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>
+
+</body>
+</html>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/prop_carb_macro_settings.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -0,0 +1,42 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Macro Settings</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2> Macro Settings</h2>
+<p>  The <b> Macro Settings</b> properties page allows you to specify a file containing macros that CDT  uses to parse the source code. </p>
+<p align="center"><img src="../images/carbide_macro_settings.png" width="786" height="476"></p>
+<p class="figure">Figure 1 - Macros Settings panel </p>
+<h5>Table 1  <span class="figure">Macros Settings</span> items </h5>
+<table width="700"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="30%" scope="col">Item</th>
+    <th width="70%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td width="28%"><b>Macro File </b></td>
+    <td>Enter the macro file path and name into the text box or click <b>Browse</b> to locate a macro file. </td>
+  </tr>
+  <tr>
+    <td><b>Use preprocessor symbols from mmp MACRO statements for parsers </b></td>
+    <td>Your code will be parsed by the CDT indexer. Enable this option to use MMP macros during parsing. </td>
+  </tr>
+  <tr>
+    <td width="28%"><b>Show paths and symbols page... </b></td>
+    <td><p>Click to open the <a href="pane_build_config_paths.htm">Paths and Symbols</a> page under Carbide Build Configuration. </p>      </td>
+  </tr>
+</table>
+<h5>Related references </h5>
+<ul>
+  <li><a href="../../tasks/projects/prj_build.htm">Building Projects</a></li>
+  <li><a href="prop_carb_build_config.htm">Build Configurations</a></li>
+</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>
+
+</body>
+</html>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/prop_carb_project_settings.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -0,0 +1,133 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Project Settings</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+<style type="text/css">
+<!--
+.style5 {font-family: Verdana, Ariel, Helvetica, sans-serif; font-weight: bold; }
+-->
+</style>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Project Settings</h2>
+<p>  Use the <b>Project Settings </b>window to specify whether all components or selected subcomponents listed in a build information file (bld.inf) should be built for the currently selected project. You can also specify whether to perform a <span class="code">clean</span> or <span class="code">reallyclean</span> command on the project before building a project.</p>
+<p align="center"><img src="../images/carbide_proj_settings.png" width="672" height="679" /></p>
+<p class="figure">Figure 1 -  Project Settings</p>
+<h5>Table 1  Project Settings items </h5>
+<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="29%" scope="col">Item</th>
+    <th width="57%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><b>Bld.inf file</b></td>
+    <td>This is the path to the bld.inf file that lists the makefile and mmp components.</td>
+  </tr>
+  <tr>
+    <td><b>Bld.inf</b></td>
+    <td>Select this option to ensure all components are built for the selected project. </td>
+  </tr>
+  <tr>
+    <td><b>Selected Components</b></td>
+    <td><p>Select this option to  specify which components of the bld.inf file to be built, including makefiles. The equivalent call to abld is <span class="code">abld build &lt;subcomponent&gt;</span>. Use the <b>Exclude extension makefiles</b> and <b>Exclude test components</b> options to manage the items that appear in the list. </p>
+      <p>Toggle the state of each component to set its build state to true or not. A checkmark indicates a component is built. Click on a column title to sort the items by that columns contents. </p>
+    </td>
+  </tr>
+  <tr>
+    <td><b>Exclude extension makefiles </b></td>
+    <td>Toggles the presense of extension makefiles in the Selected components list. </td>
+  </tr>
+  <tr>
+    <td><b>Exclude test components </b></td>
+    <td>Toggles the presense of test components in the Selected components list. </td>
+  </tr>
+  <tr>
+    <td><b>Enable project specific settings </b></td>
+    <td>Click to set project specific build settings. By default a project in the workspace uses the global build settings unless this option is enabled. See the <a href="../pref_carb_build.htm">Build</a> preference panel for details on these options. </td>
+  </tr>
+  <tr>
+    <td><b>Configure Workspace Settings... </b></td>
+    <td>Opens the <a href="../pref_carb_build.htm">Build</a> preference panel. </td>
+  </tr>
+</table>
+<p>&nbsp;</p>
+<p align="center"><img src="../images/carbide_proj_settings_sbsv1.png" alt="sbsv1 tab" width="444" height="143"></p>
+<p align="center" class="figure">Figure 2 - SBSv1 Tab</p>
+<h5 align="left">Table 2 Symbian Build System v1 tab </h5>
+<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="29%" scope="col">Item</th>
+    <th width="57%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><span class="style5">Clean level </span></td>
+    <td><p>Specifies the level of clean to perform on  project files. The levels include:</p>
+      <ul>
+        <li>Level 0  (<span class="code">abld clean</span>) - removes all the intermediate files created during compilation, and all the executables and import libraries created by the linker</li>
+        <li>Level 1  (<span class="code">abld reallyclean</span>) - performs a <span class="code">clean</span> operation, but also removes all exported files and makefiles</li>
+        <li>Level 2  (<span class="code">abld reallyclean</span>, <span class="code">bldmake clean</span>) - performs  a <span class="code">reallyclean</span> operation and then removes all files created by bldmake</li>
+      </ul></td>
+  </tr>
+  <tr>
+    <td><span class="style5">Manage dependency tracking </span></td>
+    <td>If checked, the Symbian command line build system will not generate dependencies for source and resource files. These will be managed by Carbide. This can reduce build times. </td>
+  </tr>
+  <tr>
+    <td><b>Show a dialog to modify build actions when modified MMPs are detected </b></td>
+    <td><p>If checked, you will be asked what action to take before a build if a MMP file has been modified. </p>
+        <p>If not checked, the default action is taken for all modified mmp files. </p></td>
+  </tr>
+  <tr>
+    <td><b>Default action to take when mmp files are modified </b></td>
+    <td>Select either None, Link only, or Compile and Link.</td>
+  </tr>
+</table>
+<p align="left">&nbsp;</p>
+<p align="center"><img src="../images/carbide_proj_settings_sbsv2.png" alt="sbsv2 tab" width="423" height="176"></p>
+<p align="center" class="figure">Figure 3 - SBSv2 Tab</p>
+<h5 align="left">Table 3 Symbian Build System v2 tab (only visible for Projects created with SBSv2 builder) </h5>
+<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="29%" scope="col">Item</th>
+    <th width="57%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><b>Clean level </b></td>
+    <td>Select the level of clean when cleaning a project.
+      <ul>
+        <li><strong>abld clean</strong> erases all files created by a corresponding abld target   command (all intermediate files created during compilation and all executables and import libraries created by the linker)</li>
+        <li><strong>abld reallyclean</strong> does what abld clean does, and also removes files   exported by abld export and makefiles generated by abld makefile, or the abld   test equivalents</li>
+      </ul></td>
+  </tr>
+  <tr>
+    <td><b>Keep going  </b></td>
+    <td><p>This build option tells a particular command to   keep going even if unrelated build steps report errors or files are missing.</p>    </td>
+  </tr>
+  <tr>
+    <td><b>Debug mode</b></td>
+    <td><p>This option generates symbolic debug information for release or debug builds,   independent of the compiler optimization level.</p>
+      <p>By default, the build system generates symbolic debug information only for   the debug builds. With this option, the generation of symbolic debug information   is extended to release builds to support debugging of release binaries on ARM   ABI compliant platforms.</p></td>
+  </tr>
+  <tr>
+      <td><strong>Additional SBSv2 arguments</strong></td>
+      <td>Enter any additional arguments to pass to <span class="code">sbs.bat</span>.</td>
+  </tr>
+  <tr>
+    <td><strong>Override default make engine </strong></td>
+    <td>Check this box to enable  an edit box to specify the <strong>Make engine</strong> to use, for example, eMake  from Electric Cloud.</td>
+  </tr>
+  <tr>
+      <td><strong>Make engine</strong></td>
+      <td>Enter the name of a different make engine to use when building.</td>
+  </tr>
+</table>
+<h4>Related tasks</h4>
+<ul><li><a href="../../tasks/projects/prj_build.htm">Building Projects</a></li>
+</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>
+</body>
+</html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/wnd_sis_properties.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/wnd_sis_properties.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -51,7 +51,7 @@
 </table>
 <h5>Related reference </h5>
 <ul>
-  <li><a href="pane_build_config.htm">Build Configurations</a></li>
+  <li><a href="prop_carb_build_config.htm">Build Configurations</a></li>
   <li><a href="pane_build_config_env.htm">Environment variables</a></li>
 </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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/indexer.html	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/indexer.html	Wed Jul 21 13:50:58 2010 -0500
@@ -18,7 +18,7 @@
    <p class="note"><b>NOTE</b> You can also rebuild a project's index by selecting a project, then right-click  and select the <b>Rebuild Index</b> menu item. </p>
    <p align="center" class="Image"><img src="images/pref_indexer.png" alt="Indexer preference panel" width="680" height="775"></p>
    <p align="left" class="figure">Figure 1 - C/C++ Indexer  in Preferences</p>
-   <p align="left" class="Image">The project  indexer is accessed by selecting a project in the <a href="view_cpp_projects.htm">Project Explorer</a> or <a href="view_sym_proj_nav.htm">Symbian Project Navigator</a> view and selecting <b>Project &gt; Properties &gt; C/C++ General &gt; Indexer</b> (figure 2).</p>
+   <p align="left" class="Image">The project  indexer is accessed by selecting a project in the <a href="view_proj_explorer.htm">Project Explorer</a> or <a href="view_sym_proj_nav.htm">Symbian Project Navigator</a> view and selecting <b>Project &gt; Properties &gt; C/C++ General &gt; Indexer</b> (figure 2).</p>
    <p align="center" class="Image"><img src="images/pref_indexer_properties.png" alt="Indexer properties panel" width="680" height="628"></p>
    <p align="left" class="figure">Figure 2 - Indexer panel in  Properties for project_name</p>
    <table cellpadding="2" cellspacing="0"
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/memory_rendering_options.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/memory_rendering_options.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -77,7 +77,7 @@
 </ul>
 <h5>Related References </h5>
 <ul>
-  <li><a href="view_memory_wnd.htm">Memory View</a></li>
+  <li><a href="view_memory.htm">Memory View</a></li>
 </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>
 
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/abld.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/abld.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -10,7 +10,7 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>ABLD Actions </h2>
-<p>Use the <b>ABLD</b> menu option to invoke an specific <span class="code">abld</span> command on the selected project or file. ABLD is available under  <b>Symbian Build &gt; ABLD</b> or by right-clicking a project or file in the <a href="../view_cpp_projects.htm">Project Explorer</a>, <a href="../view_sym_proj_nav.htm">Symbian Project Navigator</a>, and <a href="../view_disassembly.htm">Disassembly</a> views and choosing <b>ABLD &gt; <i>command</i></b>. When executed any arguments specified in the <a href="../build_properties/pane_build_config_args.htm">Carbide Build Configurations</a> pane for the command are passed to the selected tool. </p>
+<p>Use the <b>ABLD</b> menu option to invoke an specific <span class="code">abld</span> command on the selected project or file. ABLD is available under  <b>Symbian Build &gt; ABLD</b> or by right-clicking a project or file in the <a href="../view_proj_explorer.htm">Project Explorer</a>, <a href="../view_sym_proj_nav.htm">Symbian Project Navigator</a>, and <a href="../view_disassembly.htm">Disassembly</a> views and choosing <b>ABLD &gt; <i>command</i></b>. When executed any arguments specified in the <a href="../build_properties/pane_build_config_args.htm">Carbide Build Configurations</a> pane for the command are passed to the selected tool. </p>
 <p align="center"><img src="../images/menu_symb_abld.png" width="890" height="204"></p>
 <p class="figure">Figure 1 - Available ABLD actions</p>
 <p>The available commands include:</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/build_all_targets.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/build_all_targets.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -9,7 +9,7 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Build All Configurations </h2>
-<p>Select a project in the  <a href="../view_cpp_projects.htm">Project Explorer</a>  or <a href="../view_sym_proj_nav.htm">Symbian Project Navigator</a> view, then:</p>
+<p>Select a project in the  <a href="../view_proj_explorer.htm">Project Explorer</a>  or <a href="../view_sym_proj_nav.htm">Symbian Project Navigator</a> view, then:</p>
 <ul>
     <li>Click <b>Project &gt; Build All Configurations</b> (<span class="code">CTRL+ALT+A</span>) , or</li>
     <li>Right-click the project name and select <strong>Symbian Build &gt; Build All Configurations</strong></li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/build_pkg_file.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/build_pkg_file.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -9,7 +9,7 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Build Package (.pkg) File</h2>
-<p>Select a <span class="code">.PKG</span> file in a project&prime;s <em>/sis</em> folder in the <a href="../view_cpp_projects.htm">Project Explorer</a> view and right-click to display the context menu. Select <b>Symbian Build &gt; Build PKG File</b> to build the package file and create the .sis installation file. This option is also available from an editor view when the file is open. The <span class="code">makesis</span> tool uses the package file and packs all the required resources together into a SIS installation file. The <a href="../view_log.htm">Console</a> view displays the processing output.  The .sis and .sisx files will appear in the project's <em>/sis</em> folder.</p>
+<p>Select a <span class="code">.PKG</span> file in a project&prime;s <em>/sis</em> folder in the <a href="../view_proj_explorer.htm">Project Explorer</a> view and right-click to display the context menu. Select <b>Symbian Build &gt; Build PKG File</b> to build the package file and create the .sis installation file. This option is also available from an editor view when the file is open. The <span class="code">makesis</span> tool uses the package file and packs all the required resources together into a SIS installation file. The <a href="../view_console.htm">Console</a> view displays the processing output.  The .sis and .sisx files will appear in the project's <em>/sis</em> folder.</p>
 <p align="center"><img src="../images/build_pkg_file.png" width="543" height="117" /></p>
 <p align="center" class="figure">Figure 1. Build PKG File context menu </p>
 <h5>Other references</h5>
@@ -17,7 +17,7 @@
   <li><a href="menus.htm">Carbide Menu</a></li>
   <li><a href="../../tasks/projects/working_with_sis_pkg_files.htm">Creating a PKG File</a></li>
   <li><a href="../../tasks/projects/prj_set_build_tgt.htm">Setting an Active Configuration</a></li>
-  <li><a href="../build_properties/pane_build_config.htm">Carbide Build Configurations</a></li>
+  <li><a href="../build_properties/prop_carb_build_config.htm">Carbide Build Configurations</a></li>
 </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>
 
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/build_symbian_comp.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/build_symbian_comp.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -8,7 +8,7 @@
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/></head>
 <body bgcolor="#FFFFFF">
 <h2>Build Symbian Component </h2>
-<p>Select a .mmp or .mk  file in the <a href="../view_cpp_projects.htm">Project Explorer</a> or <a href="../view_sym_proj_nav.htm">Symbian Project Navigator</a> view, then right-click and select<b> Symbian Build &gt; Build Symbian Component</b> (<span class="code">CTRL+ALT+P</span>) to build the selected component file or makefile. You can also right-click the file in an editor view to use the same option. </p>
+<p>Select a .mmp or .mk  file in the <a href="../view_proj_explorer.htm">Project Explorer</a> or <a href="../view_sym_proj_nav.htm">Symbian Project Navigator</a> view, then right-click and select<b> Symbian Build &gt; Build Symbian Component</b> (<span class="code">CTRL+ALT+P</span>) to build the selected component file or makefile. You can also right-click the file in an editor view to use the same option. </p>
 <p align="center"><img src="../images/build_symbian_comp.png" width="580" height="197" /></p>
 <p align="center" class="figure">Figure 1. Build Symbian Component menu item </p>
 <p></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/clean_symbian_comp.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/clean_symbian_comp.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -9,7 +9,7 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Clean Symbian Component </h2>
-<p>You can select a MMP or MK  file in the <a href="../view_cpp_projects.htm">Project Explorer</a> or <a href="../view_sym_proj_nav.htm">Symbian Project Navigator</a> view and right-click to select <b>Symbian Build &gt; Clean Symbian Component</b> (<span class="code">CTRL+ALT+X</span>) to clean the selected MMP project file or makefile. You can also right-click the file in an editor view to use the same option. The cleaning process removes the object and make files, and output files. The files that are removed by this command include all the intermediate files created during compilation and all the executables and import libraries created by the linker.</p>
+<p>You can select a MMP or MK  file in the <a href="../view_proj_explorer.htm">Project Explorer</a> or <a href="../view_sym_proj_nav.htm">Symbian Project Navigator</a> view and right-click to select <b>Symbian Build &gt; Clean Symbian Component</b> (<span class="code">CTRL+ALT+X</span>) to clean the selected MMP project file or makefile. You can also right-click the file in an editor view to use the same option. The cleaning process removes the object and make files, and output files. The files that are removed by this command include all the intermediate files created during compilation and all the executables and import libraries created by the linker.</p>
 <p align="center"><img src="../images/clean_symbian_comp.png" width="580" height="200" /></p>
 <p align="center" class="figure">Figure 1. Clean Symbian Component context menu </p>
 <h5>Other references</h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/compile_source.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/compile_source.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -9,7 +9,7 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Compile</h2>
-<p>Select a .c, .cpp, or .cia source file in the <a href="../view_cpp_projects.htm">Project Explorer</a> or <a href="../view_sym_proj_nav.htm">Symbian Project Navigator</a> view, right-click the file and choose <b> Symbian Build &gt; Compile</b> (<span class="code">CTRL+ALT+C</span>) to compile it. This is also available from within a C/C++ editor view. You can use the shift or control key to select one or more of these file types across the same or different projects. The build progress is displayed in the Console view.</p>
+<p>Select a .c, .cpp, or .cia source file in the <a href="../view_proj_explorer.htm">Project Explorer</a> or <a href="../view_sym_proj_nav.htm">Symbian Project Navigator</a> view, right-click the file and choose <b> Symbian Build &gt; Compile</b> (<span class="code">CTRL+ALT+C</span>) to compile it. This is also available from within a C/C++ editor view. You can use the shift or control key to select one or more of these file types across the same or different projects. The build progress is displayed in the Console view.</p>
 <p align="center"><img src="../images/menu_symb_compile.png" alt="Compile source" width="580" height="231"></p>
 <p class="figure">Figure 1 - Right-click to compile a source file </p>
 <h5>Other references</h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/freeze_exports.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/freeze_exports.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -9,7 +9,7 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Freeze Exports </h2>
-<p>Right-click  a project in the <a href="../view_cpp_projects.htm">Project Explorer</a> or <a href="../view_sym_proj_nav.htm">Symbian Project Navigator</a> view, then  choose <b> Symbian Build &gt; Freeze Exports</b>. This command calls the appropriate <b>abld</b> command  and a .def file is generated. This  enables released versions of DLLs to freeze their exports, ensuring backward compatibility of a library.</p>
+<p>Right-click  a project in the <a href="../view_proj_explorer.htm">Project Explorer</a> or <a href="../view_sym_proj_nav.htm">Symbian Project Navigator</a> view, then  choose <b> Symbian Build &gt; Freeze Exports</b>. This command calls the appropriate <b>abld</b> command  and a .def file is generated. This  enables released versions of DLLs to freeze their exports, ensuring backward compatibility of a library.</p>
 <p align="center"><img src="../images/menu_symb_freeze_exports.png" width="543" height="115"></p>
 <p class="figure">Figure 1. Choosing Freeze Exports on a project </p>
 <h5>Other references</h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/freeze_symbian_comp.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/freeze_symbian_comp.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -9,7 +9,7 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Freeze Symbian Component </h2>
-<p>Right-click  a Symbian OS MMP file in the <a href="../view_cpp_projects.htm">Project Explorer</a>, or <a href="../view_sym_proj_nav.htm">Symbian Project Navigator</a> view, then  choose <b> Symbian Build &gt; Freeze Symbian  Component</b> (<span class="code">CTRL+ALT+F</span>). You can also right-click the file in an editor view to use the same option. This command only freezes the selected MMP file and not the entire project.</p>
+<p>Right-click  a Symbian OS MMP file in the <a href="../view_proj_explorer.htm">Project Explorer</a>, or <a href="../view_sym_proj_nav.htm">Symbian Project Navigator</a> view, then  choose <b> Symbian Build &gt; Freeze Symbian  Component</b> (<span class="code">CTRL+ALT+F</span>). You can also right-click the file in an editor view to use the same option. This command only freezes the selected MMP file and not the entire project.</p>
 <p align="center"><img src="../images/menu_symb_freeze_comp.png" width="580" height="201"></p>
 <p class="figure">Figure 1. Choosing Freeze Symbian  Component on a file </p>
 <h5>Other references</h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/preprocess_source.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/preprocess_source.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -9,7 +9,7 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Preprocess</h2>
-<p>Right-click to select a .c, .cpp, or .cia source file in the <a href="../view_cpp_projects.htm">Project Explorer</a> or <a href="../view_sym_proj_nav.htm">Symbian Project Navigator</a> view,  and choose <b> Symbian Build &gt; Preprocess </b>  to preprocess the file. You define the preprocess command in the <a href="../wnd_preprocess_prefs.htm">Preprocess preference panel</a>. This is also available from within a C/C++ editor view. You can use the shift or control key to select one or more of these file types across the same or different projects. The preprocess progress is displayed in the <a href="../view_log.htm">Console</a> view.</p>
+<p>Right-click to select a .c, .cpp, or .cia source file in the <a href="../view_proj_explorer.htm">Project Explorer</a> or <a href="../view_sym_proj_nav.htm">Symbian Project Navigator</a> view,  and choose <b> Symbian Build &gt; Preprocess </b>  to preprocess the file. You define the preprocess command in the <a href="../pref_carb_preprocess.htm">Preprocess preference panel</a>. This is also available from within a C/C++ editor view. You can use the shift or control key to select one or more of these file types across the same or different projects. The preprocess progress is displayed in the <a href="../view_console.htm">Console</a> view.</p>
 <p align="center"><img src="../images/menu_symb_preprocess.png" alt="Preprocess menu option" width="580" height="202"></p>
 <p class="figure">Figure 1. Choosing to Preprocess a file </p>
 <h5>Other references</h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/olderproject_updater.html	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/olderproject_updater.html	Wed Jul 21 13:50:58 2010 -0500
@@ -10,7 +10,7 @@
    The <b>Carbide.c++ File Updater</b> window appears when you open older Carbide.c++  projects that require updating. This most often occurs when new features are added to the project file format. The example in figure 1 shows the Carbide.c++ File Updater window with a v1.1 project that needs updating. In this case the updater  updates the template 
    projects from Carbide.c++ 1.1 to the latest template version. Projects that are already up-to-date are not affected by the updater process. New projects automatically use the most current project format.</p>
    <p>If your projects have up-to-date <span class="code">bld.inf</span> and <span class="code">MMP</span> files, it is recommended that you delete the existing Carbide.c++ projects and simply re-import them from the <span class="code">bld.inf</span> file. This ensures that the project file format is up-to-date. </p>
-   <p>You can also select projects in the <a href="view_cpp_projects.htm">Project Explorer</a> or <a href="view_sym_proj_nav.htm">Symbian Project Navigator</a> views and choose <b>Project &gt; Update Projects</b> command to display the Carbide.c++ File Updater window.</p>
+   <p>You can also select projects in the <a href="view_proj_explorer.htm">Project Explorer</a> or <a href="view_sym_proj_nav.htm">Symbian Project Navigator</a> views and choose <b>Project &gt; Update Projects</b> command to display the Carbide.c++ File Updater window.</p>
    <p align="center"><img src="images/project_update_files.png" width="568" height="569" /></p>
    <p align="left" class="figure">Figure 1 - Carbide.c++ File Updater </p>
    <h3><a name="uid" id="uid"></a>UI Designer Projects</h3>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/perspective_debug.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/perspective_debug.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -21,12 +21,12 @@
   <li><a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_editor_view.htm">Editor</a> view - one or more source code editor windows </li>
   <li><a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_outline_view.htm">Outline</a> view - displays an outline of a structured C/C++ file that is currently open in the 
     editor view </li>
-  <li><a href="view_log.htm">Console</a> view - display<span><span>s the output of a process</span></span>, like  the execution of your program, or other outputs </li>
+  <li><a href="view_console.htm">Console</a> view - display<span><span>s the output of a process</span></span>, like  the execution of your program, or other outputs </li>
   <li><a href="PLUGINS_ROOT/org.eclipse.platform.doc.user/reference/ref-31.htm">Tasks</a> view - <span>displays </span>tasks that you manually add</li>
 </ul>
 <p>And can include:</p>
 <ul>
-  <li><a href="view_memory_wnd.htm">Memory</a> view - allows you to monitor and modify process memory</li>
+  <li><a href="view_memory.htm">Memory</a> view - allows you to monitor and modify process memory</li>
   <li><a href="view_disassembly.htm">Disassembly</a> view - displays the assembly code of the source code currently being debugged </li>
   <li><a href="view_expressions.htm">Expressions</a> view - used to monitor and manipulate global and local variables, structure members, and array elements</li>
   <li><a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_modules_view.htm">Modules</a> view - uses the <a href="../projects/launch/wiz_new_launch_config.htm">Symbolics Loading</a> option to show modules loaded during a debug session </li>
@@ -43,7 +43,7 @@
   <li><a href="../debugger/debug/viewing_debug.htm">Debug view</a></li>
   <li><a href="view_variables.htm">Variables view</a></li>
   <li><a href="view_breakpoints.htm">Breakpoints view</a></li>
-  <li><a href="view_memory_wnd.htm">Memory view</a></li>
+  <li><a href="view_memory.htm">Memory view</a></li>
   <li><a href="view_symbian_kernel.htm">Symbian OS Data view</a></li>
 </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>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/pref_carb_build.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -0,0 +1,132 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Build preferences</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+<style type="text/css">
+<!--
+.style4 {font-family: Verdana, Ariel, Helvetica, sans-serif; font-weight: bold; }
+-->
+</style>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Build preferences</h2>
+<p>The Carbide.c++ &gt; <img src="../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=com.nokia.carbide.cdt.internal.builder.ui.BuilderPreferencePage)")'> Build
+</a> page in the <b>Preferences</b> window provides global preferences to control general build options like clean, test components, dependency tracking, concurrent build jobs, build behavior, and emulator options.</p>
+<p align="center"><img src="images/prefs_build_workspace.png" width="620" height="458" alt="" /></p>
+<p class="figure">Figure 1 - Build workspace preferences page </p>
+<p>The following options are available in both the global Build preference panel and the project <b>Properties &gt; Carbide.c++ &gt; </b><b><a href="build_properties/prop_carb_project_settings.htm">Project Settings</a></b> panel. </p>
+<h5>Table 1 Build Preferences &mdash;items</h5>
+<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="29%" scope="col">Item</th>
+    <th width="57%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><b>Use built-in Nokia x86 environment variables for WINSCW builds </b></td>
+    <td><p>If enabled, Carbide adds the built-in x86 compiler environment variables to the build environment.</p>
+      <p>If the option is not
+        checked, the build process will build with whatever tools are defined in your environment.</p>
+    <p>A directory named x86Build at the root of the product installation contains the build tools, libraries, and <span class="code"><a href="../tasks/projects/prj_build_cmd_line.htm">env_update.exe</a></span>.</p></td>
+  </tr>
+  <tr>
+    <td><b>Build test components when building from bld.inf </b></td>
+    <td><p>Enable to build all the projects defined by .MMP files listed under the <span class="code">PRJ_TESTMMPFILES</span> section of the component description file. </p>
+    <p>If not enabled, only those projects defined by .MMP files listed under the <span class="code">PRJ_MMPFILES</span> section of the component description file are built. </p>    </td>
+  </tr>
+  <tr>
+    <td><b>Run builds concurrently (improves compile time) </b></td>
+    <td><p>Enable to tell Carbide to generate concurrent builds up to the amount specified in the Build jobs field. This option can significantly reduce build times as it takes advantage of multi-core processors and hyperthreading to run multiple threads at once. </p>
+    <p>If not enabled, only a single build is run. Note that this may be required if your project contains circular dependencies or other issues that prevent concurrent builds from executing correctly. </p></td>
+  </tr>
+  <tr>
+    <td><b>Use default incremental builder </b></td>
+    <td>Enable to have Carbide determine if a  build is required by checking the state of  any file in the workspace. </td>
+  </tr>
+</table>
+<p>&nbsp;</p>
+<p align="center"><img src="images/carbide_proj_settings_sbsv1.png" alt="sbsv1 tab" width="444" height="143"></p>
+<p align="center" class="figure">Figure 2 - SBSv1 tab</p>
+<h5 align="left">Table 2 Symbian Build System v1 tab </h5>
+<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="29%" scope="col">Item</th>
+    <th width="57%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><p class="style4">Clean level </p></td>
+    <td><p>Specifies the level of clean to perform on  project files. The levels include:</p>
+      <ul>
+        <li>Level 0  (<span class="code">abld clean</span>) - removes all the intermediate files created during compilation, and all the executables and import libraries created by the linker</li>
+        <li>Level 1  (<span class="code">abld reallyclean</span>) - performs a <span class="code">clean</span> operation, but also removes all exported files and makefiles</li>
+        <li>Level 2  (<span class="code">abld reallyclean</span>, <span class="code">bldmake clean</span>) - performs  a <span class="code">reallyclean</span> operation and then removes all files created by bldmake</li>
+      </ul>    </td>
+  </tr>
+  <tr>
+    <td><p class="style4">Manage dependency tracking (improves build speed) </p></td>
+    <td><p>Enable to have Carbide manage the dependency tracking for source and resource files. Carbide does this by separating out the generation of dependency information from the makefile and managing the entire process.  All builds now can quickly compare whether new dependency information is required due to changes in a source file and only build those that need updating. </p>
+    <p>If not enabled, the Symbian OS command line build system handles all dependency tracking by generating the dependency information in the makefiles. Because it does this for all project files, regardless of the number of changes, it can result in a performance penalty. A single edit in a MMP file  forces a complete regeneration of the makefile dependency information for all project files. </p>    </td>
+  </tr>
+  <tr>
+    <td><p><strong>Show a dialog to modify build actions when modified MMPs are detected </strong></p></td>
+    <td><p>Enable to have Carbide ask before starting a build what action to take when modified files are detected. When disabled, do not show a dialog but use the default action listed below.</p>    </td>
+  </tr>
+  <tr>
+    <td><p><strong>Default action to take when mmp files are modified </strong></p></td>
+    <td><p>Defines the default action Carbide should execute when it detects modified MMP files and the option above is disabled: </p>
+      <ul>
+        <li>None</li>
+        <li>Link Only</li>
+        <li>Compile and Link</li>
+      </ul>    </td>
+  </tr>
+  <tr>
+    <td><strong>Do not offer to track dependencies for projects build on command-line </strong></td>
+    <td>If you build a project from the command-line (with 'abld build') and then import the project into Carbide and attempt to build, Carbide will ask if you would like Carbide to manage source dependencies for you. Enabling this option insures Carbide will not ask you to manage dependencies (they will be done as normally done via 'abld build' command).</td>
+  </tr>
+</table>
+<p align="left">&nbsp;</p>
+<p align="center"><img src="images/carbide_proj_settings_sbsv2.png" alt="sbsv2 tab" width="423" height="176"></p>
+<p align="center" class="figure">Figure 3 - SBSv2 tab </p>
+<h5 align="left">Table 3 Symbian Build System v2 tab </h5>
+<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="29%" scope="col">Item</th>
+    <th width="57%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><b>Clean level </b></td>
+    <td>Select the level of clean when cleaning a project.
+      <p><strong>abld clean</strong> erases all files created by a corresponding abld target   command (all intermediate files created during compilation and all executables and import libraries created by the linker) </p>
+      <p><strong>abld reallyclean</strong> does what abld clean does, and also removes files   exported by abld export and makefiles generated by abld makefile, or the abld   test equivalents</p></td>
+  </tr>
+  <tr>
+    <td><b>Keep going </b></td>
+    <td><p>This build option tells a particular command to   keep going even if unrelated build steps report errors or files are missing.</p></td>
+  </tr>
+  <tr>
+    <td><b>Debug mode </b></td>
+    <td><p>This option generates symbolic debug information for release or debug builds,   independent of the compiler optimization level.</p>
+        <p>By default, the build system generates symbolic debug information only for   the debug builds. With this option, the generation of symbolic debug information   is extended to release builds to support debugging of release binaries on ARM   ABI compliant platforms.</p></td>
+  </tr>
+  <tr>
+    <td><b>Additional SBSv2 arguments</b></td>
+    <td>Enter additional SBSv2 build arguments here.</td>
+  </tr>
+  <tr>
+    <td><b>Override default make engine </b></td>
+    <td>Check this box to enable  an edit box to specify the make engine to use, for example, eMake  from Electric Cloud.</td>
+  </tr>
+</table>
+<h5>Related references</h5>
+<ul>
+  <li><a href="build_properties/prop_carb_project_settings.htm">Project Settings </a></li>
+</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>
+
+</body>
+</html>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/pref_carb_cpp.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -0,0 +1,62 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Carbide.c++ preference</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Carbide.c++ preferences</h2>
+<p>The <img src="../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=com.nokia.carbide.cpp.project.ui.preferences.CarbidePreferencePage)")'>
+Carbide.c++</a> panel in the <b>Preferences</b> window provides an option to keep your projects updated when you add or create files. Figure&nbsp;1 shows the Carbide.c++ preference panel.</p>
+<p align="center"><img src="images/prefs_carbide_cpp.png" alt="Carbide.c++ preference panel" width="671" height="554"></p>
+<p class="figure">Figure 1 - Carbide.c++ preferences page </p>
+<h5>Table 1 Carbide.c++ Preferences &mdash;items</h5>
+<table width="850"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="29%" scope="col">Item</th>
+    <th width="57%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><b>Keep Symbian OS project files (bld.inf/mmp) in sync with project changes</b></td>
+    <td>Select this option to update project files (bld.inf and mmp) when you add, remove, rename or move files and directories in your current workspace.</td>
+  </tr>
+  <tr>
+    <td><b>When files are added to the project </b></td>
+    <td><p>The following options are available when files are added to a project:</p>
+      <ul>
+        <li>Ask before changing bld.inf/mmp - You are prompted to allow changes </li>
+        <li>Always change bld.inf/mmp - Changes are made wthout asking you to allow change </li>
+        <li>Never change bld.inf/mmp - No changes are made </li>
+    </ul></td>
+  </tr>
+  <tr>
+    <td><b>When files in the project are moved/renamed/deleted </b></td>
+    <td><p>The following options are available that effect the bld.inf or mmp files when files in a project are moved, renamed, or deleted:</p>
+      <ul>
+        <li>Ask before changing bld.inf/mmp - You are prompted to allow changes </li>
+        <li>Always change bld.inf/mmp - Changes are made wthout asking you to allow change </li>
+        <li>Never change bld.inf/mmp - No changes are made </li>
+      </ul></td>
+  </tr>
+  <tr>
+    <td><b>Indexing Options</b></td>
+    <td><p>The following options control how the project mmp files are indexed:</p>
+      <ul>
+        <li>Index only source files from mmp files being built (default)</li>
+        <li>Index source files from all mmp files </li>
+    </ul></td>
+  </tr>
+</table>
+<h5>Related references</h5>
+<ul>
+  <li><a href="../tasks/sdks/sdk_platform_filter.htm">Platform Filtering Preferences</a></li>
+  <li><a href="pref_carb_sdk_preferencea.html">SDK Preferences</a></li>
+</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>
+
+</body>
+</html>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/pref_carb_debugger.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -0,0 +1,60 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Carbide.c++ Debugger Preferences</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Carbide.c++ Debugger preferences</h2>
+<p>The <b>Debug</b> &gt; <img src="../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=com.nokia.cdt.debug.cw.symbian.ui.GlobalSettings)")'>
+Carbide.c++ Debugger</a> preference panel provides global debugger settings for the Carbide.c++ tools. </p>
+<p align="center"><img src="images/panel_global_debugger.png" width="688" height="586" alt="" /></p>
+<p class="figure">Figure 1 - Carbide.c++ Debugger preference panel</p>
+<h5>Table 1. Carbide.c++ Debugger panel&mdash;items </h5>
+<table width="88%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="35%" scope="col">Item</th>
+    <th width="65%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><b>Attempt to show the dynamic runtime type of objects </b></td>
+    <td>Enable this option to have the debugger deduce the actual type of an object at runtime and display it in the Variables view (applies to <b>x86 only</b>). By default, the debugger does not attempt to determine the type of an object at runtime and will simply show its declared type. Enabling this option can slow the start of a debug session.</td>
+  </tr>
+  <tr>
+    <td><b>Do not step into runtime support code </b></td>
+    <td><p>Select this option to avoid stepping into runtime support code. Runtime support code is generated by the compiler to support C++ features like <span class="code">new</span> and <span class="code">delete</span>. When enabled the debugger  attempts to identify and skip this glue code and step directly into your code. If this option is disabled the debugger steps into this language support code. For example if you are debugging this line of code and step in: </p>
+      <p class="code">MyClass* var = new MyClass(); </p>
+    <p>With this option selected the debugger will skip the code that implements the operator <span class="code">new</span> and step into the constructor for <span class="code">MyClass</span>. If this option is disabled the debugger would step into the code in <span class="code">new</span> that allocates the object.</p></td>
+  </tr>
+  <tr>
+    <td><b>Default size for unbounded arrays </b></td>
+    <td>Enter the number of array objects to display by default. </td>
+  </tr>
+  <tr>
+    <td><b>Find source files outside the SDK </b></td>
+    <td>Enable to have the debugger automatically search for source files outside of the SDK. If disabled, the debugger will only look within the SDK epocroot directory.</td>
+  </tr>
+  <tr>
+    <td><b>Time interval for auto-refreshing OS View</b></td>
+    <td>Determines how often to refresh data in the <a href="view_symbian_kernel.htm">Symbian OS Data</a> view which is available to the developer when using TRK or stop-mode debugging. </td>
+  </tr>
+</table>
+<div class="step">
+  <h4>To access the Carbide.c++ Debugger Preferences</h4>
+  <ol>
+    <li>Select the Window &gt; Preferences menu item<br />
+    <p>The Preferences window (Figure 1) appears. </p></li>
+    <li>Expand the C/C++ and Debug sections</li>
+    <li>Select the Carbide.c++ Debugger item <br />
+    <p>The Carbide.c++ Debugger preference panel appears. </p>
+    </li>
+  </ol>
+</div>
+  <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>
+
+</body>
+</html>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/pref_carb_diagnostic_logs.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Diagnostic Logs preferences</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Diagnostic Logs  preferences</h2>
+<p>The <b>Diagnostic Logs</b> page in the <b>Preferences</b> window provides the ability to activate and save debugger log files in the project. When activated, the debugger generates an XML file containing useful debugger event information that can facilitate the locating and erradication of bugs in a project. </p>
+<p class="note"><b>NOTE</b> When logging is activated the performance of the debugger will be reduced as the log information is generated. </p>
+<p align="center"><img src="images/prefs_diagnostic_logs.png" width="627" height="544"></p>
+<p class="figure">Figure 1 - Diagnostic Logs preferences panel </p>
+<h5>Table 1 <span class="figure">Diagnostic Logs</span> preferences &mdash;items</h5>
+<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="29%" scope="col">Item</th>
+    <th width="57%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><b>Diagnostic Logs</b> </td>
+    <td>A list of the log files that can be generated. Log files are stored in the project but are not visible in the <a href="view_proj_explorer.htm">Project Explorer</a> or C/C++ Project views. </td>
+  </tr>
+  <tr>
+    <td><b>Clear Logs </b></td>
+    <td><p>Click to erase all log files from the project. </p>
+    </td>
+  </tr>
+</table>
+<h5>Related references</h5>
+<ul>
+  <li><a href="build_properties/prop_carb_project_settings.htm">Carbide Project Settings </a></li>
+</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>
+
+</body>
+</html>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/pref_carb_preprocess.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -0,0 +1,46 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Preprocess preferences</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Preprocess preferences</h2>
+<p>The Carbide.c++ &gt; <img src="../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=com.nokia.carbide.cdt.builder.utils.ui.PreprocessPreferencePage)")'> Preprocess</a> page in the <b>Preferences</b> window provides global settings for the Carbide preprocessor. </p>
+<p align="center"><img src="images/prefs_preprocess.png" width="645" height="551" /></p>
+<p class="figure">Figure 1 - Preprocess preferences page </p>
+<h5>Table 1 <span class="figure">Preprocess</span> p references &mdash;items</h5>
+<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="20%" scope="col">Item</th>
+    <th width="57%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td width="20%"><b>Send output to the build console </b></td>
+    <td><p>Enable to direct preprocessor output to a console view. </p>
+    </td>
+  </tr>
+  <tr>
+    <td width="20%"><b>Send output to the editor </b></td>
+    <td><p>Enable to direct preprocessor output to an editor. </p>
+    </td>
+  </tr>
+  <tr>
+    <td width="20%"><b>CPP arguments </b></td>
+    <td><p>Enter the preprocessor arguments used by the preprocessor. </p>
+    </td>
+  </tr>
+</table>
+<h5>Other references</h5>
+<ul>
+  <li><a href="../tasks/projects/prj_preprocess.htm">Preprocessing Files</a> </li>
+</ul>
+<p>&nbsp; </p>
+<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>
+
+</body>
+</html>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/pref_carb_sdk_preferencea.html	Wed Jul 21 13:50:58 2010 -0500
@@ -0,0 +1,73 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html><head>
+<title>SDK Preferences</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+<style type="text/css">
+<!--
+.style2 {
+	color: #FF0000;
+	font-weight: bold;
+}
+-->
+</style>
+</head>
+   <body>
+   <div class="Head1">
+<h2>SDK Preferences</h2>
+</div>
+Use the <img src="../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=com.nokia.carbide.cpp.sdk.ui.preferences.SDKPreferencePage)")'>
+SDK Preferences</a> page in the <b>Preferences</b> window to control which installed SDKs are available to projects during an import.  To
+	 access SDK preferences preference panel, select <b>Window &gt; Preferences &gt; Carbide.c++ &gt; SDK Preferences</b>. 
+	 <p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project.  If the SDK you have installed is not recognized, you may still be able to add it to the Discovered Symbian OS SDK list. See <a href="../tasks/start/carbide_requirements.htm">Carbide.c++ Requirements</a> for a list of supported SDKs. </p>
+   <p class="note"><b>NOTE</b> This panel serves as a <span class="code">devices.xml</span> file editor. The <span class="code">devices.xml</span> file stores information about the installed SDKs used for Symbian OS development.</p>
+   <div class="Figure">
+
+	  <p align="center" class="Image"><img src="../images/SDKPreferences.png" width="696" height="583" alt="SDK preferences panel" /></p>
+     <p align="center" class="figure">Figure 1. SDK Preferences preference panel </p>
+   </div>
+   <table cellpadding="2" cellspacing="0"
+border="0">
+	 <tr valign="top"><th width="221" class="Cell">Name</th><th width="584" class="Cell">Function</th></tr>
+         <tr valign="top">
+           <td class="Cell"><b>Available Symbian OS SDK's</b></td>
+           <td class="Cell"><p>Lists all the installed and recognized SDKs supported by the IDE. Only SDKs supported by the IDE are included in the list. </p>
+             <p>Checked SDKs indicate build configurations available for creating projects. Unchecked SDKs are not displayed when creating new projects. </p>
+             <p>SDKs shown in <span class="style2">red</span>  indicate  a problem, usually no <span class="code">EPOCROOT</span> or missing build configurations. </p>
+           <p>Click on a SDK name to see its EPOCROOT location and build configuration status in the SDK Information area. </p></td>
+        </tr>
+         <tr valign="top">
+           <td class="Cell"><b>Remove SDK </b></td>
+           <td class="Cell">Click to remove the selected SDK from the Available Symbian OS SDK's list. </td>
+         </tr>
+         <tr valign="top">
+           <td class="Cell"><b>Add New SDK </b></td>
+           <td class="Cell"><p>Click to <a href="../tasks/sdks/sdk_add.htm">add</a> an SDK to the <b>Available Symbian OS SDKs</b> list.</p>           </td>
+     </tr>
+         <tr valign="top">
+           <td class="Cell"><b>SDK Properties</b></td>
+           <td class="Cell"><p>Click to view and edit the <a href="../tasks/sdks/sdk_view_properties.htm">properties</a> of the currently selected SDK in the <b>Available Symbian OS SDKs</b> list.</p>           </td>
+     </tr>
+         <tr valign="top">
+           <td class="Cell"><b>Listen for devices.xml changes outside of Carbide </b></td>
+           <td class="Cell">Enable of have  Carbide  issue an alert prompting you to rescan your SDKs when changes to the <span class="code">devices.xml</span> file are made outside of  Carbide. When disabled the <span class="code">devices.xml</span> file is not scanned for changes. </td>
+         </tr>
+         <tr valign="top">
+           <td class="Cell"><p><b>Rescan All SDKs</b></p>           </td>
+           <td class="Cell"><p>Click to <a href="../tasks/sdks/sdk_search.htm">rescan</a>  the drive  for newly installed SDKs. The devices.xml file is scanned for SDKs and the list of available SDKs is updated if the devices.xml file has changed.</p>
+             <p class="note"><b>NOTE</b> Carbide.c++ scans for available SDKs each time it is started.</p></td>
+        </tr>
+   </table>
+   <h5>Related tasks</h5>
+	 <ul>
+       
+       <li><a href="../tasks/WorkingwithSDKs.html">Working with SDKs</a></li>
+       <li><a href="../tasks/AddinganSDK.html">Adding an SDK</a></li>
+       <li><a href="../tasks/RmvngandVwngPropsosSDK.html">SDK Properties</a></li>
+  </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>
+
+   </body>
+   </html>
+   
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/pref_carb_x86_exceptions.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -0,0 +1,25 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Unsetting Built-in Environment</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Unsetting Built-in Environment</h2>
+<p>The Carbide.c++ &gt; <img src="../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand(&quot;org.eclipse.ui.window.preferences(preferencePageId=com.nokia.carbide.cdt.internal.builder.ui.BuilderPreferencePage)&quot;)'> Build</a> page in the <b>Preferences</b> window provides an option   to use the local x86 build tools for each emulator build. A directory named x86Build at the root of the product installation contains the build tools, libraries, and <span class="code">env_update.exe</span> file.</p>
+<p>Uncheck the &quot;Use built-in Nokia x86 environment variables for WINSCW builds&quot; option if you do not want to use the built-in compiler.</p>
+<p>Figure 1 shows the <a href="pref_carb_build.htm">Build</a> preferences window.</p>
+<p align="center"><img src="images/carbide_preferences2.png" width="670" height="373" /></p>
+<p class="figure">Figure 1 -Build preferences window showing Emulator Build Options </p>
+<h5>Related references</h5>
+<ul>
+  <li><a href="../tasks/sdks/sdk_platform_filter.htm">Platform Filtering Preferences</a></li>
+  <li><a href="pref_carb_sdk_preferencea.html">SDK Preferences</a></li>
+</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>
+
+</body>
+</html>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/pref_cpp_code_style.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -0,0 +1,28 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
+<title>Code Styles preferences</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+   <body>
+<h2>Code Styles preferences</h2>
+
+	  
+	 <p>Carbide supports the use of code styles in projects via the C/C++  <img src="../images/command_link.png" alt="" width="16" height="12" border="0" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.cdt.ui.preferences.CodeFormatterPreferencePage)")'> Code Style</a> preference panel. Use a code style profile to set specific smart typing features, like indentation, tabs or spaces, and many more options. There are several built-in code styles like GNU, Whitesmith, and others, while Carbide supplies these  additional styles:</p>
+	 <ul>
+	   <li><b>Symbian OS</b> &#8212; settings are based on the <a href="http://developer.symbian.com/main/downloads/papers/coding_stds/2003-01_SyOSCodStn.pdf">Symbian OS C++ coding standards</a></li>
+	   <li><b>S60</b> &#8212; settings are based on the <strong>C++ Developer's Library &gt; </strong><a href="http://library.forum.nokia.com/index.jsp?topic=/Nokia_Symbian3_Developers_Library/GUID-B51A9A1F-8E80-4DF6-904A-7BD1A8976BBB.html">C++ Coding Conventions</a></li>
+       <li><strong>Qt</strong> &mdash; settings for Qt projects</li>
+   </ul>
+   <p>Setting a code style sets it for the entire workspace. When a new file is created the currently selected code style rules are applied as you edit the file. You can apply a set of rules to a previously created source file by opening it in an editor view, then right-clicking and choosing <b>Source &gt; Format</b> (<span class="code">CTRL+SHIFT+F</span>). </p>
+	 <p align="center"><img src="images/wnd_pref_code_styles.png" width="658" height="562" /></p>
+   <p align="center" class="figure">Figure 1 - Code Style preference panel </p>
+	 <h5>Related references	 </h5>
+	 <ul>
+       <li><a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_c_code_style_pref.htm">Code Style preferences</a></li>
+       <li><a href="../tasks/code_style_workspace.htm">Setting the Workspace Code Style</a> </li>
+       <li><a href="../tasks/code_style_reformatting_sources.htm">Reformatting a Source File</a> </li>
+   </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>
+
+   </body>
+   </html>
+   
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/prefs_carb_carbide_news.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -0,0 +1,42 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Carbide.c++ News preference panel</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Carbide.c++ News preference panel</h2>
+<p>The <b>Carbide.c++ News</b> preferences panel enables you to control the behavior of the <a href="view_carbide_news.htm">Carbide.c++ News</a> view.</p>
+<p align="center"><img src="images/news_preferences.png" width="627" height="544"></p>
+<p class="figure">Figure 1. Carbide.c++ News preference panel</p>
+<h5>Table 1 Carbide News preference panel &mdash;items </h5>
+<table width="83%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="30%" scope="col">Item</th>
+    <th width="70%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><b>Display Carbide.c++ news page at startup</b></td>
+    <td><p>Enable to always show the news view when Carbide is launched. Recommended to ensure you are kept aware of the latest Carbide news and related information. Disable to not show the page on launch.</p>
+    </td>
+  </tr>
+  <tr>
+    <td><b>Subscribed news feeds</b></td>
+    <td>The list of subscribled news feeds.</td>
+  </tr>
+  <tr>
+    <td><b>Update news feed</b></td>
+    <td>Select the time period that the news reader checks for updated stories.</td>
+  </tr>
+</table>
+<h5>Related references </h5>
+<ul>
+  <li><a href="view_carbide_news.htm">Carbide.c++ News view</a></li>
+</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>
+</body>
+</html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/prefs_carbide_news.htm	Wed Jul 21 11:32:00 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Carbide.c++ News preference panel</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Carbide.c++ News preference panel</h2>
-<p>The <b>Carbide.c++ News</b> preferences panel enables you to control the behavior of the <a href="view_carbide_news.htm">Carbide.c++ News</a> view.</p>
-<p align="center"><img src="images/news_preferences.png" width="627" height="544"></p>
-<p class="figure">Figure 1. Carbide.c++ News preference panel</p>
-<h5>Table 1 Carbide News preference panel &mdash;items </h5>
-<table width="83%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="30%" scope="col">Item</th>
-    <th width="70%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><b>Display Carbide.c++ news page at startup</b></td>
-    <td><p>Enable to always show the news view when Carbide is launched. Recommended to ensure you are kept aware of the latest Carbide news and related information. Disable to not show the page on launch.</p>
-    </td>
-  </tr>
-  <tr>
-    <td><b>Subscribed news feeds</b></td>
-    <td>The list of subscribled news feeds.</td>
-  </tr>
-  <tr>
-    <td><b>Update news feed</b></td>
-    <td>Select the time period that the news reader checks for updated stories.</td>
-  </tr>
-</table>
-<h5>Related references </h5>
-<ul>
-  <li><a href="view_carbide_news.htm">Carbide.c++ News view</a></li>
-</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>
-</body>
-</html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_carbide_news.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_carbide_news.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -52,7 +52,7 @@
 </table>
 <h5>Related references </h5>
 <ul>
-  <li><a href="prefs_carbide_news.htm">Carbide.c++ News preference panel</a></li>
+  <li><a href="prefs_carb_carbide_news.htm">Carbide.c++ News preference panel</a></li>
 </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>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_console.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -0,0 +1,72 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Console View</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<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 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>
+<ul>
+  <li>Set <span class="code">LogToDebugger 1</span> to use the <b>View program output</b> option </li>
+  <li>Set <span class="code">LogToFile 1</span> to enable the <b>View emulator output</b> option</li>
+</ul>
+<h5>Table 1 Console view&mdash;items </h5>
+<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="29%" scope="col">Item</th>
+    <th width="14%" scope="col">Icon</th>
+    <th width="57%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><b>Scroll Lock </b></td>
+    <td><div align="center"><img src="../images/icons/console_scroll_lock_icon.png" width="15" height="18" /></div></td>
+    <td>Toggles the scrolling of the console view contents. </td>
+  </tr>
+  <tr>
+    <td><b>Clear Console </b></td>
+    <td><div align="center"><img src="../images/icons/console_clear_console_icon.png" width="19" height="18" /></div></td>
+    <td>Clears all content in the Console view.</td>
+  </tr>
+  <tr>
+    <td><b>Pin Console </b></td>
+    <td><div align="center"><img src="../images/icons/console_pin_console_icon.png" width="19" height="18" /></div></td>
+    <td><p>Toggles the behavior of the console. When enabled the current console content is fixed all the time instead of scrolling out of sight. When disabled, the console changes according to the action. </p>
+    </td>
+  </tr>
+  <tr>
+    <td><b>Display Selected Console </b></td>
+    <td><div align="center"><img src="../images/icons/console_display_selected_icon.png" width="30" height="18" /></div></td>
+    <td>Changes the contents of the current console view to show the selected console output. </td>
+  </tr>
+  <tr>
+    <td><b>Open Console </b></td>
+    <td><div align="center"><img src="../images/icons/console_open_console_icon.png" width="30" height="18" /></div></td>
+    <td><p>Opens a new  console to display  the log for:</p>
+      <ul>
+        <li>Platform Security Diagnostics</li>
+        <li>New Windows System Messages Console </li>
+        <li>New Emulation Program Output Console</li>
+        <li>New TRK Program Output Console</li>
+        <li>New TRK Communications Log Console</li>
+        <li>New Trace32 Communications Log Console</li>
+        <li>New Symbian Rom Log Console</li>
+        <li>New Emulator Output Console</li>
+        <li>CVS</li>
+        <li>New Console View</li>
+      </ul>
+      <p>Remember  that <i>program output</i> is console output from the running binary  and <i>communications log</i> is the messages sent between TRK and the on-device debug agent. </p>      
+      <p class="note"><b>NOTE</b> You can pin any message log view so that it does not lose focus.</p></td>
+  </tr>
+</table>
+<p>&nbsp;</p>
+<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>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_cpp_projects.htm	Wed Jul 21 11:32:00 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Project Explorer View</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Project Explorer view </h2>
-<p>  The <b>Project Explorer</b> view (Figure 1) display<span><span>s  relevant C/C++ projects located in the current workspace using a tree structure</span></span>. Use this view to manage all the projects located in the current workspace. The view is customizable and takes advantage of working sets. </p>
-<p>The content of a project is dependent upon how it was created in the workspace.</p>
-<p align="center"><img src="images/view_project_explorer.png" alt="Project Explorer view" width="281" height="424"></p>
-<p class="figure">Figure 1 - Project Explorer view showing projects in the current workspace</p>
-<p>The directories that appear in the project include:</p>
-<ul>
-  <li><b>sis</b>&#8212;the storage location for the final output files. The output file is linked from the top level of the project with a file of the same name.  Both the binary and link files can be expanded to show the source files used to build the program.</li>
-  <li><b>Includes</b>&#8212;a listing of all the include files used to build the project.</li>
-  <li><b>Executables</b> - a listing of debuggable executables imported into the <a href="view_executables.htm">Executables</a> view </li>
-  <li><b>User specified</b>&#8212;many other directories like <span class="code">src</span>, <span class="code">inc</span>, <span class="code">data</span>, and others are used to store specific types of project files. The names used for the directories are defined in the <a href="ProjectDirectories.html">Project Directories</a> page when the project is created. </li>
-</ul>
-<blockquote>
-  <p class="note"><b>NOTE</b> Only the directories specified by the mmp file are created during import. </p>
-</blockquote>
-<p>The files that appear in the project directories can be either:</p>
-<ul>
-  <li><b>files</b> (<img src="images/icon_project_file.png" width="15" height="16" align="absmiddle" />)&#8212;these files are located in the workspace within the project directories. Double-click a file icon to open it for editing.</li>
-  <li><b>folder links</b>&#8212;these are links pointing to folders that enable the project to support  cvs related sources. </li>
-</ul>
-<p>See  <b>C/C++ Development User Guide &gt; Reference &gt; C/C++ Views and Editors &gt; <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_project_explorer_view.htm">Project Explorer view</a></b> for more info. </p>
-<h5>Related references</h5>
-<ul>
-  <li><a href="../concepts/CarbidePerspective.html">Carbide C/C++ Perspective  </a></li>
-</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>
-
-</body>
-</html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_executables.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_executables.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -15,13 +15,13 @@
   <li>debug a binary that is not part of a project in the workspace by importing it into the Executables view to load the symbolics</li>
   <li> debug a process running on a device by <a href="../tasks/processes/attach_debugger_to_process.htm">attaching</a> to the process and importing the binaries associated with the process into the Executables view to load the symbolics. For example, you to debug a library loaded by the process, you would need to import the libary and the process executable. </li>
   <li>remove binaries when a project is closed or deleted from the workspace</li>
-  <li>remove  binaries  imported from outside the workspace by clicking the <b>Remove the selected executables</b> icon (<img src="images/icon_delete_launch_config.png" width="17" height="16" align="absmiddle">) or deleting the binary from the Executables project in the <a href="view_cpp_projects.htm">Project Explorer</a> view </li>
+  <li>remove  binaries  imported from outside the workspace by clicking the <b>Remove the selected executables</b> icon (<img src="images/icon_delete_launch_config.png" width="17" height="16" align="absmiddle">) or deleting the binary from the Executables project in the <a href="view_proj_explorer.htm">Project Explorer</a> view </li>
   <li>locate and manage which source and resource files are associated with each executable. Paths shown in black text have been resolved, those in gray text cannot be found. </li>
   <li>identify and correct any path issues with missing source files (shown in gray text). Double-click the missing source file to open a <b>Locate File</b> editor view which enables you to find the missing file. </li>
   <li>view routines and header files used by the source file. Click the tree control to expand or collapse a list of included header files and routine names for fast navigation. </li>
   <li>find and set breakpoints, watchpoints, and eventpoints in source files. Double-click a source file to open it in an editor view and to review the status of its breakpoints. </li>
 </ul>
-<p>In addition, an <b>Executables</b> project is created in the <a href="view_cpp_projects.htm">Project Explorer</a> view. The binaries shown in the Executables project can be deleted which also removes them from the Executables view. For binaries outside the workspace you must import them into the Executables view so their symbolics can be used during the debug session. <span class="note">You can also drag and drop executables into the view. </span></p>
+<p>In addition, an <b>Executables</b> project is created in the <a href="view_proj_explorer.htm">Project Explorer</a> view. The binaries shown in the Executables project can be deleted which also removes them from the Executables view. For binaries outside the workspace you must import them into the Executables view so their symbolics can be used during the debug session. <span class="note">You can also drag and drop executables into the view. </span></p>
 <p class="note"><b>NOTE</b> To debug ROM DLLs with System TRK or in stop mode, always specify the <a href="../projects/launch/page_rom_log.htm">ROM Log file</a> in the project's launch configuration. </p>
 <p align="center"><img src="images/view_executables.png" width="813" height="309" /></p>
 <p class="figure">Figure 1 - Executables view</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_log.htm	Wed Jul 21 11:32:00 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Console View</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<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 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>
-<ul>
-  <li>Set <span class="code">LogToDebugger 1</span> to use the <b>View program output</b> option </li>
-  <li>Set <span class="code">LogToFile 1</span> to enable the <b>View emulator output</b> option</li>
-</ul>
-<h5>Table 1 Console view&mdash;items </h5>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="29%" scope="col">Item</th>
-    <th width="14%" scope="col">Icon</th>
-    <th width="57%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><b>Scroll Lock </b></td>
-    <td><div align="center"><img src="../images/icons/console_scroll_lock_icon.png" width="15" height="18" /></div></td>
-    <td>Toggles the scrolling of the console view contents. </td>
-  </tr>
-  <tr>
-    <td><b>Clear Console </b></td>
-    <td><div align="center"><img src="../images/icons/console_clear_console_icon.png" width="19" height="18" /></div></td>
-    <td>Clears all content in the Console view.</td>
-  </tr>
-  <tr>
-    <td><b>Pin Console </b></td>
-    <td><div align="center"><img src="../images/icons/console_pin_console_icon.png" width="19" height="18" /></div></td>
-    <td><p>Toggles the behavior of the console. When enabled the current console content is fixed all the time instead of scrolling out of sight. When disabled, the console changes according to the action. </p>
-    </td>
-  </tr>
-  <tr>
-    <td><b>Display Selected Console </b></td>
-    <td><div align="center"><img src="../images/icons/console_display_selected_icon.png" width="30" height="18" /></div></td>
-    <td>Changes the contents of the current console view to show the selected console output. </td>
-  </tr>
-  <tr>
-    <td><b>Open Console </b></td>
-    <td><div align="center"><img src="../images/icons/console_open_console_icon.png" width="30" height="18" /></div></td>
-    <td><p>Opens a new  console to display  the log for:</p>
-      <ul>
-        <li>Platform Security Diagnostics</li>
-        <li>New Windows System Messages Console </li>
-        <li>New Emulation Program Output Console</li>
-        <li>New TRK Program Output Console</li>
-        <li>New TRK Communications Log Console</li>
-        <li>New Trace32 Communications Log Console</li>
-        <li>New Symbian Rom Log Console</li>
-        <li>New Emulator Output Console</li>
-        <li>CVS</li>
-        <li>New Console View</li>
-      </ul>
-      <p>Remember  that <i>program output</i> is console output from the running binary  and <i>communications log</i> is the messages sent between TRK and the on-device debug agent. </p>      
-      <p class="note"><b>NOTE</b> You can pin any message log view so that it does not lose focus.</p></td>
-  </tr>
-</table>
-<p>&nbsp;</p>
-<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>
-
-</body>
-</html>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_memory.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -0,0 +1,88 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Memory view</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Memory view </h2>
+<p>  Use the <b>Memory</b> view to inspect and change process memory. You can address memory using expressions such as:</p>
+<ul>
+  <li class="code">0x0847d3c </li>
+  <li class="code">(&amp;y)+1024 </li>
+  <li class="code">*ptr</li>
+  <li class="code">FNname + 1 </li>
+</ul>
+<p>You can configure your output to display traditional, hexadecimal, ascii and/or signed/unsigned decimal. You can also set the size of the rendering columns. </p>
+<p class="note"><b>CAUTION</b> Arbitrarily changing memory contents could degrade the stability of the IDE, another program, or the operating system itself. Understand the consequences of manipulating memory.</p>
+<p>Figure 1 shows the Memory view.</p>
+<p align="center"><img src="images/view_memory.png" alt="Memory view" width="619" height="208"></p>
+<p class="figure">Figure 2 - Memory view showing a memory rendering in traditional format</p>
+<h5>Table 1 Memory view&mdash;items </h5>
+<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="37%" scope="col">Item</th>
+    <th width="11%" scope="col">Icon</th>
+    <th width="52%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><a href="../tasks/memory/view_memory_show.htm">New Memory View</a> </td>
+    <td><div align="center"><img src="images/view_mem_new_memory_btn.png" width="16" height="17" /></div></td>
+    <td>Click to add a new Memory monitor view. </td>
+  </tr>
+  <tr>
+    <td><b>Pin Memory Monitor </b></td>
+    <td><div align="center"><img src="images/view_mem_pin_memory_btn.png" width="19" height="18" /></div></td>
+    <td>Pin memory view.</td>
+  </tr>
+  <tr>
+    <td><b>Toggle Memory Monitors Pane </b></td>
+    <td><div align="center"><img src="images/view_mem_toggle_pane_btn.png" width="19" height="17" /></div></td>
+    <td>Toggles the current Memory monitors view between showing only a Memory Monitor pane and a Memory Monitor and Memory Rendering pane. </td>
+  </tr>
+  <tr>
+    <td><b>Toggle Split Pane </b></td>
+    <td><div align="center"><img src="images/view_mem_split_pane_btn.png" width="17" height="17" /></div></td>
+    <td>Alternately shows and hides the Memory Rendering pane. </td>
+  </tr>
+  <tr>
+    <td><b>Link Memory Monitor Panes </b></td>
+    <td><div align="center"><img src="images/view_mem_link_btn.png" width="20" height="19" /></div></td>
+    <td><span>Enable to synchronize the current selection between the rendering of the same memory monitor </span>. </td>
+  </tr>
+  <tr>
+    <td><b>Switch Memory Monitor </b></td>
+    <td><div align="center"><img src="images/view_mem_switch_monitor_btn.png" width="33" height="20" /></div></td>
+    <td>If different memory monitor views have been added, select from list of memory monitor views.</td>
+  </tr>
+  <tr>
+    <td><a href="../tasks/memory/memory_monitor_adding.htm">Add Memory Monitor</a> / <a href="../tasks/memory/memory_rendering_adding.htm">Add Rendering</a> </td>
+    <td><div align="center"><img src="../images/icons/mem_add_monitor_icon.png" width="18" height="18" /></div></td>
+    <td>Add a new memory address or variable to the Memory Monitors pane, or add a new rendering to the Memory Rendering pane. </td>
+  </tr>
+  <tr>
+    <td><a href="../tasks/memory/memory_monitor_removing.htm">Remove Memory Monitor / Remove Rendering </a></td>
+    <td><div align="center"><img src="../images/icons/mem_remove_monitor_icon.png" width="19" height="19" /></div></td>
+    <td>Remove the selected   memory address or variable from the Memory Monitors pane, or remove the selected rendering from the Memory Rendering pane. </td>
+  </tr>
+  <tr>
+    <td><b>Remove All </b></td>
+    <td><div align="center"><img src="../images/icons/mem_remove_all_icon.png" width="21" height="20" /></div></td>
+    <td>Remove all memory monitors or renderings from the associated pane. </td>
+  </tr>
+</table>
+<p align="left">Each memory monitor rendering pane can be configured independently. Right-click in the Renderings pane to see the rendering options available. The options presented in the context menu may differ if you have not chosen the Traditional rendering view (Figure 2). </p>
+<p align="center"><img src="images/menu_memory_rendering_options.png" width="444" height="380"></p>
+<p class="figure">Figure 2 - Rendering pane options </p>
+<h5>Related tasks</h5>
+<ul>
+  <li><a href="../tasks/memory/memory_monitor_adding.htm"> Adding a Memory Monitor</a></li>
+  <li><a href="../tasks/memory/memory_rendering_adding.htm">Adding a Memory Rendering </a></li>
+</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>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_memory_wnd.htm	Wed Jul 21 11:32:00 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,88 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Memory view</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Memory view </h2>
-<p>  Use the <b>Memory</b> view to inspect and change process memory. You can address memory using expressions such as:</p>
-<ul>
-  <li class="code">0x0847d3c </li>
-  <li class="code">(&amp;y)+1024 </li>
-  <li class="code">*ptr</li>
-  <li class="code">FNname + 1 </li>
-</ul>
-<p>You can configure your output to display traditional, hexadecimal, ascii and/or signed/unsigned decimal. You can also set the size of the rendering columns. </p>
-<p class="note"><b>CAUTION</b> Arbitrarily changing memory contents could degrade the stability of the IDE, another program, or the operating system itself. Understand the consequences of manipulating memory.</p>
-<p>Figure 1 shows the Memory view.</p>
-<p align="center"><img src="images/view_memory.png" alt="Memory view" width="619" height="208"></p>
-<p class="figure">Figure 2 - Memory view showing a memory rendering in traditional format</p>
-<h5>Table 1 Memory view&mdash;items </h5>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="37%" scope="col">Item</th>
-    <th width="11%" scope="col">Icon</th>
-    <th width="52%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><a href="../tasks/memory/view_memory_show.htm">New Memory View</a> </td>
-    <td><div align="center"><img src="images/view_mem_new_memory_btn.png" width="16" height="17" /></div></td>
-    <td>Click to add a new Memory monitor view. </td>
-  </tr>
-  <tr>
-    <td><b>Pin Memory Monitor </b></td>
-    <td><div align="center"><img src="images/view_mem_pin_memory_btn.png" width="19" height="18" /></div></td>
-    <td>Pin memory view.</td>
-  </tr>
-  <tr>
-    <td><b>Toggle Memory Monitors Pane </b></td>
-    <td><div align="center"><img src="images/view_mem_toggle_pane_btn.png" width="19" height="17" /></div></td>
-    <td>Toggles the current Memory monitors view between showing only a Memory Monitor pane and a Memory Monitor and Memory Rendering pane. </td>
-  </tr>
-  <tr>
-    <td><b>Toggle Split Pane </b></td>
-    <td><div align="center"><img src="images/view_mem_split_pane_btn.png" width="17" height="17" /></div></td>
-    <td>Alternately shows and hides the Memory Rendering pane. </td>
-  </tr>
-  <tr>
-    <td><b>Link Memory Monitor Panes </b></td>
-    <td><div align="center"><img src="images/view_mem_link_btn.png" width="20" height="19" /></div></td>
-    <td><span>Enable to synchronize the current selection between the rendering of the same memory monitor </span>. </td>
-  </tr>
-  <tr>
-    <td><b>Switch Memory Monitor </b></td>
-    <td><div align="center"><img src="images/view_mem_switch_monitor_btn.png" width="33" height="20" /></div></td>
-    <td>If different memory monitor views have been added, select from list of memory monitor views.</td>
-  </tr>
-  <tr>
-    <td><a href="../tasks/memory/memory_monitor_adding.htm">Add Memory Monitor</a> / <a href="../tasks/memory/memory_rendering_adding.htm">Add Rendering</a> </td>
-    <td><div align="center"><img src="../images/icons/mem_add_monitor_icon.png" width="18" height="18" /></div></td>
-    <td>Add a new memory address or variable to the Memory Monitors pane, or add a new rendering to the Memory Rendering pane. </td>
-  </tr>
-  <tr>
-    <td><a href="../tasks/memory/memory_monitor_removing.htm">Remove Memory Monitor / Remove Rendering </a></td>
-    <td><div align="center"><img src="../images/icons/mem_remove_monitor_icon.png" width="19" height="19" /></div></td>
-    <td>Remove the selected   memory address or variable from the Memory Monitors pane, or remove the selected rendering from the Memory Rendering pane. </td>
-  </tr>
-  <tr>
-    <td><b>Remove All </b></td>
-    <td><div align="center"><img src="../images/icons/mem_remove_all_icon.png" width="21" height="20" /></div></td>
-    <td>Remove all memory monitors or renderings from the associated pane. </td>
-  </tr>
-</table>
-<p align="left">Each memory monitor rendering pane can be configured independently. Right-click in the Renderings pane to see the rendering options available. The options presented in the context menu may differ if you have not chosen the Traditional rendering view (Figure 2). </p>
-<p align="center"><img src="images/menu_memory_rendering_options.png" width="444" height="380"></p>
-<p class="figure">Figure 2 - Rendering pane options </p>
-<h5>Related tasks</h5>
-<ul>
-  <li><a href="../tasks/memory/memory_monitor_adding.htm"> Adding a Memory Monitor</a></li>
-  <li><a href="../tasks/memory/memory_rendering_adding.htm">Adding a Memory Rendering </a></li>
-</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>
-
-</body>
-</html>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_module.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -0,0 +1,24 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Modules View</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Modules View</h2>
+<p>The <b>Modules</b> view displays a list of modules loaded while debugging your program. The listed modules can be selected to show related information. You can open the Modules view in the <a href="../concepts/CarbidePerspective.html">Carbide C/C++</a> perspective by selecting <b>Window &gt; Show view &gt; Other...</b>, then expand the Debug folder and select Modules. In the <a href="perspective_debug.htm">Debug</a> perspective select <b>Window &gt; Show view &gt; Modules</b>.</p>
+<p>The Modules view is only loaded during a debug session and closes when the debug session ends. Select the running man icon to list the Type, Symbols, and Symbols file for the executable. Select the stack of books icon to list the Type, Symbols, Symbols file, and Base address for the shared library. </p>
+<p>Figure 1 shows the Modules view.</p>
+<p align="center"><img src="../images/views/view_module.png" width="595" height="181" /></p>
+<p class="figure">Figure 1 - Modules view</p>
+<h5>Related reference </h5>
+<ul>
+  <li> <a href="../debugger/debug/viewing_debug.htm">Debug view</a></li>
+</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>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_module_wnd.htm	Wed Jul 21 11:32:00 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Modules View</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Modules View</h2>
-<p>The <b>Modules</b> view displays a list of modules loaded while debugging your program. The listed modules can be selected to show related information. You can open the Modules view in the <a href="../concepts/CarbidePerspective.html">Carbide C/C++</a> perspective by selecting <b>Window &gt; Show view &gt; Other...</b>, then expand the Debug folder and select Modules. In the <a href="perspective_debug.htm">Debug</a> perspective select <b>Window &gt; Show view &gt; Modules</b>.</p>
-<p>The Modules view is only loaded during a debug session and closes when the debug session ends. Select the running man icon to list the Type, Symbols, and Symbols file for the executable. Select the stack of books icon to list the Type, Symbols, Symbols file, and Base address for the shared library. </p>
-<p>Figure 1 shows the Modules view.</p>
-<p align="center"><img src="../images/views/view_module.png" width="595" height="181" /></p>
-<p class="figure">Figure 1 - Modules view</p>
-<h5>Related reference </h5>
-<ul>
-  <li> <a href="../debugger/debug/viewing_debug.htm">Debug view</a></li>
-</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>
-
-</body>
-</html>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_proj_explorer.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Project Explorer View</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Project Explorer view </h2>
+<p>  The <b>Project Explorer</b> view (Figure 1) display<span><span>s  relevant C/C++ projects located in the current workspace using a tree structure</span></span>. Use this view to manage all the projects located in the current workspace. The view is customizable and takes advantage of working sets. </p>
+<p>The content of a project is dependent upon how it was created in the workspace.</p>
+<p align="center"><img src="images/view_project_explorer.png" alt="Project Explorer view" width="281" height="424"></p>
+<p class="figure">Figure 1 - Project Explorer view showing projects in the current workspace</p>
+<p>The directories that appear in the project include:</p>
+<ul>
+  <li><b>sis</b>&#8212;the storage location for the final output files. The output file is linked from the top level of the project with a file of the same name.  Both the binary and link files can be expanded to show the source files used to build the program.</li>
+  <li><b>Includes</b>&#8212;a listing of all the include files used to build the project.</li>
+  <li><b>Executables</b> - a listing of debuggable executables imported into the <a href="view_executables.htm">Executables</a> view </li>
+  <li><b>User specified</b>&#8212;many other directories like <span class="code">src</span>, <span class="code">inc</span>, <span class="code">data</span>, and others are used to store specific types of project files. The names used for the directories are defined in the <a href="ProjectDirectories.html">Project Directories</a> page when the project is created. </li>
+</ul>
+<blockquote>
+  <p class="note"><b>NOTE</b> Only the directories specified by the mmp file are created during import. </p>
+</blockquote>
+<p>The files that appear in the project directories can be either:</p>
+<ul>
+  <li><b>files</b> (<img src="images/icon_project_file.png" width="15" height="16" align="absmiddle" />)&#8212;these files are located in the workspace within the project directories. Double-click a file icon to open it for editing.</li>
+  <li><b>folder links</b>&#8212;these are links pointing to folders that enable the project to support  cvs related sources. </li>
+</ul>
+<p>See  <b>C/C++ Development User Guide &gt; Reference &gt; C/C++ Views and Editors &gt; <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_project_explorer_view.htm">Project Explorer view</a></b> for more info. </p>
+<h5>Related references</h5>
+<ul>
+  <li><a href="../concepts/CarbidePerspective.html">Carbide C/C++ Perspective  </a></li>
+</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>
+
+</body>
+</html>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_signals.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -0,0 +1,45 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Signals view</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Signals view</h2>
+<p>  The Signals view of the Debug perspective lets you view the signals defined on the selected debug target and how the debugger handles each one. Figure 1 shows the Signals view.</p>
+<p align="center"><img src="../images/views/view_signals.png" width="500" height="205" /></p>
+<p class="figure">Figure 1 - Signals view</p>
+<h5>Table 1 Signals view&mdash;items </h5>
+<table width="76%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="22%" scope="col">Item</th>
+    <th width="78%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><b>Name</b></td>
+    <td>Displays the name of the signal.</td>
+  </tr>
+  <tr>
+    <td><b>Pass</b></td>
+    <td>Where &quot;yes&quot; is displayed, the debugger lets your program see the signal. Your program can handle the signal, or else it may terminate if the signal is fatal and not handled.</td>
+  </tr>
+  <tr>
+    <td><b>Suspend</b></td>
+    <td>Where &quot;yes&quot; is displayed, the debugger suspends your program when this signal is handled.</td>
+  </tr>
+  <tr>
+    <td><b>Description</b></td>
+    <td>Displays a description of the signal.</td>
+  </tr>
+</table>
+<h5>Related reference </h5>
+<ul>
+  <li> <a href="../debugger/debug/viewing_debug.htm">Debug view</a></li>
+</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>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_signals_wnd.htm	Wed Jul 21 11:32:00 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Signals view</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Signals view</h2>
-<p>  The Signals view of the Debug perspective lets you view the signals defined on the selected debug target and how the debugger handles each one. Figure 1 shows the Signals view.</p>
-<p align="center"><img src="../images/views/view_signals.png" width="500" height="205" /></p>
-<p class="figure">Figure 1 - Signals view</p>
-<h5>Table 1 Signals view&mdash;items </h5>
-<table width="76%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="22%" scope="col">Item</th>
-    <th width="78%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><b>Name</b></td>
-    <td>Displays the name of the signal.</td>
-  </tr>
-  <tr>
-    <td><b>Pass</b></td>
-    <td>Where &quot;yes&quot; is displayed, the debugger lets your program see the signal. Your program can handle the signal, or else it may terminate if the signal is fatal and not handled.</td>
-  </tr>
-  <tr>
-    <td><b>Suspend</b></td>
-    <td>Where &quot;yes&quot; is displayed, the debugger suspends your program when this signal is handled.</td>
-  </tr>
-  <tr>
-    <td><b>Description</b></td>
-    <td>Displays a description of the signal.</td>
-  </tr>
-</table>
-<h5>Related reference </h5>
-<ul>
-  <li> <a href="../debugger/debug/viewing_debug.htm">Debug view</a></li>
-</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>
-
-</body>
-</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_symbian_kernel.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_symbian_kernel.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -15,7 +15,7 @@
 <p>The <b>Symbian OS Data</b> view reveals kernel data in the Symbian OS running on the device being debugged. The kernel data displayed is always that of the device with the currently selected thread or process in <a href="../debugger/debug/viewing_debug.htm">Debug</a> view. If you are debugging two devices at the same time, the content of the view will change when focus is switched from a thread on one device to a thread on another device. The kernel data includes more than just processes and threads. </p>
 <p>For the stop mode debugger and the crash debugger, all the data listed above is supported. For the Application and System TRK debuggers, the chunks and libraries views are not supported. The Symbian OS Data view is not supported for the emulator debugger and will show nothing during an emulator debug session. During a stop mode debug session or a TRK debug session, you are able to select a process or a thread in the Symbian OS Data view and attach the debugger to it for source level debugging if the binary  is listed in the <a href="view_executables.htm">Executables</a> view. Binaries listed in the Executable view can be source level debugged. Binaries  not listed in the Executables view can only be assembly code debugged in the <a href="view_disassembly.htm">Disassembly</a> view.</p>
 <p class="note"><b>NOTE</b> Any executable must be included in the <b>Executables</b> view before it can be debugged. </p>
-<p>When the <a href="wnd_debugger_prefs.htm">Time interval for auto-refreshing OS View</a> option is enabled (which is on by default except for crash debugger), the data in the Symbian OS Data view will be auto-refreshed. Note that &quot;auto-refresh&quot; has a different meaning in different debuggers. During a stop mode debug session, the view will refresh data whenever the debugged program on the device is stopped and shows data as stale (greyed out) when the program is running. During a TRK debug session, the View will refresh data at a time interval regardless of whether the debugged program is stopped or not. The time interval is specified by an option in the Carbide.c++ global preference panel, which is five seconds by default.</p>
+<p>When the <a href="pref_carb_debugger.htm">Time interval for auto-refreshing OS View</a> option is enabled (which is on by default except for crash debugger), the data in the Symbian OS Data view will be auto-refreshed. Note that &quot;auto-refresh&quot; has a different meaning in different debuggers. During a stop mode debug session, the view will refresh data whenever the debugged program on the device is stopped and shows data as stale (greyed out) when the program is running. During a TRK debug session, the View will refresh data at a time interval regardless of whether the debugged program is stopped or not. The time interval is specified by an option in the Carbide.c++ global preference panel, which is five seconds by default.</p>
 <p>When auto-refresh is turned off, the debugger will not automatically refresh data in the View and will show the data as stale (greyed out). However you can manually refresh the data by clicking on the &quot;Refresh&quot; button in the View. Usually you may want to turn off the auto-refresh if you think it is slowing down your debug operations such as stepping.</p>
 <h3>Symbian OS Data pages
 </h3>
@@ -45,7 +45,7 @@
   <tr valign="top">
     <td class="Cell"><p> <b>Refresh data</b></p></td>
     <td class="Cell"><div align="center"><img src="images/view_symbianOSbtn_refresh.png" width="19" height="19" alt="" /></div></td>
-    <td class="Cell"><p> Click this button to force a refresh of data in the view. Use the <a href="wnd_debugger_prefs.htm">Carbide.c++ Debugger</a> preference panel <b>Time interval for auto-refreshing OS View</b> option to control the automatic refreshing of data. </p></td>
+    <td class="Cell"><p> Click this button to force a refresh of data in the view. Use the <a href="pref_carb_debugger.htm">Carbide.c++ Debugger</a> preference panel <b>Time interval for auto-refreshing OS View</b> option to control the automatic refreshing of data. </p></td>
   </tr>
   <tr valign="top">
     <td class="Cell"><p> <b>Enable/disable auto-refresh</b> </p></td>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_build_prefs.htm	Wed Jul 21 11:32:00 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,132 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Build preferences</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-<style type="text/css">
-<!--
-.style4 {font-family: Verdana, Ariel, Helvetica, sans-serif; font-weight: bold; }
--->
-</style>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Build preferences</h2>
-<p>The Carbide.c++ &gt; <img src="../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=com.nokia.carbide.cdt.internal.builder.ui.BuilderPreferencePage)")'> Build
-</a> page in the <b>Preferences</b> window provides global preferences to control general build options like clean, test components, dependency tracking, concurrent build jobs, build behavior, and emulator options.</p>
-<p align="center"><img src="images/prefs_build_workspace.png" width="620" height="458" alt="" /></p>
-<p class="figure">Figure 1 - Build workspace preferences page </p>
-<p>The following options are available in both the global Build preference panel and the project <b>Properties &gt; Carbide.c++ &gt; </b><b><a href="build_properties/pane_project_settings.htm">Project Settings</a></b> panel. </p>
-<h5>Table 1 Build Preferences &mdash;items</h5>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="29%" scope="col">Item</th>
-    <th width="57%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><b>Use built-in Nokia x86 environment variables for WINSCW builds </b></td>
-    <td><p>If enabled, Carbide adds the built-in x86 compiler environment variables to the build environment.</p>
-      <p>If the option is not
-        checked, the build process will build with whatever tools are defined in your environment.</p>
-    <p>A directory named x86Build at the root of the product installation contains the build tools, libraries, and <span class="code"><a href="../tasks/projects/prj_build_cmd_line.htm">env_update.exe</a></span>.</p></td>
-  </tr>
-  <tr>
-    <td><b>Build test components when building from bld.inf </b></td>
-    <td><p>Enable to build all the projects defined by .MMP files listed under the <span class="code">PRJ_TESTMMPFILES</span> section of the component description file. </p>
-    <p>If not enabled, only those projects defined by .MMP files listed under the <span class="code">PRJ_MMPFILES</span> section of the component description file are built. </p>    </td>
-  </tr>
-  <tr>
-    <td><b>Run builds concurrently (improves compile time) </b></td>
-    <td><p>Enable to tell Carbide to generate concurrent builds up to the amount specified in the Build jobs field. This option can significantly reduce build times as it takes advantage of multi-core processors and hyperthreading to run multiple threads at once. </p>
-    <p>If not enabled, only a single build is run. Note that this may be required if your project contains circular dependencies or other issues that prevent concurrent builds from executing correctly. </p></td>
-  </tr>
-  <tr>
-    <td><b>Use default incremental builder </b></td>
-    <td>Enable to have Carbide determine if a  build is required by checking the state of  any file in the workspace. </td>
-  </tr>
-</table>
-<p>&nbsp;</p>
-<p align="center"><img src="images/carbide_proj_settings_sbsv1.png" alt="sbsv1 tab" width="444" height="143"></p>
-<p align="center" class="figure">Figure 2 - SBSv1 tab</p>
-<h5 align="left">Table 2 Symbian Build System v1 tab </h5>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="29%" scope="col">Item</th>
-    <th width="57%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><p class="style4">Clean level </p></td>
-    <td><p>Specifies the level of clean to perform on  project files. The levels include:</p>
-      <ul>
-        <li>Level 0  (<span class="code">abld clean</span>) - removes all the intermediate files created during compilation, and all the executables and import libraries created by the linker</li>
-        <li>Level 1  (<span class="code">abld reallyclean</span>) - performs a <span class="code">clean</span> operation, but also removes all exported files and makefiles</li>
-        <li>Level 2  (<span class="code">abld reallyclean</span>, <span class="code">bldmake clean</span>) - performs  a <span class="code">reallyclean</span> operation and then removes all files created by bldmake</li>
-      </ul>    </td>
-  </tr>
-  <tr>
-    <td><p class="style4">Manage dependency tracking (improves build speed) </p></td>
-    <td><p>Enable to have Carbide manage the dependency tracking for source and resource files. Carbide does this by separating out the generation of dependency information from the makefile and managing the entire process.  All builds now can quickly compare whether new dependency information is required due to changes in a source file and only build those that need updating. </p>
-    <p>If not enabled, the Symbian OS command line build system handles all dependency tracking by generating the dependency information in the makefiles. Because it does this for all project files, regardless of the number of changes, it can result in a performance penalty. A single edit in a MMP file  forces a complete regeneration of the makefile dependency information for all project files. </p>    </td>
-  </tr>
-  <tr>
-    <td><p><strong>Show a dialog to modify build actions when modified MMPs are detected </strong></p></td>
-    <td><p>Enable to have Carbide ask before starting a build what action to take when modified files are detected. When disabled, do not show a dialog but use the default action listed below.</p>    </td>
-  </tr>
-  <tr>
-    <td><p><strong>Default action to take when mmp files are modified </strong></p></td>
-    <td><p>Defines the default action Carbide should execute when it detects modified MMP files and the option above is disabled: </p>
-      <ul>
-        <li>None</li>
-        <li>Link Only</li>
-        <li>Compile and Link</li>
-      </ul>    </td>
-  </tr>
-  <tr>
-    <td><strong>Do not offer to track dependencies for projects build on command-line </strong></td>
-    <td>If you build a project from the command-line (with 'abld build') and then import the project into Carbide and attempt to build, Carbide will ask if you would like Carbide to manage source dependencies for you. Enabling this option insures Carbide will not ask you to manage dependencies (they will be done as normally done via 'abld build' command).</td>
-  </tr>
-</table>
-<p align="left">&nbsp;</p>
-<p align="center"><img src="images/carbide_proj_settings_sbsv2.png" alt="sbsv2 tab" width="423" height="176"></p>
-<p align="center" class="figure">Figure 3 - SBSv2 tab </p>
-<h5 align="left">Table 3 Symbian Build System v2 tab </h5>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="29%" scope="col">Item</th>
-    <th width="57%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><b>Clean level </b></td>
-    <td>Select the level of clean when cleaning a project.
-      <p><strong>abld clean</strong> erases all files created by a corresponding abld target   command (all intermediate files created during compilation and all executables and import libraries created by the linker) </p>
-      <p><strong>abld reallyclean</strong> does what abld clean does, and also removes files   exported by abld export and makefiles generated by abld makefile, or the abld   test equivalents</p></td>
-  </tr>
-  <tr>
-    <td><b>Keep going </b></td>
-    <td><p>This build option tells a particular command to   keep going even if unrelated build steps report errors or files are missing.</p></td>
-  </tr>
-  <tr>
-    <td><b>Debug mode </b></td>
-    <td><p>This option generates symbolic debug information for release or debug builds,   independent of the compiler optimization level.</p>
-        <p>By default, the build system generates symbolic debug information only for   the debug builds. With this option, the generation of symbolic debug information   is extended to release builds to support debugging of release binaries on ARM   ABI compliant platforms.</p></td>
-  </tr>
-  <tr>
-    <td><b>Additional SBSv2 arguments</b></td>
-    <td>Enter additional SBSv2 build arguments here.</td>
-  </tr>
-  <tr>
-    <td><b>Override default make engine </b></td>
-    <td>Check this box to enable  an edit box to specify the make engine to use, for example, eMake  from Electric Cloud.</td>
-  </tr>
-</table>
-<h5>Related references</h5>
-<ul>
-  <li><a href="build_properties/pane_project_settings.htm">Project Settings </a></li>
-</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>
-
-</body>
-</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_carbide_pref.htm	Wed Jul 21 11:32:00 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Carbide.c++ preference</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Carbide.c++ preferences</h2>
-<p>The <img src="../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=com.nokia.carbide.cpp.project.ui.preferences.CarbidePreferencePage)")'>
-Carbide.c++</a> panel in the <b>Preferences</b> window provides an option to keep your projects updated when you add or create files. Figure&nbsp;1 shows the Carbide.c++ preference panel.</p>
-<p align="center"><img src="images/prefs_carbide_cpp.png" alt="Carbide.c++ preference panel" width="671" height="554"></p>
-<p class="figure">Figure 1 - Carbide.c++ preferences page </p>
-<h5>Table 1 Carbide.c++ Preferences &mdash;items</h5>
-<table width="850"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="29%" scope="col">Item</th>
-    <th width="57%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><b>Keep Symbian OS project files (bld.inf/mmp) in sync with project changes</b></td>
-    <td>Select this option to update project files (bld.inf and mmp) when you add, remove, rename or move files and directories in your current workspace.</td>
-  </tr>
-  <tr>
-    <td><b>When files are added to the project </b></td>
-    <td><p>The following options are available when files are added to a project:</p>
-      <ul>
-        <li>Ask before changing bld.inf/mmp - You are prompted to allow changes </li>
-        <li>Always change bld.inf/mmp - Changes are made wthout asking you to allow change </li>
-        <li>Never change bld.inf/mmp - No changes are made </li>
-    </ul></td>
-  </tr>
-  <tr>
-    <td><b>When files in the project are moved/renamed/deleted </b></td>
-    <td><p>The following options are available that effect the bld.inf or mmp files when files in a project are moved, renamed, or deleted:</p>
-      <ul>
-        <li>Ask before changing bld.inf/mmp - You are prompted to allow changes </li>
-        <li>Always change bld.inf/mmp - Changes are made wthout asking you to allow change </li>
-        <li>Never change bld.inf/mmp - No changes are made </li>
-      </ul></td>
-  </tr>
-  <tr>
-    <td><b>Indexing Options</b></td>
-    <td><p>The following options control how the project mmp files are indexed:</p>
-      <ul>
-        <li>Index only source files from mmp files being built (default)</li>
-        <li>Index source files from all mmp files </li>
-    </ul></td>
-  </tr>
-</table>
-<h5>Related references</h5>
-<ul>
-  <li><a href="../tasks/sdks/sdk_platform_filter.htm">Platform Filtering Preferences</a></li>
-  <li><a href="SDKPreferences.html">SDK Preferences</a></li>
-</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>
-
-</body>
-</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_carbide_pref_x86.htm	Wed Jul 21 11:32:00 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Unsetting Built-in Environment</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Unsetting Built-in Environment</h2>
-<p>The Carbide.c++ &gt; <img src="../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand(&quot;org.eclipse.ui.window.preferences(preferencePageId=com.nokia.carbide.cdt.internal.builder.ui.BuilderPreferencePage)&quot;)'> Build</a> page in the <b>Preferences</b> window provides an option   to use the local x86 build tools for each emulator build. A directory named x86Build at the root of the product installation contains the build tools, libraries, and <span class="code">env_update.exe</span> file.</p>
-<p>Uncheck the &quot;Use built-in Nokia x86 environment variables for WINSCW builds&quot; option if you do not want to use the built-in compiler.</p>
-<p>Figure 1 shows the <a href="wnd_build_prefs.htm">Build</a> preferences window.</p>
-<p align="center"><img src="images/carbide_preferences2.png" width="670" height="373" /></p>
-<p class="figure">Figure 1 -Build preferences window showing Emulator Build Options </p>
-<h5>Related references</h5>
-<ul>
-  <li><a href="../tasks/sdks/sdk_platform_filter.htm">Platform Filtering Preferences</a></li>
-  <li><a href="SDKPreferences.html">SDK Preferences</a></li>
-</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>
-
-</body>
-</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_debugger_prefs.htm	Wed Jul 21 11:32:00 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Carbide.c++ Debugger Preferences</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Carbide.c++ Debugger preferences</h2>
-<p>The <b>Debug</b> &gt; <img src="../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=com.nokia.cdt.debug.cw.symbian.ui.GlobalSettings)")'>
-Carbide.c++ Debugger</a> preference panel provides global debugger settings for the Carbide.c++ tools. </p>
-<p align="center"><img src="images/panel_global_debugger.png" width="688" height="586" alt="" /></p>
-<p class="figure">Figure 1 - Carbide.c++ Debugger preference panel</p>
-<h5>Table 1. Carbide.c++ Debugger panel&mdash;items </h5>
-<table width="88%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="35%" scope="col">Item</th>
-    <th width="65%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><b>Attempt to show the dynamic runtime type of objects </b></td>
-    <td>Enable this option to have the debugger deduce the actual type of an object at runtime and display it in the Variables view (applies to <b>x86 only</b>). By default, the debugger does not attempt to determine the type of an object at runtime and will simply show its declared type. Enabling this option can slow the start of a debug session.</td>
-  </tr>
-  <tr>
-    <td><b>Do not step into runtime support code </b></td>
-    <td><p>Select this option to avoid stepping into runtime support code. Runtime support code is generated by the compiler to support C++ features like <span class="code">new</span> and <span class="code">delete</span>. When enabled the debugger  attempts to identify and skip this glue code and step directly into your code. If this option is disabled the debugger steps into this language support code. For example if you are debugging this line of code and step in: </p>
-      <p class="code">MyClass* var = new MyClass(); </p>
-    <p>With this option selected the debugger will skip the code that implements the operator <span class="code">new</span> and step into the constructor for <span class="code">MyClass</span>. If this option is disabled the debugger would step into the code in <span class="code">new</span> that allocates the object.</p></td>
-  </tr>
-  <tr>
-    <td><b>Default size for unbounded arrays </b></td>
-    <td>Enter the number of array objects to display by default. </td>
-  </tr>
-  <tr>
-    <td><b>Find source files outside the SDK </b></td>
-    <td>Enable to have the debugger automatically search for source files outside of the SDK. If disabled, the debugger will only look within the SDK epocroot directory.</td>
-  </tr>
-  <tr>
-    <td><b>Time interval for auto-refreshing OS View</b></td>
-    <td>Determines how often to refresh data in the <a href="view_symbian_kernel.htm">Symbian OS Data</a> view which is available to the developer when using TRK or stop-mode debugging. </td>
-  </tr>
-</table>
-<div class="step">
-  <h4>To access the Carbide.c++ Debugger Preferences</h4>
-  <ol>
-    <li>Select the Window &gt; Preferences menu item<br />
-    <p>The Preferences window (Figure 1) appears. </p></li>
-    <li>Expand the C/C++ and Debug sections</li>
-    <li>Select the Carbide.c++ Debugger item <br />
-    <p>The Carbide.c++ Debugger preference panel appears. </p>
-    </li>
-  </ol>
-</div>
-  <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>
-
-</body>
-</html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_diagnostic_logs_pref.htm	Wed Jul 21 11:32:00 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Diagnostic Logs preferences</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Diagnostic Logs  preferences</h2>
-<p>The <b>Diagnostic Logs</b> page in the <b>Preferences</b> window provides the ability to activate and save debugger log files in the project. When activated, the debugger generates an XML file containing useful debugger event information that can facilitate the locating and erradication of bugs in a project. </p>
-<p class="note"><b>NOTE</b> When logging is activated the performance of the debugger will be reduced as the log information is generated. </p>
-<p align="center"><img src="images/prefs_diagnostic_logs.png" width="627" height="544"></p>
-<p class="figure">Figure 1 - Diagnostic Logs preferences panel </p>
-<h5>Table 1 <span class="figure">Diagnostic Logs</span> preferences &mdash;items</h5>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="29%" scope="col">Item</th>
-    <th width="57%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><b>Diagnostic Logs</b> </td>
-    <td>A list of the log files that can be generated. Log files are stored in the project but are not visible in the <a href="view_cpp_projects.htm">Project Explorer</a> or C/C++ Project views. </td>
-  </tr>
-  <tr>
-    <td><b>Clear Logs </b></td>
-    <td><p>Click to erase all log files from the project. </p>
-    </td>
-  </tr>
-</table>
-<h5>Related references</h5>
-<ul>
-  <li><a href="build_properties/pane_project_settings.htm">Carbide Project Settings </a></li>
-</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>
-
-</body>
-</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_pref_code_style.htm	Wed Jul 21 11:32:00 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
-<title>Code Styles preferences</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-   <body>
-<h2>Code Styles preferences</h2>
-
-	  
-	 <p>Carbide supports the use of code styles in projects via the C/C++  <img src="../images/command_link.png" alt="" width="16" height="12" border="0" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.cdt.ui.preferences.CodeFormatterPreferencePage)")'> Code Style</a> preference panel. Use a code style profile to set specific smart typing features, like indentation, tabs or spaces, and many more options. There are several built-in code styles like GNU, Whitesmith, and others, while Carbide supplies these  additional styles:</p>
-	 <ul>
-	   <li><b>Symbian OS</b> &#8212; settings are based on the <a href="http://developer.symbian.com/main/downloads/papers/coding_stds/2003-01_SyOSCodStn.pdf">Symbian OS C++ coding standards</a></li>
-	   <li><b>S60</b> &#8212; settings are based on the <strong>C++ Developer's Library &gt; </strong><a href="http://library.forum.nokia.com/index.jsp?topic=/Nokia_Symbian3_Developers_Library/GUID-B51A9A1F-8E80-4DF6-904A-7BD1A8976BBB.html">C++ Coding Conventions</a></li>
-       <li><strong>Qt</strong> &mdash; settings for Qt projects</li>
-   </ul>
-   <p>Setting a code style sets it for the entire workspace. When a new file is created the currently selected code style rules are applied as you edit the file. You can apply a set of rules to a previously created source file by opening it in an editor view, then right-clicking and choosing <b>Source &gt; Format</b> (<span class="code">CTRL+SHIFT+F</span>). </p>
-	 <p align="center"><img src="images/wnd_pref_code_styles.png" width="658" height="562" /></p>
-   <p align="center" class="figure">Figure 1 - Code Style preference panel </p>
-	 <h5>Related references	 </h5>
-	 <ul>
-       <li><a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_c_code_style_pref.htm">Code Style preferences</a></li>
-       <li><a href="../tasks/code_style_workspace.htm">Setting the Workspace Code Style</a> </li>
-       <li><a href="../tasks/code_style_reformatting_sources.htm">Reformatting a Source File</a> </li>
-   </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>
-
-   </body>
-   </html>
-   
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_preprocess_prefs.htm	Wed Jul 21 11:32:00 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Preprocess preferences</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Preprocess preferences</h2>
-<p>The Carbide.c++ &gt; <img src="../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=com.nokia.carbide.cdt.builder.utils.ui.PreprocessPreferencePage)")'> Preprocess</a> page in the <b>Preferences</b> window provides global settings for the Carbide preprocessor. </p>
-<p align="center"><img src="images/prefs_preprocess.png" width="645" height="551" /></p>
-<p class="figure">Figure 1 - Preprocess preferences page </p>
-<h5>Table 1 <span class="figure">Preprocess</span> p references &mdash;items</h5>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="20%" scope="col">Item</th>
-    <th width="57%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td width="20%"><b>Send output to the build console </b></td>
-    <td><p>Enable to direct preprocessor output to a console view. </p>
-    </td>
-  </tr>
-  <tr>
-    <td width="20%"><b>Send output to the editor </b></td>
-    <td><p>Enable to direct preprocessor output to an editor. </p>
-    </td>
-  </tr>
-  <tr>
-    <td width="20%"><b>CPP arguments </b></td>
-    <td><p>Enter the preprocessor arguments used by the preprocessor. </p>
-    </td>
-  </tr>
-</table>
-<h5>Other references</h5>
-<ul>
-  <li><a href="../tasks/projects/prj_preprocess.htm">Preprocessing Files</a> </li>
-</ul>
-<p>&nbsp; </p>
-<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>
-
-</body>
-</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/AddinganSDK.html	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/AddinganSDK.html	Wed Jul 21 13:50:58 2010 -0500
@@ -36,7 +36,7 @@
    </ul>
    <img src="../images/related_references.png" width="115" height="14" />
 <ul>
-       <li><a href="../reference/SDKPreferences.html">SDK Preferences</a></li>
+       <li><a href="../reference/pref_carb_sdk_preferencea.html">SDK Preferences</a></li>
    </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>
 
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/CreatingNewProjects.html	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/CreatingNewProjects.html	Wed Jul 21 13:50:58 2010 -0500
@@ -8,7 +8,7 @@
 <h2>Creating New Symbian OS C++ Projects</h2>
   <div class="Bodytext">
     <p>New  projects are created using the <b>New Project Wizard</b>. Carbide includes a number of templates that make creating projects for different SDKs and executables quick and easy.</p>
-    <p class="note"><b>NOTE</b> You must have  at least one recognized SDK installed before you can create a project. See the <a href="../reference/SDKPreferences.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to <a href="sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
+    <p class="note"><b>NOTE</b> You must have  at least one recognized SDK installed before you can create a project. See the <a href="../reference/pref_carb_sdk_preferencea.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to <a href="sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
     <p class="note"><b>NOTE</b> When creating or importing projects the sources and SDK must be on the same drive. This is due to many of the internal SDK tools using an implicit working drive to calculate paths (e.g. \epoc32\tools). Avoid spaces in SDK paths since this will also cause problems.</p>
     <div class="step">
     <h3>Creating New Symbian OS C++ Projects</h3>
@@ -18,7 +18,7 @@
         <li>The <b class="step">New Symbian OS C++ Project</b> wizard appears. Select a template related to an installed SDK.</li>
       <p>A project template provides the initial source files and project settings appropriate for the chosen project type. A brief description of each template appears below the list. The project type determines the type of program that you are writing.</p>
       <p class="note"><b>NOTE</b> If the selected template requires user input, additional wizard pages will collect data from the user before creating the project.</p>
-      <p>Checkmark the <b>Filter templates based on enabled SDKs</b> option to only list  SDKs enabled in the <a href="../reference/SDKPreferences.html">SDK Preferences</a> panel. Uncheck this option to list  SDKs that can be used with Carbide. Click <b>Next</b>.</p>
+      <p>Checkmark the <b>Filter templates based on enabled SDKs</b> option to only list  SDKs enabled in the <a href="../reference/pref_carb_sdk_preferencea.html">SDK Preferences</a> panel. Uncheck this option to list  SDKs that can be used with Carbide. Click <b>Next</b>.</p>
       <p align="center"><img src="../images/step2.png" width="500" height="567" alt="" ></p>
       <li>Enter a name for your project. </li>
       <p>Checkmark the <b>Use default location</b> option to save the project in the current workspace by default or uncheck it to save to another location. Enter the path in the <b>Location</b> field or click <b>Browse</b> button to locate the directory. Click <b>Next</b>.</p>
@@ -68,7 +68,7 @@
         </div>
       <p>Accept the defaults or enter the names for Include and Source folders to be created under the project root directory. Generated files will be copied to these directories.</p>
       <li> Click <b>Finish</b> to create the project.</li>
-      <p>This generates the necessary files for the project based on the template selected and show them in the <a href="../reference/view_cpp_projects.htm">Project Explorer</a> view.</p>
+      <p>This generates the necessary files for the project based on the template selected and show them in the <a href="../reference/view_proj_explorer.htm">Project Explorer</a> view.</p>
     </ol>
     <blockquote>
       <p align="center"><img src="../images/step7.png" width="273" height="301" alt="" > </p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/EmulatorToc.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/EmulatorToc.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -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">Unsetting Built-in Environment </a></li>
-   </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>
-
-   </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/pref_carb_x86_exceptions.htm">Unsetting Built-in Environment </a></li>
+   </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>
+
+   </body>
+   </html>
    
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/ImportingProjects.html	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/ImportingProjects.html	Wed Jul 21 13:50:58 2010 -0500
@@ -100,7 +100,7 @@
          <li> Click Finish to import the project
              <p>
                  The
-                 wizard creates the project in the <a href="../reference/view_cpp_projects.htm">Project Explorer</a> view, where it can be built and edited as normal. If the wizard is unable to read the project files, then the page
+                 wizard creates the project in the <a href="../reference/view_proj_explorer.htm">Project Explorer</a> view, where it can be built and edited as normal. If the wizard is unable to read the project files, then the page
                  describes the error that occurred. If an error occurs, you must fix the project file, and then
              re-import the bld.inf.</p>
                      </li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/WorkingwithSDKs.html	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/WorkingwithSDKs.html	Wed Jul 21 13:50:58 2010 -0500
@@ -8,13 +8,13 @@
 		which of the installed SDKs to work with. From the chosen SDK, Symbian OS
 		plug-ins pick-up information such as header files, import libraries,
    documentation and other SDK specific information.</p>
-  <p>You can add and manage SDKs in the SDK Preferences panel. The <a href="../reference/SDKPreferences.html">SDK Preferences</a> panel lists all
+  <p>You can add and manage SDKs in the SDK Preferences panel. The <a href="../reference/pref_carb_sdk_preferencea.html">SDK Preferences</a> panel lists all
     available SDKs and allows you to rescan the drive for newly installed and supported SDKs or remove an existing SDK.
     The changes in SDK Preferences are applicable to all projects under that
     workspace.</p>
   <h5>Related references</h5>
   <ul>
-    <li><a href="../reference/SDKPreferences.html">SDK Preferences</a></li>
+    <li><a href="../reference/pref_carb_sdk_preferencea.html">SDK Preferences</a></li>
     <li><a href="sdks/sdk_add.htm">Adding  SDKs</a></li>
     <li><a href="sdks/sdk_search.htm">Searching SDKs</a></li>
     <li><a href="../tasks/RmvngandVwngPropsosSDK.html">Viewing SDK Properties</a></li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/code_style_reformatting_sources.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/code_style_reformatting_sources.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -10,7 +10,7 @@
 	 <div class="step">
 	   <h4>To reformat a source file</h4>
 	   <ol>
-	     <li>Verify the correct code style is set in the <a href="../reference/wnd_pref_code_style.htm">Code Style</a> preference panel </li>
+	     <li>Verify the correct code style is set in the <a href="../reference/pref_code_style.htm">Code Style</a> preference panel </li>
          <li>Open an editor view with the source file you want to reformat</li>
 	     <li>Right-click and choose <b>Source &gt; Format</b> (<span class="code">CTRL+SHIFT+F</span>)</li>
 	   </ol>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/code_style_workspace.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/code_style_workspace.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -13,7 +13,7 @@
 	 <div class="step">
        <h4>To set the workspace code style</h4>
 	   <ol>
-         <li>Open  the <a href="../reference/wnd_pref_code_style.htm">Code Style</a> preference panel </li>
+         <li>Open  the <a href="../reference/pref_code_style.htm">Code Style</a> preference panel </li>
 	     <li>Choose a profile from the Select a profile dropdown list </li>
 	     <li>Click OK </li>
        </ol>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -11,7 +11,7 @@
 <p>This example shows how to create and build an application and debug it on a device using JTAG debug software and Lauterbach hardware.</p>
 <p>The basic steps include:</p>
 <ul>
-  <li>Verify that your SDK or customer kit is recognized in the <a href="../../reference/SDKPreferences.html">SDK preferences</a> panel.</li>
+  <li>Verify that your SDK or customer kit is recognized in the <a href="../../reference/pref_carb_sdk_preferencea.html">SDK preferences</a> panel.</li>
   <li>Create project or <a href="../ImportingProjects.html">Import</a> the project's bld.inf file into Carbide.c++</li>
 <li>Specify your <a href="../../reference/ROM_build_settings.html">ROM build settings</a> for the selected project</li>
   <li><a href="../projects/prj_build.htm">Build</a> your Project with the ARMV5 Debug Build Configuration</li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug_precond.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug_precond.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -18,7 +18,7 @@
 <li>Install Board Support Package (BSP) for your target board</li>
 <li>Install JTAG software and drivers for <a href="http://www.lauterbach.com">Trace32</a>  support</li>
 <li>Connect JTAG interface between PC and hardware</li>
-<li>Verify that your SDK or customer kit is recognized in the <a href="../../reference/SDKPreferences.html">SDK preferences</a> panel.</li>
+<li>Verify that your SDK or customer kit is recognized in the <a href="../../reference/pref_carb_sdk_preferencea.html">SDK preferences</a> panel.</li>
 <li>Build your <a href="../../reference/ROM_build_settings.html">ROM Image</a></li>
 </ul>
 </div>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/memory/memory_monitor_adding.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/memory/memory_monitor_adding.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -9,7 +9,7 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Adding a Memory Monitor </h2>
-<p>You can add one or more memory monitors to the <a href="../../reference/view_memory_wnd.htm">Memory</a> view. A memory monitor  shows the contents of a different address or expression. </p>
+<p>You can add one or more memory monitors to the <a href="../../reference/view_memory.htm">Memory</a> view. A memory monitor  shows the contents of a different address or expression. </p>
 <p class="note"><b>NOTE</b> When using an emulator, the memory addresses are actually based on their location and  formats dependent upon the host machine. </p>
 <div class="step">
   <h4>To add a Memory Monitor</h4>
@@ -49,7 +49,7 @@
 </ul>
 <h5>Related References </h5>
 <ul>
-  <li><a href="../../reference/view_memory_wnd.htm">Memory View</a></li>
+  <li><a href="../../reference/view_memory.htm">Memory View</a></li>
 </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>
 
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/memory/memory_monitor_removing.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/memory/memory_monitor_removing.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -50,7 +50,7 @@
   </ul>
   <h5>Related References </h5>
   <ul>
-    <li><a href="../../reference/view_memory_wnd.htm">Memory View</a>
+    <li><a href="../../reference/view_memory.htm">Memory View</a>
 </li>
 </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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/memory/memory_rendering_adding.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/memory/memory_rendering_adding.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -42,7 +42,7 @@
 </ul>
 <h5>Related References </h5>
 <ul>
-  <li><a href="../../reference/view_memory_wnd.htm">Memory View</a></li>
+  <li><a href="../../reference/view_memory.htm">Memory View</a></li>
 </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>
 
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/memory/view_memory_show.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/memory/view_memory_show.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -30,7 +30,7 @@
 </ul>
 <h5>Related References </h5>
 <ul>
-  <li><a href="../../reference/view_memory_wnd.htm">Memory View</a></li>
+  <li><a href="../../reference/view_memory.htm">Memory View</a></li>
 </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>
 
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_clean.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_clean.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -9,11 +9,11 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Cleaning Projects</h2>
-<p>In the <a href="../../reference/view_cpp_projects.htm">Project Explorer</a> or <a href="../../reference/view_sym_proj_nav.htm">Symbian Project Navigator</a> views you can select a project, right-click and select <b>Clean Project</b> (<span class="code">CTRL+SHIFT+-</span>) to remove the object and make files, and output files. The files that are removed by this command include all the intermediate files created during compilation and all the executables and import libraries created by the linker.</p>
+<p>In the <a href="../../reference/view_proj_explorer.htm">Project Explorer</a> or <a href="../../reference/view_sym_proj_nav.htm">Symbian Project Navigator</a> views you can select a project, right-click and select <b>Clean Project</b> (<span class="code">CTRL+SHIFT+-</span>) to remove the object and make files, and output files. The files that are removed by this command include all the intermediate files created during compilation and all the executables and import libraries created by the linker.</p>
 <p>If you select a project and select the menu option <b>Project &gt; Clean...</b> the <b>Clean</b> dialog  appears (Figure 1). You can clean all projects or select individual projects to clean within the workspace. This method of cleaning projects  performs the same operations as the <b>Clean Project</b> context menu option. If the <b>Start a build immediately</b> option is selected, then the selected project(s) are rebuilt after the clean operation.</p>
 <p align="center"><img src="images/clean.png" width="500" height="440" /></p>
 <p class="figure">Figure 1 - Clean project options</p>
-<p>By default, performing a<b> Clean Project</b> complies with the global  <b>Clean level</b> settings in the <a href="../../reference/wnd_build_prefs.htm">Build</a> preference panel and inherited by the project on creation. You can also assign project specific clean settings in the <span class="note"><a href="../../reference/build_properties/pane_project_settings.htm">Carbide Project Settings</a></span> panel in the <b>Properties for &lt;<i>project</i>&gt;</b> dialog. </p>
+<p>By default, performing a<b> Clean Project</b> complies with the global  <b>Clean level</b> settings in the <a href="../../reference/pref_carb_build.htm">Build</a> preference panel and inherited by the project on creation. You can also assign project specific clean settings in the <span class="note"><a href="../../reference/build_properties/prop_carb_project_settings.htm">Carbide Project Settings</a></span> panel in the <b>Properties for &lt;<i>project</i>&gt;</b> dialog. </p>
 <h5>Table 1. Clean dialog &mdash; options</h5>
   <table width="700" border="0" cellpadding="2" cellspacing="0">
       <tr valign="top">
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_dlls.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_dlls.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -19,7 +19,7 @@
 <ul>
   <li>If the DLL is not built by the project you can import the DLL by  clicking the<b> Import an executable file</b> icon (<img src="../../images/icons/btn_import_executables.png" width="18" height="15" align="absmiddle">) in the <a href="../../reference/view_executables.htm">Executables</a> view. Then, set your  breakpoints and start the  debug session.</li>
 </ul>
-<p> You can use the <a href="../../reference/view_module_wnd.htm">Modules</a> view to determine if a particular DLL or binary is loaded and available for debugging.</p>
+<p> You can use the <a href="../../reference/view_module.htm">Modules</a> view to determine if a particular DLL or binary is loaded and available for debugging.</p>
 <h5>Other references</h5>
 <ul>
   <li><a href="../../reference/view_executables.htm">Executables</a> view  </li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_import_exe.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_import_exe.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -29,7 +29,7 @@
     <p>The IDE imports the Symbian executable and displays it in the Executables view  (figure 3).</p>
     <p align="center"><img src="images/wnd_import_executable_06.png" width="677" height="164" /></p>
     <p class="figure">Figure 3 - Executables view showing executable and source files </p>
-    <p>The new project is listed under the <a href="../../reference/view_cpp_projects.htm">Project Explorer</a> view, as shown in Figure 4.</p>
+    <p>The new project is listed under the <a href="../../reference/view_proj_explorer.htm">Project Explorer</a> view, as shown in Figure 4.</p>
     <p align="center"><img src="images/wnd_import_executable_05.png" width="252" height="206" /></p>
     <p class="figure">Figure 4 - New executable listed</p>
   </ol>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_new_build_config.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_new_build_config.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -14,7 +14,7 @@
   <h4>Adding/Removing a Build Configuration </h4>
   <ol>
     <li>Open Carbide Build Configuration panel in the project's Properties window
-      <p>Select the <b>Project &gt; Properties</b> menu item or right-click the project name in the <a href="../../reference/view_cpp_projects.htm">Project Explorer</a> view, then select <b>Properties</b>. The project <b>Properties for <em>&lt;project_name&gt;</em></b> window appears. Then select Carbide Build Configurations. </p>    
+      <p>Select the <b>Project &gt; Properties</b> menu item or right-click the project name in the <a href="../../reference/view_proj_explorer.htm">Project Explorer</a> view, then select <b>Properties</b>. The project <b>Properties for <em>&lt;project_name&gt;</em></b> window appears. Then select Carbide Build Configurations. </p>    
       <p align="center"><img src="images/panel_active_config.png" width="801" height="350" alt=""/></p>
       <p class="figure">Figure 1 - Active Configuration group in project Properties window </p></li>
     <li>Click Manage... in the Active Configuration group (Figure 1)
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_preprocess.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_preprocess.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -9,14 +9,14 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Preprocessing Files </h2>
-<p>In the <a href="../../reference/view_cpp_projects.htm">Project Explorer</a> or <a href="../../reference/view_sym_proj_nav.htm">Symbian Project Navigator</a> views you can preprocess source files (.c, .cpp, .cia), header files (.h), and resource files (.rss) by right-clicking the source file and then selecting the <b>Preprocess</b> command. Use the <a href="../../reference/wnd_preprocess_prefs.htm">Preprocess</a> preference panel to specify the preprocessor settings. </p>
+<p>In the <a href="../../reference/view_proj_explorer.htm">Project Explorer</a> or <a href="../../reference/view_sym_proj_nav.htm">Symbian Project Navigator</a> views you can preprocess source files (.c, .cpp, .cia), header files (.h), and resource files (.rss) by right-clicking the source file and then selecting the <b>Preprocess</b> command. Use the <a href="../../reference/pref_carb_preprocess.htm">Preprocess</a> preference panel to specify the preprocessor settings. </p>
 <p>When preprocessing resource files that use more than one language, the <b>Select Language</b> dialog appears asking you to select the language to preprocess. </p>
 <p align="center"><img src="images/menu_preprocessing.png" width="409" height="471"></p>
 <p class="figure">Figure 1 - Selecting a source file to preprocess </p>
 <h5>Other references </h5>
   <ul>
 <li><a href="../../concepts/Projects.html">Projects</a></li>
-<li><a href="../../reference/wnd_preprocess_prefs.htm">Preprocess Preferences </a></li>
+<li><a href="../../reference/pref_carb_preprocess.htm">Preprocess Preferences </a></li>
   </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>
 
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_set_build_tgt.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_set_build_tgt.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -42,7 +42,7 @@
     <li>From the Properties for &lt;<em>project_name</em>&gt; window
       <ol>
         <li>Right-click the project name, select  Properties </li>
-        <li>Select Carbide.c++ &gt; <a href="../../reference/build_properties/pane_build_config.htm">Carbide Build Configurations</a> panel </li>
+        <li>Select Carbide.c++ &gt; <a href="../../reference/build_properties/prop_carb_build_config.htm">Carbide Build Configurations</a> panel </li>
         <li>Select the active build configuration from the Active Configuration dropdown list</li>
         <li>Click Apply </li>
       </ol>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/working_with_sis_pkg_files.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/working_with_sis_pkg_files.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -41,7 +41,7 @@
 &quot;$(EPOCROOT)epoc32\data\z\resource\apps\HelloWorld.rsc&quot; -&quot;!:\resource\apps\HelloWorld.rsc&quot;<br />
 &quot;$(EPOCROOT)epoc32\data\z\private\10003af\import\apps\HelloWorld_reg.rsc&quot; - &quot;!:\private\10003a3f\import\apps\HelloWorld_reg.rsc&quot;<br />
 &quot;$(EPOCROOT)epoc32\data\z\resource\apps\HelloWorld.mbm&quot; -&quot;!:\resource\apps\HelloWorld.mbm&quot;</p>
-<p>In addition you will need to add the PKG file to the project before building the final application. Add the pkg file in the SIS builder tab of the <a href="../../reference/build_properties/pane_build_config.htm">Carbide Build Configurations</a> in the project properties window.</p>
+<p>In addition you will need to add the PKG file to the project before building the final application. Add the pkg file in the SIS builder tab of the <a href="../../reference/build_properties/prop_carb_build_config.htm">Carbide Build Configurations</a> in the project properties window.</p>
 <h5>Related references </h5>
 <ul>
   <li><a href="../../reference/build_properties/pane_build_config_sis.htm">SIS Builder</a> pane</li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/sdk_add.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/sdk_add.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -47,7 +47,7 @@
 <div class="step">
   <h4>Adding  SDKs to Carbide.c++ </h4>
   <ol>
-    <li>Click  Add  New SDK in the <a href="../../reference/SDKPreferences.html">SDK Preferences panel </a></li>
+    <li>Click  Add  New SDK in the <a href="../../reference/pref_carb_sdk_preferencea.html">SDK Preferences panel </a></li>
     <p>The <b>Add New SDK</b> window (Figure 1) appears.</p>
     <li>Enter SDK name, EPOCROOT, and additional information</li>
     <p>Enter the requested information in the appropriate fields.</p>
@@ -65,7 +65,7 @@
 </ul>
 <h5>Related references </h5>
 <ul>
-  <li><a href="../../reference/SDKPreferences.html">SDK Preferences Panel</a></li>
+  <li><a href="../../reference/pref_carb_sdk_preferencea.html">SDK Preferences Panel</a></li>
 </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>
 
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/sdk_platform_filter.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/sdk_platform_filter.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -101,7 +101,7 @@
 <h4>Related references </h4>
 <ul>
   <li><a href="../WorkingwithSDKs.html">Working with SDKs</a></li>
-  <li><a href="../../reference/SDKPreferences.html">SDK Preferences Panel </a> </li>
+  <li><a href="../../reference/pref_carb_sdk_preferencea.html">SDK Preferences Panel </a> </li>
 </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>
 
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/sdk_search.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/sdk_search.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -9,13 +9,13 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Searching for SDKs</h2>
-<p>  Use the <a href="../../reference/SDKPreferences.html">SDK Preferences panel</a> to search for installed Symbian OS SDKs.</p>
+<p>  Use the <a href="../../reference/pref_carb_sdk_preferencea.html">SDK Preferences panel</a> to search for installed Symbian OS SDKs.</p>
 <p align="center"><img src="../../images/SDKPreferences.png" width="740" height="546" /></p>
 <p class="figure">Figure 1. SDK Preferences panel</p>
 <div class="step">
   <h4>Searching for SDKs </h4>
   <ul>
-    <li>Click Rescan All SDKs in the <a href="../../reference/SDKPreferences.html">SDK Preferences panel </a></li>
+    <li>Click Rescan All SDKs in the <a href="../../reference/pref_carb_sdk_preferencea.html">SDK Preferences panel </a></li>
   </ul>
   <ol>
     <p>Carbide rescans the hard drive searching for install SDKs, adding them to the <b>Available Symbian OS SDKs</b> list.</p>
@@ -28,7 +28,7 @@
   <li><a href="../WorkingwithSDKs.html">Working with SDKs</a></li>
   <li><a href="sdk_add.htm">Adding SDKs</a></li>
   <li><a href="sdk_view_properties.htm">View SDK Properties</a> </li>
-  <li><a href="../../reference/SDKPreferences.html">SDK Preferences Panel</a></li>
+  <li><a href="../../reference/pref_carb_sdk_preferencea.html">SDK Preferences Panel</a></li>
 </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>
 
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/sdk_view_properties.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/sdk_view_properties.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -9,14 +9,14 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>SDK Properties</h2>
-<p> Use the <b>SDK Properties</b> window to examine the properties associated with the currently selected SDK in the <a href="../../reference/SDKPreferences.html">SDK Preferences panel</a>. You can also use this window to <a href="sdk_add_custkits.htm">map</a> an unrecognized SDK to a known build configuration to use CustKits with a project.</p>
+<p> Use the <b>SDK Properties</b> window to examine the properties associated with the currently selected SDK in the <a href="../../reference/pref_carb_sdk_preferencea.html">SDK Preferences panel</a>. You can also use this window to <a href="sdk_add_custkits.htm">map</a> an unrecognized SDK to a known build configuration to use CustKits with a project.</p>
 <p class="note"><b>NOTE</b> The SDK Properties dialog box serves as a devices.xml editor for the OEM or Professional Developer edition of Carbide.c++.</p>
 <p align="center"><img src="images/wnd_sdk_properties.png" width="418" height="375" alt="SDK Properties window" /></p>
 <p class="figure">Figure 1. SDK properties window </p>
 <div class="step">
   <h4>Viewing and Modifying SDK Properties </h4>
   <ol>
-    <li>Select an SDK in the Available Symbian OS SDKs list  in the <a href="../../reference/SDKPreferences.html">SDK Preferences panel </a></li>
+    <li>Select an SDK in the Available Symbian OS SDKs list  in the <a href="../../reference/pref_carb_sdk_preferencea.html">SDK Preferences panel </a></li>
     <li>Click SDK Properties
     <p>The <b>SDK Properties </b> window (Figure 1) appears. You can now review an SDKs properties and make modifications if your Carbide.c++ edition supports SDK modification.</p>
     <p class="note"><b>NOTE</b> Changes are directly applied to the devices.xml file.</p></li>
@@ -29,7 +29,7 @@
   <li><a href="../WorkingwithSDKs.html">Working with SDKs</a></li>
   <li><a href="sdk_add.htm">Adding SDKs</a></li>
   <li><a href="sdk_search.htm">Searching SDKs</a></li>
-  <li><a href="../../reference/SDKPreferences.html">SDK Preferences Panel </a> </li>
+  <li><a href="../../reference/pref_carb_sdk_preferencea.html">SDK Preferences Panel </a> </li>
 </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>
 
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_example.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_example.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -17,7 +17,7 @@
   <li>Using a <a href="carbide_debugging.htm">debugger</a> to interactively control the program in the emulator </li>
 </ul>
 <p>Follow the steps to successfully create the HelloCarbide program and debug it on the S60 Emulator. </p>
-<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../../reference/SDKPreferences.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have installed is not recognized, you may still be able to <a href="../AddinganSDK.html">add</a> it to the Discovered Symbian OS SDK list.</p>
+<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../../reference/pref_carb_sdk_preferencea.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have installed is not recognized, you may still be able to <a href="../AddinganSDK.html">add</a> it to the Discovered Symbian OS SDK list.</p>
 <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>
 
 </body>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_overview_trk.htm	Wed Jul 21 11:32:00 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_overview_trk.htm	Wed Jul 21 13:50:58 2010 -0500
@@ -13,7 +13,7 @@
 <p>This example shows how to create and build an application and debug it on a device using the Application TRK on-device debug agent. Click this link to the <img src="../../images/command_link.png" width="16" height="12" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.cheatsheets.openCheatSheet(cheatSheetId=com.nokia.carbide.cpp.doc.user.trk_appTRK_Using)")'>HelloCarbide</a> cheatsheet that provides links to detailed steps. The majority of steps are identical to the ones used to create a program and debug in an emulator, with some minor variations.</p>
 <p>See the <a href="carbide_example_trk.htm">Run Mode Debug Example</a> for a walkthrough of the following steps which include:</p>
 <ol>
-  <li>Verify that your SDK or customer kit is recognized in the <a href="../../reference/SDKPreferences.html">SDK preferences</a> panel.</li>
+  <li>Verify that your SDK or customer kit is recognized in the <a href="../../reference/pref_carb_sdk_preferencea.html">SDK preferences</a> panel.</li>
   <li>Create a project by <a href="../ImportingProjects.html">importing</a> a Bld.inf  </li>
   <li>Verify that all the symbolics for the binaries are visible in the <a href="../../reference/view_executables.htm">Executables</a> view</li>
   <li><a href="../projects/prj_creating_sis_file.htm">Manage</a> the project's PKG file, being sure to: