From d8c47d612aa69c49b92e57ef007b263dd18a44a3 Mon Sep 17 00:00:00 2001 From: Vivian Kong Date: Wed, 31 Mar 2010 01:34:27 +0000 Subject: [PATCH] Bug 307593 - [Accessibility] CDT documentation has accessibility issues --- doc/org.eclipse.cdt.doc.isv/book.css | 2 +- doc/org.eclipse.cdt.doc.isv/cdtOptions | 2 +- .../4.0/migration_guide_40.html | 12 +- .../whats_new/4.0/whats_new_CBS_40.html | 120 +- .../guide/dom/index/prebuiltIndexes.html | 36 +- .../guide/dom/index/prebuiltVersioning.html | 4 +- .../Managed_Build_Extensibility.html | 2128 ++++++++--------- .../Howtodeveloptemplates.html | 40 +- .../Howtoregistertemplates.html | 4 +- doc/org.eclipse.cdt.doc.user/book.css | 107 +- .../concepts/cdt_c_before_you_begin.htm | 6 +- .../concepts/cdt_c_brkpnts.htm | 14 +- .../concepts/cdt_c_build_over.htm | 74 +- .../concepts/cdt_c_comments.htm | 10 +- .../concepts/cdt_c_content_assist.htm | 8 +- .../concepts/cdt_c_dbg_info.htm | 8 +- .../concepts/cdt_c_discovery_options.htm | 6 +- .../concepts/cdt_c_editor.htm | 2 +- .../concepts/cdt_c_makefile.htm | 14 +- .../concepts/cdt_c_outlineview.htm | 8 +- .../concepts/cdt_c_over_cdt.htm | 12 +- .../concepts/cdt_c_over_dbg.htm | 2 +- .../concepts/cdt_c_perspectives.htm | 8 +- .../concepts/cdt_c_projects.htm | 26 +- .../concepts/cdt_c_search.htm | 24 +- .../concepts/cdt_c_templates.htm | 8 +- .../concepts/cdt_c_views.htm | 10 +- .../concepts/cdt_c_whatsnew.htm | 52 +- .../getting_started/cdt_w_basic.htm | 52 +- .../getting_started/cdt_w_build.htm | 16 +- .../cdt_w_creating_cpp_file.html | 30 +- .../getting_started/cdt_w_debug.htm | 32 +- .../getting_started/cdt_w_existing_code.htm | 24 +- .../getting_started/cdt_w_import.htm | 68 +- .../getting_started/cdt_w_install_cdt.htm | 22 +- .../getting_started/cdt_w_newcpp.htm | 26 +- .../getting_started/cdt_w_newmake.htm | 18 +- .../getting_started/cdt_w_newproj.htm | 64 +- .../cdt_w_prepare_workbench.htm | 16 +- .../getting_started/hw_example.htm | 2 +- .../getting_started/make_example.htm | 2 +- doc/org.eclipse.cdt.doc.user/help.css | 5 + .../reference/cdt_o_mproj_pref_macro.htm | 18 +- .../reference/cdt_o_new_mproj.htm | 2 +- .../reference/cdt_o_new_sproj.htm | 2 +- .../reference/cdt_o_prop_proj.htm | 2 +- .../reference/cdt_u_appearance_pref.htm | 16 +- .../reference/cdt_u_build_pref.htm | 20 +- .../reference/cdt_u_c_code_style_pref.htm | 2 +- .../reference/cdt_u_c_code_templates_pref.htm | 16 +- .../reference/cdt_u_c_editor_color.htm | 28 +- .../reference/cdt_u_c_editor_con_assist.htm | 20 +- .../cdt_u_c_editor_con_assist_adv.htm | 12 +- .../reference/cdt_u_c_editor_folding.htm | 30 +- .../reference/cdt_u_c_editor_gen.htm | 16 +- .../reference/cdt_u_c_editor_hov.htm | 8 +- .../cdt_u_c_editor_mark_occurrences.htm | 2 +- .../reference/cdt_u_c_editor_save_actions.htm | 10 +- .../reference/cdt_u_c_editor_scalability.htm | 20 +- .../reference/cdt_u_c_editor_typing.htm | 22 +- .../reference/cdt_u_c_pref.htm | 6 +- .../reference/cdt_u_call_hierarchy_view.htm | 16 +- .../reference/cdt_u_code_temp.htm | 26 +- .../reference/cdt_u_console_view.htm | 12 +- .../reference/cdt_u_cproj_view.htm | 30 +- .../reference/cdt_u_create_make_target.htm | 2 +- .../reference/cdt_u_dbg_brkpt_actions.htm | 16 +- .../reference/cdt_u_dbg_pref.htm | 18 +- .../reference/cdt_u_dbg_src.htm | 18 +- .../reference/cdt_u_dbg_view.htm | 82 +- .../reference/cdt_u_debug.htm | 2 +- .../reference/cdt_u_dissassembly_view.htm | 8 +- .../reference/cdt_u_environment_pref.htm | 24 +- .../reference/cdt_u_fileprop_discovery.htm | 32 +- .../reference/cdt_u_fileprop_lang_mapp.htm | 8 +- .../reference/cdt_u_fileprop_lng.htm | 2 +- .../reference/cdt_u_fileprop_toolsettings.htm | 8 +- .../reference/cdt_u_find_replace.htm | 22 +- .../reference/cdt_u_fprop_discovery.htm | 32 +- .../reference/cdt_u_fprop_toolsettings.htm | 8 +- .../reference/cdt_u_gdb_mi.htm | 2 +- .../reference/cdt_u_icons.htm | 4 +- .../reference/cdt_u_indexer_preference.html | 30 +- .../reference/cdt_u_language_mapping_pref.htm | 14 +- .../reference/cdt_u_m_edit.htm | 62 +- .../reference/cdt_u_m_file.htm | 40 +- .../reference/cdt_u_m_navigate.htm | 50 +- .../reference/cdt_u_m_project.htm | 32 +- .../reference/cdt_u_m_refactor.htm | 2 +- .../reference/cdt_u_m_run.htm | 18 +- .../reference/cdt_u_m_search.htm | 10 +- .../reference/cdt_u_m_window.htm | 58 +- .../reference/cdt_u_make_settings_pref.htm | 18 +- .../cdt_u_makefile_settings_pref.htm | 18 +- .../reference/cdt_u_memoryview.htm | 38 +- .../reference/cdt_u_modules_view.htm | 14 +- .../reference/cdt_u_navigator_view.htm | 26 +- .../reference/cdt_u_new_proj_wiz.htm | 12 +- .../reference/cdt_u_new_proj_wiz_config.htm | 12 +- .../reference/cdt_u_new_proj_wiz_name.htm | 12 +- .../cdt_u_new_proj_wiz_toolchain.htm | 4 +- .../reference/cdt_u_new_proj_wiz_type.htm | 8 +- .../reference/cdt_u_newproj_behavior.htm | 22 +- .../reference/cdt_u_newproj_buildset.htm | 20 +- .../cdt_u_newproj_discovery_options.htm | 24 +- .../reference/cdt_u_newproj_parser_binary.htm | 12 +- .../reference/cdt_u_newproj_parser_error.htm | 14 +- .../reference/cdt_u_outline_view.htm | 8 +- .../reference/cdt_u_pref_multi_cfg.htm | 8 +- .../reference/cdt_u_problems_view.htm | 6 +- .../reference/cdt_u_project_explorer_view.htm | 18 +- .../reference/cdt_u_prop_all.htm | 10 +- .../reference/cdt_u_prop_build.htm | 88 +- .../reference/cdt_u_prop_build_discovery.htm | 56 +- .../cdt_u_prop_build_environment.htm | 28 +- .../cdt_u_prop_build_settings_artifact.htm | 18 +- .../cdt_u_prop_build_settings_binparser.htm | 20 +- .../cdt_u_prop_build_settings_errparser.htm | 22 +- .../cdt_u_prop_build_settings_steps.htm | 26 +- .../cdt_u_prop_build_settings_tool.htm | 8 +- .../reference/cdt_u_prop_build_toolchain.htm | 20 +- .../reference/cdt_u_prop_build_variables.htm | 28 +- .../reference/cdt_u_prop_builders.htm | 30 +- .../reference/cdt_u_prop_general_idx.htm | 2 +- .../reference/cdt_u_prop_general_lng.htm | 2 +- .../reference/cdt_u_prop_general_pns_ref.htm | 10 +- .../reference/cdt_u_prop_resource.htm | 30 +- .../reference/cdt_u_properties.htm | 2 +- .../reference/cdt_u_properties_view.htm | 12 +- .../reference/cdt_u_registersview.htm | 32 +- .../reference/cdt_u_run_dbg_arg.htm | 14 +- .../reference/cdt_u_run_dbg_comm.htm | 22 +- .../reference/cdt_u_run_dbg_dbg.htm | 8 +- .../reference/cdt_u_run_dbg_env.htm | 16 +- .../reference/cdt_u_run_dbg_launch_group.htm | 44 +- .../reference/cdt_u_run_dbg_main.htm | 8 +- .../reference/cdt_u_run_dbg_srce.htm | 14 +- .../reference/cdt_u_search.htm | 36 +- .../reference/cdt_u_search_view.htm | 2 +- .../reference/cdt_u_signals_view.htm | 22 +- .../reference/cdt_u_views.htm | 10 +- .../tasks/cdt_o_build_task.htm | 2 +- .../tasks/cdt_t_add_brk_action.htm | 18 +- .../tasks/cdt_t_add_brkpnts.htm | 8 +- .../tasks/cdt_t_add_codetemp.htm | 38 +- .../tasks/cdt_t_add_custom_persp.htm | 8 +- .../tasks/cdt_t_add_watch.htm | 8 +- .../tasks/cdt_t_addmaketarget.htm | 4 +- .../tasks/cdt_t_addrmv_brk_action.htm | 28 +- .../tasks/cdt_t_autobuild.htm | 4 +- .../tasks/cdt_t_autosave.htm | 8 +- .../tasks/cdt_t_cbuild_pref.htm | 24 +- .../tasks/cdt_t_comment_out.htm | 8 +- .../tasks/cdt_t_contentassist.htm | 20 +- .../tasks/cdt_t_controldebug.htm | 14 +- .../tasks/cdt_t_conv_proj.htm | 12 +- .../tasks/cdt_t_convert_cdt_proj.htm | 14 +- .../tasks/cdt_t_convert_mbs20_proj.htm | 6 +- .../tasks/cdt_t_create_make_target.htm | 4 +- .../tasks/cdt_t_cust_cpp_editor.htm | 16 +- .../tasks/cdt_t_debug_exes.htm | 36 +- .../tasks/cdt_t_debug_prog.htm | 18 +- .../tasks/cdt_t_disassembly.htm | 6 +- .../tasks/cdt_t_discovery.htm | 14 +- .../tasks/cdt_t_endis_able_brk_wtch.htm | 8 +- .../tasks/cdt_t_expressions.htm | 4 +- .../tasks/cdt_t_filtererror.htm | 8 +- .../tasks/cdt_t_imp_code_temp.htm | 20 +- .../tasks/cdt_t_jumperror.htm | 6 +- .../tasks/cdt_t_manualbuild.htm | 28 +- .../tasks/cdt_t_memory.htm | 2 +- .../tasks/cdt_t_new_cpp.htm | 14 +- .../tasks/cdt_t_new_make.htm | 10 +- .../tasks/cdt_t_new_run_config.htm | 6 +- .../tasks/cdt_t_open_declarations.htm | 4 +- .../tasks/cdt_t_proj_build_set.htm | 34 +- .../tasks/cdt_t_proj_error_parser.htm | 20 +- .../tasks/cdt_t_proj_new.htm | 20 +- .../tasks/cdt_t_proj_new_with_template.htm | 10 +- .../tasks/cdt_t_proj_parser.htm | 20 +- .../tasks/cdt_t_proj_paths.htm | 18 +- .../tasks/cdt_t_proj_platf.htm | 2 +- .../tasks/cdt_t_proj_referenced_configs.htm | 6 +- .../tasks/cdt_t_proj_rename.htm | 6 +- .../tasks/cdt_t_prvw_hide_files.htm | 6 +- .../tasks/cdt_t_refactoring.htm | 6 +- .../tasks/cdt_t_registers.htm | 10 +- .../tasks/cdt_t_rem_wtch_brk.htm | 10 +- .../tasks/cdt_t_run_arg.htm | 12 +- .../tasks/cdt_t_run_com.htm | 16 +- .../tasks/cdt_t_run_config.htm | 6 +- .../tasks/cdt_t_run_dbg.htm | 14 +- .../tasks/cdt_t_run_env.htm | 20 +- .../tasks/cdt_t_run_main.htm | 14 +- .../tasks/cdt_t_run_source.htm | 14 +- .../tasks/cdt_t_search.htm | 48 +- .../tasks/cdt_t_sel_search.htm | 12 +- .../tasks/cdt_t_set_src_fold.htm | 16 +- .../tasks/cdt_t_setreminder.htm | 12 +- .../tasks/cdt_t_shift_code.htm | 8 +- .../tasks/cdt_t_show_proj_files.htm | 8 +- .../tasks/cdt_t_variables.htm | 6 +- 202 files changed, 2905 insertions(+), 2895 deletions(-) diff --git a/doc/org.eclipse.cdt.doc.isv/book.css b/doc/org.eclipse.cdt.doc.isv/book.css index 139eb28a09b..0d00c10b7e0 100644 --- a/doc/org.eclipse.cdt.doc.isv/book.css +++ b/doc/org.eclipse.cdt.doc.isv/book.css @@ -1 +1 @@ -P.Code { display: block; text-align: left; text-indent: 0.00pt; margin-top: 0.000000pt; margin-bottom: 0.000000pt; margin-right: 0.000000pt; margin-left: 15pt; font-size: 10.000000pt; font-weight: medium; font-style: Regular; color: #4444CC; text-decoration: none; vertical-align: baseline; text-transform: none; font-family: "Courier New"; } H6.CaptionFigColumn { display: block; text-align: left; text-indent: 0.000000pt; margin-top: 3.000000pt; margin-bottom: 11.000000pt; margin-right: 0.000000pt; margin-left: 0.000000pt; font-size: 9.000000pt; font-weight: medium; font-style: Italic; color: #000000; text-decoration: none; vertical-align: baseline; text-transform: none; font-family: "Arial"; } P.Note { display: block; text-align: left; text-indent: 0pt; margin-top: 19.500000pt; margin-bottom: 19.500000pt; margin-right: 0.000000pt; margin-left: 30pt; font-size: 11.000000pt; font-weight: medium; font-style: Italic; color: #000000; text-decoration: none; vertical-align: baseline; text-transform: none; font-family: "Arial"; } EM.UILabel { font-weight: Bold; font-style: Regular; text-decoration: none; vertical-align: baseline; text-transform: none; } EM.CodeName { font-weight: Bold; font-style: Regular; text-decoration: none; vertical-align: baseline; text-transform: none; font-family:"Courier New"; } /* following font face declarations need to be removed for DBCS */ body, h1, h2, h3, h4, h5, h6, p, table, td, caption, th, ul, ol, dl, li, dd, dt {font-family: Arial, Helvetica, sans-serif; color: #000000} pre { font-family: Courier, monospace} /* end font face declarations */ /* following font size declarations should be OK for DBCS */ body, h1, h2, h3, h4, h5, h6, p, table, td, caption, th, ul, ol, dl, li, dd, dt {font-size: 10pt; } pre { font-size: 10pt} /* end font size declarations */ body { background: #FFFFFF} h1 { font-size: 18pt; margin-top: 5; margin-bottom: 1 } h2 { font-size: 14pt; margin-top: 25; margin-bottom: 3 } h3 { font-size: 11pt; margin-top: 20; margin-bottom: 3 } h4 { font-size: 10pt; margin-top: 20; margin-bottom: 3; font-style: italic } p { margin-top: 10px; margin-bottom: 10px } pre { margin-left: 6; font-size: 9pt } a:link { color: #0000FF } a:hover { color: #000080 } a:visited { text-decoration: underline } ul { margin-top: 0; margin-bottom: 10 } li { margin-top: 0; margin-bottom: 0 } li p { margin-top: 0; margin-bottom: 0 } ol { margin-top: 0; margin-bottom: 10 } dl { margin-top: 0; margin-bottom: 10 } dt { margin-top: 0; margin-bottom: 0; font-weight: bold } dd { margin-top: 0; margin-bottom: 0 } strong { font-weight: bold} em { font-style: italic} var { font-style: italic} div.revision { border-left-style: solid; border-left-width: thin; border-left-color: #7B68EE; padding-left:5 } th { font-weight: bold } \ No newline at end of file +P.Code { display: block; text-align: left; text-indent: 0.00pt; margin-top: 0.000000pt; margin-bottom: 0.000000pt; margin-right: 0.000000pt; margin-left: 15pt; font-size: 10.000000pt; font-weight: medium; font-style: Regular; color: #4444CC; text-decoration: none; vertical-align: baseline; text-transform: none; font-family: "Courier New"; } H6.CaptionFigColumn { display: block; text-align: left; text-indent: 0.000000pt; margin-top: 3.000000pt; margin-bottom: 11.000000pt; margin-right: 0.000000pt; margin-left: 0.000000pt; font-size: 9.000000pt; font-weight: medium; font-style: Italic; color: #000000; text-decoration: none; vertical-align: baseline; text-transform: none; font-family: "Arial"; } P.Note { display: block; text-align: left; text-indent: 0pt; margin-top: 19.500000pt; margin-bottom: 19.500000pt; margin-right: 0.000000pt; margin-left: 30pt; font-size: 11.000000pt; font-weight: medium; font-style: Italic; color: #000000; text-decoration: none; vertical-align: baseline; text-transform: none; font-family: "Arial"; } EM.UILabel { font-weight: Bold; font-style: Regular; text-decoration: none; vertical-align: baseline; text-transform: none; } EM.CodeName { font-weight: Bold; font-style: Regular; text-decoration: none; vertical-align: baseline; text-transform: none; font-family:"Courier New"; } /* following font face declarations need to be removed for DBCS */ body, h1, h2, h3, h4, h5, h6, p, table, td, caption, th, ul, ol, dl, li, dd, dt {font-family: Arial, Helvetica, sans-serif; color: #000000} pre { font-family: Courier, monospace} /* end font face declarations */ /* following font size declarations should be OK for DBCS */ body, h1, h2, h3, h4, h5, h6, p, table, td, caption, th, ul, ol, dl, li, dd, dt {font-size: 10pt; } pre { font-size: 10pt} /* end font size declarations */ body { background: #FFFFFF} h1 { font-size: 18pt; margin-top: 5; margin-bottom: 1 } h2 { font-size: 14pt; margin-top: 25; margin-bottom: 3 } h3 { font-size: 11pt; margin-top: 20; margin-bottom: 3 } h4 { font-size: 10pt; margin-top: 20; margin-bottom: 3; font-style: italic } p { margin-top: 10px; margin-bottom: 10px } pre { margin-left: 6; font-size: 9pt } a:link { color: #0000FF } a:hover { color: #000080 } a:visited { text-decoration: underline } ul { margin-top: 0; margin-bottom: 10 } li { margin-top: 0; margin-bottom: 0 } li p { margin-top: 0; margin-bottom: 0 } ol { margin-top: 0; margin-bottom: 10 } dl { margin-top: 0; margin-bottom: 10 } dt { margin-top: 0; margin-bottom: 0; font-weight: bold } dd { margin-top: 0; margin-bottom: 0 } strong { font-weight: bold} em { font-style: italic} var { font-style: italic} div.revision { border-left-style: solid; border-left-width: thin; border-left-color: #7B68EE; padding-left:5 } th { font-weight: bold } .typewriter {font-family:monospace;} .bold {font-weight:600;} .linethrough {text-decoration: line-through;} .underline {text-decoration: underline;} \ No newline at end of file diff --git a/doc/org.eclipse.cdt.doc.isv/cdtOptions b/doc/org.eclipse.cdt.doc.isv/cdtOptions index 608b90c040e..a7614513108 100644 --- a/doc/org.eclipse.cdt.doc.isv/cdtOptions +++ b/doc/org.eclipse.cdt.doc.isv/cdtOptions @@ -7,7 +7,7 @@ -splitIndex -windowtitle "Eclipse CDT API Specification" -doctitle "Eclipse CDT API Specification" --header "Eclipse CDT
Pre-release 3.0" +-header "Eclipse CDT
Pre-release 3.0" -bottom "Copyright (c) IBM Corp. and others 2004. All Rights Reserved." -group "C/C++ Development Tools Core Plug-in Packages" "org.eclipse.cdt.core:org.eclipse.cdt.core.*" -group "C/C++ Development Tools Debug Core Plug-in Packages" "org.eclipse.cdt.debug.core:org.eclipse.cdt.debug.core.*" diff --git a/doc/org.eclipse.cdt.doc.isv/guide/cdt_build_system/migration_guides/4.0/migration_guide_40.html b/doc/org.eclipse.cdt.doc.isv/guide/cdt_build_system/migration_guides/4.0/migration_guide_40.html index c0161b509bc..3d2641aef8e 100644 --- a/doc/org.eclipse.cdt.doc.isv/guide/cdt_build_system/migration_guides/4.0/migration_guide_40.html +++ b/doc/org.eclipse.cdt.doc.isv/guide/cdt_build_system/migration_guides/4.0/migration_guide_40.html @@ -67,10 +67,10 @@ table.MsoTableGrid - + @@ -144,8 +144,8 @@ please refer to the "What's New in the CDT Build System" document.

different tool-chain/tool/builder must have different names as well as toolChain/tool/builder build definitions representing one and the same tool-chain/tool/builder must have identical names.

-

    - Example: to illustrate the above requirement here is how this is handled +

    + Example: to illustrate the above requirement here is how this is handled in the gnu tool-chain definitions:

    The gnu plug-in contains the gcc linker tool on Linux is defined as

diff --git a/doc/org.eclipse.cdt.doc.isv/guide/cdt_build_system/whats_new/4.0/whats_new_CBS_40.html b/doc/org.eclipse.cdt.doc.isv/guide/cdt_build_system/whats_new/4.0/whats_new_CBS_40.html index be0d827295a..5136b3e2288 100644 --- a/doc/org.eclipse.cdt.doc.isv/guide/cdt_build_system/whats_new/4.0/whats_new_CBS_40.html +++ b/doc/org.eclipse.cdt.doc.isv/guide/cdt_build_system/whats_new/4.0/whats_new_CBS_40.html @@ -31,7 +31,7 @@ h3 margin-left:0in; page-break-after:avoid; font-size:14.0pt; - font-family:Arial; + font-family:"Arial"; font-style:italic} table.MsoTableGrid {border:1.0pt solid windowtext; @@ -68,11 +68,11 @@ table.MsoTableGrid
Migrating your - tool-chain integration to CDT 4.0
- This document describes steps needed to be - done to migrate the existing tool-chain integrations to the CDT 4.0		Migrating your + tool-chain integration to CDT 4.0
+ This document describes steps needed to be + done to migrate the existing tool-chain integrations to the CDT 4.0
- + CDT build system in CDT 4.0 @@ -196,11 +196,11 @@ functionality (org.eclipse.cdt.managedbuilder.core and org.eclipse.cdt.managedbuilder.ui plug-ins). So all the API that were used for the Managed Build Projects in the CDT 3.x becomes valid for the Makefile Projects in the 4.0, i.e

-

The -org.eclipse.cdt.managedbuilder.core.buildDefinitions extension point serves +

The +org.eclipse.cdt.managedbuilder.core.buildDefinitions extension point serves as an entry-point for the tool integration into the Build System.

-

The -org.eclipse.cdt.managedbuilder.core.ManagedBuildManager class serves as an +

The +org.eclipse.cdt.managedbuilder.core.ManagedBuildManager class serves as an entry-point for accessing/manipulating the Build Settings information.

From the API point of view there is no principal difference between the Makefile and Managed Build Projects. From the Build System perspective the @@ -230,21 +230,21 @@ Project Wizard" user description for more detail on the New Project Wizard type and tool-chain(s) to be used with the project type.

 

New project wizard dialog

-

Presenting project-types and tool-chains in the New Project Wizard

+

Presenting project-types and tool-chains in the New Project Wizard

A tool-integrator has two options of presenting his project-types in the wizard.

  1. Define a new custom Project Type entry.
  2. Use the general project type entries mechanism.
-

NOTE:  The new New Project Wizard now +

NOTE:  The new New Project Wizard now operates with tool-chains allowing to select the tool-chain(s) to be used on project creation. Thus it is required that all toolChain/tool/builder build definitions representing different tool-chains/tools/builders must have different names as well as toolChain/tool/builder build definitions representing one and the same tool-chain/tool/builder must have identical names.

-

    - Example: to illustrate the above requirement here is how this is handled +

    + Example: to illustrate the above requirement here is how this is handled in the gnu tool-chain definitions:

    The gnu plug-in contains the gcc linker tool on Linux is defined as

@@ -276,14 +276,14 @@ wizard.

different tool(executable) than the Linux linker definition. The cygwin linker definition specifies the name="%ToolName.linker.cygwin.gnu.c" that differs from the one defined by the Linux gcc linker.

-

Defining new Project Type entries

+

Defining new Project Type entries

In case a tool-integrator is willing his/her project type to be displayed as separate entries with custom names, his project-type definition must specify a "name" property for the project-type, e.g.

Project type definition and new project wizard

When the project type entry is selected in the wizard the "Toolchain:" pane will display the list of tool-chains defined/associated with the project type

-

Using general project type entries

+

Using general project type entries

The "general project types" mechanism allows grouping multiple project types/tool-chains under one project-type entry thus ensuring the compactness of the project-type information and ensuring a common user experience across @@ -291,7 +291,7 @@ different tool-chains and integrations. When the general project type entry is s "ToolChains:" pane will list all tool-chains contributed from different project types allowing user to select the tool-chain to be used with the given project-type.

-

What are the general project type entries?

+

What are the general project type entries?

The general project type entries mechanism is made based upon the new Build Properties mechanism introduces in the new CDT Build System. Each general project type entry is a value of the "buildArtefactType" property which represents the build @@ -308,7 +308,7 @@ shared library

org.eclipse.cdt.managedbuilder.core.buildProperties extension point.

See the "Build Properties" section for more detail on the Build Properties mechanism.

-

Contributing to the general project type entries

+

Contributing to the general project type entries

The minimal steps needed to specify that the general project type entry should be used, a project-type definition should specify the "buildArtefact" attribute and assign it to one of the values of the buildArtefactType build property, e.g.

@@ -353,8 +353,8 @@ E.g.

id="cdt.managedbuild.tool.gnu.builder.mingw.base"

-       - ...

+       + ...

        @@ -418,9 +418,9 @@ supported

 

What's New in CDT - Build System 4.0
- This document outlines the new features presented + 		What's New in CDT + Build System 4.0
+ This document outlines the new features presented in the new - CDT build system in CDT 4.0		 idea
- - + + @@ -484,12 +484,12 @@ following

properties associated with the configuration. (See the "Build Properties mechanism" section for detail on the Build Properties mechanism)

-

NOTE:  In order to function properly +

NOTE:  In order to function properly the tool-chain modification functionality requires that all toolChain/tool/builder build definitions representing different tool-chains/tools/builders must have different names as well as toolChain/tool/builder build definitions representing one and the same tool-chain/tool/builder must have identical names.

-

    - Example: to illustrate the above requirement here is how this is handled +

    + Example: to illustrate the above requirement here is how this is handled in the gnu tool-chain definitions:

    The gnu plug-in contains the gcc linker tool on Linux is defined as

@@ -562,8 +562,8 @@ functionality:

changing the value of the buildArtefactType property in case the tool-chain supports that. -

Defining new -Build Properties and their values

+

Defining new +Build Properties and their values

 

Build Properties are defined with the org.eclipse.cdt.managedbuilder.core.buildProperties @@ -776,13 +776,13 @@ Build System-predefined properties

+ Property id + Description + Pre-defined Values + The unique identifier of the projectType that this projectType is derived from. + The unique identifier of the projectType that was used when + creating this project. parent + The unique identifier of the configuration that this + configuration is derived from. @@ -1096,8 +1096,8 @@ track of this specific configuration. artifactName + The name of the build goal defined by the configuration.  + This can be set by the user in the UI. @@ -1108,8 +1108,8 @@ track of this specific configuration. artifactExtension + The extension that the build goal will have, for example + ‘.exe’ or ‘.so’ @@ -1120,8 +1120,8 @@ track of this specific configuration. cleanCommand + The command to remove intermediary and output files on the + build machine. + specified, this overrides the tool-chain errorParsers attribute. + The unique identifier of the toolChain that this toolChain + is derived from. @@ -1341,11 +1341,11 @@ the schema table below.

isAbstract + is false. @@ -1356,10 +1356,10 @@ the schema table below.

targetTool + versions of a target tool that are used with different project natures. + get built. + operating systems, unless the user has turned off filtering. + turned off filtering. @@ -1431,13 +1431,13 @@ the schema table below.

valign="top">errorParsers + the tool-chain and the builder child of the tool-chain. @@ -1486,8 +1486,8 @@ the schema table below.

method to be called to determine if support for the tool-chain is currently installed on the system.  MBS uses this information in order to filter the choices presented to the CDT user and to inform the - user when support needed by their project is not installed. If the - isToolChainSupported callback is not provided by the tool-chain + user when support needed by their project is not installed. If the + isToolChainSupported callback is not provided by the tool-chain definition, the tool-chain is treated as supported.  If all configurations defined for the given project type are not supported the project type is treated as unsupported. @@ -1575,9 +1575,9 @@ the schema table below.

3.6 Builder

The builder element represents the utility that drives the build process (typically, but not necessarily, a variant -of “make”).  It defines the command needed to invoke the build utility in the -command attribute. Any special flags that need to be passed to the builder -are defined in the arguments attribute.   The builder can specify the +of “make”).  It defines the command needed to invoke the build utility in the +command attribute. Any special flags that need to be passed to the builder +are defined in the arguments attribute.   The builder can specify the error parser(s) to be used to parse its output.  The builder also specifies a Java class that generates the build file.  MBS provides built-in gnu makefile generation.

@@ -1585,7 +1585,7 @@ generation.

build macros and how they interact with the build file generator. 

The builder can specify the template of how to convert a build macro that contains an environment variable into the build file -environment variable format by specifying the variableFormat attribute. +environment variable format by specifying the variableFormat attribute.

The builder can specify the builder internal (reserved) macro names and the macro names reserved by a build file generator (used to @@ -1593,24 +1593,24 @@ store the list of objects files, input files, etc.). This information will be used by the build file generator in the case where the build environment variable macros are not to be expanded in the build file. If an environment variable build macro name conflicts with the name of some reserved macro, it -always gets resolved in the build file. See the reservedMacroNames and -reservedMacroNameSupplier attributes below.

+always gets resolved in the build file. See the reservedMacroNames and +reservedMacroNameSupplier attributes below.

The builder can provide the values for the file-context -build macros.  To provide the value for the macro ${<macro_name>}, the -macro<macro_name>Value attribute should be specified. The value of this +build macros.  To provide the value for the macro ${<macro_name>}, the +macro<macro_name>Value attribute should be specified. The value of this attribute should be set to the value of the given macro. MBS will resolve the value of unsupported file-context macros to their actual macro value. In this case, a separate rule for each file will be generated when file-specific macros are used.  See the gnu tool-chain for an example of setting these attributes for gnu make.

MBS supports multiple versions of -a builder.  The versionsSupported attribute contains a list +a builder.  The versionsSupported attribute contains a list of supported versions of a particular builder. This indicates that there is no need to perform a conversion when user imports/loads a project with one of the supported builder versions. When a tool integrator decides to no longer support a version of a builder, they continue to ship the old builder definition and -specify the id with version number of the new builder to convert to in the -convertToId attribute.  If changes to the project information need to be +specify the id with version number of the new builder to convert to in the +convertToId attribute.  If changes to the project information need to be performed by the conversion, the tool chain definition must provide a converter extension to perform the conversion.  If no converter extension is provided, then there won’t be any conversion.  See § 8.2 for additional information.

@@ -1636,87 +1636,87 @@ the schema table below.

+ id + A unique identifier that the model manager will use to keep +track of this specific builder. + yes + name + Human-readable name for the builder to be used in the UI. + no + superClass + The unique identifier of the builder that this builder is + derived from. + no + isAbstract + will inherit its attributes and children.  The default value is false. + no + command + The default is "make". + no + arguments + is “-k”. + no + errorParsers + no + buildfileGenerator + no + variableFormat contain environment variables are resolved by MBS to their actual value.  The user can also specify that build macros that contain environment variables be resolved to their actual value, as explained - earlier. + earlier. + no + isVariableCase + Sensitive + in the buildfile. + no + reservedMacro + Names + these names will always be treated as reserved. + no + reservedMacro + NameSupplier + no + macroInputFile + NameValue 2. If a tool accepts building multiple files of the primary input type with one tool invocation the input file is undefined and the macros representing the input file contain information about one of the inputs - of the primary input type being built. + of the primary input type being built. + no + macroInputFile + ExtValue + Represents the InputFileExt macro value. The macro + specifies the extension of the input file. + no + macroInputFile + BaseNameValue + extension stripped. + no + macroInputFile + RelPathValue + Represents the InputFileRelPath macro value. The macro + specifies the input file path relative to the builder current directory. + no + macroInputDir + RelPathValue + directory. + no + macroInputDir + RelPathValue + directory. + no
Modification typePossible levels of - modificationsModification typePossible levels of + modifications
Changing/substituting the entire tool-chain

- Property id

- Description

- Pre-defined Values
@@ -848,8 +848,8 @@ Build System-predefined properties

 

 

-

Automatic tool -settings adjustment with Build Properties

+

Automatic tool +settings adjustment with Build Properties

 

Tool-chain ant tool definitions can specify enablement expressions to make their default settings be @@ -994,8 +994,8 @@ font-family:"Courier New";color:navy"></option>

information on using enablement expressions please refer to the description of the org.eclipse.cdt.managedbuilder.core.buildDefinitions extension-point.

 

-

Specifying the set of supported -build properties

+

Specifying the set of supported +build properties

 

The tool-chain modification and New Project Wizard mechanisms need to know the set of build properties each @@ -1077,8 +1077,8 @@ color:black">    Assigning the set of build -properties for configurations/project-types

+

Assigning the set of build +properties for configurations/project-types

 

Once the tools/tool-chains has specified the setting adjustment expressions it is possible to use one and the @@ -1102,9 +1102,9 @@ buildArtefactType= -It is possible to specify +It is possible to specify the "buildProperties" attribute for the project type and define the set of build -properties there in the same way as for configuration (see below)

+properties there in the same way as for configuration (see below)

            .......>

@@ -1114,8 +1114,8 @@ properties there in the same way as for configuration (see below)< <configuration

-                -...

+                +...

               @@ -1138,8 +1138,8 @@ color:navy">>

                        .....>

-                    -...

+                    +...

                  @@ -1172,9 +1172,9 @@ font-family:"Courier New";color:navy"> </toolChain>< The folderInfo is a new element presented in 4.0. The element represents the per-folder settings - - - + + + @@ -1202,9 +1202,9 @@ path, while the fileInfo specifies project-relative resource path in the same way as the folderInfo does.

PropertyDescriptionDefault ValuePropertyDescriptionDefault Value
resourcePath
- - - + + + @@ -1249,9 +1249,9 @@ way as the folderInfo does.

the default value is used ONLY in case the property is undefined for all tool-chain's super-classes
PropertyDescriptionDefault ValuePropertyDescriptionDefault Value
resourcePath
- - - + + + @@ -1266,9 +1266,9 @@ tool-chain's super-classes
PropertyDescriptionDefault ValuePropertyDescriptionDefault Value
supportsManagedBuild
the default value is used ONLY in case the property is undefined for all tool's super-classes
- - - + + + @@ -1283,9 +1283,9 @@ super-classes
PropertyDescriptionDefault ValuePropertyDescriptionDefault Value
supportsManagedBuild
the default value is used ONLY in case the property is undefined for all input types's super-classes
- - - + + + @@ -1320,9 +1320,9 @@ types's super-classes
PropertyDescriptionDefault ValuePropertyDescriptionDefault Value
languageId
the default value is used ONLY in case the property is undefined for all input types's super-classes
- - - + + + diff --git a/doc/org.eclipse.cdt.doc.isv/guide/dom/index/prebuiltIndexes.html b/doc/org.eclipse.cdt.doc.isv/guide/dom/index/prebuiltIndexes.html index b4a95d726c5..4fc587350a4 100644 --- a/doc/org.eclipse.cdt.doc.isv/guide/dom/index/prebuiltIndexes.html +++ b/doc/org.eclipse.cdt.doc.isv/guide/dom/index/prebuiltIndexes.html @@ -541,8 +541,8 @@ table.MsoTableGrid

 

-

 

+

 

-

 

+style='mso-element:field-end'> 

-

 

+

 

Overview

@@ -864,8 +864,8 @@ sufficient.

The call-back for project creation must implement the following interface

-

org.eclipse.cdt.core.index.export.IExportProjectProvider

+org.eclipse.cdt.core.index.export.IExportProjectProvider

 

@@ -993,7 +993,7 @@ release.

A default implementation of this interface, which is also intended to be sub-classed, is            org.eclipse.cdt.core.index.export.ExternalExportProjectProvider

+style='mso-tab-count:1'>            org.eclipse.cdt.core.index.export.ExternalExportProjectProvider

 

@@ -1559,9 +1559,9 @@ style='mso-bookmark:_Toc164570192'> -

            org.eclipse.cdt.core.CIndex.ReadOnlyPDOMProvider

+            org.eclipse.cdt.core.CIndex.ReadOnlyPDOMProvider

 

@@ -1581,12 +1581,12 @@ _Toc164570193'> has the concept of project configurations, which in terms of code corresponds to the interface:

-

org.eclipse.cdt.core.settings.model.ICConfigurationDescription

+org.eclipse.cdt.core.settings.model.ICConfigurationDescription -

 

+ 

The index model allows content to be associated with ICConfigurationDescription objects diff --git a/doc/org.eclipse.cdt.doc.isv/guide/dom/index/prebuiltVersioning.html b/doc/org.eclipse.cdt.doc.isv/guide/dom/index/prebuiltVersioning.html index ec4fabde8f7..74bbf9e27ef 100644 --- a/doc/org.eclipse.cdt.doc.isv/guide/dom/index/prebuiltVersioning.html +++ b/doc/org.eclipse.cdt.doc.isv/guide/dom/index/prebuiltVersioning.html @@ -167,7 +167,7 @@ another.

diff --git a/doc/org.eclipse.cdt.doc.isv/guide/mbs/extensibilityGuide/Managed_Build_Extensibility.html b/doc/org.eclipse.cdt.doc.isv/guide/mbs/extensibilityGuide/Managed_Build_Extensibility.html index 2dd20a15d48..47fe067d3f6 100644 --- a/doc/org.eclipse.cdt.doc.isv/guide/mbs/extensibilityGuide/Managed_Build_Extensibility.html +++ b/doc/org.eclipse.cdt.doc.isv/guide/mbs/extensibilityGuide/Managed_Build_Extensibility.html @@ -68,10 +68,10 @@ table.MsoTableGrid
PropertyDescriptionDefault ValuePropertyDescriptionDefault Value
parallelBuildCmd -

Built With \ Use With

+ Built With \ Use With 		-

 

+  
- + @@ -219,8 +219,8 @@ managed build system and how to extend it.

1 Introduction

-

NOTE: -the document describes the CDT Managed Build System (MBS) 3.x functionality. +

NOTE: +the document describes the CDT Managed Build System (MBS) 3.x functionality. Although there have been lots of significant changes made to the Build System in the 4.0, the document still remains valid since all the 4.0 build system changes were made by extending the MBS functionality described in this document.

@@ -439,7 +439,7 @@ contains the following primary objects: 

Managed Build -System Extensibility Document
- This document describes the design of the -managed build system and how to extend it.		Managed Build +System Extensibility Document
+ This document describes the design of the +managed build system and how to extend it.		 idea

2.1 User Scenarios

The following sections describe how the user interacts with MBS.  Text -in red indicates MBS functionality that is not yet +in red indicates MBS functionality that is not yet implemented, but is intended to be implemented in future releases of MBS.

2.1.1 Creating a New Project

The CDT user’s experience with the @@ -464,7 +464,7 @@ consideration by turning them off in the MBS Preferences page.

filtering, however configurations that use tool-chains that are not installed will not be able to be built on the host system.

After selecting the project type, -the user selects 1 … n configurations for her new project from the list +the user selects 1 … n configurations for her new project from the list of configurations defined in the project type.  Different configurations can use different tool-chains. The list of configurations is, by default, filtered by:

@@ -501,63 +501,63 @@ tool-chain.  It should be easy for a user to take an existing CDT project t different host system and quickly create a configuration that builds on that host system using a version of the tool-chain that supports the new host.

The user -can also pick 1 … n configurations from the list of default +can also pick 1 … n configurations from the list of default configurations defined in the project type.  The list of configurations is, by default, filtered as specified above.

2.1.3 Modifying the Tool-chain of the Configuration

The user can select a configuration and modify the following attributes of the tool-chain:

    -
  1. - The command used to invoke a - particular tool in the tool-chain.
    2. -
  2. - The set of error parsers to +
  3. + The command used to invoke a + particular tool in the tool-chain.
    4. +
  4. + The set of error parsers to be used with the build output and the order that the error parsers will be - invoked
    5. -
  5. - The binary parser to be used - with the build binary outputs.
    6. -
  6. - The set of file extensions - that are processed by a tool.
    7. -
  7. - The + invoked
    8. +
  8. + The binary parser to be used + with the build binary outputs.
    9. +
  9. + The set of file extensions + that are processed by a tool.
    10. +
  10. + The addition of Custom Build steps before or after the build.  The user specifies the commands - to be executed by the step.
    11. -
  11. - The mapping of an individual + to be executed by the step.
    12. +
  12. + The mapping of an individual resource to a Custom Build step.  The user specifies the commands to be executed by the step, the input dependencies of the step, and the output files that are created by the - step.
    13. -
  13. - The mapping of + step.
    14. +
  14. + The mapping of a set of file extensions to a Custom Build step.  The user specifies the commands to be executed by the step, the input dependencies of the step, and the output resources that are created by the - step.
    15. -
  15. - The + step.
    16. +
  16. + The tool-chain itself:  The user can change the tool-chain to be used with the configuration.  All applicable settings are automatically transferred to the - new tool-chain.
    17. -
  17. - The + new tool-chain.
    18. +
  18. + The mapping of an individual resource to a tool:  The available tools come from the configuration’s - tool-chain, from a different tool-chain or from individually defined tools.
    19. -
  19. - The + tool-chain, from a different tool-chain or from individually defined tools.
    20. +
  20. + The mapping of a set file extensions to a category of tools or a specific tool:  The user can modify the current assignments and add new assignments.  The available tools come from the configuration’s tool-chain, - from a different tool-chain or from individually defined tools.
    21. + from a different tool-chain or from individually defined tools.

2.1.4 Modifying the Tool Options of the Configuration

The user can modify the options of -an individual configuration, or he can make changes to a set of configurations -that he has selected.  The user can select a set of configurations individually +an individual configuration, or he can make changes to a set of configurations +that he has selected.  The user can select a set of configurations individually or by selecting a “category” of configurations.  The names of the categories are defined by the configuration provider – “debug” and “release” are commonly supported.  Categories which group configurations by target platform could also @@ -612,18 +612,18 @@ project file (.cdtbuild).

When MBS reads a project file with an older version number:

    -
  1. - MBS asks the user to confirm - the conversion.
    2. -
  2. - If the user confirms the +
  3. + MBS asks the user to confirm + the conversion.
    4. +
  4. + If the user confirms the conversion, the project file is converted and the project can no longer be - loaded by previous versions of MBS.
    5. -
  5. - If the user does not confirm + loaded by previous versions of MBS.
    6. +
  6. + If the user does not confirm the conversion, the MBS information is loaded in a read-only mode, and any changes made to the MBS information will be discarded when the project is - closed.
    7. + closed.

When MBS reads a project file with a newer version number, it displays an error message, and does not load the MBS @@ -634,38 +634,38 @@ also define a version number.  The version number is appended to the end of the element id, and stored by MBS with each reference to the element.  MBS attempts to resolve references in the following manner:

    -
  1. - MBS looks up the id with the - version specified with the reference. 
    2. -
  2. - If not found, MBS looks up +
  3. + MBS looks up the id with the + version specified with the reference. 
    4. +
  4. + If not found, MBS looks up all occurrences of the id, and selects a match in the following order: - +
      -
    1. - the id with the closest - higher version number that lists the referenced version in its - versionsSupported attribute
      2. -
    2. - the id with no version - information specified
      3. +
    3. + the id with the closest + higher version number that lists the referenced version in its + versionsSupported attribute
      4. +
    4. + the id with no version + information specified

If a match is found, there are 2 scenarios:

    -
  1. - The version is still +
  2. + The version is still actively supported by the tool integrator, and the MBS information is - loaded.
    3. -
  3. - The version specifies that a + loaded.
    4. +
  4. +The version specifies that a conversion to a later version of the tool-chain/tool/builder is required.  At the discretion of the tool-chain/tool/builder, the conversion may occur automatically, or the converter may prompt the user to confirm the upgrade.  The same rules apply as above for whether or not the user confirms the - conversion.
    5. + conversion.

If no match is found, MBS displays an error message, and does not load the MBS information.  None of the MBS @@ -681,16 +681,16 @@ describes the format of the grammar and what the information is used for by the build model.  See the CDT 3.0 Gnu tool-chain definitions for an example of using the managed build object model.

Common Attributes

-

Many of the MBS elements require the specification of the id +

Many of the MBS elements require the specification of the id attribute.  The attribute value typically takes a form similar to Eclipse -package names, e.g. "cdt.managedbuild.tool.gnu.c.linker".  Each id +package names, e.g. "cdt.managedbuild.tool.gnu.c.linker".  Each id must be unique within MBS and among all of the loaded manifest files.  It is suggested that you include your company/organization name in -the ids that you create.

-

Many of the MBS elements can specify the name attribute.  The +the ids that you create.

+

Many of the MBS elements can specify the name attribute.  The attribute value is used in the MBS user interface, and may therefore change if your tool-chain supports more than one language.  You can use a plugin.properties file in order to define these strings in an external file (see the Gnu tool-chain definitions for an example).

-

Many of the MBS elements can specify the superClass attribute.  +

Many of the MBS elements can specify the superClass attribute.  The attribute value is the id of an element of the same type as this element.  For most attributes, when the value of an attribute is not specified in an element, the value will default to the value defined by the first super-class @@ -708,8 +708,8 @@ that the attribute is required by the schema for every instance of the element.& "No" means that the attribute is never required and an appropriate default is supplied if necessary.  "In Hierarchy" means that the attribute is not required by the schema, but MBS requires that the attribute be specified -either by the element itself, or inherited from one of its ancestors (see the superClass - attribute). +either by the element itself, or inherited from one of its ancestors (see the superClass + attribute).

3.1 Model

The figure below shows a UML model @@ -729,7 +729,7 @@ template for the projects that a user will create.  The projectType contain or more children of type configuration.  These are the default configurations that the user can choose from.  Note that there is no reason to define a projectType element in a .cdtbuild file.  It would never be used since projectType elements are used to populate the New Project dialog boxes.

-

You must provide a unique identifier for the project-type in the id +

You must provide a unique identifier for the project-type in the id attribute. The build model uses this information to distinguish between the project-type definitions it finds.  You must also @@ -739,22 +739,22 @@ in the UI and new project wizards.

Project-types can be arranged into hierarchies to promote the efficient sharing of configurations. If you have defined a project-type that should not be selected by the user, but is a root -for other project-types, it may be declared abstract by setting the -isAbstract attribute to ‘true’. Abstract project-types do not appear in the +for other project-types, it may be declared abstract by setting the +isAbstract attribute to ‘true’. Abstract project-types do not appear in the UI.  Descendents of an abstract project-type will have the same configurations that the abstract project-type has. For these children to -function properly, their superClass attribute must contain +function properly, their superClass attribute must contain the unique identifier of the super-class project-type.

A concrete project type must have at least one configuration defined for it. A configuration must define (or inherit) a set of tool-chain definitions that work together to produce the build goal as an output.

A projectType may define a project -level environment variable provider in the projectEnvironmentSupplier attribute.  See § +level environment variable provider in the projectEnvironmentSupplier attribute.  See § 7.6 for additional information.

A projectType may define a project -level macro provider in the projectMacroSupplier attribute.  See § +level macro provider in the projectMacroSupplier attribute.  See § 7.8 for additional information.

3.2.1 Schema

@@ -820,7 +820,7 @@ UI.

 - The unique identifier of the projectType that this projectType is derived from. @@ -835,10 +835,10 @@ UI.

 -

Flags the projectType as abstract.  An abstract +

Flags the projectType as abstract.  An abstract projectType can not be selected by the user in the UI, but projectTypes derived from this projectType will inherit its attributes and children.  - The default value is false.

+ The default value is false.

 -

A projectType can be flagged for test purposes only.  It +

A projectType can be flagged for test purposes only.  It can be manipulated programmatically, in JUnit tests for example, but not - selected by the user in the UI.  The default value is false.

+ selected by the user in the UI.  The default value is false.

The following steps occur when a CDT user creates a new Managed Build project:

    -
  1. A new managedProject element is - created.  Its projectType attribute is set to the projectType that - the user selected.  Its name attribute is set to the project name - that the user entered.
    2. -
  2. When the user adds a +
  3. A new managedProject element is + created.  Its projectType attribute is set to the projectType that + the user selected.  Its name attribute is set to the project name + that the user entered.
    4. +
  4. When the user adds a default configuration, the selected configuration element is cloned to - become a child of the managedProject element created in step 1.
    5. -
  5. Add a tool-chain element - that specifies as its superClass the tool-chain that is the child of - the selected configuration element.
    6. -
  6. For each tool element + become a child of the managedProject element created in step 1.
    7. +
  7. Add a tool-chain element + that specifies as its superClass the tool-chain that is the child of + the selected configuration element.
    8. +
  8. For each tool element child of the tool-chain that is the child of the selected configuration element, create a tool element child of the cloned configuration’s - tool-chain element that specifies the original tool element as its - superClass.
    9. + tool-chain element that specifies the original tool element as its + superClass.

This prepares the new project/configurations for modification by the user.

@@ -998,8 +998,8 @@ UI. This is the name that the user entered in the New Project wizard.		 - The unique identifier of the projectType that was used when - creating this project. @@ -1019,8 +1019,8 @@ configuration.

child of type tool-chain.  This describes how the project’s resources are transformed into the build artifact.  The configuration is responsible for maintaining the name of the final build goal. The user selects the name of the -build artifact in the UI, and the configuration maintains it in the -artifactName and artifactExtension attributes.  The +build artifact in the UI, and the configuration maintains it in the +artifactName and artifactExtension attributes.  The configuration can contain one or more children of type resourceConfiguration.  These describe build settings of individual resources that are different from the configuration as a whole. 

@@ -1029,10 +1029,10 @@ attribute that will be used by the build model to manage the configuration. It must also have a name that will be displayed in the UI in the build property page and new project wizards.  The configuration contains the information needed to “clean” the build files on -the host machine.  The configuration can specify the cleanCommand +the host machine.  The configuration can specify the cleanCommand attribute which specifies a command that removes the build files.

-

The prebuildStep, -preannounceBuildStep, postbuildStep and postannouncebuildStep +

The prebuildStep, +preannounceBuildStep, postbuildStep and postannouncebuildStep attributes define a custom build step to be run before and/or after the the build steps defined by the tool-chain.  These attributes are not typically defined in the manifest file, but are instead added by a user from the @@ -1084,8 +1084,8 @@ track of this specific configuration.

 - The unique identifier of the configuration that this - configuration is derived from. no - The name of the build goal defined by the configuration.  - This can be set by the user in the UI. no - The extension that the build goal will have, for example - ‘.exe’ or ‘.so’ in hierarchy - The command to remove intermediary and output files on the - build machine. @@ -1135,13 +1135,13 @@ track of this specific configuration. - The semi-colon separated list of the default error parsers + The semi-colon separated list of the default error parsers to be used with this configuration. The list is ordered with the first error parser on the list invoked first, the second error parser second, and so on.  The list may contain the error parsers defined by CDT and/or other installed error parser extensions.  The list of error parsers to be used may be changed by the user on a per-configuration basis.  When - specified, this overrides the tool-chain errorParsers attribute. @@ -1249,33 +1249,33 @@ only on a limited subset of operating system/architecture combinations. For example, it does not make much sense to allow a user to try to build a Solaris shared library project if they are running Eclipse and CDT on Windows. You can specify the operating systems and architectures that the tool-chain is supported -on as a comma-separated list in the osList and archList +on as a comma-separated list in the osList and archList attributes.

-

A tool-chain should specify the -targetTool attribute to identify the tool that runs to generate the primary +

A tool-chain should specify the +targetTool attribute to identify the tool that runs to generate the primary build output.  If this is not specified, MBS uses the file extension of the build artifact name supplied by the user.  This will work when the user uses one of the extensions expected by the tool, but will not work if they do not.

MBS supports multiple versions of -a tool-chain.  The versionsSupported attribute contains a +a tool-chain.  The versionsSupported attribute contains a list of supported versions of a particular tool chain. This indicates that there is no need to perform a conversion when user imports/loads a project with one of the supported tool chain versions. When a tool integrator decides to no longer support a version of a tool chain, they continue to ship the old tool chain definition and specify the id with version number of the tool chain definition -to convert to in the convertToId attribute.  If changes to the project +to convert to in the convertToId attribute.  If changes to the project information need to be performed by the conversion, the tool chain must provide a converter extension to perform the conversion.  If no converter extension is provided, then there won’t be any conversion.  See § 8.2 for additional information.

A tool-chain may define a -configuration level environment variable provider in the configurationEnvironmentSupplier attribute.  See § +configuration level environment variable provider in the configurationEnvironmentSupplier attribute.  See § 7.6 for additional information.

A tool-chain may define a configuration -level macro provider in the configurationMacroSupplier attribute.  See § +level macro provider in the configurationMacroSupplier attribute.  See § 7.8 for additional information.

A tool-chain may be associated @@ -1329,8 +1329,8 @@ the schema table below.

superClass		 - The unique identifier of the toolChain that this toolChain - is derived from. no - Flags the toolChain as abstract.  An abstract toolChain + Flags the toolChain as abstract.  An abstract toolChain must be defined as a top level object in the model definition and cannot be selected by the user in the UI, but tool-chains derived from this tool-chain will inherit its attributes and children.  The default value - is false. no - A semi-colon separated + A semi-colon separated list of the identifiers of the tools that can be used to create the build artifact.  A list is required, for example, when there are 2 - versions of a target tool that are used with different project natures. @@ -1371,11 +1371,11 @@ the schema table below.

secondaryOutputs		 - A semi-colon separated + A semi-colon separated list of the identifiers of other output types, besides the primary output of the targetTool, that are also considered to be build artifacts.  The build file generator will ensure that the outputs - get built. @@ -1387,15 +1387,15 @@ the schema table below.

osList		 - + The comma separated list of operating systems that the tool-chain is supported on.  The - valid list of operating systems - is the string values returned by Platform.getOS().
- If + valid list of operating systems + is the string values returned by Platform.getOS().
+ If the osList attribute is not specified, or if the value is "all", then the tool-chain is supported on all operating systems.  Otherwise, the tool-chain is only displayed when CDT is running on one of the specified - operating systems, unless the user has turned off filtering.		 @@ -1409,20 +1409,20 @@ the schema table below.

 - + The comma separated list of architectures that the tool-chain is supported on.  The - valid list of - - architectures is the string values returned by Platform.getOSArch().
- - If the archList attribute is not + valid list of + + architectures is the string values returned by Platform.getOSArch().
+ + If the archList attribute is not specified, or if the value is "all", then the tool-chain is supported on all architectures.  Otherwise, the tool-chain is only displayed when CDT is running on one of the specified architectures, unless the user has - turned off filtering.		 + valign="top"> no
The semi-colon separated list of the default error + valign="top">The semi-colon separated list of the default error parsers to be used with this tool-chain. The list is ordered with the first error parser on the list invoked first, the second error parser second, and so on.  The list may contain the error parsers defined by CDT and/or other installed error parser extensions.  When specified, this overrides the tool errorParsers attributes of the tool children of - the tool-chain and the builder child of the tool-chain. no - id - A unique identifier that the model manager will use to keep -track of this specific builder. - yes
- name - Human-readable name for the builder to be used in the UI. - no
- superClass - The unique identifier of the builder that this builder is - derived from. - no
- isAbstract - Flags the builder as abstract.  An abstract builder must be + Flags the builder as abstract.  An abstract builder must be defined as a top level object in the model definition and cannot be selected by the user in the UI, but builders derived from this builder - will inherit its attributes and children.  The default value is false. - no
- command - Specifies the default command to start the build + Specifies the default command to start the build utility for your toolchain. If the user changes this through the UI, the overriden value will be stored in the project build file. The build model will default to this value if the user ever resets a change.  - The default is "make". - no
- arguments - Specifies the additional, default arguments + Specifies the additional, default arguments that will be passed to the build utility when it is called by the builder. If the user changes the flags through the UI, the overriden value will be stored in the project build settings file. The build model will default to this value if the user ever resets a change. The default - is “-k”. - no
- errorParsers Specifies the default list of error parsers used by the builder. These @@ -1727,32 +1727,32 @@ track of this specific builder. - no
- buildfileGenerator - The name of a class that implements IManagedBuilderMakefileGenerator.  + The name of a class that implements IManagedBuilderMakefileGenerator.  See § 7.2 for additional information. - no
- variableFormat -

The value of this attribute should +

The value of this attribute should be set to the expression representing the variable format. For example, to generate macros with the ${macro} format, the attribute would contain ${=}.  To generate macros with the @macro format, the attribute would @@ -1762,107 +1762,107 @@ track of this specific builder.

 - no
- isVariableCase - Sensitive - Specifies whether the + Specifies whether the builder variables are case sensitive or not. Can be set to either “true” or “false”. The default is “true”. If the builder does not support case-sensitive variables and there are some build environment variables that differ only in case (Environment variables on Unix-like operating systems are case sensitive), then those macros will always get resolved - in the buildfile. - no
- reservedMacro - Names -

Comma-separated list of reserved +

Comma-separated list of reserved macro names. The macro name could contain either the exact name or the java regular expression. The latter could be used to supply the pattern of variable names that are generated by MBS in case the “buildVariable” attribute of the “InputType” element is not specified, etc.  If this attribute is specified and the reservedMacroNameSupplier is not - specified, the following macro names will be treated as reserved:

+ specified, the following macro names will be treated as reserved:

- 1.   a + 1.   a macro name that is equal to one of the names specified in the - reservedMacroNames value

+ reservedMacroNames value

- 2.   a + 2.   a macro name that matches one of the regexp patterns specified in the - reservedMacroNames value

+ reservedMacroNames value

- 3.   a + 3.   a macro name that is equal to one of the build variable names specified - InputType elements of the tools used in the tool-chain

- If this attribute is not + InputType elements of the tools used in the tool-chain

+ If this attribute is not specified, MBS will assume that there are no reserved macro names that could conflict with the build environment variable macros, except names specified in the “buildVariable” attribute of the “InputType” elements: - these names will always be treated as reserved.		 - no
- reservedMacro - NameSupplier -

Should be set to the name of the +

Should be set to the name of the class that implements the IReservedMacroNameSupplier interface. If this attribute is specified the reservedMacroNames attribute is ignored, and - the following macro names will be treated as reserved:

+ the following macro names will be treated as reserved:

- 1.   macro - names that the IReservedMacroNamesSupplier specifies as reserved

+ 1.   macro + names that the IReservedMacroNamesSupplier specifies as reserved

- 2.   a macro + 2.   a macro name that is equal to one of the build variable names specified - InputType elements in the tools used in the tool-chain.  + InputType elements in the tools used in the tool-chain. 

- no
- macroInputFile - NameValue - Represents the InputFileName macro value. The macro + Represents the InputFileName macro value. The macro specifies the input file name. The input file has the following meaning:
1. If a tool does not accept building multiple files of the primary input type with one tool invocation, the input file is the file of the @@ -1870,94 +1870,94 @@ track of this specific builder.		 - no
- macroInputFile - ExtValue - Represents the InputFileExt macro value. The macro - specifies the extension of the input file. - no
- macroInputFile - BaseNameValue - Represents the InputFileBaseName macro value. The macro + Represents the InputFileBaseName macro value. The macro specifies the base name of the input file. That is the file name with an - extension stripped. - no
- macroInputFile - RelPathValue - Represents the InputFileRelPath macro value. The macro - specifies the input file path relative to the builder current directory. - no
- macroInputDir - RelPathValue - Represents the InputDirRelPath macro value. The macro + Represents the InputDirRelPath macro value. The macro specifies the input file directory path relative to the builder current - directory. - no
- macroInputDir - RelPathValue - Represents the InputDirRelPath macro value. The macro + Represents the InputDirRelPath macro value. The macro specifies the input file directory path relative to the builder current - directory. - no

3.7 Target Platform

The targetPlatform element represents the os/architecture -combination(s) upon which the output of a tool-chain can be deployed.  The -osList and archList attributes contain the Eclipse names of the +combination(s) upon which the output of a tool-chain can be deployed.  The +osList and archList attributes contain the Eclipse names of the operating systems and architectures described by this element. 

CDT offers a facility for parsing binary files if it knows which output format the build artifact has been -produced with. The binaryParser attribute must contain the id of the +produced with. The binaryParser attribute must contain the id of the appropriate parser if you want build artifacts of the tool-chain to be parsed in the workspace.

3.7.1 Schema

@@ -2133,8 +2133,8 @@ the workspace.

superClass - The unique identifier of the targetPlatform that this - targetPlatform is derived from. + The unique identifier of the targetPlatform that this + targetPlatform is derived from. no @@ -2145,11 +2145,11 @@ the workspace.

isAbstract - Flags the targetPlatform as abstract.  An abstract + Flags the targetPlatform as abstract.  An abstract targetPlatform must be defined as a top level object in the model definition and can not be selected by the user in the UI, but target platforms derived from this target platform will inherit its attributes - and children.  The default value is false. + and children.  The default value is false. no @@ -2160,12 +2160,12 @@ the workspace.

osList - + The list of operating systems that is valid for this target platform. -  The valid list of operating systems - is the string values returned by Platform.getOS().  If +  The valid list of operating systems + is the string values returned by Platform.getOS().  If the osList attribute is not specified, or if the value is "all", then - the target platform supports all operating systems. + the target platform supports all operating systems. @@ -2179,12 +2179,12 @@ the workspace.

- + The list of architectures that is valid for this target platform.  The - valid list of architectures - is the string values returned by Platform.getOSArch().  If + valid list of architectures + is the string values returned by Platform.getOSArch().  If the archList attribute is not specified, or if the value is "all", then - the target platform supports all architectures. + the target platform supports all architectures. @@ -2196,8 +2196,8 @@ the workspace.

valign="top">binaryParser Semi-colon separated list of the ids of the appropriate parser(s) for the build - artifact + valign="top">Semi-colon separated list of the ids of the appropriate parser(s) for the build + artifact no @@ -2207,7 +2207,7 @@ the workspace.

3.8 Tool

The tool element represents the tool in the user model.  A tool must have a -unique id for the build model, and a name that is displayed to a +unique id for the build model, and a name that is displayed to a user through the UI.  A tool can be defined as part of a tool-chain, or as an independent specification.

A tool may contain one or more @@ -2227,29 +2227,29 @@ library paths.

Certain tools logically belong to certain kinds of projects. For example, the Gnu compiler is invoked differently for C and C++ source files. You can specify a filter for a tool based on the -nature of a project using the natureFilter attribute. When a new C +nature of a project using the natureFilter attribute. When a new C project is created, a “cnature” is added to it. New C++ projects have both a “cnature” and “ccnature”. The build model interprets the filter as follows. If you specify a ‘cnature’ filter, then the tool will only be displayed if the -project has a “cnature” and does not have a “ccnature”. If you specify a +project has a “cnature” and does not have a “ccnature”. If you specify a ‘ccnature’ filter, then the tool will be displayed if the project has a “ccnature”. The default if no filter is specified is to display the tool for all projects.

-

Each tool specifies a command +

Each tool specifies a command that will be placed in the build file during the build file generation stage of building.  If the tool requires a special output flag, such as ‘-o’ for a compiler or linker, the -implementer must specify that in the outputFlag attribute.

-

The commandLineGenerator +implementer must specify that in the outputFlag attribute.

+

The commandLineGenerator attribute allows the implementer to specify a class that implements the IManagedCommandLineGenerator interface.  An explanation of how to replace the default command line generator can be found in § 7.4.

MBS supports multiple versions of -a tool.  The versionsSupported attribute contains a list of +a tool.  The versionsSupported attribute contains a list of supported versions of a particular tool. This indicates that there is no need to perform a conversion when user imports/loads a project with one of the supported tool versions. When a tool integrator decides to no longer support a version of a tool, they continue to ship the old tool definition and specify the id with -version number of the tool to convert to in the convertToId attribute.  +version number of the tool to convert to in the convertToId attribute.  If changes to the project information need to be performed by the conversion, the tool chain must provide a converter extension to perform the conversion.  If no converter extension is provided, then there won’t be any conversion.  @@ -2318,8 +2318,8 @@ build model.

- The unique identifier of the tool that this tool is derived - from. + The unique identifier of the tool that this tool is derived + from. @@ -2333,10 +2333,10 @@ build model.

- Flags the tool as abstract.  An abstract tool must be + Flags the tool as abstract.  An abstract tool must be defined as a top level object in the model definition and can not be selected by the user in the UI, but tools derived from this tool will - inherit its attributes and children.  The default value is false. + inherit its attributes and children.  The default value is false. @@ -2469,7 +2469,7 @@ Gnu C compiler, or g++ for the Gnu C++ compiler. - Specifies a command “pattern” that indicates how the parts + Specifies a command “pattern” that indicates how the parts of the command line are used to create the entire command line.  The pattern consists of the replaceable variables COMMAND, FLAGS, OUTPUT_FLAG, OUTPUT_PREFIX, OUTPUT and INPUTS.  The default command line @@ -2477,7 +2477,7 @@ Gnu C compiler, or g++ for the Gnu C++ compiler. ${COMMAND} ${FLAGS} ${OUTPUT_FLAG}${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}, except when customBuildStep is true, where the default is $(COMMAND).  White space and other characters are significant and are copied to the - generated command. + generated command. @@ -2491,13 +2491,13 @@ Gnu C compiler, or g++ for the Gnu C++ compiler. - When True, indicates that + When True, indicates that the Tool represents a CDT end-user-defined custom build step.  The default is False.  When True, the default value of the commandLinePattern attribute changes to “$(command)”.  This attribute is used by the implementation of Custom Build Steps on the MBS configuration property page.  It is not intended for use by tools defined by a - tool-integrator. + tool-integrator. @@ -2511,12 +2511,12 @@ Gnu C compiler, or g++ for the Gnu C++ compiler. - Contains a semi-colon separated, ordered, list of error + Contains a semi-colon separated, ordered, list of error parser ids.  MBS adds the error parser(s) to the end of the toolChain error parser list, if not already present, when a project resource is defined to use the tool.  The error parser(s) can be removed by the CDT user, and is automatically removed when there are no more project - resources that use the tool. + resources that use the tool. @@ -2727,8 +2727,8 @@ attributes of the InputType element are described in the table below.

- A unique identifier that - the MBS will use to track this element. + A unique identifier that + the MBS will use to track this element. @@ -2742,8 +2742,8 @@ attributes of the InputType element are described in the table below.

- The name of the input type - that is displayed to the user in the UI. + The name of the input type + that is displayed to the user in the UI. @@ -2757,8 +2757,8 @@ attributes of the InputType element are described in the table below.

- The unique identifier of - the inputType that this inputType is derived from. + The unique identifier of + the inputType that this inputType is derived from. @@ -2772,10 +2772,10 @@ attributes of the InputType element are described in the table below.

- The id of an Eclipse + The id of an Eclipse content type that describes this input type.  If both the sources attribute and the sourceContentType attribute are specified, the - sourceContentType will be used if it is defined in Eclipse. + sourceContentType will be used if it is defined in Eclipse. @@ -2789,10 +2789,10 @@ attributes of the InputType element are described in the table below.

- A comma-separated list of + A comma-separated list of file extensions that the tool will produce output for.  Note that the user will not be able to modify the set of file extensions as they can - when sourceContentType is specified. + when sourceContentType is specified. @@ -2806,11 +2806,11 @@ attributes of the InputType element are described in the table below.

- The id of an Eclipse + The id of an Eclipse content type used for dependency files.  If both the dependencyExtensions attribute and the dependencyContentType attribute are specified, the dependencyContentType will be used if it is defined - in Eclipse. + in Eclipse. @@ -2824,10 +2824,10 @@ attributes of the InputType element are described in the table below.

- A comma-separated list of + A comma-separated list of file extensions used by dependency files. Note that the user will not be able to modify the set of file extensions as they can when - dependencyContentType is specified. + dependencyContentType is specified. @@ -2876,10 +2876,10 @@ attributes of the InputType element are described in the table below.

- True if all of the inputs + True if all of the inputs of this category are used in one invocation of the tool.  The inputs can be project resources, or the outputs of other tools in the tool-chain.  - The default is False. + The default is False. @@ -2893,8 +2893,8 @@ attributes of the InputType element are described in the table below.

- True is this is considered - the primary input of the tool.  The default is False. + True is this is considered + the primary input of the tool.  The default is False. @@ -2908,10 +2908,10 @@ attributes of the InputType element are described in the table below.

- The name of a class that + The name of a class that provides the source file dependency calculation for the input type.  The class implements the IManagedDependencyGenerator2 interface.  The default - is none. + is none. @@ -2925,13 +2925,13 @@ attributes of the InputType element are described in the table below.

- A variable used in the + A variable used in the build file to represent the list of input files.  The same variable name can be used by an outputType to identify a set of output files that contribute to this tool’s input (i.e., those using the same buildVariable name).  A build variable is ignored when multipleOfType is false and this is the primary input of the tool.  The default name is - chosen by MBS. + chosen by MBS. @@ -2970,12 +2970,12 @@ specified by the user (or tool integrator).

- Defines a semi-colon + Defines a semi-colon separated list of the relative or absolute path of the resource(s) to which this element applies.  The resource(s) must be a member of the project, the output from another tool in the tool-chain, or an external file.  The file name of a path can use GNU Make pattern rule syntax (in - order to generate the name from the output file name). + order to generate the name from the output file name). @@ -3005,7 +3005,7 @@ specified by the user (or tool integrator).

AdditionalInputDependency – added as both. - The default is + The default is AdditionalInputDependency.
    -
  1. +
  2. If this is the “target” tool in the tool-chain, and this is the primary - OutputType, use the user-defined artifact name and extension.
    3. -
  3. - If the option attribute is specified, use the value of the option.
    4. -
  4. - If the nameProvider attribute is specified, call the nameProvider and use - the returned name(s).
    5. -
  5. - If the outputNames attribute is specified, use the value of the attribute.
    6. -
  6. - Use the namePattern attribute value to construct the name from the input - file name.
    7. + OutputType, use the user-defined artifact name and extension. +
  7. + If the option attribute is specified, use the value of the option.
    8. +
  8. + If the nameProvider attribute is specified, call the nameProvider and use + the returned name(s).
    9. +
  9. + If the outputNames attribute is specified, use the value of the attribute.
    10. +
  10. + Use the namePattern attribute value to construct the name from the input + file name.

 If the output of the tool usually has a special prefix, like the prefix -‘lib’ for libraries on POSIX systems, the implementer must specify this in the outputPrefix +‘lib’ for libraries on POSIX systems, the implementer must specify this in the outputPrefix attribute.

3.11.1 Schema

3.12 Option Category

-

The optionCategory element represents the option category in -the user model.  A tool can have a large number of options. To help organize the user +

The optionCategory element represents the option category in +the user model.  A tool can have a large number of options. To help organize the user interface for these options, a hierarchical set of option categories can be defined. A unique identifier must be specified in the id @@ -3401,12 +3401,12 @@ Options'. This will be the name the user sees displayed in the UI.

The option element represents the option in the user model.  Options are used to organize and maintain the command arguments that are sent to tools during the build. Users interact with the build model through the UI to -set the value of options.  Each option must have a unique id for the -build model to properly manage it. A descriptive name that will appear in +set the value of options.  Each option must have a unique id for the +build model to properly manage it. A descriptive name that will appear in the UI must be specified. Options can be organized into categories to keep the UI more manageable. If an option category has been defined for the tool, and the option should be displayed as part of that category, then the unique identifier -of the option category must be specified in the category attribute.

+of the option category must be specified in the category attribute.

3.13.1 Option Types

Some options contain commands to turn a feature off or on, such as setting a flag to see descriptive messages from a tool. Others contain @@ -3434,7 +3434,7 @@ in respectively.

commands that take a user-defined value.  The UI representation for a string option is a text box.

3.12.1.2 Boolean Options

-

Boolean options are used to specify an option that is +

Boolean options are used to specify an option that is either true or false. The UI representation for a boolean option is a check box. The value of the option is set true by selecting the check box, and false by deselecting it. If true, the command @@ -3485,21 +3485,21 @@ is ignored for all other option types.

3.13.2 Values and Default Values

An option can define a default value that applies to the option until a value has been specified. An option -defines its default value using the defaultValue attribute.  When an +defines its default value using the defaultValue attribute.  When an option has a value that has been specifically set, the value is contained in the -value attribute.  In order to determine the current value of an option, +value attribute.  In order to determine the current value of an option, MBS performs the following steps until a value is found:

    -
  1. Examine the value - attribute of the option.
    2. -
  2. Examine the value - attribute of the option’s superClass recursively.
    3. -
  3. Examine the - defaultValue attribute of the option.
    4. -
  4. Examine the - defaultValue attribute of the option’s superClass recursively.
    5. -
  5. Use the default value for - the option type.
    6. +
  6. Examine the value + attribute of the option.
    7. +
  7. Examine the value + attribute of the option’s superClass recursively.
    8. +
  8. Examine the + defaultValue attribute of the option.
    9. +
  9. Examine the + defaultValue attribute of the option’s superClass recursively.
    10. +
  10. Use the default value for + the option type.

The type of option will determine how the build model treats the value it finds associated with the attribute. @@ -3512,18 +3512,18 @@ enumerated options search through the defined enumerated values for the default. are passed to build tools with unique flags, depending on the compiler and the option. For example, an option defining the paths a linker should search for libraries might contain a large number of search paths, but each path is passed -to the linker with a ‘-L’ flag. The command attribute is used to hold the +to the linker with a ‘-L’ flag. The command attribute is used to hold the actual flag to pass along with the option value.

The build model handles the value it finds associated with the command attribute differently depending on the type of value the option is managing based on the following heuristic. For string -options the option value is appended to the value of the command -attribute. The command attribute can be empty in order to support an area -for typing in additional options.  For enumerated options, the command +options the option value is appended to the value of the command +attribute. The command attribute can be empty in order to support an area +for typing in additional options.  For enumerated options, the command associated with the selected enumerated value is used, not the command defined -in the option. For boolean options, the command is used if the option -value is set to true, otherwise the value of the commandFalse attribute -is used. For list options, the command is applied to each element of the +in the option. For boolean options, the command is used if the option +value is set to true, otherwise the value of the commandFalse attribute +is used. For list options, the command is applied to each element of the list.

@@ -3697,8 +3697,8 @@ build model.

superClass + The unique identifier of the option that this option is + derived from. @@ -3709,10 +3709,10 @@ build model.

isAbstract + will inherit its attributes and children.  The default value is false. @@ -3760,8 +3760,8 @@ can be the id of the tool which is also a category.  The default category value + individual file’s options.  Specifying “file” indicates the opposite. @@ -4122,8 +4122,8 @@ attributes are specified in the schema table below.

resourcePath + The path of the project resource to which this + resourceConfiguration applies. @@ -4134,10 +4134,10 @@ attributes are specified in the schema table below.

exclude + exist, even when excluded from the build. @@ -4256,7 +4256,7 @@ attributes are specified in the schema table below.

The name of a class that implements the IBuildPathResolver interface that the tool-integrator can supply in order to provide his/her own logic of resolving the variable values to the build paths

-

Design note: the reason why this callback is +

Design note: the reason why this callback is needed is because some tools may store the build paths in some special way or in the format other than <path1><delimiter><path2><delimiter>…<pathN>.  The example of such a tool is gcc for Win32 Cygwin.  The cygwin @@ -4800,7 +4800,7 @@ to expand it. Click on the expansion icon beside META-INF, and then double click the MANIFEST.MF file to edit its contents.

  • We have to add a dependency between our project and the org.eclipse.cdt.managedbuilder.core -plug-in where the extension point is defined. Click on the Dependencies +plug-in where the extension point is defined. Click on the Dependencies tab located along the bottom of the manifest editor. Click the Add… button located beside the Required Plug-Ins @@ -4845,7 +4845,7 @@ property in the Extension Element Details column. For now, let’s use the name Example Executable for our projectType.
  • Make sure that the values of isTest - and isAbstract are set + and isAbstract are set to false.
    • @@ -4881,8 +4881,8 @@ following list org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.G org.eclipse.cdt.core.VCErrorParser

    - -6.6 Adding a ToolChain

    + +6.6 Adding a ToolChain

    Each configuration requires a toolChain child that defines the set of tools used by the configuration.

    @@ -4908,8 +4908,8 @@ you are running on a version of Solaris, or other if none of the above apply.

    - -6.7 Adding a Builder

    + +6.7 Adding a Builder

    Each toolChain can have a builder child that describes the build utility used by the tool-chain to create the build artifacts of the configuration.

    @@ -4946,8 +4946,8 @@ property and  to be Example Target Platform  and the valu style="font-weight: bold;">id to be example.toolchain.targetplatform.
  • Our target platform is the same as our host platform.  Enter the - same value for the osList property as entered for the ToolChain - osList.
    • + same value for the osList property as entered for the ToolChain + osList.
  • Set the value of the binary parser property based on the platform you will be using to create your example projects on. For example, if you @@ -4955,8 +4955,8 @@ are running this tutorial on Linux or Solaris, enter the value org.eclipse If you are running the tutorial on Windows, enter the value org.eclipse.cdt.core.PE.

    • - -6.9 Adding a Tool

    + +6.9 Adding a Tool

    Each toolChain describes the set of tools used by the build utility to create the build artifacts of the configuration.

    @@ -4981,41 +4981,41 @@ property.

    - -6.10 Adding Input and Output Types

    + +6.10 Adding Input and Output Types

    Each tool describes its inputs and outputs in InputType and OutputType elements. 

    1. -

      Right click on Compiler to get the - context menu and select New > inputType.  Name the inputType - Compiler Input and make - its id - example.toolchain.compiler.input.

      2. +

      Right click on Compiler to get the + context menu and select New > inputType.  Name the inputType + Compiler Input and make + its id + example.toolchain.compiler.input.

    2. Our imaginary compiler only works on c source files. Locate the sourceContentType property and set it to - org.eclipse.cdt.core.cSource.

      3. + org.eclipse.cdt.core.cSource.

    3. The build model needs to know if there are any special file extensions that indicate a file is a ‘header’ file. Set the dependencyContentType -property to be org.eclipse.cdt.core.cHeader - and the - dependencyCalculator property to be - - org.eclipse.cdt.managedbuilder.makegen.internal.DefaultIndexerDependencyCalculator. +property to be org.eclipse.cdt.core.cHeader + and the + dependencyCalculator property to be + + org.eclipse.cdt.managedbuilder.makegen.internal.DefaultIndexerDependencyCalculator.

    4. -

      Set the primaryInput property to - true.

      5. +

      Set the primaryInput property to + true.

    5. -

      Right click on Compiler to get the - context menu and select New > outputType.  Name the outputType - Compiler Output and make - its id - example.toolchain.compiler.output.

      6. +

      Right click on Compiler to get the + context menu and select New > outputType.  Name the outputType + Compiler Output and make + its id + example.toolchain.compiler.output.

    6. Let us assume that the output of the compiler is an object module that has the @@ -5025,14 +5025,14 @@ tool to o.

    7. The object modules created by your compiler are typically used as a group by another tool, for example a linker or - archiver.  Set the buildVariable property to be - OBJS. You would use the + archiver.  Set the buildVariable property to be + OBJS. You would use the same name as the buildVariable with - the inputType of this other tool.

      + the inputType of this other tool.

    8. -

      Set the primaryOutput property to - true.

      9. +

      Set the primaryOutput property to + true.

    6.11 Testing the ProjectType

    @@ -5073,8 +5073,8 @@ Projects view to access the context menu, and select Properties to open the property browser for the project. Select C/C++ Build -from the choices, select the Tool Settings tab, and note that the tool we defined appears in the list. -
  • Select the Build Settings tab.  The user can change the +from the choices, select the Tool Settings tab, and note that the tool we defined appears in the list.
    • +
  • Select the Build Settings tab.  The user can change the build output name and the build command from here, and the MBS will manage that selection between sessions.
  • Select the Error Parsers @@ -5148,12 +5148,12 @@ the category that you entered in step 4.
    • compiler (remember, you add the option to the tool and set its category via the category property). Set the name of the option to Other -flags, its id to example.toolchain.compiler.general.otherflags, its valueType +flags    , its id to example.toolchain.compiler.general.otherflags, its valueType to string, and its defaultValue to -c.
  • Add a check-box option to the 'General' category of the compiler. Name it Error messages, - set the id to example.toolchain.compiler.general.errmsgs, and set its - valueType to boolean. + set the id to example.toolchain.compiler.general.errmsgs, and set its + valueType to boolean. This is a boolean option, so it might have a command associated with the selected and unselected states. In this case we want to turn on reporting when it is selected, and turn it off when it is deselected. @@ -5202,7 +5202,7 @@ the preprocessor symbols defined for the project.

    MBS gathers information about the defined symbols and include paths from a number of sources:

    -

    User-defined symbols and include paths:  You can flag certain +

    User-defined symbols and include paths:  You can flag certain tool options as special so the build model will know to pay special attention to them. As the implementer of the tool integration, you should make sure your @@ -5210,16 +5210,16 @@ specification has options of type “includePaths” and “definedS The build model will pay special attention to these options and provide them to the appropriate clients in the CDT core without any further intervention on your part.

    -

    Pre-defined symbols and include paths:  A toolChain may specify +

    Pre-defined symbols and include paths:  A toolChain may specify the id of scanner configuration discovery profile for gathering the built-in compiler settings.  See the org.eclipse.cdt.make.core.ScannerConfigurationDiscoveryProfile extension point description in the reference documentation for more information.  If a collector is specified, MBS invokes it to return the pre-defined symbols and include paths.  If a collector is not specified, MBS searches for -options of type “includePaths” and “definedSymbols” with the builtIn +options of type “includePaths” and “definedSymbols” with the builtIn attribute set to true.

    -

    Environment include paths:  Your build definition may specify a -envVarBuildPath element with the pathType attribute set to "buildpathInclude".  +

    Environment include paths:  Your build definition may specify a +envVarBuildPath element with the pathType attribute set to "buildpathInclude".  If specified, MBS will read the environment variable(s) for additional include paths.  See § 3.17 for additional information regarding the envVarBuildPath element.

    @@ -5268,8 +5268,8 @@ not difficult. You must supply the plugin manifest we created inside the Eclipse platform's plug-in directory. The plug-in directory is named plugins and is typically located underneath the main directory where you installed the Eclipse -platform. -

    +platform. +

    1. From the Plug-in @@ -5282,9 +5282,9 @@ page, chose Deployable Plugins and FragmentsNext > button.
      2. -
    2. In the Deployable Plugins and Fragments - dialog, Export - Destination section, select Directory and click the Browse... button. +
    3. In the Deployable Plugins and Fragments + dialog, Export + Destination section, select Directory and click the Browse... button. Browse to your Eclipse installation. Deselect all Export Options.  Click the Finish button.
    4. Restart Eclipse, switch to the C/C++ @@ -5366,34 +5366,34 @@ dependencyCalculator attribute.  Typically, dependency calculators are only relevant for a "compiler" tool, but what tool you use to specify the generator (or generators) is arbitrary.

      By design, a dependency calculator must answer what type of -dependency generation it will do.  There are two major, +dependency generation it will do.  There are two major, and multiple minor, modes of dependency calculation supported by the MBS.  -The major modes are:

      +The major modes are:

        -
      1. The build file generator invokes tool integrator +
      2. The build file generator invokes tool integrator provided methods that calculate all dependencies using whatever method the tool integrator wants.  The build file generator then adds the dependencies to the build file using the appropriate build file syntax.  This is a TYPE_CUSTOM dependency calculator as defined below.  See the - IManagedDependencyCalculator - interface discussion below for more information. 
        3. -
      3. The build file generator and the tool-chain cooperate + IManagedDependencyCalculator + interface discussion below for more information. 
        4. +
      4. The build file generator and the tool-chain cooperate in creating and using separate "dependency" files.  In this case, dependency calculation is done at "build time", rather than at "build file generation time" as in mode #1.  This currently supports the GNU concept of using .d files in GNU make.  This is either a TYPE_BUILD_COMMANDS dependency calculator or a TYPE_PREBUILD_COMMANDS - dependency calculator as defined below.  See the - IManagedDependencyCommands - and IManagedDependencyPreBuild - interfaces discussion below for more information.
        5. + dependency calculator as defined below.  See the + IManagedDependencyCommands + and IManagedDependencyPreBuild + interfaces discussion below for more information.
      -

      public interface IManagedDependencyGeneratorType {
      -    /**
      +

      public interface IManagedDependencyGeneratorType {
      +    /**
           *  Constants returned by getCalculatorType
           */
          -       public int TYPE_NODEPS = 0; //  Deprecated - use + public int TYPE_NODEPS = 0; //  Deprecated - use TYPE_NODEPENDENCIES
          public int TYPE_COMMAND = 1; //  Deprecated - use @@ -5405,8 +5405,8 @@ TYPE_BUILD_COMMANDS
          public int TYPE_OLD_TYPE_LIMIT = 3;

      -     //  Use these types
      -           +     //  Use these types
      +           public int TYPE_NODEPENDENCIES = 4;
          public int TYPE_BUILD_COMMANDS = 5;
      @@ -5415,7 +5415,7 @@ TYPE_BUILD_COMMANDS
          public int TYPE_CUSTOM = 7;

      -    /**
      +    /**
           * Returns the type of dependency generator that is implemented. 
           *
      @@ -5463,25 +5463,25 @@ dependency files need to be re-generated.
           * @return int
           */
              -       public int getCalculatorType();
      -}

      -

      After deciding upon the type of dependency calculator, you -must implement the methods in IManagedDependencyGenerator2.  -The method getDependencySourceInfo -returns an instance of the -IManagedDependencyInfo interface.  This can be -any one of the 3 interfaces that derive from -IManagedDependencyInfo  - -IManagedDependencyCalculator, -IManagedDependencyCommands or -IManagedDependencyPreBuild + public int getCalculatorType();
      +}

      +

      After deciding upon the type of dependency calculator, you +must implement the methods in IManagedDependencyGenerator2.  +The method getDependencySourceInfo +returns an instance of the +IManagedDependencyInfo interface.  This can be +any one of the 3 interfaces that derive from +IManagedDependencyInfo  - +IManagedDependencyCalculator, +IManagedDependencyCommands or +IManagedDependencyPreBuild which are discussed below.  The returned interface is called to get the dependency information for a particular source file in the configuration.  -See the descriptions of the other methods in IManagedDependencyGenerator2 -in the code comments below.

      +See the descriptions of the other methods in IManagedDependencyGenerator2 +in the code comments below.

      public interface IManagedDependencyGenerator2 extends IManagedDependencyGeneratorType {
 	
-    /**
+    /**
      * Returns an instance of IManagedDependencyInfo for this source file.
      * IManagedDependencyCalculator, IManagedDependencyCommands
      * and IManagedDependencyPreBuild are all derived from
@@ -5498,13 +5498,13 @@ in the code comments below.
      
      *   the working directory for the tool.  This IPath is relative to the project directory.
      * @return IManagedDependencyInfo    
      */
-	public IManagedDependencyInfo getDependencySourceInfo(
+	public IManagedDependencyInfo getDependencySourceInfo(
 		IPath source,
 		IBuildObject buildContext,
 		ITool tool,
 		IPath topBuildDirectory);
 
-    /**
+    /**
      * Returns the file extension used by dependency files created
      * by this dependency generator.
      * This is called when getCalculatorType returns TYPE_BUILD_COMMANDS or 
@@ -5515,11 +5515,11 @@ in the code comments below.
      
      *
      * @return String
      */
-	public String getDependencyFileExtension(
+	public String getDependencyFileExtension(
 		IConfiguration buildContext,
 		ITool tool);
 
-    /**
+    /**
      * Called to allow the dependency calculator to post-process dependency files.
      * This method is called after the build has completed for at least every 
      * dependency file that has changed, and possibly for those that have not
@@ -5539,20 +5539,20 @@ in the code comments below.
      
      *
      * @return boolean  True if the method modified the dependency (e.g., .d) file
      */
-	public boolean postProcessDependencyFile(
+	public boolean postProcessDependencyFile(
 		IPath dependencyFile,
 		IConfiguration buildContext,
 		ITool tool,
 		IPath topBuildDirectory);
 }
      -

      7.3.1 TYPE_CUSTOM dependency calculator -

      -

      A TYPE_CUSTOM dependency calculator must implement the -IManagedDependencyCalculator -interface.

      +

      7.3.1 TYPE_CUSTOM dependency calculator +

      +

      A TYPE_CUSTOM dependency calculator must implement the +IManagedDependencyCalculator +interface.

      public interface IManagedDependencyCalculator extends IManagedDependencyInfo {
 	
-    /**
+    /**
      * Returns the list of source file specific dependencies.
      *   
      * The paths can be either relative to the project directory, or absolute 
@@ -5560,9 +5560,9 @@ interface.
      
      *
      * @return IPath[]    
      */
-	public IPath[] getDependencies();
+	public IPath[] getDependencies();
 	
-    /**
+    /**
      * Returns the list of source file specific additional targets that the 
      * source file creates.  Most source files will return null.  An example 
      * of where additional targets should be returned is for a Fortran 90 
@@ -5578,7 +5578,7 @@ interface.
      
      *
      * @return IPath[]    
      */
-	public IPath[] getAdditionalTargets();
+	public IPath[] getAdditionalTargets();
 }

      An example TYPE_CUSTOM dependency calculator can be found in the MBS test suite - org.eclipse.cdt.managedbuilder.core.tests\DefaultFortranDependencyCalculator.

      @@ -5592,76 +5592,76 @@ to complete its work before it will answer, so your build may take longer to complete.  See the org.eclipse.cdt.managedbuilder.makegen.internal\DefaultIndexerDependencyCalculator class for an example of how this was implemented using the old, deprecated -IManagedDependencyGenerator +IManagedDependencyGenerator interface.  However, it doesn't seem as if it worked with CDT 3.0.  Readers are encouraged to update this method to the new interfaces and -contribute the implementation to CDT.

      -

      7.3.2 TYPE_BUILD_COMMANDS dependency -calculator

      +contribute the implementation to CDT.

      +

      7.3.2 TYPE_BUILD_COMMANDS dependency +calculator

      When using a TYPE_BUILD_COMMANDS dependency calculator, the build file generator and the tool-chain cooperate in creating and using separate "dependency" files. The build file generator calls the dependency calculator to get the dependency file names and to get commands that need to be added to the build file. In this case, dependency calculation is done at "build time", rather than at "build file generation time" as with TYPE_CUSTOM. This currently supports the GNU concept of using .d files in GNU make.

      -There are multiple ways that these separate dependency files can +There are multiple ways that these separate dependency files can be created by the tool-chain and used by the builder.  In some cases (e.g., Fortran 90 using modules) the dependency files must be created/updated prior to invoking the build of the project artifact (e.g., an application). In this case, the dependency generation step must occur separately before the main build. See -TYPE_PREBUILD_COMMANDS for more information.  In other cases (e.g., C/C++) the dependency files can be created as +TYPE_PREBUILD_COMMANDS for more information.  In other cases (e.g., C/C++) the dependency files can be created as a side effect of the main build. This implies that the up to date dependency files are not required for the current build, but for the next build. C/C++ builds can be treated in this manner as is described in the following link: - http://sourceware.org/automake/automake.html#Dependency-Tracking-Evolution.  Use the IManagedDependencyCommands interface for this mode.

      -

      Two sub-scenarios of this mode are to: -

      + http://sourceware.org/automake/automake.html#Dependency-Tracking-Evolution.  Use the IManagedDependencyCommands interface for this mode.

      +

      Two sub-scenarios of this mode are to: +

        -
      1. Create dependency files in the same invocation of the tool that +
      2. Create dependency files in the same invocation of the tool that creates the tool's build artifact - by adding additional options - to the tool invocation command line.
        3. -
      3. Create dependency files in a separate invocation of the tool, or - by the invocation of another tool
        4. + to the tool invocation command line. +
      4. Create dependency files in a separate invocation of the tool, or + by the invocation of another tool
      -

      MBS can also help in the generation of the dependency files. Prior to +

      MBS can also help in the generation of the dependency files. Prior to CDT 3.1, MBS and gcc cooperated in generating dependency files using the - following steps:

      + following steps:

        -
      1. Gcc is invoked to perform the compilation that generates the object - file.
        2. -
      2. An "echo" command creates the .d file, adding the name of the .d +
      3. Gcc is invoked to perform the compilation that generates the object + file.
        4. +
      4. An "echo" command creates the .d file, adding the name of the .d file to the beginning of the newly created .d file. Note that this causes problems with some implementations of "echo" that don't work exactly the way that we want (e.g., it doesn't support the -n - switch).
        5. -
      5. Gcc is invoked again with the appropriate additional command line + switch).
        6. +
      6. Gcc is invoked again with the appropriate additional command line options to append its dependency file information to the .d file - that was created by "echo".
        7. -
      7. Steps 1 - 3 are invoked in the make file. Step 4 occurs after the + that was created by "echo".
        8. +
      8. Steps 1 - 3 are invoked in the make file. Step 4 occurs after the make invocation has finished. In step 4, MBS code post-processes the .d files to add a dummy dependency for each header file, for - the reason explained in the link above.
        9. + the reason explained in the link above.
      -

      This mode is no longer used by the default gcc implementation, but can - still be used by selecting the DefaultGCCDependencyCalculator3Commands class.

      -

      Note for GNU make: these separate dependency files are "include"d by +

      This mode is no longer used by the default gcc implementation, but can + still be used by selecting the DefaultGCCDependencyCalculator3Commands class.

      +

      Note for GNU make: these separate dependency files are "include"d by a main makefile. Therefore, if the dependency files are required to be up to date before the main build begins, they must be updated by a separate invocation of make. Also, the configuration "clean" step must be invoked by a separate invocation of make. This is so that we can exclude the dependency files for a "make clean" invocation - using syntax like:

      -

      ifneq ($(MAKECMDGOALS), clean)

      -

      -include $(DEPS)

      -

      endif -

      -

      Otherwise, because GNU make attempts to re-make make files, we + using syntax like:

      +

      ifneq ($(MAKECMDGOALS), clean)

      +

      -include $(DEPS)

      +

      endif +

      +

      Otherwise, because GNU make attempts to re-make make files, we can end up with out of date or missing dependency files being - re-generated and then immediately "clean"ed.

      -

      Examples of the use of TYPE_BUILD_COMMANDS -can be found in org.eclipse.cdt.managedbuilder.makegen.gnu\DefaultGCCDependencyCalculator2Commands -and DefaultGCCDependencyCalculator3Commands.

      + re-generated and then immediately "clean"ed.

      +

      Examples of the use of TYPE_BUILD_COMMANDS +can be found in org.eclipse.cdt.managedbuilder.makegen.gnu\DefaultGCCDependencyCalculator2Commands +and DefaultGCCDependencyCalculator3Commands.

      public interface IManagedDependencyCommands extends IManagedDependencyInfo {
 	
-    /**
+    /**
      * Returns the list of generated dependency files.
      *   
      * The paths can be either relative to the top build directory, or absolute 
@@ -5669,9 +5669,9 @@ and DefaultGCCDependencyCalculator3Commands.
      
      *
      * @return IPath[]    
      */
-	public IPath[] getDependencyFiles();
+	public IPath[] getDependencyFiles();
 
-    /**
+    /**
      * Returns the command lines to be invoked before the normal tool invocation 
      * to calculate dependencies.
      *
@@ -5679,9 +5679,9 @@ and DefaultGCCDependencyCalculator3Commands.
      
      *                   generation command needs to be invoked before the normal 
      *                   tool invocation.
      */
-	public String[] getPreToolDependencyCommands();
+	public String[] getPreToolDependencyCommands();
 	
-    /**
+    /**
      * Returns the command line options to be used to calculate dependencies.
      * The options are added to the normal tool invocation. 
      *
@@ -5689,9 +5689,9 @@ and DefaultGCCDependencyCalculator3Commands.
      
      *                   arguments need to be added to the tool invocation.
      *         SHOULD THIS RETURN AN IOption[]?
      */
-	public String[] getDependencyCommandOptions();
+	public String[] getDependencyCommandOptions();
  	
-    /**
+    /**
      * Returns the command lines to be invoked after the normal tool invocation  
      * to calculate dependencies.  
      *
@@ -5699,9 +5699,9 @@ and DefaultGCCDependencyCalculator3Commands.
      
      *                   generation commands needs to be invoked after the normal 
      *                   tool invocation
      */
-	public String[] getPostToolDependencyCommands();
+	public String[] getPostToolDependencyCommands();
 	
-    /**
+    /**
      * Returns true if the command lines and/or options returned by this interface
      * are not specific to the particular source file, but are only specific to,
      * at most, the configuration and tool.  If the build context is a resource 
@@ -5712,10 +5712,10 @@ and DefaultGCCDependencyCalculator3Commands.
      
      *
      * @return boolean
      */
-	public boolean areCommandsGeneric();
+	public boolean areCommandsGeneric();
 }
      -

      7.3.3 TYPE_PREBUILD_COMMANDS dependency -calculator

      +

      7.3.3 TYPE_PREBUILD_COMMANDS dependency +calculator

      When using a TYPE_BUILD_PRECOMMANDS dependency calculator, the build file generator and the tool-chain cooperate in creating and using separate "dependency" files. For GNU make, these separate dependency files are "include"d by a main makefile. Make performs special processing on make files:
      @@ -5740,10 +5740,10 @@ include $(DEPS)
      endif

      The restriction with this is that it only works if "clean" is the only target specified on the make command line. Therefore, the build "clean" step must be -invoked separately.

      Examples of the use of TYPE_PREBUILD_COMMANDS -can be found in org.eclipse.cdt.managedbuilder.makegen.gnu\DefaultGCCDependencyCalculatorPreBuildCommands.

      public interface IManagedDependencyPreBuild extends IManagedDependencyInfo {
-	
-    /**
+invoked separately.
      Examples of the use of TYPE_PREBUILD_COMMANDS 
+can be found in org.eclipse.cdt.managedbuilder.makegen.gnu\DefaultGCCDependencyCalculatorPreBuildCommands.
      public interface IManagedDependencyPreBuild extends IManagedDependencyInfo {
+
+    /**
      * Returns the list of generated dependency files.
      *   
      * The paths can be either relative to the top build directory, or absolute 
@@ -5751,9 +5751,9 @@ invoked separately.
      Examples of the use of TYPE_PREB
      *
      * @return IPath[]    
      */
-	public IPath[] getDependencyFiles();
+	public IPath[] getDependencyFiles();
 
-    /**
+    /**
      * Returns the name to be used in the build file to identify the separate
      * build step.  Note that this name should be unique to the tool since
      * multiple tools in a tool-chain may be using this method of
@@ -5761,17 +5761,17 @@ invoked separately.
      Examples of the use of TYPE_PREB
      *    
      * @return String  
      */
-	public String getBuildStepName();
+	public String getBuildStepName();
 
-    /**
+    /**
      * Returns the command line(s) to be invoked in the separate 
      * dependencies pre-build step.
      *
      * @return String[]
      */
-	public String[] getDependencyCommands();
+	public String[] getDependencyCommands();
 	
-    /**
+   /**
      * Returns true if the command lines returned by this interface
      * are not specific to the particular source file, but are only specific to,
      * at most, the configuration and tool.  If the build context is a resource 
@@ -5782,7 +5782,7 @@ invoked separately.
      Examples of the use of TYPE_PREB
      *
      * @return boolean
      */
-	public boolean areCommandsGeneric();
+	public boolean areCommandsGeneric();
 }
      
 
      7.4 Replacing the Command Line Generator
      
 
      You can specify a replacement command line generator for a tool. You must specify and supply a class
@@ -5849,7 +5849,7 @@ getInputResources();
      
 
      MBS calls IManagedCommandLineGenerator.generateCommandLineInfo to generate the command 
 line information.  The supplied IManagedCommandLineGenerator could modify the 
 command line parts if necessary and then provide the modified values, as well as 
-the complete command line, in the IManagedCommandLineInfo interface.  The 
+the complete command line, in the IManagedCommandLineInfo interface.  The 
 default MBS implementation does not modify any of the command line parts.  It 
 uses the parts and the pattern to generate the complete command line that can be 
 retrieved using IManagedCommandLineInfo.getCommandLine.
      
@@ -5864,17 +5864,17 @@ given project type are not supported the project type is treated as unsupported.
 
      In order to provide this functionality, the “isToolChainSupported” 
 attribute in the toolChain 
 definition must be specified. The value of this attribute should be set to the 
-name of the class which implements the IManagedIsToolChainSupported 
+name of the class which implements the IManagedIsToolChainSupported 
 interface.
      
 
      
-public interface 
-IManagedIsToolChainSupported{
      
+public interface 
+IManagedIsToolChainSupported{
      
 
      
-        boolean 
+        boolean 
 isSupported(IToolChain toolChain, PluginVersionIdentifier version, String 
-instance);
      
+instance);
      
 
      
-}
      
+}
      
 
       
      
 
      The version 
 argument specifies the version of the ToolChain, or null if the ToolChain does 
@@ -5894,815 +5894,815 @@ Configuration-level environment variable suppliers separately: 
      
 
      To provide a Configuration-level 
 supplier the “configurationEnvironmentSupplier” attribute in the toolChain 
 definition must be specified. The value of this attribute should be set to the 
-name of the class which implements the IConfigurationEnvironmentVariableSupplier 
+name of the class which implements the IConfigurationEnvironmentVariableSupplier 
 interface 
      
 
      
-public interface 
-IConfigurationEnvironmentVariableSupplier{
      
+public interface 
+IConfigurationEnvironmentVariableSupplier{
      
 
      
-  /**
      
+  /**
      
 
      
-   *
      
+   *
      
 
      
-   * @variableName the variable mane
      
+   * @variableName the variable mane
      
 
      
-   * @param configuration configuration
      
+   * @param configuration configuration
      
 
      
-   * @param provider the instance of the 
-environment variable provider to be used for querying the
      
+   * @param provider the instance of the 
+environment variable provider to be used for querying the
      
 
      
-   * environment variables from within 
-the supplier. The supplier should use this provider to obtain
      
+   * environment variables from within 
+the supplier. The supplier should use this provider to obtain
      
 
      
-  
+  
  * the already defined environment instead of using 
-the “default” provider returned by the
      
+the “default” provider returned by the
      
 
      
-  
+  
  * 
-ManagedBuildManager.getEnvironmentVariableProvider().
      
+ManagedBuildManager.getEnvironmentVariableProvider().
      
 
      
-   * 
-The provider passed to a supplier will ignore 
-searching the variables for the levels 
      
+   * 
+The provider passed to a supplier will ignore 
+searching the variables for the levels 
      
 
      
-  
+  
  * higher than the current supplier level, will 
-query only the lower-precedence suppliers 
      
+query only the lower-precedence suppliers 
      
 
      
-  
+  
  * for the current level and will query all 
-suppliers for the lower levels. 
      
+suppliers for the lower levels. 
      
 
      
-  
+  
  * This is done to avoid infinite loops that could 
-be caused if the supplier calls the provider 
      
+be caused if the supplier calls the provider 
      
 
      
-  
+  
  * and the provider in turn calls that supplier 
-again. Also the supplier should not know anything 
      
+again. Also the supplier should not know anything 
      
 
      
-  
+  
  * about the environment variables defined for the 
-higher levels.
      
+higher levels.
      
 
      
-
+
    * @return the reference to the IBuildEnvironmentVariable interface representing 
-
      
+
      
 
      
-  
- * the variable of a given name
      
+  
+ * the variable of a given name
      
 
      
-   */
      
+   */
      
 
      
-   IBuildEnvironmentVariable getVariable(String variableName,
- 
      
+   IBuildEnvironmentVariable getVariable(String variableName,
+ 
      
 
      
-IConfiguration configuration,
      
+IConfiguration configuration,
      
 
      
-IEnvironmentVariableProvider provider);
      
+IEnvironmentVariableProvider provider);
      
 
       
      
 
      
-  /**
      
+  /**
      
 
      
-   * @param configuration configuration
      
+   * @param configuration configuration
      
 
      
-   * @param provider the instance of the 
-environment variable provider to be used for querying the
      
+   * @param provider the instance of the 
+environment variable provider to be used for querying the
      
 
      
-   * environment variables from within 
-the supplier. The supplier should use this provider to obtain
      
+   * environment variables from within 
+the supplier. The supplier should use this provider to obtain
      
 
      
-   * the already defined environment instead of using 
-the “default” provider returned by the
      
+   * the already defined environment instead of using 
+the “default” provider returned by the
      
 
      
-   
-* 
-ManagedBuildManager.getEnvironmentVariableProvider().
      
+   
+* 
+ManagedBuildManager.getEnvironmentVariableProvider().
      
 
      
-  
+  
  * The provider passed to a supplier will ignore 
-searching the variables for the levels 
      
+searching the variables for the levels 
      
 
      
-  
+  
  * higher than the current supplier level, will 
-query only the lower-precedence suppliers 
      
+query only the lower-precedence suppliers 
      
 
      
-  
+  
  * for the current level and will query all 
-suppliers for the lower levels.  
      
+suppliers for the lower levels.  
      
 
      
-  
+  
  * This is done to avoid infinite loops that could 
-be caused if the supplier calls the provider 
      
+be caused if the supplier calls the provider 
      
 
      
-  
+  
  * and the provider in turn calls that supplier 
-again. Also the supplier should not know anything
      
+again. Also the supplier should not know anything
      
 
      
-  
+  
  * about the environment variables defined for the 
-higher levels.
      
+higher levels.
      
 
      
-   * @return the array of IBuildEnvironmentVariable that represents the environment variables
      
+   * @return the array of IBuildEnvironmentVariable that represents the environment variables
      
 
      
-   */
      
+   */
      
 
      
-   IBuildEnvironmentVariable[] getVariables (IConfiguration configuration,
      
+   IBuildEnvironmentVariable[] getVariables (IConfiguration configuration,
      
 
      
-IEnvironmentVariableProvider provider);
      
+IEnvironmentVariableProvider provider);
      
 
      
-}
      
+}
      
 
      To provide a Project-level 
 supplier the “projectEnvironmentSupplier” attribute in the projectType 
 definition must be specified. The value of this attribute should be set to the 
-name of the class which implements the IProjectEnvironmentVariableSupplier 
+name of the class which implements the IProjectEnvironmentVariableSupplier 
 interface.
      
 
      
-public interface 
-IProjectEnvironmentVariableSupplier{
      
+public interface 
+IProjectEnvironmentVariableSupplier{
      
 
      
-
-  /**
      
+
+  /**
      
 
      
-   * @variableName the variable mane
      
+   * @variableName the variable mane
      
 
      
-   * @param project the managed project
      
+   * @param project the managed project
      
 
      
-   * @param provider the instance of the 
-environment variable provider to be used for querying the
      
+   * @param provider the instance of the 
+environment variable provider to be used for querying the
      
 
      
-   * environment variables from within 
-the supplier. The supplier should use this provider to obtain
      
+   * environment variables from within 
+the supplier. The supplier should use this provider to obtain
      
 
      
-   
-* the already defined environment instead of using 
-the “default” provider returned by the
      
+   
+* the already defined environment instead of using 
+the “default” provider returned by the
      
 
      
-   
-* 
-ManagedBuildManager.getEnvironmentVariableProvider().
      
+   
+* 
+ManagedBuildManager.getEnvironmentVariableProvider().
      
 
      
-  
+  
  * The provider passed to a supplier will ignore 
-searching the variables for the levels 
      
+searching the variables for the levels 
      
 
      
-  
+  
  * higher than the current supplier level, will 
-query only the lower-precedence suppliers 
      
+query only the lower-precedence suppliers 
      
 
      
-  
+  
  * for the current level and will query all 
-suppliers for the lower levels. 
      
+suppliers for the lower levels. 
      
 
      
-  
+  
  * This is done to avoid infinite loops that could 
-be caused if the supplier calls the provider 
      
+be caused if the supplier calls the provider 
      
 
      
-  
+  
  * and the provider in turn calls that supplier 
-again. Also the supplier should not know anything
      
+again. Also the supplier should not know anything
      
 
      
-  
+  
  * about the environment variables defined for the 
-higher levels.
      
+higher levels.
      
 
      
-
+
    * @return the reference to the IBuildEnvironmentVariable interface representing 
-
      
+
      
 
      
-  
- * the variable of a given name
      
+  
+ * the variable of a given name
      
 
      
-
-   */
      
+
+   */
      
 
      
-   IBuildEnvironmentVariable getVariable(String variableName,
- 
      
+   IBuildEnvironmentVariable getVariable(String variableName,
+ 
      
 
      
-IManagedProject project,
      
+IManagedProject project,
      
 
      
-IEnvironmentVariableProvider provider);
      
+IEnvironmentVariableProvider provider);
      
 
       
      
 
      
-
-  /**
      
+
+  /**
      
 
      
-
-   *
      
+
+   *
      
 
      
-
-   * @param project the managed project
      
+
+   * @param project the managed project
      
 
      
-
+
    * @param provider the instance of the 
-environment variable provider to be used for querying the
      
+environment variable provider to be used for querying the
      
 
      
-
+
    * environment variables from within 
-the supplier. The supplier should use this provider to obtain
      
+the supplier. The supplier should use this provider to obtain
      
 
      
-   
-* the already defined environment instead of using 
-the “default” provider returned by the
      
+   
+* the already defined environment instead of using 
+the “default” provider returned by the
      
 
      
-   
-* 
-ManagedBuildManager.getEnvironmentVariableProvider().
      
+   
+* 
+ManagedBuildManager.getEnvironmentVariableProvider().
      
 
      
-  
+  
  * The provider passed to a supplier will ignore 
-searching the variables for the levels 
      
+searching the variables for the levels 
      
 
      
-  
+  
  * higher than the current supplier level, will 
-query only the lower-precedence suppliers 
      
+query only the lower-precedence suppliers 
      
 
      
-  
+  
  * for the current level and will query all 
-suppliers for the lower levels. 
      
+suppliers for the lower levels. 
      
 
      
-  
+  
  * This is done to avoid infinite loops that could 
-be caused if the supplier calls the provider 
      
+be caused if the supplier calls the provider 
      
 
      
-  
+  
  * and the provider in turn calls that supplier 
-again. Also the supplier should not know anything
      
+again. Also the supplier should not know anything
      
 
      
-  
+  
  * about the environment variables defined for the 
-higher levels.
      
+higher levels.
      
 
      
-
+
    * @return the array of IBuildEnvironmentVariable that represents the environment variables 
-
      
+
      
 
      
-
-   */
      
+
+   */
      
 
      
-   IBuildEnvironmentVariable[] getVariables (IManagedProject project,
      
+   IBuildEnvironmentVariable[] getVariables (IManagedProject project,
      
 
      
-IEnvironmentVariableProvider provider);
      
+IEnvironmentVariableProvider provider);
      
 
      
-}
      
-
      The IBuildEnvironmentVariable interface returns information regarding an 
+}
      
+
      The IBuildEnvironmentVariable interface returns information regarding an 
 individual environment variable. 
      
 
      
-public interface 
-IBuildEnvironmentVariable{
      
+public interface 
+IBuildEnvironmentVariable{
      
 
      
-   
-public static final int ENVVAR_REPLACE = 1;
      
+   
+public static final int ENVVAR_REPLACE = 1;
      
 
      
-   
-public static final int ENVVAR_REMOVE = 2;
      
+   
+public static final int ENVVAR_REMOVE = 2;
      
 
      
-   
-public static final int ENVVAR_PREPEND = 3;
      
+   
+public static final int ENVVAR_PREPEND = 3;
      
 
      
-   
-public static final int ENVVAR_APPEND = 4;
      
+   
+public static final int ENVVAR_APPEND = 4;
      
 
      
  
      
 
      
-    String getName();
      
+    String getName();
      
 
       
      
 
      
-    String getValue();
      
+    String getValue();
      
 
       
      
 
      
-
-   /**
      
+
+   /**
      
 
      
-
-    * @return one of the IBuildEnvironmentVariable.ENVVAR_* operation types
      
+
+    * @return one of the IBuildEnvironmentVariable.ENVVAR_* operation types
      
 
      
-
-    */
      
+
+    */
      
 
      
-    int 
-getOperation();
      
+    int 
+getOperation();
      
 
       
      
 
      
-
-   /**
      
+
+   /**
      
 
      
-
+
     * @return if the variable can hold the 
-list of values this method returns the String representing
      
+list of values this method returns the String representing
      
 
      
-   
- * the delimiter that is used to separate values. 
-This information is used for the following:
      
+   
+ * the delimiter that is used to separate values. 
+This information is used for the following:
      
 
      
-   
- *
      
+   
+ *
      
 
      
-   
- * 1. in append and prepend operations:
      
+   
+ * 1. in append and prepend operations:
      
 
      
-   
- * If the variable already exists and contains some 
-value the new 
      
+   
+ * If the variable already exists and contains some 
+value the new 
      
 
      
-   
- * value will be calculated in the following way:
      
+   
+ * value will be calculated in the following way:
      
 
      
-   
- * For the “prepend” operation:
      
+   
+ * For the “prepend” operation:
      
 
      
-   
- *         <New value> = <the value from the 
-getValue() method><delimiter><Old value>
      
+   
+ *         <New value> = <the value from the 
+getValue() method><delimiter><Old value>
      
 
      
-   
- * For the “append” operation:
      
+   
+ * For the “append” operation:
      
 
      
-   
- *         <New value> = <Old value><delimiter><the 
-value from the getValue() method>
      
+   
+ *         <New value> = <Old value><delimiter><the 
+value from the getValue() method>
      
 
      
-   
- * 
      
+   
+ * 
      
 
      
-   
- * The Environment Variable Provider will also 
-remove the duplicates of “sub-values” 
      
+   
+ * The Environment Variable Provider will also 
+remove the duplicates of “sub-values” 
      
 
      
-   
- * in the resulting value. 
-
      
+   
+ * in the resulting value. 
+
      
 
      
-   
- * For example:
      
+   
+ * For example:
      
 
      
-   
- * If the current value is 
+   
+ * If the current value is 
 “string1:string2:string3”, the getDelimiter() method returns “:” 
-
      
+
      
 
      
-   
- * and getValue() method returns “string4:string2” 
-the new value will contain:
      
+   
+ * and getValue() method returns “string4:string2” 
+the new value will contain:
      
 
      
-   
- * For the “prepend” operation: 
-“string4:string2:string1:string3”
      
+   
+ * For the “prepend” operation: 
+“string4:string2:string1:string3”
      
 
      
-   
- * For the “append” operation: 
-“string1:string3:string4:string2”
      
+   
+ * For the “append” operation: 
+“string1:string3:string4:string2”
      
 
      
-   
- * 
      
+   
+ * 
      
     * 2. Since the environment variables are also 
-treated as build macros the delimiter is also used 
      
+treated as build macros the delimiter is also used 
      
 
      
-   
- * by the BuildMacroProvider to determine the type 
-of the macro used to represent the
      
+   
+ * by the BuildMacroProvider to determine the type 
+of the macro used to represent the
      
 
      
-   
- * given environment variable. If the variable has 
-the delimiter it is treated as the Text-List macro
      
+   
+ * given environment variable. If the variable has 
+the delimiter it is treated as the Text-List macro
      
 
      
-   
- * otherwise it is treated as the Text macro. (See 
-Build Macro design for more details)
      
+   
+ * otherwise it is treated as the Text macro. (See 
+Build Macro design for more details)
      
 
      
-   
- * 
      
+   
+ * 
      
 
      
-   
- * To specify that no delimiter should be used, the 
+   
+ * To specify that no delimiter should be used, the 
 getDelimiter() method should
      
-    * return null or an empty string
      
+    * return null or an empty string
      
 
      
-
-    */
      
+
+    */
      
 
      
-    String getDelimiter();
      
+    String getDelimiter();
      
 
      
-}
      
+}
      
 
      7.7 Defining a Build Path Resolver 
      
 
      To provide a build path resolver, 
 the buildPathResolver attribute in the envVarBuildPath 
 definition must be specified. The value of this attribute should be set to the 
-name of the class which implements the IBuildPathResolver interface.  This 
+name of the class which implements the IBuildPathResolver interface.  This 
 allows the tool-integrator to provide his/her own 
 		logic for resolving the environment variable values to build paths.
      
 
      
-public interface 
-IBuildPathResolver {
      
+public interface 
+IBuildPathResolver {
      
 
       
      
 
      
-
-   /**
      
+
+   /**
      
 
      
-
-    *
      
+
+    *
      
 
      
-
+
     * @param pathType one of the 
-IEnvVarBuildPath.BUILDPATH _xxx
      
+IEnvVarBuildPath.BUILDPATH _xxx
      
 
      
-   
- * @param variableName represents the name of the 
-variable that holds the build paths
      
+   
+ * @param variableName represents the name of the 
+variable that holds the build paths
      
 
      
-   
- * @param variableValue represents the value of the 
-value specified with the 
      
+   
+ * @param variableValue represents the value of the 
+value specified with the 
      
 
      
-   
- *     variableName argument
      
+   
+ *     variableName argument
      
 
      
-   
- * @param configuration represents configuration 
-for which the build paths are requested
      
+   
+ * @param configuration represents configuration 
+for which the build paths are requested
      
 
      
-
-    */
      
+
+    */
      
 
      
-    
-String[] resolveBuildPaths(
      
+    
+String[] resolveBuildPaths(
      
 
      
-                 int pathType,
      
+                 int pathType,
      
 
      
-                
-String variableName, 
      
+                
+String variableName, 
      
 
      
-                
-String variableValue,
      
+                
+String variableValue,
      
 
      
-                
-IConfiguration configuration);
      
+                
+IConfiguration configuration);
      
 
      
-}
      
+}
      
 
       
      
 
      See 
 org.eclipse.cdt.managedbuilder.gnu.cygwin.CygwinPathResolver for an example of a 
 build path resolver.  It converts Cygwin-style paths to Windows paths.
      
 
      7.8 Defining Build Macros
      
-
      The IConfigurationBuildMacroSupplier interface and the 
-IProjectBuildMacroSupplier interface allow a tool-integrator to define build 
+
      The IConfigurationBuildMacroSupplier interface and the 
+IProjectBuildMacroSupplier interface allow a tool-integrator to define build 
 macros and their values.
      
-
      All methods of the IConfigurationBuildMacroSupplier 
+
      All methods of the IConfigurationBuildMacroSupplier 
 interface MUST return macros ONLY for the configuration context, and MUST NOT 
 search for macro values for contexts with lower precedence. This is up to 
 BuildMacroProvider to query macro suppliers passing lower-precedence context if 
 necessary in case the macro value was not found for some specified context
      
 
      
-public interface 
-IConfigurationBuildMacroSupplier {
      
+public interface 
+IConfigurationBuildMacroSupplier {
      
 
      
-   /**
      
+   /**
      
 
      
-
-    *
      
+
+    *
      
 
      
-
-    * @ macroName the macro name
      
+
+    * @ macroName the macro name
      
 
      
-
-    * @param configuration configuration
      
+
+    * @param configuration configuration
      
 
      
-
+
     * @param provider the instance of the 
-build macro provider to be used for querying the
      
+build macro provider to be used for querying the
      
 
      
-
+
     * build macros from within the 
-supplier. The supplier should use this provider to obtain
      
+supplier. The supplier should use this provider to obtain
      
 
      
-    
-* the already defined build macros instead of using 
-the “default” provider returned by the
      
+    
+* the already defined build macros instead of using 
+the “default” provider returned by the
      
 
      
-    
-* ManagedBuildManager.getBuildMacroProvider().
      
+    
+* ManagedBuildManager.getBuildMacroProvider().
      
 
      
-   
- * The provider passed to a supplier will ignore 
+   
+ * The provider passed to a supplier will ignore 
 searching macros for the levels 
      
     * higher than the current supplier level, will 
-query only the lower-precedence suppliers 
      
+query only the lower-precedence suppliers 
      
 
      
-   
- * for the current level and will query all 
-suppliers for the lower levels. 
      
+   
+ * for the current level and will query all 
+suppliers for the lower levels. 
      
 
      
-   
- * This is done to avoid infinite loops that could 
-be caused if the supplier calls the provider 
      
+   
+ * This is done to avoid infinite loops that could 
+be caused if the supplier calls the provider 
      
 
      
-   
- * and the provider in turn calls that supplier 
+   
+ * and the provider in turn calls that supplier 
 again. Also the supplier should not know anything
      
     * about the build macros defined for the higher 
-levels.
      
+levels.
      
 
      
-
+
     * @return the reference to the IBuildMacro interface representing 
-
      
+
      
 
      
-   
- * the build macro of a given name or null if the 
-macro of  that name is not defined
      
+   
+ * the build macro of a given name or null if the 
+macro of  that name is not defined
      
 
      
-
-    */
      
+
+    */
      
 
      
-    
-IBuildMacro getMacro(String macroName, 
      
+    
+IBuildMacro getMacro(String macroName, 
      
 
      
-IConfiguration configuration,  
      
+IConfiguration configuration,  
      
 
      
-IBuildMacroProvider provider);
      
+IBuildMacroProvider provider);
      
 
       
      
 
      
-
-   /**
      
+
+   /**
      
 
      
-
-    *
      
+
+    *
      
 
      
-
-    * @param configuration configuration
      
+
+    * @param configuration configuration
      
 
      
-
+
     * @param provider the instance of the 
-build macro provider to be used for querying the
      
+build macro provider to be used for querying the
      
 
      
-
+
     * build macros from within the 
-supplier. The supplier should use this provider to obtain
      
+supplier. The supplier should use this provider to obtain
      
 
      
-    
-* the already defined build macros instead of using 
-the “default” provider returned by the
      
+    
+* the already defined build macros instead of using 
+the “default” provider returned by the
      
 
      
-    
-* ManagedBuildManager.getBuildMacroProvider().
      
+    
+* ManagedBuildManager.getBuildMacroProvider().
      
 
      
-    
-* The provider passed to a supplier will ignore 
-searching macros for the levels 
      
+    
+* The provider passed to a supplier will ignore 
+searching macros for the levels 
      
 
      
-    
-* higher than the current supplier level, will 
-query only the lower-precedence suppliers 
      
+    
+* higher than the current supplier level, will 
+query only the lower-precedence suppliers 
      
 
      
-   
- * for the current level and will query all 
-suppliers for the lower levels. 
      
+   
+ * for the current level and will query all 
+suppliers for the lower levels. 
      
 
      
-   
- * This is done to avoid infinite loops that could 
-be caused if the supplier calls the provider 
      
+   
+ * This is done to avoid infinite loops that could 
+be caused if the supplier calls the provider 
      
 
      
-   
- * and the provider in turn calls that supplier 
-again. Also the supplier should not know anything
      
+   
+ * and the provider in turn calls that supplier 
+again. Also the supplier should not know anything
      
 
      
-   
- * about the build macros defined for the higher 
-levels.
      
+   
+ * about the build macros defined for the higher 
+levels.
      
 
      
-
+
     * @return the IBuildMacro[] array 
-representing defined macros 
      
+representing defined macros 
      
 
      
-
-    */
      
+
+    */
      
 
      
-    
-IBuildMacro[] getMacros(IConfiguration configuration,
      
+    
+IBuildMacro[] getMacros(IConfiguration configuration,
      
 
      
-IBuildMacroProvider provider);
      
+IBuildMacroProvider provider);
      
 
      
-}
      
-
      All methods of the IProjectBuildMacroSupplier interface 
+}
      
+
      All methods of the IProjectBuildMacroSupplier interface 
 MUST return macros ONLY for the Project context, and MUST NOT search for macro 
 values for contexts with lower precedence. This is up to the BuildMacroProvider 
 to query macro suppliers passing lower-precedence context if necessary in case 
 the macro value was not found for some specified context.
      
 
      
-public interface 
-IProjectBuildMacroSupplier {
      
+public interface 
+IProjectBuildMacroSupplier {
      
 
      
-
-   /**
      
+
+   /**
      
 
      
-
-    *
      
+
+    *
      
 
      
-
-    * @ macroName the macro mane
      
+
+    * @ macroName the macro mane
      
 
      
-
+
     * @param project the instance of the 
-managed project
      
+managed project
      
 
      
-
+
     * @param provider the instance of the 
-build macro provider to be used for querying the
      
+build macro provider to be used for querying the
      
 
      
-
+
     * build macros from within the 
-supplier. The supplier should use this provider to obtain
      
+supplier. The supplier should use this provider to obtain
      
 
      
-    
-* the already defined build macros instead of using 
-the “default” provider returned by the
      
+    
+* the already defined build macros instead of using 
+the “default” provider returned by the
      
 
      
-    
-* ManagedBuildManager.getBuildMacroProvider().
      
+    
+* ManagedBuildManager.getBuildMacroProvider().
      
 
      
-   
- * The provider passed to a supplier will ignore 
-searching macros for the levels 
      
+   
+ * The provider passed to a supplier will ignore 
+searching macros for the levels 
      
 
      
-   
- * higher than the current supplier level, will 
-query only the lower-precedence suppliers 
      
+   
+ * higher than the current supplier level, will 
+query only the lower-precedence suppliers 
      
 
      
-   
- * for the current level and will query all 
-suppliers for the lower levels. 
      
+   
+ * for the current level and will query all 
+suppliers for the lower levels. 
      
 
      
-   
- * This is done to avoid infinite loops that could 
-be caused if the supplier calls the provider 
      
+   
+ * This is done to avoid infinite loops that could 
+be caused if the supplier calls the provider 
      
 
      
-   
- * and the provider in turn calls that supplier 
-again. Also the supplier should not know anything
      
+   
+ * and the provider in turn calls that supplier 
+again. Also the supplier should not know anything
      
 
      
-   
- * about the build macros defined for the higher 
-levels.
      
+   
+ * about the build macros defined for the higher 
+levels.
      
 
      
-
+
     * @return the reference to the IBuildMacro interface representing 
-
      
+
      
 
      
-   
- * the build macro of a given name or null if the 
-macro of  that name is not defined
      
+   
+ * the build macro of a given name or null if the 
+macro of  that name is not defined
      
 
      
-
-    */
      
+
+    */
      
 
      
-    
-IBuildMacro getMacro(String macroName, 
      
+    
+IBuildMacro getMacro(String macroName, 
      
 
      
-IManagedProject project,
      
+IManagedProject project,
      
 
      
-IBuildMacroProvider provider);
      
+IBuildMacroProvider provider);
      
 
       
      
 
      
-
-   /**
      
+
+   /**
      
 
      
-
-    *
      
+
+    *
      
 
      
-
+
     * @param project the instance of the 
-managed project
      
+managed project
      
 
      
-
+
     * @param provider the instance of the 
-build macro provider to be used for querying the
      
+build macro provider to be used for querying the
      
 
      
-
+
     * build macros from within the 
-supplier. The supplier should use this provider to obtain
      
+supplier. The supplier should use this provider to obtain
      
 
      
-    
-* the already defined build macros instead of using 
-the “default” provider returned by the
      
+    
+* the already defined build macros instead of using 
+the “default” provider returned by the
      
 
      
-    
-* ManagedBuildManager.getBuildMacroProvider().
      
+    
+* ManagedBuildManager.getBuildMacroProvider().
      
 
      
-   
- * The provider passed to a supplier will ignore 
-searching macros for the levels 
      
+   
+ * The provider passed to a supplier will ignore 
+searching macros for the levels 
      
 
      
-   
- * higher than the current supplier level, will 
-query only the lower-precedence suppliers 
      
+   
+ * higher than the current supplier level, will 
+query only the lower-precedence suppliers 
      
 
      
-   
- * for the current level and will query all 
-suppliers for the lower levels. 
      
+   
+ * for the current level and will query all 
+suppliers for the lower levels. 
      
 
      
-   
- * This is done to avoid infinite loops that could 
-be caused if the supplier calls the provider 
      
+   
+ * This is done to avoid infinite loops that could 
+be caused if the supplier calls the provider 
      
 
      
-   
- * and the provider in turn calls that supplier 
-again. Also the supplier should not know anything
      
+   
+ * and the provider in turn calls that supplier 
+again. Also the supplier should not know anything
      
 
      
-   
- * about the build macros defined for the higher 
-levels.
      
+   
+ * about the build macros defined for the higher 
+levels.
      
 
      
-
+
     * @return the IBuildMacro[] array 
-representing defined macros 
      
+representing defined macros 
      
 
      
-
-    */
      
+
+    */
      
 
      
-    
-IBuildMacro[] getMacros(IManagedProject project,
      
+    
+IBuildMacro[] getMacros(IManagedProject project,
      
 
      
-IBuildMacroProvider provider);
      
+IBuildMacroProvider provider);
      
 
      
-}
      
-
      The IBuildMacro interface returns information regarding an 
+}
      
+
      The IBuildMacro interface returns information regarding an 
 individual build macro. 
      
 
      
-public interface 
-IBuildMacro{
      
+public interface 
+IBuildMacro{
      
 
      
-    public 
-static final int VALUE_TEXT = 1; //can hold any text string
      
+    public 
+static final int VALUE_TEXT = 1; //can hold any text string
      
 
      
-    public 
-static final int VALUE_TEXT_LIST = 2; //can hold the array of text string values
      
+    public 
+static final int VALUE_TEXT_LIST = 2; //can hold the array of text string values
      
 
      
-    public 
-static final int VALUE_PATH_FILE = 3; //can hold file path
      
+    public 
+static final int VALUE_PATH_FILE = 3; //can hold file path
      
 
      
-    public 
+    public 
 static final int VALUE_PATH_FILE_LIST = 4; //can hold the array of file path 
-values
      
+values
      
 
      
-    public 
-static final int VALUE_PATH_DIR = 5; //can hold dir path
      
+    public 
+static final int VALUE_PATH_DIR = 5; //can hold dir path
      
 
      
-    public 
+    public 
 static final int VALUE_PATH_DIR_LIST = 6; //can hold the array of dir path 
-values
      
+values
      
 
      
-    public 
-static final int VALUE_PATH_ANY = 7; //can hold both file and dir path
      
+    public 
+static final int VALUE_PATH_ANY = 7; //can hold both file and dir path
      
 
      
-    public 
-static final int VALUE_PATH_ANY_LIST = 8; //can hold the array of  PATH_ANY
      
+    public 
+static final int VALUE_PATH_ANY_LIST = 8; //can hold the array of  PATH_ANY
      
 
      
-// values 
      
+// values 
      
 
       
      
 
      
-    String getName();
      
+    String getName();
      
 
      
-            
- 
      
+            
+ 
      
 
      
-
-    /**
      
+
+    /**
      
 
      
-
-     * @returns IBuildMacro.VALUE_xxx
      
+
+     * @returns IBuildMacro.VALUE_xxx
      
 
      
-
-     */
      
+
+     */
      
 
      
-    int 
-getMacroValueType();
      
+    int 
+getMacroValueType();
      
 
       
      
 
      
-
-    /**
      
+
+    /**
      
 
      
-
+
      * @throws BuildMacroException if macro 
-holds StringList-type value
      
+holds StringList-type value
      
 
      
-
-     */
      
+
+     */
      
 
      
-    String getStringValue() throws BuildMacroException;
      
+    String getStringValue() throws BuildMacroException;
      
 
      
  
      
 
      
-    /**
      
+    /**
      
 
      
-     * @throws BuildMacroException if macro 
-holds single String-type value
      
+     * @throws BuildMacroException if macro 
+holds single String-type value
      
 
      
-     */
      
+     */
      
 
      
-    
-String[] getStringListValue() throws BuildMacroException;
      
+    
+String[] getStringListValue() throws BuildMacroException;
      
 
      
-}
      
+}
      
 
      7.9 Defining a Configuration Name Provider
      
 
      All the configuration names must be unique within a 
 project.  You can provide unique configuration names in your build 
@@ -6721,14 +6721,14 @@ configurations.  You can define unique names statically in your build
 definitions (for example, "Debug_1.0", "Debug_2.0", etc.)  However, these 
 names are not very "user-friendly", particularly for a user who intends to use a 
 single version of your tool-chain.  The alternative is to dynamically 
-assign unique configuration names using a configuration name provider (see the  
-getNewConfigurationName method below.)  The first configuration 
+assign unique configuration names using a configuration name provider (see the  
+getNewConfigurationName method below.)  The first configuration 
 that is created gets to use the most “basic” name – for example, “Debug”.  When another configuration is 
 created that uses a different tool-chain version, it would see that “Debug” was 
 already chosen, so it could return a more qualified name - for example, “Debug_2.0”.  
 The same technique could be used when your tool-chain supports multiple 
 host/target platforms.
      
-
      public interface 
+
      public interface 
 IConfigurationNameProvider {
      
 
      
    /*
      
@@ -6741,12 +6741,12 @@ in the project.
      
 
      
     String getNewConfigurationName(IConfiguration configuration, 
 String [] usedConfigurationNames );
      
-}
      
+}
      
 
      7.10 Defining an Output Name Provider
      
 
      You can specify an output name provider for an outputType. You must specify 
 and supply a class that implements the IManagedOutputNameProvider
 interface shown below.  The class name is assigned to the outputType element, 
-nameProvider attribute. 
      
+nameProvider attribute. 
      
 
      public 
 interface IManagedOutputNameProvider{
      
 
      
@@ -6767,8 +6767,8 @@ corresponding to the primary input name(s)
      
 getOutputPaths(ITool tool, IPath[] primaryInputs);
      
 
      
 }
      
-
      When multipleOfType 
-is true, an output name provider, or the outputNames attribute, is required 
+
      When multipleOfType 
+is true, an output name provider, or the outputNames attribute, is required 
 		in order for MBS to know the names of the output files.
      
 
      The returned 
 paths must be relative to the top-level build directory. However, if only a file 
@@ -6779,10 +6779,10 @@ build directory, regardless of the source file directory structure, return
 "./path".
      
 
      7.11 Defining an Option Value Handler
      
 
      You can specify a value handler for an option.  You must specify and 
-supply a class that implements the 
-IManagedOptionValueHandler interface shown below.  This interface is 
+supply a class that implements the 
+IManagedOptionValueHandler interface shown below.  This interface is 
 used to dynamically manage the value of an option.
      
-
      public interface IManagedOptionValueHandler{ 
      
+
      public interface IManagedOptionValueHandler{ 
      
 
      
     public final int EVENT_OPEN = 1;  /** The option is 
 opened, i.e. its UI element 
      
@@ -6902,18 +6902,18 @@ to 
      
         IOption option,
      
         String extraArgument, 
      
         String enumValue);
      
-}
      
-
      See the Shared Tool Options design document in bugzilla #90481 
-for additional information.
      
+}
      
+
      See the Shared Tool Options design document in bugzilla #90481 
+for additional information.
      
 
      7.12 Defining an Option Applicability Calculator
      
 
      You can specify an option applicability calculator for an option.  You
 must specify and supply a 
-class that implements the IManagedOutputNameProvider
+class that implements the IManagedOutputNameProvider
 interface shown below.  The class name is assigned to the outputType element, 
-nameProvider attribute.  You should implement this interface when an 
+nameProvider attribute.  You should implement this interface when an 
 option is not always applicable - for example, when an option is only used if 
-another option has a particular value.
      
-
      public interface IOptionApplicability {
      
+another option has a particular value.
      
+
      public interface IOptionApplicability {
      
  
 /**
      
  
@@ -7008,7 +7008,7 @@ public boolean isOptionEnabled(
      
     IHoldsOptions holder, 
      
     IOption option); 
      
 
      
-}
      
+}
      
 
      7.13 Defining a Dynamic Element Provider
      
 
      Tool integrators may supply a dynamic element provider to dynamically provide the definitions that are otherwise specified in the buildDefinitions 
 extension point.  To specify a dynamic element provider, your build 
@@ -7161,8 +7161,8 @@ Element Schema:
      
 		
      Specifies the Java class
 		which implements the added page. 
 		This class must implement the org.eclipse.jface.wizard.IWizardPage
+			name="OLE_LINK7">
+			org.eclipse.jface.wizard.IWizardPage
 		interface
    • - The unique identifier of the option that this option is - derived from. no - Flags the option as abstract.  An abstract option must be + Flags the option as abstract.  An abstract option must be defined as a top level object in the model definition and can not be selected by the user in the UI, but options derived from this option - will inherit its attributes and children.  The default value is false. no - Value assigned to the option by the end user or in a - default configuration.  For options containing a Boolean + Value assigned to the option by the end user or in a + default configuration.  For options containing a Boolean value, the string ‘true’ is treated as true, any other value as false. @@ -3795,12 +3795,12 @@ not edited it. For options containing a Boolean value, the string style="border-style: none solid solid none; border-width: medium 1pt 1pt medium; border-right: 1pt solid windowtext; border-bottom: 1pt solid windowtext; padding: 0in 5.4pt;" valign="top">

    An optional value that specifies the actual command that will -be passed to the tool on the command line.  The command +be passed to the tool on the command line.  The command provides a “pattern” for specifying where the value should be placed for options of type string and stringlist.  The pattern can contain the replaceable variable “value”.  If no ${value} is specified in the command, the option value is appended to the end of the specified - command.

    + command.

    		 valign="top">resourceFilter Specifies the resource types that this option + valign="top">Specifies the resource types that this option applies to.  The values are “project”, “file”, and “all”.  The default is “all”.  Specifying “project” indicates that the option is displayed when modifying a configuration’s options, but not when modifying an - individual file’s options.  Specifying “file” indicates the opposite. no - The path of the project resource to which this - resourceConfiguration applies. yes - Specifies whether the resource is excluded from building in + Specifies whether the resource is excluded from building in the parent configuration.  The default value is false.  The resourceConfiguration element retains its tool children, if any - exist, even when excluded from the build. no which implements the operations associated with this page.  The class must implement the - java.lang.Runnable interface

    + java.lang.Runnable interface

    		 The Target attributes name, id, -isTest and isAbstract should be transferred to a new ProjectType -element in the new model.  The id assigned to the Target must be +

    The Target attributes name, id, +isTest and isAbstract should be transferred to a new ProjectType +element in the new model.  The id assigned to the Target must be transferred to the new ProjectType element without change.  Otherwise, projects created using your integration with CDT 1.2 or 2.0.x will not be able to be converted.  There is no tool integrator intervention into the conversion process @@ -7649,46 +7649,46 @@ yet, but this is a high priority for CDT 3.0.

    8.1.3 MBS 2.0 Configuration Element

    The Configuration children of the Target element are made Configuration children of the new ProjectType element.  -The Configuration name and  id attributes should be transferred -with the Configuration.  The id assigned to the Configuration must remain +The Configuration name and  id attributes should be transferred +with the Configuration.  The id assigned to the Configuration must remain unchanged in order to support the conversion of old model project files.  The -Target attributes artifactName, cleanCommand and errorParsers -attributes should be transferred to the Configuration element.  The Target -defaultExtension attribute should be transferred to the Configuration +Target attributes artifactName, cleanCommand and errorParsers +attributes should be transferred to the Configuration element.  The Target +defaultExtension attribute should be transferred to the Configuration element -as the artifactExtension attribute (Note the name change).

    +as the artifactExtension attribute (Note the name change).

    A new ToolChain element should be -created as the child of each Configuration element.  The name and id +created as the child of each Configuration element.  The name and id of the ToolChain are not dependent upon the name of any of the old model objects.  However, if you allow users to create CDT 2.1 projects using your CDT -2.0 manifest file, then the id of your new ToolChain must be the parent -Configuration id, appended with “.toolchain”.  The Target isAbstract, -osList, archList and scannerInfoCollector attributes are +2.0 manifest file, then the id of your new ToolChain must be the parent +Configuration id, appended with “.toolchain”.  The Target isAbstract, +osList, archList and scannerInfoCollector attributes are transferred to the ToolChain element.

    A new Builder element can be -created as the child of each ToolChain element.  The name and id of +created as the child of each ToolChain element.  The name and id of the Builder are not dependent upon the name of any of the old model elements.  However, if you allow users to create CDT 2.1 projects using your CDT 2.0 -manifest file, then the id of your new Builder must be the parent -Configuration id, appended with “.builder”.  The target isAbstract -attribute is transferred to the Builder element.   The target -makeCommand attribute should be transferred to the Builder element as the -command attribute (Note the name change).  The target -makeArguments attribute should be transferred to the Builder element as the -arguments attribute (Note the name change).  The target -makefileGenerator attribute should be transferred to the Builder element as -the buildfileGenerator attribute (Note the name change).

    +manifest file, then the id of your new Builder must be the parent +Configuration id, appended with “.builder”.  The target isAbstract +attribute is transferred to the Builder element.   The target +makeCommand attribute should be transferred to the Builder element as the +command attribute (Note the name change).  The target +makeArguments attribute should be transferred to the Builder element as the +arguments attribute (Note the name change).  The target +makefileGenerator attribute should be transferred to the Builder element as +the buildfileGenerator attribute (Note the name change).

    A new TargetPlatform element can be -created as the child of each ToolChain element.  The name and id of +created as the child of each ToolChain element.  The name and id of the TargetPlatform are not dependent upon the name of any of the old model elements.  However, if you allow users to create CDT 2.1 projects using your CDT -2.0 manifest file, then the id of your new TargetPlatform must be the -parent Configuration id, appended with “.targetplatform”.  The target -isAbstract and binaryParser attributes are transferred to the -TargetPlatform element.  The TargetPlatform element contains osList and -archList attributes that specify the architecture(s) and operating system(s) +2.0 manifest file, then the id of your new TargetPlatform must be the +parent Configuration id, appended with “.targetplatform”.  The target +isAbstract and binaryParser attributes are transferred to the +TargetPlatform element.  The TargetPlatform element contains osList and +archList attributes that specify the architecture(s) and operating system(s) on which the Configuration’s build artifact(s) execute.  You can transfer the -Target osList and archList attributes if appropriate.

    +Target osList and archList attributes if appropriate.

    8.1.4 MBS 2.0 Tool Element

    The old model allows Tools to be defined at the top level scope in the manifest file.  This is still true in the new model.  In addition, @@ -7699,21 +7699,21 @@ also be specified as the children of Target elements.  In the new model, To elements are children of ToolChain elements.  Old model Tool elements need to be added as the child of each ToolChain that uses the Tool.  All of the old model Tool attributes are supported by the new model.

    -

    The id assigned to the Tool +

    The id assigned to the Tool must remain unchanged in order to support the conversion of old model project -files.  The outputs attribute no longer defaults to an empty string.  If +files.  The outputs attribute no longer defaults to an empty string.  If your Tool produces files by default with no extension, you must specify -‘outputs=””’ in the definition of the Tool or one of its ancestors (superClass).

    +‘outputs=””’ in the definition of the Tool or one of its ancestors (superClass).

    8.1.5 MBS 2.0 ToolReference Element

    The new model does not define a ToolReference element.  -Instead, a Tool element can specify the superClass attribute in order to +Instead, a Tool element can specify the superClass attribute in order to provide the same functionality.  That is, specifying a Tool that inherits attributes from another Tool and can override one or more attributes.

    The old model uses ToolReferences in two ways.  They can be specified as the child of a Configuration element.  In this case, the ToolReference should be converted a Tool element child of the -Configuration’s ToolChain, transferring the value of the id attribute to -the Tool superClass attribute.

    +Configuration’s ToolChain, transferring the value of the id attribute to +the Tool superClass attribute.

    A ToolReference can also be specified as the child of a Target element.  In this case, the ToolReference applies to all of the Configuration children of the Target.  These ToolReference @@ -7721,17 +7721,17 @@ elements need to be converted to Tool elements and added as the child of each To

    8.1.6 MBS 2.0 Option Element

    All of the old model Option attributes are supported by the new model.

    -

    The id assigned to the +

    The id assigned to the Option must remain unchanged in order to support the conversion of old model project files.

    8.1.7 MBS 2.0 OptionReference Element

    The new model does not define an OptionReference element.  -Instead, an Option element can specify the superClass attribute in order +Instead, an Option element can specify the superClass attribute in order to provide the same functionality.  That is, specifying an Option that inherits attributes from another Option and can override one or more attributes.

    All OptionReference elements should -be converted to Option elements, transferring the value of the id -attribute to the Option superClass attribute.

    +be converted to Option elements, transferring the value of the id +attribute to the Option superClass attribute.

    8.1.8 MBS 2.0 OptionCategory, EnumeratedOptionValue, ListOptionValue Elements

    There are no changes to these elements.

    diff --git a/doc/org.eclipse.cdt.doc.isv/guide/projectTemplateEngine/Howtodeveloptemplates.html b/doc/org.eclipse.cdt.doc.isv/guide/projectTemplateEngine/Howtodeveloptemplates.html index 4976df14e8e..d18706f98a5 100644 --- a/doc/org.eclipse.cdt.doc.isv/guide/projectTemplateEngine/Howtodeveloptemplates.html +++ b/doc/org.eclipse.cdt.doc.isv/guide/projectTemplateEngine/Howtodeveloptemplates.html @@ -447,7 +447,7 @@ The following is a list of process types provided by the Template Engine:

  • -org.eclipse.cdt.managedbuilder.core.NewManagedProject: It defines all the parameters +org.eclipse.cdt.managedbuilder.core.NewManagedProject: It defines all the parameters required for a new managed project and provides the fully qualified name of the class, which processes these parameters.

    @@ -521,7 +521,7 @@ configurations for the managed project. It is of type simple.

  • -org.eclipse.cdt.core.Copy: It defines all the parameters required to copy +org.eclipse.cdt.core.Copy: It defines all the parameters required to copy files and provides the fully qualified name of the class, which processes these parameters.

    @@ -559,14 +559,14 @@ location.

  • -org.eclipse.cdt.core.Append: It defines all the parameters required to append +org.eclipse.cdt.core.Append: It defines all the parameters required to append files to a project and provides the fully qualified name of the class, which processes these parameters. For more information about the parameters, refer to the Copy process type described above.

  • -org.eclipse.cdt.core.AddFile: It defines all the parameters required to add a +org.eclipse.cdt.core.AddFile: It defines all the parameters required to add a file to the project and provides the fully qualified name of the class, which processes these parameters.

    @@ -591,7 +591,7 @@ process type described above.

  • -org.eclipse.cdt.core.AddFiles: It defines all the parameters required to add +org.eclipse.cdt.core.AddFiles: It defines all the parameters required to add files to a project and provides the fully qualified name of the class, which processes these parameters.

    @@ -616,7 +616,7 @@ process type described above.

  • -org.eclipse.cdt.core.CreateSourceFolder: It defines all the parameters +org.eclipse.cdt.core.CreateSourceFolder: It defines all the parameters required to create a folder for the source files in a project and provides the fully qualified name of the class, which processes these parameters.

    @@ -640,7 +640,7 @@ created. It is of simple type.

  • -org.eclipse.cdt.core.AddLink: It defines all the parameters required to +org.eclipse.cdt.core.AddLink: It defines all the parameters required to create a linked file and provides the fully qualified name of the class, which processes these parameters.

    @@ -670,7 +670,7 @@ file should be created. It is of simple type.

  • -org.eclipse.cdt.managedbuilder.core.CreateIncludeFolder: It defines all the parameters +org.eclipse.cdt.managedbuilder.core.CreateIncludeFolder: It defines all the parameters required to create a folder for the header files in a project and provides the fully qualified name of the class, which processes these parameters. For information about the parameters, refer to the CreateSourceFolder @@ -678,7 +678,7 @@ process type described above.

  • -org.eclipse.cdt.managedbuilder.core.ExcludeResources: It defines all the parameters +org.eclipse.cdt.managedbuilder.core.ExcludeResources: It defines all the parameters required to exclude resources from a CDT project and provides the fully qualified name of the class, which processes these parameters.

    @@ -696,7 +696,7 @@ type.

    configIdPattern: Use this parameter to specify a regular expression of java.util.regex.Pattern syntax for matching against project configuration ids. -The resources that match any of the regular expressions given in the filePatterns argument +The resources that match any of the regular expressions given in the filePatterns argument will be excluded from all matching project configurations. It is of simple type.

  • @@ -706,7 +706,7 @@ will be excluded from all matching project configurations. It is of simple will be matched against are workspace relative (include the project folder) and use forward slash as the file separator. That this argument is an array is purely to allow logically separate patterns to be given separately rather than as one big string. If any of the regular expressions matches then the resource in question will be excluded for the matching configuration(s). -The resources that match any of the regular expressions given in the filePatterns argument +The resources that match any of the regular expressions given in the filePatterns argument will be excluded for all matching project configurations. It is of simple-array type.

  • @@ -719,7 +719,7 @@ files should not be excluded for without having to know what other configuration

  • -org.eclipse.cdt.managedbuilder.core.SetMBSStringOptionValue: It defines all the parameters +org.eclipse.cdt.managedbuilder.core.SetMBSStringOptionValue: It defines all the parameters required to create a string option value and provides the fully qualified name of the class, which processes these parameters.

    @@ -762,7 +762,7 @@ the resource. It is of simple type.

  • -org.eclipse.cdt.managedbuilder.core.SetMBSStringListOptionValues: It defines all the +org.eclipse.cdt.managedbuilder.core.SetMBSStringListOptionValues: It defines all the parameters required to create a string list of option values and provides the fully qualified name of the class, which processes these parameters. The parameters required are similar to that of SetMBSStringOptionValue @@ -772,7 +772,7 @@ option values. For information about the parameters, refer to the

  • -org.eclipse.cdt.managedbuilder.core.SetMBSBooleanOptionValue: It defines all the parameters +org.eclipse.cdt.managedbuilder.core.SetMBSBooleanOptionValue: It defines all the parameters required to create a boolean option value and provides the fully qualified name of the class, which processes these parameters. The parameters required are similar to that of SetMBSStringOptionValue process type, only @@ -782,7 +782,7 @@ For information about the parameters, refer to the

  • -org.eclipse.cdt.managedbuilder.core.AppendToMBSStringOptionValue: It defines all the +org.eclipse.cdt.managedbuilder.core.AppendToMBSStringOptionValue: It defines all the parameters required to append a string option value to an existing string option. It also provides the fully qualified name of the class, which processes these parameters. For information about the parameters, refer to the @@ -790,21 +790,21 @@ these parameters. For information about the parameters, refer to the

  • -org.eclipse.cdt.managedbuilder.core.AppendToMBSStringListOptionValues: It defines all the +org.eclipse.cdt.managedbuilder.core.AppendToMBSStringListOptionValues: It defines all the parameters required to append a string list of option values to an existing string list of option value. It also provides the fully qualified name of the class, which processes these parameters. For information about the parameters, refer to the SetMBSStringListOptionValues process type described above.

  • -org.eclipse.cdt.core.AppendCreate: It defines all the parameters required to +org.eclipse.cdt.core.AppendCreate: It defines all the parameters required to append or create a file in a project. It also provides the fully qualified name of the class, which processes these parameters. For information about the parameters, refer to the AddFiles process type described above.

  • -org.eclipse.cdt.core.CreateResourceIdentifier: It defines all the parameters +org.eclipse.cdt.core.CreateResourceIdentifier: It defines all the parameters required to append or create a resource identifier. It also provides the fully qualified name of the class, which processes these parameters.

    @@ -827,7 +827,7 @@ type.

  • -org.eclipse.cdt.managedbuilder.core.GenerateMakefileWithBuildDescription: +org.eclipse.cdt.managedbuilder.core.GenerateMakefileWithBuildDescription:

    • diff --git a/doc/org.eclipse.cdt.doc.isv/guide/projectTemplateEngine/Howtoregistertemplates.html b/doc/org.eclipse.cdt.doc.isv/guide/projectTemplateEngine/Howtoregistertemplates.html index 393eef136bf..845ef76bf14 100644 --- a/doc/org.eclipse.cdt.doc.isv/guide/projectTemplateEngine/Howtoregistertemplates.html +++ b/doc/org.eclipse.cdt.doc.isv/guide/projectTemplateEngine/Howtoregistertemplates.html @@ -59,9 +59,9 @@ header files, source files, resource files etc.

      Open the plug-in manifest editor and select the Dependencies page. For more information on plug-in manifest -editor, refer to PDE +editor, refer to PDE Guide > Getting Started > Basic Plug-in Tutorial -> Plug-in manifest editor. +> Plug-in manifest editor.

    • diff --git a/doc/org.eclipse.cdt.doc.user/book.css b/doc/org.eclipse.cdt.doc.user/book.css index 8f09f90e7b3..39391cd1cac 100644 --- a/doc/org.eclipse.cdt.doc.user/book.css +++ b/doc/org.eclipse.cdt.doc.user/book.css @@ -1,51 +1,56 @@ -/* following font face declarations need to be removed for DBCS */ - - -body, h1, h2, h3, h4, p, table, td, caption, th, ul, ol, dl, li, dd, dt {font-family: Arial, sans-serif; color: #000000} -pre { font-family: Courier, monospace} - -/* end font face declarations */ - -/* following font size declarations should be OK for DBCS */ -body, h1, h2, h3, h4, p, table, td, caption, th, ul, ol, dl, li, dd, dt {font-size: 10pt; } -pre { font-size: 10pt} - -/* end font size declarations */ - -body { background: #FFFFFF} -h1 { font-size: 18pt; margin-top: 5; margin-bottom: 1 } -h2 { font-size: 14pt; margin-top: 25; margin-bottom: 3 } -h3 { font-size: 11pt; margin-top: 20; margin-bottom: 3 } -h4 { font-size: 10pt; margin-top: 20; margin-bottom: 3; font-style: italic } -p { font-size: 10pt; } -pre { margin-left: 6; font-size: 9pt } - -a:link { color: #006699 } -a:visited { color: #996699 } -a:hover { color: #006699 } - -ul { margin-top: 0; margin-bottom: 10 } -li { margin-top: 0; margin-bottom: 0 } -li p { margin-top: 0; margin-bottom: 0 } -ol { margin-top: 0; margin-bottom: 10 } -dl { margin-top: 0; margin-bottom: 10 } -dt { margin-top: 0; margin-bottom: 0; font-weight: bold } -dd { margin-top: 0; margin-bottom: 0 } -strong { font-weight: bold} -em { font-style: italic} -var { font-style: italic} -div.revision { border-left-style: solid; border-left-width: thin; - border-left-color: #7B68EE; padding-left:5 } -th { font-weight: bold } - -/* Mike Behm's addition to the style sheet */ -.userinput { font-family: monospace; } -.guitab, .important, .guibutton, .selectblue, .guimenu, .guilabel, -.notetitle { - color: #000000; - font-family: helvetica, arial, sans-serif; - font-weight: bold; - } -div.linux {display:none;} -.firsterm {font-style:italic;} - +/* following font face declarations need to be removed for DBCS */ + + +body, h1, h2, h3, h4, p, table, td, caption, th, ul, ol, dl, li, dd, dt {font-family: Arial, sans-serif; color: #000000} +pre { font-family: Courier, monospace} + +/* end font face declarations */ + +/* following font size declarations should be OK for DBCS */ +body, h1, h2, h3, h4, p, table, td, caption, th, ul, ol, dl, li, dd, dt {font-size: 10pt; } +pre { font-size: 10pt} + +/* end font size declarations */ + +body { background: #FFFFFF} +h1 { font-size: 18pt; margin-top: 5; margin-bottom: 1 } +h2 { font-size: 14pt; margin-top: 25; margin-bottom: 3 } +h3 { font-size: 11pt; margin-top: 20; margin-bottom: 3 } +h4 { font-size: 10pt; margin-top: 20; margin-bottom: 3; font-style: italic } +p { font-size: 10pt; } +pre { margin-left: 6; font-size: 9pt } + +a:link { color: #006699 } +a:visited { color: #996699 } +a:hover { color: #006699 } + +ul { margin-top: 0; margin-bottom: 10 } +li { margin-top: 0; margin-bottom: 0 } +li p { margin-top: 0; margin-bottom: 0 } +ol { margin-top: 0; margin-bottom: 10 } +dl { margin-top: 0; margin-bottom: 10 } +dt { margin-top: 0; margin-bottom: 0; font-weight: bold } +dd { margin-top: 0; margin-bottom: 0 } +strong { font-weight: bold} +em { font-style: italic} +var { font-style: italic} +div.revision { border-left-style: solid; border-left-width: thin; + border-left-color: #7B68EE; padding-left:5 } +th { font-weight: bold } + +/* Mike Behm's addition to the style sheet */ +.userinput { font-family: monospace; } +.guitab, .important, .guibutton, .selectblue, .guimenu, .guilabel, +.notetitle { + color: #000000; + font-family: helvetica, arial, sans-serif; + font-weight: bold; + } +div.linux {display:none;} +.firsterm {font-style:italic;} + +.typewriter {font-family:monospace;} +.bold {font-weight:600;} +.linethrough {text-decoration: line-through;} +.underline {text-decoration: underline;} + diff --git a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_before_you_begin.htm b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_before_you_begin.htm index 34058b5a6c9..fee67ae4d25 100644 --- a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_before_you_begin.htm +++ b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_before_you_begin.htm @@ -28,7 +28,7 @@ For instructions about installing the GNU toolchain for Linux, see the instructi

      Windows

      For windows, MinGW, and Cygwin are the two main choices for acquiring the GNU toolchain:

        -
      • Cygwin is a port of the Linux environment to Windows. +
      • Cygwin is a port of the Linux environment to Windows. It provides a compatibility layer in a set of DLLs. These DLLs are GPL licensed, making any code that links to them also subject to the GPL. @@ -38,7 +38,7 @@ Note: currently Cygwin >= version 3.4.4-999 is not supported since gcc and g+ be launched from the windows' native shell.


        • -

      • MinGW is a port of the GNU toolchain to the Windows platform. +

      • MinGW is a port of the GNU toolchain to the Windows platform. The biggest difference over Cygwin is that MinGW uses the Windows C runtime libraries (mscvrt) instead of GNU's libc. As a result, a compatibility layer is not required, thus avoiding the GPL issues with Cygwin. There are differences, though, between the Windows and GNU C runtime libraries that will make @@ -59,7 +59,7 @@ MinGW File Release section for the latest versions.

      • Select download and install the MinGW base tools and the g++ compiler. You may select the Current or Candidate version of these tools. You may also install any of the other available compilers as well. -

        Do not install the MinGW Make feature as the MSYS version of make from step 5 +

        Do not install the MinGW Make feature as the MSYS version of make from step 5 is a more complete implementation of make.

      • The MinGW setup program currently does not install the gdb debugger. To install the debugger, download the file from the following location: diff --git a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_brkpnts.htm b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_brkpnts.htm index 38920296715..96dddd88536 100644 --- a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_brkpnts.htm +++ b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_brkpnts.htm @@ -13,13 +13,13 @@

        A breakpoint suspends the execution of a program at the location where the breakpoint is set. To set a line breakpoint, right-click in the marker bar area on the left side of an editor beside -the line where you want the program to be suspended, then choose Toggle Breakpoint. You can +the line where you want the program to be suspended, then choose Toggle Breakpoint. You can also double-click on the marker bar next to the source code line. A new breakpoint marker appears on the marker bar, directly to the left of the line where you added the breakpoint. Also, the new breakpoint appears in the Breakpoints view list.

        Once set, a breakpoint can be enabled and disabled by right-clicking on its icon or by -right-clicking on its description in the Breakpoints view. +right-clicking on its description in the Breakpoints view.

          @@ -37,11 +37,11 @@ Disabled breakpoints are indicated with a white -

          Note: Execution will also suspend -if Stop at main() on startup is enabled -on the Launch Configuration dialog. -To access the Launch Configuration dialog, -from the menu bar choose Run > Debug. +

          Note: Execution will also suspend +if Stop at main() on startup is enabled +on the Launch Configuration dialog. +To access the Launch Configuration dialog, +from the menu bar choose Run > Debug.

          diff --git a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_build_over.htm b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_build_over.htm index 59040616644..511aa7c231b 100644 --- a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_build_over.htm +++ b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_build_over.htm @@ -21,13 +21,13 @@ project and providing the makefile yourself.

        • Compile (e.g. gcc).
        • Debug (e.g. gdb).
        -Note: while make, gcc and gdb are the examples used in the +Note: while make, gcc and gdb are the examples used in the documentation, virtually any similar set of tools or utilities could be used.

        -

        Tip: Cygwin contains these utilities (make, gcc and gdb) for +

        Tip: Cygwin contains these utilities (make, gcc and gdb) for a Windows environment.  While running the cygwin installation, -ensure gcc and make are selected since they are not +ensure gcc and make are selected since they are not installed by default. For more information, see http://www.cygwin.com. If you are a Red Hat user, all that you need to do to build your project is included @@ -46,8 +46,8 @@ particular project are built.

        modified since the last build. A rebuild is a clean followed by a build.

        For more information on builds, see:

          -
        • Workbench User Guide > Concepts > Workbench > Builds
          • -
        • Workbench User Guide > Tasks > Building resources
          • +
        • Workbench User Guide > Concepts > Workbench > Builds
          • +
        • Workbench User Guide > Tasks > Building resources

        Build-related information is displayed as follows:

          @@ -57,67 +57,67 @@ related to your projects.
        • For Standard Make projects, the Makefile targets are displayed in the Make Targets view.
        -

        For more information about the Tasks view, see Workbench User +

        For more information about the Tasks view, see Workbench User Guide > Reference > User interface information > Views and -editors > Tasks view.

        +editors > Tasks view.

        Getting a makefile

        -

        You can either create a C/C++ project for which you supply the makefile +

        You can either create a C/C++ project for which you supply the makefile or create a C/C++ project for which the CDT generates makefiles automatically.

        -

        To create a new project, from the menu bar choose File > New -> Project. In the dialog that appears, expand the C/C++ group +

        To create a new project, from the menu bar choose File > New +> Project. In the dialog that appears, expand the C/C++ group and choose e.g. C Project

          -
        • In the resulting wizard page, to create a project for which you supply the makefile, -select Makefile project and choose one of the alternatives under that. +
        • In the resulting wizard page, to create a project for which you supply the makefile, +select Makefile project and choose one of the alternatives under that. An empty project, or a simple "Hello World" can be created. You edit and manage the makefile yourself.

           

          • -
        • To create a project for which the CDT supplies a basic makefile, -select another project type, e.g. Executable and choose one of the examples -under that, or choose Empty Project. +
        • To create a project for which the CDT supplies a basic makefile, +select another project type, e.g. Executable and choose one of the examples +under that, or choose Empty Project.

        Setting build preferences

        You can set build preferences in Eclipse:

        Build order
        -
        If certain projects must be built before others, you can set the build -order. If your project refers to another project, the CDT must +
        If certain projects must be built before others, you can set the build +order. If your project refers to another project, the CDT must build the other project first. To set the build order, from the menu -bar select Window > Preferences and choose General > Preferences > Build Order. +bar select Window > Preferences and choose General > Preferences > Build Order.

        When you set the build order, the CDT does not rebuild projects that depend on a project; you must rebuild all projects to ensure all changes are propagated.

        Automatic save
        -
        You can set the CDT to perform an automatic save of all +
        You can set the CDT to perform an automatic save of all modified resources when you perform a manual build. In the preferences dialog, -select General > Workspace and check Save automatically before build. +select General > Workspace and check Save automatically before build. By default, -this feature is not enabled.
        +this feature is not enabled.

        Controlling the building of your project

        For a Makefile project, the C/C++ compiler that a project uses -is controlled by the project's Properties setting. -To view a project's properties, right-click on the project and select Properties. -In the dialog that appears, the C/C++ Build +is controlled by the project's Properties setting. +To view a project's properties, right-click on the project and select Properties. +In the dialog that appears, the C/C++ Build page enables you to control a variety of settings, including:

        Build Command
        -
        On the Builder Settings tab, this controls which make is used. To change it, uncheck Use - default build command and change it or add arguments to the make command.
        +
        On the Builder Settings tab, this controls which make is used. To change it, uncheck Use + default build command and change it or add arguments to the make command.
        Build Setting
        -
        On the Behaviour tab, this controls whether the compiler will Stop on first build error or not - (keep going). Unchecking Stop on first build error will force the compiler to attempt to build all referenced +
        On the Behaviour tab, this controls whether the compiler will Stop on first build error or not + (keep going). Unchecking Stop on first build error will force the compiler to attempt to build all referenced projects even if the current project has errors.
        Workbench Build Behavior
        -
        On the Behaviour tab, this controls which makefile target will be built depending on the scope of the +
        On the Behaviour tab, this controls which makefile target will be built depending on the scope of the build, e.g. all or clean.

        For a standard (non-Makefile) project (often called "Managed Build" or "Managed Make" project from @@ -125,19 +125,19 @@ earlier CDT version), the project properties dialog enables you to manage the build configurations of your project. For additional information see:

          -
        • Reference > C/C++ Properties > C/C++ Project Properties > Managed Make -Projects
          • -
        • Reference > C/C++ Properties > C/C++ Project Properties > Managed Make File -Properties
          • +
        • Reference > C/C++ Properties > C/C++ Project Properties > Managed Make +Projects
          • +
        • Reference > C/C++ Properties > C/C++ Project Properties > Managed Make File +Properties

        Viewing build information

        Build-related information is displayed as follows:

          -
        • The Console view displays the output of the make utility.
          • -
        • The Tasks view displays a list of compiler errors and +
        • The Console view displays the output of the make utility.
          • +
        • The Tasks view displays a list of compiler errors and warnings related to your projects.
          • -
        • For a Standard Make project, build actions display in the Make -Targets view.
          • +
        • For a Standard Make project, build actions display in the Make +Targets view.

        Related concepts diff --git a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_comments.htm b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_comments.htm index 2573ad2b11d..c6f3de47a57 100644 --- a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_comments.htm +++ b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_comments.htm @@ -21,18 +21,18 @@ Two styles of comments are supported by current C/C++ compilers:

        Comment

        You can quickly comment out one or more lines of code by inserting the leading characters // at the beginning of the line. To do so, select the line -(or lines) of code you want to comment out and press CTRL+/ (slash).

        +(or lines) of code you want to comment out and press CTRL+/ (slash).

        Uncomment

        -

        To uncomment select the line (or lines) of code, and press CTRL+\ +

        To uncomment select the line (or lines) of code, and press CTRL+\ (backslash). -

        Tip: The characters /* */ on lines that are +

        Tip: The characters /* */ on lines that are already commented out, are not affected when you comment and uncomment code.

        Multiline comment

        You can use the Content Assist feature to insert a multi-line comment before a function. -Type com+Ctrl+Space, and the following code is entered at the cursor location: +Type com+Ctrl+Space, and the following code is entered at the cursor location: 

         /*
  * author userid
@@ -42,7 +42,7 @@ Type com+Ctrl+Space, and the following code is entered at the cursor lo
  */
        - To change the default comment click Window > Preferences > C > Templates. For more information see the + To change the default comment click Window > Preferences > C > Templates. For more information see the Content Assist section.

        Related concepts diff --git a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_content_assist.htm b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_content_assist.htm index 2587fead256..e3ced62fd7e 100644 --- a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_content_assist.htm +++ b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_content_assist.htm @@ -34,8 +34,8 @@ the relevance of each proposal is determined in the following order:

      • Enumerations
      -You trigger the Code completion feature when you call Content Assist (such as when you type Ctrl+Space), but it is auto-activated when you type -".", "->" or "::".

      +You trigger the Code completion feature when you call Content Assist (such as when you type Ctrl+Space), but it is auto-activated when you type +".", "->" or "::".

      C++ example showing Code Assist popup

      @@ -46,7 +46,7 @@ You trigger the Code completion feature when you call Content Assist (such as wh

      You can create and save templates for frequently used sections of code, which will be inserted according to scope. The Content Assist feature also provides quick access to code templates.

      -

      When you enter a letter combination in the C/C++ editor, and type CTRL+SPACE (or right-click and click Content Assist), a +

      When you enter a letter combination in the C/C++ editor, and type CTRL+SPACE (or right-click and click Content Assist), a list of code elements and templates that start with the letter combination that you typed is displayed.

      You can then select a template from the list and it is inserted directly into your code.

      @@ -64,7 +64,7 @@ list of code elements and templates that start with the letter combination that

      If the completion engine finds only one proposal in your templates, that proposal is inserted at the current cursor position. -For example if you create a new .cpp file and type mai+CTRL+SPACE the following code is inserted at the cursor location:

      +For example if you create a new .cpp file and type mai+CTRL+SPACE the following code is inserted at the cursor location:

      int
 main(int argc, char **argv) {
 	
diff --git a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_dbg_info.htm b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_dbg_info.htm
index 6b9a9a64de0..42e4a8a6d6e 100644
--- a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_dbg_info.htm
+++ b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_dbg_info.htm
@@ -14,11 +14,11 @@
 
 
      Debug information
      
 
-
      The Debug perspective lets you manage the debugging or running of a program 
+
      The Debug perspective lets you manage the debugging or running of a program 
 in the Workbench. You can control the execution of your program by setting 
 breakpoints, suspending launched programs, stepping through your code, and 
 examining the contents of variables.
      
-
       The Debug perspective displays the following information:
      
+
       The Debug perspective displays the following information:
      
 
 
        
   
      • The stack frame for the suspended threads 
@@ -26,8 +26,8 @@ for each target that you are debugging
        • 
   
      • Each thread in your program represented as a node in the tree
        • 
   
      • The process for each program that you are running
        • 
 
      
-
      The Debug perspective also drives the C/C++ Editor. As you step 
-through your program, the C/C++ Editor highlights the location of the 
+
      The Debug perspective also drives the C/C++ Editor. As you step 
+through your program, the C/C++ Editor highlights the location of the 
 execution pointer. 
      
 
 
      Variables
      
diff --git a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_discovery_options.htm b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_discovery_options.htm
index f9836fd920a..93a105341d5 100644
--- a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_discovery_options.htm
+++ b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_discovery_options.htm
@@ -13,13 +13,13 @@
 
 
      For projects where the IDE generates a makefile to build the project automatically, the IDE has more information about the internal build state of the make project compared to those projects where you provide a makefile to build the project. 
 
-
      For example, a makefile includes build information and other settings, such as include file paths (-I) and macro definitions (-D), which are standard to the build tools (such as the compiler and linker). When the makefile is automatically created for you, this information is known to Eclipse to a greater extent then when you create and manage the makefile for a project yourself. The type of information affects the search capabilities and Code Assist abilities of Eclipse. Therefore, in this example, the purpose of Discovery Options is for improved search and Code Assist capability for projects where Eclipse does not manage the makefile for you. For example, in an open source file of an editor view, to see the declaration for a function that the code calls, you select the function, right click, and select Open Declaration from the context menu. If the location of the include file (that was coded in the makefile for the project) containing the function declaration was in some directory, the CDT would not find the declaration because it has no visibility for that include path. Consequently, you can use Discovery Options in the CDT to enhance the IDE build state by parsing the build process output to extract build path information that the CDT searching mechanism uses to locate and open the include file. By default, the CDT uses GNU* tools (gcc, etc.).  If you want to build your projects using another compiler, use the settings described here.
      
+
      For example, a makefile includes build information and other settings, such as include file paths (-I) and macro definitions (-D), which are standard to the build tools (such as the compiler and linker). When the makefile is automatically created for you, this information is known to Eclipse to a greater extent then when you create and manage the makefile for a project yourself. The type of information affects the search capabilities and Code Assist abilities of Eclipse. Therefore, in this example, the purpose of Discovery Options is for improved search and Code Assist capability for projects where Eclipse does not manage the makefile for you. For example, in an open source file of an editor view, to see the declaration for a function that the code calls, you select the function, right click, and select Open Declaration from the context menu. If the location of the include file (that was coded in the makefile for the project) containing the function declaration was in some directory, the CDT would not find the declaration because it has no visibility for that include path. Consequently, you can use Discovery Options in the CDT to enhance the IDE build state by parsing the build process output to extract build path information that the CDT searching mechanism uses to locate and open the include file. By default, the CDT uses GNU* tools (gcc, etc.).  If you want to build your projects using another compiler, use the settings described here.
      
 
 
      Scanner configuration discovery is tightly linked to project's build process. The first part of scanner discovery begins during the make build for make projects where you provide the makefile. The Eclipse CDT parses the build output for compiler commands with options that specify the definition of the preprocessor symbols and include search paths (for the gcc compiler, -D and -I), and then it stores the information as the project's discovered scanner configuration. 
 
 
      Next, after the build process completes, it is implemented as a separate Eclipse builder where it runs a generate scanner info command, and then parses the output (properties specified on the Discover Options tab for Builds in the Project Properties window). 
 
-
      For C++, the default generate scanner information command is gcc -E -P -v myfile.c | myfile.cpp. This command reads the compiler's configuration file and prints the information that includes compiler's internally defined preprocessor symbols and include search paths.
+
      For C++, the default generate scanner information command is gcc -E -P -v myfile.c | myfile.cpp. This command reads the compiler's configuration file and prints the information that includes compiler's internally defined preprocessor symbols and include search paths.
 
 
      A single scanner configuration is applicable to all the files in a project. Although Eclipse discovers the information for each compilation unit, it stores the scanner configuration on a per project basis. This means that Eclipse applies a single, cumulative scanner configuration to all files in a project. 
 
@@ -31,7 +31,7 @@

    -

    Note: Only basic command line options are supported. In addition, only basic scanner configuration related command line options are recognized (for example, -D and -I for gcc). For some of the commands, their relative position in the command line is important. For information about these options, see the documentation for the utilities you are using. +

    Note: Only basic command line options are supported. In addition, only basic scanner configuration related command line options are recognized (for example, -D and -I for gcc). For some of the commands, their relative position in the command line is important. For information about these options, see the documentation for the utilities you are using.

    Related concepts
    CDT Overview diff --git a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_editor.htm b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_editor.htm index b3b7f8556ec..4c1de237cc0 100644 --- a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_editor.htm +++ b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_editor.htm @@ -21,7 +21,7 @@ This C/C++ editor is invoked automatically when you edit a C/C++ source file.

    Integrated debugging features
    • -

    You can customize some of the operation of the Editor view from the Window > Preferences > C/C++ > Editor preferences dialog.

    +

    You can customize some of the operation of the Editor view from the Window > Preferences > C/C++ > Editor preferences dialog.

    diff --git a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_makefile.htm b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_makefile.htm index a87315263c6..26f57d0e634 100644 --- a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_makefile.htm +++ b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_makefile.htm @@ -102,7 +102,7 @@ Test2.o : Test2.h

    Frequently Asked Questions:

    Your Console view can be very useful for debugging a build. -

    Q1. My Console view says "Error launching builder". What does that mean?

    +

    Q1. My Console view says "Error launching builder". What does that mean?

     Error launching builder (make -k clean all )
 (Exec error:Launching failed)
@@ -111,7 +111,7 @@ Error launching builder (make -k clean all )
 
    Most probably, the build command (by default "make") is not on your path. You can put it on your path and restart Eclipse.
    
 You can also change the build command to something that is on your path. If you are using MinGW tools to compile, you should replace the build command with "mingw32-make".
    
 
-
    Q2. My Console view says "No rule to make target 'X'".
    
+
    Q2. My Console view says "No rule to make target 'X'".
    
 
     make -k clean all 
 make: *** No rule to make target 'clean'.
@@ -124,11 +124,11 @@ contain rules for the command line goals ("clean" and "all" in this case), it wi
 with an error message similar to those shown.  
    
 
 
    If you already have a valid Makefile, you may need to change the working directory of your build.  The default working directory for the build command is the project's root directory.  You can change this by specifying an alternate Build Directory in the Make Project properties.  
-Or, if your Makefile is named something else (eg. buildFile.mk), you can specify the name by setting the default Build command to make -f  buildFile.mk.
    
+Or, if your Makefile is named something else (eg. buildFile.mk), you can specify the name by setting the default Build command to make -f  buildFile.mk.
    
 
 
    If you do not have a valid Makefile, create a new file named Makefile in the root directory.  You can then add the contents of the sample Makefile (above), and modify it as appropriate.
    
 
-
    Q3. My Console view says "missing separator".
    
+
    Q3. My Console view says "missing separator".
    
 
     make -k clean all 
 makefile:12: *** missing separator.  Stop.
@@ -138,7 +138,7 @@ This Tab character is often accidentally replaced with spaces, and because both
 this problem is easily overlooked.  In the sample provided, the error message can be pinpointed to line 12 of the 
 file "makefile"; to fix the problem, insert a tab at the beginning of that line.
    
 
-
    Q4. My Console view says "Target 'all' not remade because of errors".
    
+
    Q4. My Console view says "Target 'all' not remade because of errors".
    
 
     make -k clean all 
 make: *** [clean] Error 255
@@ -155,13 +155,13 @@ make: Target 'all' not remade because of errors.
 
    The Error 255 is produced by make as a result of its command shell not being able to find a command for a particular rule.
    
 Messages from the standard error stream (the lines saying Error 255) and standard output stream (all the other lines) are merged in the Console view here.
    
 
-
    Q5. What's with the -k flag?
    
+
    Q5. What's with the -k flag?
    
 
 
    The -k flag tells make to continue making other independent rules even when one rule fails.
 This is helpful for build large projects.
    
 
    You can remove the -k flag by turning on Project Properties > C/C++ Make Project > Make Builder > Stop on first build error
    
 
-
    Q6. My Console view looks like:
    
+
    Q6. My Console view looks like:
    
 
     mingw32-make clean all 
 process_begin: CreateProcess((null), rm -f Test1.o Test2.o Main.o test_me.exe, ...) failed.
diff --git a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_outlineview.htm b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_outlineview.htm
index 40dd24715b4..0d5fadafd00 100644
--- a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_outlineview.htm
+++ b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_outlineview.htm
@@ -47,8 +47,8 @@ editor highlights both the selected item and the marker bar (left margin). For e
 to the start of main() in the C/C++ editor, click main() in the Outline 
 view.
    
 
-
    For more information about the marker bar, see Workbench User Guide > Reference > User interface 
-information > Views and editors > Editor area.
    
+
    For more information about the marker bar, see Workbench User Guide > Reference > User interface 
+information > Views and editors > Editor area.
    
 
 
    Filtering the Outline View
    
 
@@ -91,8 +91,8 @@ items:

    -

    For more information about the Eclipse workbench, see Workbench User Guide > Tasks > Upgrading Eclipse.

    -

    For more information about Working sets, see Workbench User Guide > Concepts > Working sets.

    +

    For more information about the Eclipse workbench, see Workbench User Guide > Tasks > Upgrading Eclipse.

    +

    For more information about Working sets, see Workbench User Guide > Concepts > Working sets.

    Related concepts diff --git a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_over_cdt.htm b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_over_cdt.htm index c5ebcfe76e3..47f9ac35345 100644 --- a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_over_cdt.htm +++ b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_over_cdt.htm @@ -11,7 +11,7 @@

    CDT Overview

    The C/C++ Development Toolkit (CDT) is a set of Eclipse plug-ins that provide C and C++ extensions to the Eclipse workbench. For more information about -Eclipse, see Workbench User Guide > Concepts > Workbench.

    +Eclipse, see Workbench User Guide > Concepts > Workbench.

    The CDT provides a C/C++ IDE that simplifies many of the same tools that you can use from the command line. The CDT can also communicate with many external utilities and interpret their responses, for example:

    -Note: while make, gcc and gdb are the examples used in the documentation, virtually any similar set of tools or utilities could be used.

    +Note: while make, gcc and gdb are the examples used in the documentation, virtually any similar set of tools or utilities could be used.

    The CDT opens as the C/C++ perspective of the Eclipse workbench. The @@ -36,15 +36,15 @@ views:

    Search
    Shows the results of searches for files or text.
    Tasks
    Lists tasks that you want to keep track of, either as a schedule of things to do or a history of things that have been done.
    -

    For more information, see Workbench User Guide > Concepts > Perspectives.

    +

    For more information, see Workbench User Guide > Concepts > Perspectives.

    CDT updates

    -

    The Install/Update wizard provides information about your current Eclipse installation and provides the framework to manage your updates. -For more information, see Workbench User Guide > Tasks > Updating and installing software.

    +

    The Install/Update wizard provides information about your current Eclipse installation and provides the framework to manage your updates. +For more information, see Workbench User Guide > Tasks > Updating and installing software.

    To view a list of the updates available for the toolsets that you -installed, click Help > Check for Updates.

    +installed, click Help > Check for Updates.

    Additional information

    diff --git a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_over_dbg.htm b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_over_dbg.htm index 0f898cc0196..7f4f14cfa99 100644 --- a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_over_dbg.htm +++ b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_over_dbg.htm @@ -23,7 +23,7 @@ generated from that original source.

    The CDT debugger uses GDB as the underlying debug engine. It translates each user interface action into a sequence of GDB commands and processes the output from GDB to display the current state of the program being debugged.

    -

    Tip: Editing the source after compiling causes the line numbering to be out of +

    Tip: Editing the source after compiling causes the line numbering to be out of step because the debug information is tied directly to the source. Similarly, debugging optimized binaries can also cause unexpected jumps in the execution trace.

    diff --git a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_perspectives.htm b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_perspectives.htm index f832c54287f..e1a0cbf16ec 100644 --- a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_perspectives.htm +++ b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_perspectives.htm @@ -14,16 +14,16 @@

    A perspective is a layout of views (development tools) in the Workbench window. Each type of perspective is a combination of views, menus, and toolbars that enable you to perform a particular task. For example, the C/C++ perspective has views that are organized to help you develop C/C++ programs; -the Debug perspective has views that enable you to debug those programs. +the Debug perspective has views that enable you to debug those programs.

    To Open the C/C++ Perspective, select Window > Open Perspective > Other... and select C/C++

    -Selecting / Opening Views: +Selecting / Opening Views:
      -
    • You can add views to a perspective. From the menu bar choose Window > Show View > Other and select a new view from the Show View dialog.
      • -
    • To reset the current perspective to its original layout, from the menu bar choose Window > Reset Perspective.
      • +
    • You can add views to a perspective. From the menu bar choose Window > Show View > Other and select a new view from the Show View dialog.
      • +
    • To reset the current perspective to its original layout, from the menu bar choose Window > Reset Perspective.
    diff --git a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_projects.htm b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_projects.htm index e84083cd31a..2a5285bb16d 100644 --- a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_projects.htm +++ b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_projects.htm @@ -15,7 +15,7 @@ source code, makefiles, binaries, and related files. C/C++ projects are displayed in the C/C++ Projects view.

    -

    Tip: Nested projects are not supported. Each project must be organized as a +

    Tip: Nested projects are not supported. Each project must be organized as a discrete entity. Project dependencies are supported by allowing a project to reference other projects that reside in your workspace. For more information, see Selecting referenced projects.

    @@ -23,8 +23,8 @@ see Selecting referenced p

    For more information about projects and where they are stored, see:

      -
    • Workbench User Guide > Tasks > Resources
      • -
    • Workbench User Guide > Tasks > Running Eclipse
      • +
    • Workbench User Guide > Tasks > Resources
      • +
    • Workbench User Guide > Tasks > Running Eclipse

    Project types

    @@ -39,22 +39,22 @@ at any time for existing project. Use     diff --git a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_search.htm b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_search.htm index ccbfafd1ca7..7fea9893f13 100644 --- a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_search.htm +++ b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_search.htm @@ -32,7 +32,7 @@ through the use of search delimiters, correct syntax, and wildcards.

    -For information on working sets, see Workbench User Guide > Concepts > Workbench > Working sets
    +For information on working sets, see Workbench User Guide > Concepts > Workbench > Working sets

    What you can search for

    @@ -42,8 +42,8 @@ For information on working sets, see Workbench User Guide > Concepts > specify. If you choose to search for matching elements, all types, macros, and typdefs are included in the search.

    - - + + @@ -119,13 +119,13 @@ is to be searched:

    You can use wildcard characters to further refine your search.

    ElementNoteElementNote
     Class/Struct
    - - + + - @@ -138,7 +138,7 @@ is to be searched:

    Use this wildcard characterTo search for thisUse this wildcard characterTo search for this
     *Any string

    Tip:
    -     Use the character sequence \* to search for +

    		Any string

    Tip:
    +     Use the character sequence \* to search for operators that begin with *. See syntax examples in the table below.
    @@ -144,7 +144,7 @@ may contain other information. -

    Implicit references and overloaded operators

    +

    Implicit references and overloaded operators

    @@ -179,7 +179,7 @@ may contain other information. -

    System Includes

    +

    System Includes

    @@ -197,7 +197,7 @@ may contain other information. -

    Indexer Accuracy

    +

    Indexer Accuracy

      @@ -219,7 +219,7 @@ may contain other information. -

      Open Declaration

      +

      Open Declaration

      Open Declaration (F3) improved, particularly for unresolved symbols.

      Open Declaration is capable of detecting potential matches.

      @@ -237,7 +237,7 @@ may contain other information. -

      Converters

      +

      Converters

        @@ -250,7 +250,7 @@ may contain other information. -

        Working Sets

        +

        Working Sets

          @@ -274,7 +274,7 @@ may contain other information. -

          Make Targets View

          +

          Make Targets View

          More accurate algorithm for associating errors/warnings from build output with files in the workspace -

          In the Problems View, external file locations (outside of the workspace) have been moved to the Location +

          In the Problems View, external file locations (outside of the workspace) have been moved to the Location column and associated with "Open External Location" menu.

          Open External Location from context menu in Problems View

          • Remote Project Support
              -
            • New ICommandLauncher interface supports overriding how build commands are launched.
              • -
            • EFS resources now supported with Managed Build.
              • +
            • New ICommandLauncher interface supports overriding how build commands are launched.
              • +
            • EFS resources now supported with Managed Build.
          • XL C/C++ Compiler Support
              -
            • The XL C/C++ Error Parser has been modernized. It can handle compiler errors/warnings better and +
            • The XL C/C++ Error Parser has been modernized. It can handle compiler errors/warnings better and now also xlC linker warnings.
              • -
            • XL C/C++ v10.1 option support in Managed Build
              • -
            • XL UPC compiler support added.
              • +
            • XL C/C++ v10.1 option support in Managed Build
              • +
            • XL UPC compiler support added.
            • -
          • Headless Build You can now Import and Build CDT Projects without starting the IDE.
            • +
          • Headless Build You can now Import and Build CDT Projects without starting the IDE.
          @@ -339,14 +339,14 @@ may contain other information. -

          DSF Integration

          +

          DSF Integration

          DSF (Eclipse Debugger Services Framework) integrated. See DSF features for more information. -

          Launch Group

          +

          Launch Group

          New "Launch Group" launch configuration. Allows to launch several processes at once.

          @@ -361,7 +361,7 @@ may contain other information. -

          Bugs fixed

          +

          Bugs fixed

          Bugs fixed in this release: @@ -379,7 +379,7 @@ may contain other information. -

          texthere

          +

          texthere

          text here.

          alternate text for image for accessibility diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic.htm index fbfe781f6f8..362039642f3 100644 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic.htm +++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic.htm @@ -26,43 +26,43 @@ Now with CDT, you now select a project type, and that determines what build syst

          Step 1: Creating a project

            -
          1. Select File > New > Project.

            +
          2. Select File > New > Project.

            Click here to see an illustration (displayed in a separate window).


            3. -
          3. Select the type of project to create. For this tutorial, expand the C++ folder and select C++ Project and click Next. +
          4. Select the type of project to create. For this tutorial, expand the C++ folder and select C++ Project and click Next.

            Click here to see an illustration.

            -


            The C++ Project wizard opens.

            +


            The C++ Project wizard opens.

            Click here to see an illustration.

            -


            By default, the CDT filters the Toolchain and Project types that it displays in those lists based on the language support for the C++ Project wizard you selected for this tutorial.

            +


            By default, the CDT filters the Toolchain and Project types that it displays in those lists based on the language support for the C++ Project wizard you selected for this tutorial.


            5. -

          5. In the Project name field, type a name for the project, such as Hello World.

            +

          6. In the Project name field, type a name for the project, such as Hello World.


            -

          7. From the Project types list, expand Executable and select Hello World C++ Project. This project type provides a simple Hello World application in C++, and the makefile is automatically created by the CDT.

            +

          8. From the Project types list, expand Executable and select Hello World C++ Project. This project type provides a simple Hello World application in C++, and the makefile is automatically created by the CDT.


            -

          9. Select a required toolchain from the Toolchain list.

            +

          10. Select a required toolchain from the Toolchain list.


            A toolchain is a set of tools (such as a compiler, linker, and assembler) intended to build your project. Additional tools, such as a debugger, can be associated with a toolchain. There can be several toolchains available, depending on the compilers installed on your system.


            -

          11. Click Next.

            +

          12. Click Next.


            The Select Configurations window displays a list of configurations based on the project type and toolchain(s) you selected earlier.
            Click here to see an illustration.


            -

          13. Optional: If you want to change the default project settings, click Advanced Settings.

            +

          14. Optional: If you want to change the default project settings, click Advanced Settings.


            This opens the project properties dialog for your new project allowing you change any of the project specific settings, such as includes paths, compiler options, and libraries.

            Click here to see an illustration.


            -
          15. If you clicked Next at Step 6, you can specify the basic properties for the new project, such as your name, copyright, and source information.

            +
          16. If you clicked Next at Step 6, you can specify the basic properties for the new project, such as your name, copyright, and source information.

            Click here to see an illustration.


            -

          17. Click Finish.

            +

          18. Click Finish.


            -

          19. If the C++ perspective is not currently set as the default, you are prompted to determined if you would like to this project to be associated with the C/C++ perspective. Click Yes. +

          20. If the C++ perspective is not currently set as the default, you are prompted to determined if you would like to this project to be associated with the C/C++ perspective. Click Yes.

            Click here to see an illustration.


            A project is created with the default settings and a full set of configurations based on the project type and toolchain you selected. @@ -73,24 +73,24 @@ Now with CDT, you now select a project type, and that determines what build syst

            Step 2: Reviewing the code and building the project

              -
            1. From the Project Explorer in the C++ Projects View, double-click the .cpp file that was created for your project, for example, Hello World.cpp. +
            2. From the Project Explorer in the C++ Projects View, double-click the .cpp file that was created for your project, for example, Hello World.cpp.

              Note that the file may be within a folder inside the project, e.g. the "src" folder.

              This file opens in a default editor. It contains C++ template code for the Hello World example project you selected earlier.


              -

              Note: You can specify a different editor, and add or modify existing code templates in Window > Preferences.

              In addition, the Outline view has also been populated +

              Note: You can specify a different editor, and add or modify existing code templates in Window > Preferences.

              In addition, the Outline view has also been populated with objects created from your code.

              Click here to see an illustration.

            3. Optional: You can type additional code in this file, and then save the changes by clicking File > Save, or pressing CTRL+S. + style="font-weight: bold;">File > Save, or pressing CTRL+S.


              Next, you will need to build your project before you can run it.


              4. -
            4. Build your project by pressing CTRL+B, or select the project from the Project Explorer tab in the C++ Projects view and select File > Build Project.

              -


              Note: If a build generates any errors or warnings, you can see those in the Problems view. If you encounter difficulty, see the topics Building C/C++ projects and Before you begin
              .

              5. -
            5. Read through the build messages in the Console view. +
            6. Build your project by pressing CTRL+B, or select the project from the Project Explorer tab in the C++ Projects view and select File > Build Project.

              +


              Note: If a build generates any errors or warnings, you can see those in the Problems view. If you encounter difficulty, see the topics Building C/C++ projects and Before you begin
              .

              7. +
            7. Read through the build messages in the Console view. The project should build successfully.


              -

              You will also see the Outline view has also been populated -with objects created from your code. If you select an item from the Outline view, the +

              You will also see the Outline view has also been populated +with objects created from your code. If you select an item from the Outline view, the corresponding text in the editor is highlighted.


            @@ -98,16 +98,16 @@ corresponding text in the editor is highlighted.


            To run your application:

              -
            1. Within the C/C++ Perspective, click Run > Run Configurations....


              2. -
            2. Select C/C++ Application.


              3. -
            3. Click New.


              4. +
            4. Within the C/C++ Perspective, click Run > Run Configurations....


              5. +
            5. Select C/C++ Application.


              6. +
            6. Click New.


              7. A new Run Configuration is created. Its name and path to the executable are provided by the project ('Hello World' in our case). -

            7. Click Run.


              +
            8. Click Run.


              -

              Now, you should see the Hello World application running in the Console view. -The Console also shows which application is running in a title bar.


              9. +

              Now, you should see the Hello World application running in the Console view. +The Console also shows which application is running in a title bar.


            9. You can click the other views to see the information that they contain.
            diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_build.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_build.htm index 52431390379..1fa7a18fdc2 100644 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_build.htm +++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_build.htm @@ -19,16 +19,16 @@ Console view. The Make Targets view displays makefile actions, and the Tasks view displays compile warnings or errors.

            To build a project:

              -
            1. In the Project Explorer view, select your project. For the tutorial, you can select the HelloWorld project you created earlier.


              2. -
            2. Click Project > Build Project. -
              You can also hit the hammer icon on the toolbar. +
            3. In the Project Explorer view, select your project. For the tutorial, you can select the HelloWorld project you created earlier.


              4. +
            4. Click Project > Build Project. +
              You can also hit the hammer icon build icon on the toolbar.

              5. If you see an error message, such as:

                 (Cannot run program "make": Launching failed)

              then CDT cannot locate the build command, usually make. Either your path is not configured correctly, or you do not have make installed on your system.

              -
            5. You can see the output and results of the build command in the Console view. +
            6. You can see the output and results of the build command in the Console view. Click on its tab to bring the view forward if it is not currently visible. If for some reason it's not present, you can open it by selecting Window > Show View > Console.


              @@ -57,11 +57,11 @@ If for some reason it's not present, you can open it by selecting Window > Show C/C++ Properties window

              -Next icon Next: Debugging a project

              +Next icon Next: Debugging a project

              -Previous icon Back: Creating a makefile

              +Previous icon Back: Creating a makefile

              QNX Copyright Statement

              diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_creating_cpp_file.html b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_creating_cpp_file.html index bb11d85c41b..e1b2746a172 100644 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_creating_cpp_file.html +++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_creating_cpp_file.html @@ -13,50 +13,50 @@ The .cpp file that you create will be saved in the project folder you just created in Creating a remote project.

              -

              Files are edited in the Remote C/C++ Editor located to the right of - the Project Explorer view. The left margin of the Remote C/C++ Editor, called the marker +

              Files are edited in the Remote C/C++ Editor located to the right of + the Project Explorer view. The left margin of the Remote C/C++ Editor, called the marker bar, displays icons for items such as bookmarks, breakpoints, and compiler errors and warnings.

              For more information about:

                -
              • The marker bar, see Workbench User Guide > Reference > User interface - information > Icons and buttons > Editor area marker bar
                • -
              • The editor area, see Workbench User Guide > Reference > User interface - information > Views and editors > Editor area
                • +
              • The marker bar, see Workbench User Guide > Reference > User interface + information > Icons and buttons > Editor area marker bar
                • +
              • The editor area, see Workbench User Guide > Reference > User interface + information > Views and editors > Editor area

              To create a C++ file:

                -
              1. In the Project Explorer view, right-click a project, and - select New > File > Other.
                +
              2. In the Project Explorer view, right-click a project, and + select New > File > Other.
                New > File > Other in Projects View
                3. -
              3. Select Source file under C++.
                +
              4. Select Source file under C++.
                New Source file in New Wizard Dialog
                5. -
              5. In the Source File box, type a name followed by the +
              6. In the Source File box, type a name followed by the appropriate extension. Select a template.
                7. -
              7. Click Finish.
                +
              8. Click Finish.
                New Source File Wizard

                9. The file will open in the Remote C/C++ editor.

              9. Enter your code in the editor view.
                Editor view with a sample code
                10. -
              10. Type CTRL+S to save the file.
                11. +
              11. Type CTRL+S to save the file.
              -

              Your new .cpp file is displayed in the Project Explorer view. Before you +

              Your new .cpp file is displayed in the Project Explorer view. Before you can build your newly created project, you must create a makefile. See Creating your makefile.


              - Related tasks + Related tasks
              Creating a C/C++ file
              - Related reference + Related reference
              Remote C/C++ Editor
              diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_debug.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_debug.htm index fd94b958153..a3eb8de41f3 100644 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_debug.htm +++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_debug.htm @@ -17,15 +17,15 @@ breakpoints, suspending executed programs, stepping through your code, and examining the contents of variables.

              To debug a project:

                -
              1. Click Run > Debug Configurations....

                The Debug Configurations dialog opens.

                2. -
              2. Double-click C/C++ Application.
                3. -
              3. In the Name field, type Hello World.
                4. +
              4. Click Run > Debug Configurations....

                The Debug Configurations dialog opens.

                5. +
              5. Double-click C/C++ Application.
                6. +
              6. In the Name field, type Hello World.

                7. You can now select this debug launch configuration by name the next time that you debug this project.

                -
              7. In the Project box, type or choose your project, e.g. HelloWorld. +
              8. In the Project box, type or choose your project, e.g. HelloWorld.
                Your executable should be selected under "C/C++ Application." -
                If not, the Search Project button should find the executable in the project. +
                If not, the Search Project button should find the executable in the project.

                 

                  9. @@ -33,8 +33,8 @@ examining the contents of variables.

                  and choose a valid debugger for your platform (e.g. gdb/mi).
                -
              9. Click Debug.
                10. -

                You will be prompted to switch to the Debug Perspective. Click Yes

                +
              10. Click Debug.
                11. +

                You will be prompted to switch to the Debug Perspective. Click Yes

                You will now see the debug perspective with the hello.exe application window open. The C/C++ editor repositions in the perspective.

                  @@ -47,19 +47,19 @@ examining the contents of variables.

                   cout << "You just entered"
                  You'll see an icon there indicating the breakpoint is set.
                  -
                • Click Run > Resume. -
                  Or, you can use the Resume button (green arrow) on the toolbar of the Debug View +
                • Click Run > Resume. +
                  Or, you can use the Resume button (green arrow) on the toolbar of the Debug View
                • When prompted, in the Console view, type a value other than 'm', and hit Enter/Return.
                  The breakpoint will be hit.
                  • -
                • In the Variables view, verify that the variable is not 'm'.
                  • -
                • Click Run > Resume.
                  • +
                • In the Variables view, verify that the variable is not 'm'.
                  • +
                • Click Run > Resume.
                • When prompted, again type a value other than 'm' in the Console view, and press Enter/Return.

                  • The breakpoint will be hit.

                  -
                • In the Variables view, verify that the variable is not 'm'.
                  • -
                • In the Variables view, right-click the input variable, and select Change Value... - and type 'm' between the single quotes and hit OK.
                  • -
                • Click Run > Resume.
                  • +
                • In the Variables view, verify that the variable is not 'm'.
                  • +
                • In the Variables view, right-click the input variable, and select Change Value... + and type 'm' between the single quotes and hit OK.
                  • +
                • Click Run > Resume.

                  • The output in the hello.exe application window is:
                   "You just entered m, you need to enter m to exit."

                • The application terminates and the debug session ends. The debug @@ -69,7 +69,7 @@ examining the contents of variables.

                  To learn more about debugging, see the related debug conceptual topics.

                  -Back icon Back: Building a project   

                  +Back icon Back: Building a project   

                  Related concepts
                  diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_existing_code.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_existing_code.htm index da6b8908c5b..080b7ed3d1b 100644 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_existing_code.htm +++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_existing_code.htm @@ -50,7 +50,7 @@ you're importing:

                  Importing a C/C++ project from CVS

                  -To check out an existing C/C++ project from the CVS repository into your workspace, right-click the project in the CVS Repositories view, and select Check Out from the menu. A project with the same name as the CVS module is checked out in to your workspace. +To check out an existing C/C++ project from the CVS repository into your workspace, right-click the project in the CVS Repositories view, and select Check Out from the menu. A project with the same name as the CVS module is checked out in to your workspace.

                  @@ -63,7 +63,7 @@ To check out existing C/C++ code that is not part of a project:
                  1. Right-click the module or directory in the CVS - Repositories view and choose Check Out As… + Repositories view and choose Check Out As… from the menu.

                    @@ -103,10 +103,10 @@ To check out existing C/C++ code that is not part of a project:

                    Choose the workspace location for this project, then the CVS tag to check out. -

                  2. Click Finish to exit the Check Out As dialog. +
                  3. Click Finish to exit the Check Out As dialog.

                    -
                  4. Click Next to continue. +
                  5. Click Next to continue.

                  Importing C/C++ code into an existing project

                  @@ -118,22 +118,22 @@ To import a directory full of C/C++ code into an existing project:
                  1. Right-click the module or directory in the CVS - Repositories view and choose Check Out As + Repositories view and choose Check Out As from the menu.

                    The IDE displays the Check Out As dialog.

                    -
                  2. Choose Check out into an existing project, and then click - Next. +
                  3. Choose Check out into an existing project, and then click + Next. The IDE displays the Check Out Into dialog:
                  4. Select an existing project from the list, and then - click Finish to add the code from CVS to the selected + click Finish to add the code from CVS to the selected project.
                  @@ -163,7 +163,7 @@ not in the workspace folder for Eclipse. However, your existing folder structure is displayed in the C/C++ Projects view. Meta data for the project, such as the index for the project and the link to the existing source, is stored in the metadata directory in the workspace folder. For more information on the workspace folder, -see Workbench User Guide > Tasks > Upgrading Eclipse.

                  +see Workbench User Guide > Tasks > Upgrading Eclipse.

                  After you create a CDT project, you cannot easily move it or redefine its root folders. If you need to, you can delete the CDT project (without deleting its contents) and then @@ -174,8 +174,8 @@ recreate it specifying a different non-default location.

                  Another approach would be to create a C/C++ Project and then import your existing file system. -For more information about importing, see Workbench User Guide > Tasks > Importing > -Importing resources from the file system.

                  +For more information about importing, see Workbench User Guide > Tasks > Importing > +Importing resources from the file system.

                  This approach copies the files from your file system to an Eclipse Workbench project or folder. Your original source files remain unchanged and it is the @@ -184,7 +184,7 @@ When you have successfully imported your existing file system, the folder structure is displayed in the C/C++ Projects view. Again, you should identify an appropriate "root folder" to import from.

                  -

                  Tip: +

                  Tip:

                  • Importing your existing file system can consume significant disk space diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import.htm index 440a8cde47f..225f18a48c4 100644 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import.htm +++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import.htm @@ -20,15 +20,15 @@ function newWin(url) {

                    Step 1: You want to create a single project that will reflect all of the components for the existing source tree.

                      -
                    1. Select File > New > Project. -
                    2. For this tutorial, expand C/C++ and select C++ project. +
                    3. Select File > New > Project. +
                    4. For this tutorial, expand C/C++ and select C++ project.


                      - The New Project wizard displays. + The New Project wizard displays. Click here to see an illustration (displayed in a separate window).


                      -
                    5. In the Project name field, type a name for the project. -
                    6. Ensure that the Use default location option is not selected because here we will specify where the +
                    7. In the Project name field, type a name for the project. +
                    8. Ensure that the Use default location option is not selected because here we will specify where the resources reside in the file system, in a location other than your workspace.
                      We assume this directory location already exists, and contains e.g. source files and makefile. If it does not exist, it will be created. @@ -39,19 +39,19 @@ function newWin(url) { here to see an illustration (displayed in a separate window).

                      -
                    9. In the Location field, specify the path to the existing files for your project. -
                    10. From the Project types list, expand Makefile Project and select Empty Project.. +
                    11. In the Location field, specify the path to the existing files for your project. +
                    12. From the Project types list, expand Makefile Project and select Empty Project..
                        -
                      • To have sample source and a makefile created in your existing directory, select Hello World C++ Project
                        • +
                      • To have sample source and a makefile created in your existing directory, select Hello World C++ Project
                    13. Make sure a toolchain is selected.
                      14. -
                    14. Click Next. +
                    15. Click Next.

                        -

                    16. (Optional) On the Select Configurations page, select only the configurations you want created. Configurations +
                    17. (Optional) On the Select Configurations page, select only the configurations you want created. Configurations display for each toolchain selected on the previous page of the wizard. -
                    18. Click Finish to close the dialog box. +
                    19. Click Finish to close the dialog box.

                      You will see the new project in the Project Explorer view. In addition, new 'dot' files have been created in your legacy project's root directory, these are CDT project files.

                    Step 2: You are now ready to build your project.

                      -
                    1. To build your project, select Project > Build Project. -
                      You can also hit the hammer icon on the toolbar to +
                    2. To build your project, select Project > Build Project. +
                      You can also hit the hammer icon build icon on the toolbar to build the selected project.
                       
                    3. You may see an error e.g. "make: *** no rule to make target 'all'.

                      This is because, in our case, we didn't tell it where the makefile is, or its name.

                        -
                      • Open the project properties (right mouse on project name in the Project Explorer view - and select Properties at the bottom on the context menu).
                        • -
                      • On the C/C++ Build Page, on its Builder Settings tab, uncheck "Use default build command" +
                      • Open the project properties (right mouse on project name in the Project Explorer view + and select Properties at the bottom on the context menu).
                        • +
                      • On the C/C++ Build Page, on its Builder Settings tab, uncheck "Use default build command" and change the make command to make -f hello.mak since our makefile is not named the default makefile.

                        Click here to see an illustration (displayed in a separate window).

                        • -
                      • Click OK to close the Project Properties window. +
                      • Click OK to close the Project Properties window.
                      • Your project will probably rebuild. If not you can force a build via - Project > Build Project - or use the hammer icon . + Project > Build Project + or use the hammer icon build icon.
                      4. -

                      After the project build completes, the results display in the Console view and new objects, such as binaries and includes, show in the Project Explorer view.

                      +

                      After the project build completes, the results display in the Console view and new objects, such as binaries and includes, show in the Project Explorer view.

                        Click here to see an illustration (displayed in a separate window).

                      @@ -107,7 +107,7 @@ function newWin(url) {

                       

                      -Note: By default, the indexer is set to Fast indexer for the project to parse your project in the same way that a compiler does; beginning with each compilation unit and parsing that file and all files that it includes, except that it parses each header file included in a project only once. This method provides the most accurate index information. For large projects using complex C++ code, this indexer can be slow. For example, if a header file is included and takes two compilation units, the parsing of the second unit reuses the results of parsing the first unit. This is similar to how precompiled headers work. The indexing of large projects using the Fast indexer uses fewer resources than the Full indexer, but the resulting index is not quite as accurate. +Note: By default, the indexer is set to Fast indexer for the project to parse your project in the same way that a compiler does; beginning with each compilation unit and parsing that file and all files that it includes, except that it parses each header file included in a project only once. This method provides the most accurate index information. For large projects using complex C++ code, this indexer can be slow. For example, if a header file is included and takes two compilation units, the parsing of the second unit reuses the results of parsing the first unit. This is similar to how precompiled headers work. The indexing of large projects using the Fast indexer uses fewer resources than the Full indexer, but the resulting index is not quite as accurate.
                      To change indexer settings, bring up the Indexer page in the Project Properties.

                      Click here to see an illustration (displayed in a separate window).


                      @@ -117,16 +117,16 @@ function newWin(url) {

                      Step 3: You are now ready to run your application.

                        -
                      1. To run your application within the C/C++ Perspective, click Run > Run Configurations...

                        -

                        The Run Configurations dialog displays.

                        -
                      2. To create a run configuration, select C/C++ Application and click the New icon. -
                      3. Give your run configuration a name by entering a new name in the Name field at the top. -
                      4. On the Main tab, select the project by clicking Browse opposite the Project field. +
                      5. To run your application within the C/C++ Perspective, click Run > Run Configurations...

                        +

                        The Run Configurations dialog displays.

                        +
                      6. To create a run configuration, select C/C++ Application and click the New icon. +
                      7. Give your run configuration a name by entering a new name in the Name field at the top. +
                      8. On the Main tab, select the project by clicking Browse opposite the Project field.
                          -
                        • From the Project Selection window, select the project and click OK. -
                      9. Select the new C/C++ Application you want to execute by clicking Search. +
                      10. From the Project Selection window, select the project and click OK. +
                • Select the new C/C++ Application you want to execute by clicking Search.

                  In our case it didn't find the file because it's in a nonstandard location. -Use the Browse button to select the executable. In our case also it's a nonstandard +Use the Browse button to select the executable. In our case also it's a nonstandard name, hello.e because that's what our makefile hello.mak built.

                  Click here to see an illustration (displayed in a separate window).

                  @@ -137,10 +137,10 @@ name, hello.e because that's what our makefile hello.mak -
                • Click Run to save the run configuration and run it. +
                • Click Run to save the run configuration and run it.

                  Click here to see an illustration (displayed in a separate window).

                  -

                  The application runs in the Console view. The Console also shows which application it is currently running in the title bar. You can configure the view to display different elements, such as user input elements using different colors.

                  +

                  The application runs in the Console view. The Console also shows which application it is currently running in the title bar. You can configure the view to display different elements, such as user input elements using different colors.

              QNX Copyright Statement diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_install_cdt.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_install_cdt.htm index 81dc2a2b929..6adae39acd4 100644 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_install_cdt.htm +++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_install_cdt.htm @@ -29,46 +29,46 @@ function newWin(url) {

              To obtain the latest CDT features:

                -
              1. Select Help > Software Updates > Find and Install. +
              2. Select Help > Software Updates > Find and Install.

                Click here to see an illustration (displayed in a separate window).


                3. -
              3. In the Feature Updates window, select Search for new features to install and click Next.

                Note: If you want to search for updates on features that you currently have installed, you can select the option Search for updates of the currently installed features, and then follow the steps to update using that method.

                Click here to see an illustration.

                +
              4. In the Feature Updates window, select Search for new features to install and click Next.

                Note: If you want to search for updates on features that you currently have installed, you can select the option Search for updates of the currently installed features, and then follow the steps to update using that method.

                Click here to see an illustration.


                5. -
              5. If you have not updated previously, you will have to enter the location of the Eclipse CDT Install site. Click New Remote Site.... +
              6. If you have not updated previously, you will have to enter the location of the Eclipse CDT Install site. Click New Remote Site....

                Click here to see an illustration.


              7. In the New Update Site dialog box, type the name and URL for the Eclipse update site.

                Click here to see an illustration.


                8. -
              8. Click OK.


                9. -
              9. From the Sites to include in search list, select the update site you just created by clicking the appropriate check box, and click Finish. +
              10. Click OK.


                11. +
              11. From the Sites to include in search list, select the update site you just created by clicking the appropriate check box, and click Finish.

                Click here to see an illustration.


              12. The Search Results dialog shows the features available to install from the update site. Expand and select any additional features that you require. De-select any options that do not apply to you.


                13. -
              13. Click Next. +
              14. Click Next.

                Click here to see an illustration.


                15. -
              15. You must accept the Eclipse.org Software User Agreement to continue installing the CDT update. If you accept the terms, select I accept the terms in the license agreement and then click Next. +
              16. You must accept the Eclipse.org Software User Agreement to continue installing the CDT update. If you accept the terms, select I accept the terms in the license agreement and then click Next.

                Click here to see an illustration.


                17. You can review the summary list of the features you selected to install.


                -
              17. Optional: Click Change Location to select the location you would like the updates installed. Typically, this is the directory where you installed Eclipse.


                18. -
              18. Click Finish.

                Click here to see an illustration.

                +
              19. Optional: Click Change Location to select the location you would like the updates installed. Typically, this is the directory where you installed Eclipse.


                20. +
              20. Click Finish.

                Click here to see an illustration.


              21. You will now start downloading the CDT components. You will have to verify that you want the features installed by clicking - Install for each feature you selected. + Install for each feature you selected.

                Click here to see an illustration.


                Now, you have to restart Eclipse.


                22. -
              22. Select Yes to complete the feature installation process. +
              23. Select Yes to complete the feature installation process.

                Click here to see an illustration.

              diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_newcpp.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_newcpp.htm index ee518037568..ab425c85c11 100644 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_newcpp.htm +++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_newcpp.htm @@ -23,20 +23,20 @@ bar, displays icons for items such as bookmarks, breakpoints, and compiler erro

              For more information about:

                -
              • The editor area and marker bar, see Workbench User Guide > Reference > User interface - information > Views and editors > Editor area
                • -
              • The marker bar icons, see Workbench User Guide > Reference > User interface - information > Icons and buttons > Editor area marker bar
                • +
              • The editor area and marker bar, see Workbench User Guide > Reference > User interface + information > Views and editors > Editor area
                • +
              • The marker bar icons, see Workbench User Guide > Reference > User interface + information > Icons and buttons > Editor area marker bar

              To create a C++ file:

                -
              1. In the Project Explorer view, right-click the HelloWorld project - folder, and select New > Source File.
                2. -
              2. In the Source file: field, type main.cpp. +
              3. In the Project Explorer view, right-click the HelloWorld project + folder, and select New > Source File.
                4. +
              4. In the Source file: field, type main.cpp.
                By default the source folder should be your project folder.
                The template selected is probably "Default C/C++ Source Template."
                5. -
              5. Click Finish.
                6. +
              6. Click Finish.
              7. A Comment template probably appears at the top of an otherwise empty file. Type the code, exactly as it appears below, in the editor. Or you can paste it in from this help file. @@ -61,20 +61,20 @@ int main () { -
              8. Click File > - Save.
                9. +
              9. Click File > + Save.
              -

              Your new .cpp file is displayed in the Project Explorer view. Your project now contains main.cpp. Before you +

              Your new .cpp file is displayed in the Project Explorer view. Your project now contains main.cpp. Before you can build your HelloWorld project, you must create a makefile.

              -Next icon Next: Creating your makefile +Next icon Next: Creating your makefile

              -Back icon Back: Creating your project

              +Back icon Back: Creating your project

              Related concepts
              diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_newmake.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_newmake.htm index ce562f6a5fe..8dbb8282f15 100644 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_newmake.htm +++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_newmake.htm @@ -21,10 +21,10 @@ function newWin(url) {

              To create a makefile:

                -
              1. In the Project Explorer view, right-click the HelloWorld project - folder and select New > File. -
              2. In the File name box, type makefile.
                3. -
              3. Click Finish.
                4. +
              4. In the Project Explorer view, right-click the HelloWorld project + folder and select New > File. +
              5. In the File name box, type makefile.
                6. +
              6. Click Finish.
              7. Type the gnu make instructions below in the editor. Lines are indented with tab characters, not with spaces.
                8. @@ -43,8 +43,8 @@ function newWin(url) {     g++ -c -g main.cpp
                 

                -
              8. Click File > - Save.
              +
            7. Click File > + Save.

            Your new makefile, along with your main.cpp file are displayed in the Project Explorer view. Your project now @@ -56,13 +56,13 @@ contains main.cpp and makefile. You can now build your HelloWorld project.

            Next icon - - Next: Building your project + + Next: Building your project

            -Back icon Back: Creating your C++ file

            +Back icon Back: Creating your C++ file

            Related concepts
            Project
            diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_newproj.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_newproj.htm index e1e122a5c0c..5e70acff390 100644 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_newproj.htm +++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_newproj.htm @@ -23,56 +23,56 @@ that can incrementally compile source files as they are changed.

            To create a project:

              -
            1. Select File > New > Project. +
            2. Select File > New > Project.


              When you create a new project, you are required to specify the project type. This project type will determine the toolchain, data, and tabs that the CDT uses/displays.


              -
            3. Select the type of project to create. For this tutorial, expand the C/C++ folder and select C++ Project. -

              The C++ Project wizard opens. Click here to see an illustration.


              -

              By default, the CDT filters the Toolchain and Project types that currently display in those lists are based on the language support for the C++ Project wizard you selected for this tutorial.


              -
            4. In the Project name field, type HelloWorld. -
            5. Leave the Use Default Location option selected. +
            6. Select the type of project to create. For this tutorial, expand the C/C++ folder and select C++ Project. +

              The C++ Project wizard opens. Click here to see an illustration.


              +

              By default, the CDT filters the Toolchain and Project types that currently display in those lists are based on the language support for the C++ Project wizard you selected for this tutorial.


              +
            7. In the Project name field, type HelloWorld. +
            8. Leave the Use Default Location option selected.


              Next, you want to select the type of project to create. In the New CDT Project Wizard, you can choose from the following project types:

                -
              • Executable - Provides an executable application. This project type folder contains three templates.

                +
              • Executable - Provides an executable application. This project type folder contains three templates.

                  -
                • Hello World C++ Example provides a simple C++ Hello World application with main(). -
                • Hello World ANSI C Example provides a simple C Hello World application with main(). -
                • Empty Project provides a single source project folder that contains no files. +
                • Hello World C++ Example provides a simple C++ Hello World application with main(). +
                • Hello World ANSI C Example provides a simple C Hello World application with main(). +
                • Empty Project provides a single source project folder that contains no files.

                  After you select this template, the result is a project with only the meta-data files required for the project type. You are expected to provide source files for the project's target.

                -

                The makefile for the Executable project type is automatically created by the CDT.

                +

                The makefile for the Executable project type is automatically created by the CDT.

                 

                -
              • Shared Library - An executable module that is compiled and linked separately. When you create a project that uses a shared library (libxx.so), you define your shared library's project as a Project Reference for your application. For this project type, the CDT combines object files together and joins them so they're relocatable and can be shared by many processes. Shared libraries are named using the format +
              • Shared Library - An executable module that is compiled and linked separately. When you create a project that uses a shared library (libxx.so), you define your shared library's project as a Project Reference for your application. For this project type, the CDT combines object files together and joins them so they're relocatable and can be shared by many processes. Shared libraries are named using the format libxx.so.version, where version is a number with a default of 1. The libxx.so file usually is a symbolic link to the latest version. The makefile for this project type is automatically created by the CDT. -
              • Static Library - A collection of object files that you can link into another application (libxx.a). The CDT combines object files (i.e. *.o) +
              • Static Library - A collection of object files that you can link into another application (libxx.a). The CDT combines object files (i.e. *.o) into an archive (*.a) that is directly linked into an executable. The makefile for this project type is automatically created by the CDT. -
              • Makefile Project - Creates an empty project without the meta-data files. This selection is useful for importing and modifying existing makefile-based projects; a new makefile is not created for this project type. +
              • Makefile Project - Creates an empty project without the meta-data files. This selection is useful for importing and modifying existing makefile-based projects; a new makefile is not created for this project type.
              -

              By default, the CDT filters the Toolchain and Project types that currently display in those lists based on the language support for the C++ Project wizard you selected for this tutorial. +

              By default, the CDT filters the Toolchain and Project types that currently display in those lists based on the language support for the C++ Project wizard you selected for this tutorial.

               

              -
            9. From the Project types list, expand Makefile project and select Empty Project. +
            10. From the Project types list, expand Makefile project and select Empty Project. This project lets you enter the source file and the makefile yourself. -
            11. Select a required toolchain from the Toolchain list. +
            12. Select a required toolchain from the Toolchain list.

              A toolchain is a set of tools (such as a compiler, linker, and assembler) intended to build your project. Additional tools, such as a debugger, can be associated with a toolchain.
              There can be several toolchains available, depending on the compilers installed on your system.

              13. -
            13. Click Next. -
            14. (Optional) On the Select Configurations page, Click Advanced Settings. +
            15. Click Next. +
            16. (Optional) On the Select Configurations page, Click Advanced Settings.
                -
              • Expand C/C++Build > Settings. Click the Binary Parsers tab. +
              • Expand C/C++Build > Settings. Click the Binary Parsers tab.


                Click here to see an illustration.


                • -
              • In the Binary Parser list, select the error parser that is appropriate for your platform. +
              • In the Binary Parser list, select the error parser that is appropriate for your platform. Other project settings can be modified here as well. The default selection is probably OK.
                • @@ -81,11 +81,11 @@ run and debug your programs, selecting the correct parser is important. After you select the correct parser for your development environment and build your project, you can view the components of the .o file in the C/C++ Projects view. You can also view the contents of the .o file in the C/C++ editor. -

                Click OK to close the Project Properties window. +

                Click OK to close the Project Properties window.

              -
            17. Click Finish.
              18. -
            18. If a message box prompts you to change perspectives, click Yes. +
            19. Click Finish.
              20. +
            20. If a message box prompts you to change perspectives, click Yes.
            @@ -96,16 +96,16 @@ You may see an error since there is nothing to build yet for your project. You can now start writing the code for your HelloWorld program.

            -

            Tip: You can view and modify the properties of your -HelloWorld project at any time by right-clicking on the project in the Project Explorer +

            Tip: You can view and modify the properties of your +HelloWorld project at any time by right-clicking on the project in the Project Explorer view and clicking Properties.

            Next Icon -Next: Creating your C++ file

            For more information +src="../images/ngnext.gif" height="16" width="16" border="0" alt="Next Icon"> +Next: Creating your C++ file

            For more information about:

              -
            • Projects, see Workbench User Guide > Concepts > Workbench > Resources -
              • -
            • The workspace, see Workbench User Guide > Tasks > Upgrading Eclipse -
              • +
            • Projects, see Workbench User Guide > Concepts > Workbench > Resources +
              • +
            • The workspace, see Workbench User Guide > Tasks > Upgrading Eclipse +

            Related concepts
            CDT overview
            CDT projects
            Project file views diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_prepare_workbench.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_prepare_workbench.htm index 9352cd898ef..d487aad466e 100644 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_prepare_workbench.htm +++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_prepare_workbench.htm @@ -22,7 +22,7 @@ function newWin(url) {

            • Your Workbench has its default settings. To reset the current perspective to its original layout, from the menu bar select -Window > Reset Perspective.
              • +Window > Reset Perspective.
            • You are familiar with the basic Workbench features, such as views and perspectives. @@ -32,23 +32,23 @@ To reset the current perspective to its original layout, from the menu bar selec

              Setting the operation and appearance of the C/C++ Editor

                -
              1. To open the Workbench preferences, from the menu bar, select Window > Preferences.
                2. -
              2. Expand C/C++ and select Editor. +
              3. To open the Workbench preferences, from the menu bar, select Window > Preferences.
                4. +
              4. Expand C/C++ and select Editor.


                Click here to see an illustration (displayed in a separate window).


              5. Make any changes that you require to be comfortable editing files. -For example, you might want to enable Show line numbers or change the Problem indicator color to a different shade of red. For more information about setting preferences in the editor, see General page Preferences window in the reference section.
                6. +For example, you might want to enable Show line numbers or change the Problem indicator color to a different shade of red. For more information about setting preferences in the editor, see General page Preferences window in the reference section. -
              6. On the Preferences C/C++ Editor dialog, click the Colors tab. The Colors tab for the C/C++ Editor preferences dialog displays.


                Click here to see an illustration.

                +
              7. On the Preferences C/C++ Editor dialog, click the Colors tab. The Colors tab for the C/C++ Editor preferences dialog displays.


                Click here to see an illustration.

                -
                Again, make any changes that will be useful for your working habits and click OK. For more information see the Color page Preferences window in the reference section.
                8. +
                Again, make any changes that will be useful for your working habits and click OK. For more information see the Color page Preferences window in the reference section. -
              8. On the Preferences C/C++ Editor dialog, click the Content Assist tab. The Preferences C/C++ Editor dialog's Content Assist tab appears.
                +
              9. On the Preferences C/C++ Editor dialog, click the Content Assist tab. The Preferences C/C++ Editor dialog's Content Assist tab appears.


                Click here to see an illustration.


                If you want to set an auto-activation delay or change the background for completion proposals, do so now. For more information see the Content Assist page Preferences window in the reference section.

                10. -
              10. Leave the preferences by clicking OK.
                11. +
              11. Leave the preferences by clicking OK.
              diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/hw_example.htm b/doc/org.eclipse.cdt.doc.user/getting_started/hw_example.htm index e2d019c953f..73d6ae44ed5 100644 --- a/doc/org.eclipse.cdt.doc.user/getting_started/hw_example.htm +++ b/doc/org.eclipse.cdt.doc.user/getting_started/hw_example.htm @@ -6,7 +6,7 @@ C++ Hello World example -Copy the code below and paste it into the main.cpp file in the Editor view: +

              Copy the code below and paste it into the main.cpp file in the Editor view:

               #include <iostream>
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/make_example.htm b/doc/org.eclipse.cdt.doc.user/getting_started/make_example.htm
index ce4db2a8320..25addd267eb 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/make_example.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/make_example.htm
@@ -6,7 +6,7 @@
 	C++ Makefile example
 
 
-Copy the script below and paste it into the makefile file in the Editor view:
+
              Copy the script below and paste it into the makefile file in the Editor view:
              
 
 
               all: hello
diff --git a/doc/org.eclipse.cdt.doc.user/help.css b/doc/org.eclipse.cdt.doc.user/help.css
index 8f09f90e7b3..55e14e7f8c9 100644
--- a/doc/org.eclipse.cdt.doc.user/help.css
+++ b/doc/org.eclipse.cdt.doc.user/help.css
@@ -17,6 +17,7 @@ h1           { font-size: 18pt; margin-top: 5; margin-bottom: 1 }
 h2           { font-size: 14pt; margin-top: 25; margin-bottom: 3 }
 h3           { font-size: 11pt; margin-top: 20; margin-bottom: 3 }
 h4           { font-size: 10pt; margin-top: 20; margin-bottom: 3; font-style: italic }
+h5           { font size: 13.5pt; }
 p 	     { font-size: 10pt; }
 pre	     { margin-left: 6; font-size: 9pt }
 
@@ -49,3 +50,7 @@ th	     { font-weight: bold }
 div.linux  {display:none;}
 .firsterm {font-style:italic;}
 
+.typewriter {font-family:monospace;}
+.bold {font-weight:600;}
+.linethrough {text-decoration: line-through;}
+.underline {text-decoration: underline;}
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_mproj_pref_macro.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_mproj_pref_macro.htm
index 8e6238bcb22..501b3dfdd89 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_mproj_pref_macro.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_mproj_pref_macro.htm
@@ -16,16 +16,16 @@
 Managed Build Macros Preference page
              
 
              You can add, remove and edit build macros that apply to all managed make projects in the workspace. 
 Two tables are displayed - one for user-defined build macros and one for non user-defined build macros. 
-Each table contains three columns:
              
-
              Name of the build macro
              
-
              Type of value contained in the build macro (see below)
              
-
              Value of the build macro.  
              
-
              You can view all build macros that are not user-defined in the System 
-	Macros table.
              
-
              You can view all user-defined macros in the User 
-	Macros table.  A user-defined macro overrides a non user-defined macro of the same 
+Each table contains three columns:
              
+
              Name of the build macro
              
+
              Type of value contained in the build macro (see below)
              
+
              Value of the build macro.  
              
+
              You can view all build macros that are not user-defined in the System 
+	Macros table.
              
+
              You can view all user-defined macros in the User 
+	Macros table.  A user-defined macro overrides a non user-defined macro of the same 
 	name.  Overridden macros are displayed in bold in 
-	the System Macros table.
              
+	the System Macros table.
              
 
              For more detailed information about managed make project build macros 
 settings, see the description in the Build Macros Property Pages.
              
 
              Related reference
              
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_new_mproj.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_new_mproj.htm
index 057c9396deb..27a0a736aa9 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_new_mproj.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_new_mproj.htm
@@ -11,7 +11,7 @@
 
 
 
              C/C++ New Project Wizard, Managed Make Project
              
-
              This section describes properties for creating a Managed make project in the C/C++ New Project Wizard.
              
+
              This section describes properties for creating a Managed make project in the C/C++ New Project Wizard.
              
 		Name
              
 		Select a 
 Project Type
              
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_new_sproj.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_new_sproj.htm
index ced7be4a050..67756f336b0 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_new_sproj.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_new_sproj.htm
@@ -11,7 +11,7 @@
 
 
 
              C/C++ New Project Wizard, Standard Make Project
              
-
              This section describes properties for creating a Standard make project in the C/C++ New Project Wizard.
              
+
              This section describes properties for creating a Standard make project in the C/C++ New Project Wizard.
              
 		Name
              
 		Referenced Projects
              
 		Make Builder
              
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_prop_proj.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_prop_proj.htm
index 2140835f18c..da955665b9d 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_prop_proj.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_prop_proj.htm
@@ -12,7 +12,7 @@
 
 
              Project Properties
              
 
              This section describes C/C++ Project Properties. 
-To select project properties, right click a project and select Properties.
              
+To select project properties, right click a project and select Properties.
              
 
 
              Related concepts 
              
 CDT projects
              
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_appearance_pref.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_appearance_pref.htm
index ad78c65b5d2..3cb6214ae7f 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_appearance_pref.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_appearance_pref.htm
@@ -12,12 +12,12 @@
 
 
              Appearance preferences
              
 
-
              Use the Appearance panel of the Preferences window to customize the appearance of C elements in the viewers.
              
+
              Use the Appearance panel of the Preferences window to customize the appearance of C elements in the viewers.
              
 
              Appearance Preference
              
 
 @@ -25,27 +25,27 @@
 	
-			
+			
-			
+			
-			
+			
-			
+			
-			
+			
-			
+			
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_build_pref.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_build_pref.htm
index 576b18d8658..fb76d29a78b 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_build_pref.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_build_pref.htm
@@ -12,46 +12,46 @@
 
 
              Build Console preferences
              
 
-
              You can customize the appearance of the Build Console view.
              
+
              You can customize the appearance of the Build Console view.
              Build Console Preferences Dialog Box
              
 	
-	Appearance Options
+	Appearance Options
 	
 	
 		

 	
 		
              Show translation unit members Show translation unit members 
 			Select this option to show translation unit members in Project Explorer and C/C++ Projects view. 
 		
              
 		
              Group include directives in Project Explorer and C/C++ Projects view Group include directives in Project Explorer and C/C++ Projects view 
 			Select this option to group include directives in Project Explorer and C/C++ Projects view. 
 		
              
 		
              Group include directives in the Outline view Group include directives in the Outline view 
 			Select this option to group include directives in the Outline view. 
 		
              
 		
              Group namespaces in the Outline view Group namespaces in the Outline view 
 			Select this option to group namespace declarations in the Outline view. 
 		
              
 		
              Group method definitions in the Outline view Group method definitions in the Outline view 
 			Select this option to group method definitions for the same type in the Outline view. 
 		
              
 		
              Sort header files before source files in Project Explorer and C/C++ Projects view Sort header files before source files in Project Explorer and C/C++ Projects view 
 			Select this option to separate header and source files in Project Explorer and C/C++ Projects view. 
 		
              
 	              
 
 
 
              
-	
+	
-			
+			
-			
+			
-			
+			
-			
+			
-			
+			
-			
+			
-			
+			
-			
+			
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_code_style_pref.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_code_style_pref.htm
index 2ecb15b8240..cda0d495aae 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_code_style_pref.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_code_style_pref.htm
@@ -11,7 +11,7 @@
 
 
              Code Style preferences
              
 
-
              Use the Code Style preference panel to configure you code style profiles for smart typing features, like auto-indentation and formatting. Click Window > Preferences > C/C++ > Code Style to make changes.
              
+
              Use the Code Style preference panel to configure you code style profiles for smart typing features, like auto-indentation and formatting. Click Window > Preferences > C/C++ > Code Style to make changes.
              Code Style Preferences
              Build Console Preference OptionsBuild Console Preference Options
 	
 		
 		
 	
 	
 		
              Always clear console before buildingAlways clear console before building
 			Select this option to clear the contents of the Console view every time you perform a build.
 		
              
 		
              Open console when buildingOpen console when building
 			Select this option to open the Console view when you perform a build.
 		
              
 		
              Bring console to top when building (if present)Bring console to top when building (if present)
 			Select this option to make the Console view the active window when you perform a build.
 		
              
 		
              Limit console output (#lines)Limit console output (#lines)
 			Specify the maximum number of lines that can display in the Console view.
 		
              
 		
              Display tab widthDisplay tab width
 			Specify the number of spaces for a tab.
 		
              
 		
              Output text colorOutput text color
 			Customize the color of text in the Console view.
 		
              
 		
              Information message text colorInformation message text color
 			Customize the color of information text messages in the Console view.
 		
              
 		
              Error message text colorError message text color
 			Customize the color of error messages in the Console view.
 		
              
 	              
 
 
              
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_code_templates_pref.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_code_templates_pref.htm
index 30156bae643..cb9d228f255 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_code_templates_pref.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_code_templates_pref.htm
@@ -16,7 +16,7 @@
 
              The
 
 Opens the Code Templates preference page
-C/C++ > Code Style > Code Templates preference page
+C/C++ > Code Style > Code Templates preference page
 lets you configure the format of newly generated code stubs, comments and files.
              The code templates page contains templates that are used by actions that generate code and/or source files. 
@@ -106,7 +106,7 @@ Templates contain variables that are substituted when the template is applied. S
 			
 			
              
@@ -115,7 +115,7 @@ Templates contain variables that are substituted when the template is applied. S
 			
@@ -217,7 +217,7 @@ The New File from Template wizard can be used to create new files based on one o
 			
@@ -226,7 +226,7 @@ The New File from Template wizard can be used to create new files based on one o
 			
@@ -235,7 +235,7 @@ The New File from Template wizard can be used to create new files based on one o
 			
@@ -244,12 +244,12 @@ The New File from Template wizard can be used to create new files based on one o
 			
-        
+        
-        
+        
-        
+        
-        
+        
-        
+        
-        
+        
-        
+        
-        
+        
-        
+        
@@ -93,7 +93,7 @@ union.
-        
+        
@@ -112,20 +112,20 @@ union.
-        
+        
-        
+        
-        
+        
-        
+        
@@ -146,14 +146,14 @@ search.
-        
+        
-        
+        
-        
+        
-        
+        
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_search_view.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_search_view.htm
index 5cbe2146473..5369491a1a7 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_search_view.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_search_view.htm
@@ -10,7 +10,7 @@
 
              Search view
              
-
              Any matches are reported in the Search view. 
              
+
              Any matches are reported in the Search view. 
              Search View
              When you have completed a search and have results in the 
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_signals_view.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_signals_view.htm
index 04fc78233b5..60eda385e40 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_signals_view.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_signals_view.htm
@@ -14,12 +14,12 @@
 
 
              Signals view
              
 
-
              The Signals view of the Debug perspective lets you view the signals defined on the selected debug target and how the 
+
              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.
              Signals View
              
 	
 
 
              
 			
              Header comment for new source or header files.
              
-			
              Note that this template can be referenced in source and header file templates with ${filecomment}.
              
+			
              Note that this template can be referenced in source and header file templates with ${filecomment}.
              
 			              		
 		
              
 		
              
 			
 			
              The comment for new types.
              
-			
              Note that this template can be referenced in source and header file templates with ${typecomment}.
              
+			
              Note that this template can be referenced in source and header file templates with ${typecomment}.
              
 			              		
 		
              
 		
              
 			
 			
              Used by the New Class wizard and the New Source File wizard when a new C++ source file is created.
               
-			
              The template can specify where comments are added. Note that the template can contain the variable ${typecomment} and ${filecomment} that will be substituted by the evaluation of the Types respectively Files comment template.
              
+			
              The template can specify where comments are added. Note that the template can contain the variable ${typecomment} and ${filecomment} that will be substituted by the evaluation of the Types respectively Files comment template.
              
 			              		
 		
              
 		
              
 			
 			
              Used by the New Class wizard and the New Header File wizard when a new C++ header file is created.
               
-			
              The template can specify where comments are added. Note that the template can contain the variable ${typecomment} and ${filecomment} that will be substituted by the evaluation of the Types respectively Files comment template.
              
+			
              The template can specify where comments are added. Note that the template can contain the variable ${typecomment} and ${filecomment} that will be substituted by the evaluation of the Types respectively Files comment template.
              
 			              		
 		
              
 		
              
 			
 			
              Used by the New Source File wizard when a new C source file is created.
               
-			
              The template can specify where comments are added. Note that the template can contain the variable ${typecomment} and ${filecomment} that will be substituted by the evaluation of the Types respectively Files comment template.
              
+			
              The template can specify where comments are added. Note that the template can contain the variable ${typecomment} and ${filecomment} that will be substituted by the evaluation of the Types respectively Files comment template.
              
 			              		
 		
              
 		
              
 			
 			
              Used by the New Header File wizard when a new C source file is created.
               
-			
              The template can specify where comments are added. Note that the template can contain the variable ${typecomment} and ${filecomment} that will be substituted by the evaluation of the Types respectively Files comment template.
              
+			
              The template can specify where comments are added. Note that the template can contain the variable ${typecomment} and ${filecomment} that will be substituted by the evaluation of the Types respectively Files comment template.
              
 			              		
 		
              
 		
              
 			
-			
              Other file templates
              
+			
              Other file templates
              
 			              		
 			
 			
              File templates can be defined for other content types, e.g. Assembly or plain text.
               
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_color.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_color.htm
index 427ae96380d..4e03347a922 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_color.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_color.htm
@@ -12,44 +12,44 @@
 
 
              Syntax Coloring preferences
              
 
-
              The Syntax Coloring preference panel specifies how C/C++ source code is rendered. Each element category (Code, Comments, and Preprocessor) contains a list of language elements that may be rendered with its own color and style.
              
-	
              Note that general text editor settings such as the background color can be configured on the general Text Editors preference pages. Fonts may be configured on the general Colors and Fonts preference page
              
+
              The Syntax Coloring preference panel specifies how C/C++ source code is rendered. Each element category (Code, Comments, and Preprocessor) contains a list of language elements that may be rendered with its own color and style.
              
+	
              Note that general text editor settings such as the background color can be configured on the general Text Editors preference pages. Fonts may be configured on the general Colors and Fonts preference page
              
 	
              Syntax Coloring Preferences Page
              
 
 
-	
+	
-			
+			
-			
+			
-			
+			
-			
-			
+			
+			
-			
-			
+			
+			
-			
-			
+			
+			
-			
-			
+			
+			
              Syntax Coloring Preference OptionsSyntax Coloring Preference Options
 	
 		
 		
 	
 	
 		
              Enable semantic highlightingEnable semantic highlighting
 			Checkmark to activate semantic highlighting of specific structures in the elements listed.
 		
              
 		
              EnableEnable
 			Makes the selected element active for syntax coloring.
 		
              
 		
              ColorColor
 			Specifies the color in which to display the selected element.
 		
              
 		
              BoldMakes the selected element bold.BoldMakes the selected element bold.
 		
              
 		
              ItalicMakes the selected element italic.ItalicMakes the selected element italic.
 		
              
 		
              StrikethroughMakes the selected element strikethrough.StrikethroughMakes the selected element strikethrough.
 		
              
 		
              UnderlineMakes the selected element underlined.UnderlineMakes the selected element underlined.
 		
              
 	              
 
              
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_con_assist.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_con_assist.htm
index 425c286f3d6..0668a223319 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_con_assist.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_con_assist.htm
@@ -11,45 +11,45 @@
 
 
              Content Assist preferences
              
 
-
              You can customize the Content Assist feature on the Contents Assist panel of the Preferences window. To change the Content Assist preferences click
-Window > Preferences > C/C++ > Editor > Content Assist.
              
+
              You can customize the Content Assist feature on the Contents Assist panel of the Preferences window. To change the Content Assist preferences click
+Window > Preferences > C/C++ > Editor > Content Assist.
              
 
              Content Assist Preferences Dialog Box
              
 
 
-	
+	
-			
+			
-			
+			
-			
+			
-			
+			
-			
+			
-			
+			
-			
+			
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_con_assist_adv.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_con_assist_adv.htm
index 4d1b9b78826..52c06134a4e 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_con_assist_adv.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_con_assist_adv.htm
@@ -11,30 +11,30 @@
 
 
              Advanced preferences
              
 
-
              Use the Advanced panel in the Preferences window to configure the behavior of the Content Assist (Ctrl+Space) command.
              
+
              Use the Advanced panel in the Preferences window to configure the behavior of the Content Assist (Ctrl+Space) command.
              Content Assist Preferences Dialog Box
              Content Assist Preference OptionsContent Assist Preference Options
 	
 		
 		
 	
 	
 		
              Insert single proposals automaticallyInsert single proposals automatically
 			Inserts an element into your code when the Content Assist feature finds only one proposal.
 		
              
 		
              Insert common prefixes automaticallyInsert common prefixes automatically
 			Inserts common prefixes.
 		
              
 		
              Completion Proposal FilterCompletion Proposal Filter
 			Completion proposal filters may have been supplied with your Eclipse CDT distribution.
 		Completion proposal filters can sort and order the proposals provided by the Content Assist feature to best suit your needs.
 		Select the desired content assist filter from the list of available filters.
 		
              
 		
              Enable "." as triggerEnable "." as trigger
 			Enable to use "." as a trigger for auto-completion.
 		
              
 		
              Enable "->" as triggerEnable "->" as trigger
 			Enable to use "->" as a trigger for auto-completion.
 		
              
 		
              Enable "::" as triggerEnable "::" as trigger
 			Enable to use "::" as a trigger for auto-completion.
 		
              
 		
              delay (ms)delay (ms)
 			Specifies the number of milliseconds before Content Assist is activated.
 		
              
 	              
 
 
 
              
-	
+	
-			
+			
-			
+			
-			
+			
-			
+			
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_folding.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_folding.htm
index e0f7be1e52f..e22ace7f427 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_folding.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_folding.htm
@@ -11,10 +11,10 @@
 
 
              Folding preferences
              
 
-
              You can customize the C/C++ editor folding behavior in the Folding panel of the Preferences window.
              
+
              You can customize the C/C++ editor folding behavior in the Folding panel of the Preferences window.
              Editor Folding Preferences Window
              Advanced Content Assist Preference OptionsAdvanced Content Assist Preference Options
 	
 		
 		
 	
 	
 		
              Default Proposal KindsyDefault Proposal Kindsy
 			Specifies the types of proposals Content Assist uses and the key bindings assigned.
 		
              
 		
              Content Assist CyclingContent Assist Cycling
 			Specifies the order and types of proposals Content Assist will cycle through.
 		
              
 		
              UpUp
 			Moves the selected proposal item up in the cycling list.
 		
              
 		
              DownDown
 			Moves the selected proposal item down in the cycling list.
 		
              
 	              
 
 
              
-	
+	@@ -22,57 +22,57 @@
 	
-			
-			
-			
+			
+			
+			
-			
+			
-			
+			
-			
+			
-			
+			
-			
+			
-			
+			
-			
+			
-			
+			
-			
+			
-			
+			
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_gen.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_gen.htm
index 001d63b8ccc..5aff16b0510 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_gen.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_gen.htm
@@ -11,38 +11,38 @@
 
 
              Editor preferences
              
 
-
              Use the Editor preference panel to control the appearance of text highlighting in C/C++ editors.
              
+
              Use the Editor preference panel to control the appearance of text highlighting in C/C++ editors.
              Editor Preferences Dialog Box
              Folding Preference OptionsFolding Preference Options
 	
 		
 		

 	
 		
              OptionDescriptionDefaultOptionDescriptionDefault
 		
              
 		
              Enable folding when opening a new editorEnable folding when opening a new editor
 			If enabled, apply folding rules to the new editor.
 			 
 		
              
 		
              Select folding to useSelect folding to use
 			Select the folding to use from the available choices.
 			 
 		
              
 		
              Enable folding of preprocessor branches (#if/#endif)Enable folding of preprocessor branches (#if/#endif)
 			If enabled, fold preprocessor branches.
 			 
 		
              
 		
              MacrosMacros
 			If enabled, fold macro definitions.
 			On
 		
              
 		
              FunctionsFunctions
 			If enabled, fold functions.
 			Off
 		
              
 		
              MethodsMethods
 			If enabled, fold methods.
 			Off
 		
              
 		
              StructuresStructures
 			If enabled, fold structures.
 			On
 		
              
 		
              CommentsComments
 			If enabled, fold comments.
 			Off
 		
              
 		
              Header CommentsHeader Comments
 			If enabled, fold header comments.
 			On
 		
              
 		
              Inactive Preprocessor BranchesInactive Preprocessor Branches
 			If enabled, fold inactive processor branches.
 			On
 		
              
 
 
 
              
-	
+	
-			
+			
-			
+			
-			
+			
-			
+			
-			
+			
-			
+			
-	
+	
-		
+		
-		
+		
-		
+		
-		
+		
-		
+		
 
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_registersview.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_registersview.htm
index e4a35e53fdf..a5d53f5316f 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_registersview.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_registersview.htm
@@ -13,7 +13,7 @@
 
 
              Registers view
              
 
-
              The Registers view of the Debug perspective lists information about the registers in a selected stack frame. 
+
              The Registers view of the Debug perspective lists information about the registers in a selected stack frame. 
 Values that have changed are highlighted in the Registers view when your program 
 stops. 
              Registers View
              
@@ -22,14 +22,14 @@ stops. 
              The table below lists the icons displayed in the Registers view toolbar.
              Editor Preference OptionsEditor Preference Options
 	
 		
 		
 	
 	
 		
              Smart caret positioning in identifiersSmart caret positioning in identifiers
 			If enabled, there are additional word boundaries inside identifiers.
 		
              
 		
              Highlight matching bracketsHighlight matching brackets
 			When the cursor is beside a bracket, the matching bracket is highlighted.
 		
              
 		
              Highlight inactive codeHighlight inactive code
 			Highlights inactive code when the cursor is positioned inside it.
 		
              
 		
              Appearance color optionsAppearance color options
 			Lists the items for which you can specify a color.
 		
              
 		
              ColorColor
 			Specifies the color in which to display the selected item.
 		
              
 		
              Documentation tool commentsDocumentation tool comments
 			Specifies which documentation tool should be used to determine editor presentation and behaviors. This
 			enables editor features such as content-assist, documentation comment generation and syntax highlighting. The particular
 			tool selected here will be used for files that are not associated with a project, or where no project level preference has
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_hov.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_hov.htm
index 6c65ecc1324..f1a14d648bc 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_hov.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_hov.htm
@@ -11,21 +11,21 @@
 
 
              Hovers preferences
              
 
-
              You can customize the appearance of the C/C++ editor hover behavior on the Hovers panel of the Preferences window.
              
+
              You can customize the appearance of the C/C++ editor hover behavior on the Hovers panel of the Preferences window.
              
 
              Editor Hover Preferences Window
              
 
-	
+	
-			
+			
-			
+			
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_mark_occurrences.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_mark_occurrences.htm
index f6bb2450dad..2ca3efae82f 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_mark_occurrences.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_mark_occurrences.htm
@@ -9,7 +9,7 @@
 
              Mark Occurrences
              
-
              Indicate your preferences for the Mark Occurrences settings on the  Opens the Mark Occurrences preference page C/C++ > Editor > Mark Occurrences preference page.
              
+
              Indicate your preferences for the Mark Occurrences settings on the  Opens the Mark Occurrences preference page C/C++ > Editor > Mark Occurrences preference page.
              Hovers Preference OptionsHovers Preference Options
 	
 		
 		
 	
 	
 		
              Enable editor problem annotationEnable editor problem annotation
 			When selected problems found will be highlighted in the editor.
 		
              
 		
              Text Hover key modifier preferencesText Hover key modifier preferences
 			You can select hot-keys to enable alternate hover behavior. For example, a mouse over while pressing the <Ctrl> key will link to the element's source declaration.
 		
              
 	              
 
 
 
              
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_save_actions.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_save_actions.htm
index 6cd20dbca2b..bef615d9c7c 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_save_actions.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_save_actions.htm
@@ -11,23 +11,23 @@
 
 
              Save actions
              
 
-
              Use the Save Actions preference panel to configure actions performed by C/C++ editor while saving
-a file. Click Window > Preferences > C/C++ > Editor > Save Actions to make changes.
              
+
              Use the Save Actions preference panel to configure actions performed by C/C++ editor while saving
+a file. Click Window > Preferences > C/C++ > Editor > Save Actions to make changes.
              
 	
 		
              
 
 
              
-	
+	
-			
+			
-			
+			
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_scalability.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_scalability.htm
index bc61b570ac4..4e9c52128c2 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_scalability.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_scalability.htm
@@ -11,49 +11,49 @@
 
 
              Scalability preferences
              
 
-
              Use the Scalability preference panel to configure options for dealing with large source files. Click Window > Preferences > C/C++ > Editor > Scalability to make changes.
              
+
              Use the Scalability preference panel to configure options for dealing with large source files. Click Window > Preferences > C/C++ > Editor > Scalability to make changes.
              Scalability Preferences
              Editor Preference OptionsEditor Preference Options
 	
 		
 		
 	
 	
 		
              Remove trailing whitespaceRemove trailing whitespace
 			While saving a file, C/C++ editor will remove spaces and tab characters from the end of edited
 			  or all lines.
 		
              
 		
              Ensure newline at the end of fileEnsure newline at the end of file
 			While saving a file, C/C++ editor will insert a newline at the end of the last line,
 			  if the last line does not have it already.
 		
              
 
 
 	
              
-	
+	
-			
+			
-			
+			
-			
+			
-			
+			
-			
+			
-			
+			
-			
+			
-			
+			
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_typing.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_typing.htm
index ec40dbad27d..186e8a38c98 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_typing.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_typing.htm
@@ -11,49 +11,49 @@
 
 
              Typing preferences
              
 
-
              Use the Typing preference panel to assist in formatting input as you type. Click Window > Preferences > C/C++ > Editor > Typing to make changes.
              
+
              Use the Typing preference panel to assist in formatting input as you type. Click Window > Preferences > C/C++ > Editor > Typing to make changes.
              Typing Preferences
              Scalability Preference OptionsScalability Preference Options
 	
 		
 		
 	
 	
 		
              Alert me when scalability mode will be turned onAlert me when scalability mode will be turned on
 			If enabled, an information dialog pops up when a large file is opened 
 			with the C/C++ Editor which exceeds the specified line limit.
 		
              
 		
              Enable scalability mode options when the number of lines in the file is more thanEnable scalability mode options when the number of lines in the file is more than
 			If the number of lines in a file exceeds the specified number the C/C++ Editor will 
 			enable scalability mode and all scalability mode options below will take effect.
 		
              
 		
              Enable all scalability mode optionsEnable all scalability mode options
 			If enabled, all options below are enabled, too.
 		
              
 		
              Disable editor live parsingDisable editor live parsing
 			If enabled, parsing while typing will be disabled. 
 			This disables also other features like Outline view, semantic highlighting, folding, etc.
 		
              
 		
              Disable semantic highlightingDisable semantic highlighting
 			If enabled, C/C++ identifiers will not be colored.
 		
              
 		
              Disable syntax coloringDisable syntax coloring
 			If enabled, no coloring of keywords, comments and literals is done.
 		
              
 		
              Disable parsing-based content assist proposalsDisable parsing-based content assist proposals
 			If enabled, content assist proposals which require parsing the file will not be available.
 		
              
 		
              Disable content assist auto activationDisable content assist auto activation
 			If enabled, content assist will not be activated automatically on trigger sequences, like '.', '::' or '->'.
 		
              
 	              
 
 	
              
-	
+	
-			
+			
-			
+			
-			
+			
-			
+			
-			
+			
-			
+			
-			
+			
-			
+			
-			
+			
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_pref.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_pref.htm
index 158e85de215..98db070ea5e 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_pref.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_pref.htm
@@ -11,18 +11,18 @@
 
 
              C/C++ preferences
              
 
-
              The C/C++ preference dialog box allows you to make changes to your C/C++ environment.
              
+
              The C/C++ preference dialog box allows you to make changes to your C/C++ environment.
              C/C++ Main Preferences Window
              Typing Preference OptionsTyping Preference Options
 	
 		
 		
 	
 	
 		
              "Strings""Strings"
 			If enabled, automatically close string quotes.
 		
              
 		
              (Parenthesis) and [square] brackets(Parenthesis) and [square] brackets
 			If enabled, automatically close parenthesis and square brackets.
 		
              
 		
              <Angle> brackets<Angle> brackets
 			If enabled, automatically close angle brackets.
 		
              
 		
              {Braces}{Braces}
 			If enabled, automatically close curly braces.
 		
              
 		
              Tab key indents the current lineTab key indents the current line
 			If enabled, indent the current line when the tab key is pressed.
 		
              
 		
              Adjust indentationAdjust indentation
 			Adjust the indentation of pasted text to match the current indentation level.
 		
              
 		
              Wrap automaticallyWrap automatically
 			Enable to automatically wrap string literals when they exceed the max line length.
 		
              
 		
              Escape text when pasting into a literal stringEscape text when pasting into a literal string
 			If enabled, special characters in pasted strings are escaped when pasted into an existing string literal.
 		
              
 		
              Automatically indent - New lines and bracesAutomatically indent - New lines and braces
 			If enabled, a new line or brace will be indented according to the Code Style preferences. 
 			If disabled, the default Text Editor indentation strategy is applied (copy indent from previous line)
 		
              
 
 
 
              
-	
+	
-			
+			
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_call_hierarchy_view.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_call_hierarchy_view.htm
index 3cb2f7a5099..98b4db70d7d 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_call_hierarchy_view.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_call_hierarchy_view.htm
@@ -11,7 +11,7 @@
 
 
              Call Hierarchy view
              
 
-
              The Call Hierarchy view shows the loaded callers and callees for a selected C/C++ function. Right-click a function name in a source file and select Open Call Hierarchy to open a Call Hierarchy view, if none is open, and show the function's callers.
              
+
              The Call Hierarchy view shows the loaded callers and callees for a selected C/C++ function. Right-click a function name in a source file and select Open Call Hierarchy to open a Call Hierarchy view, if none is open, and show the function's callers.
              Call Hierarchy view
              
 
@@ -20,9 +20,9 @@
   
              The Call Hierarchy view toolbar commands include:
              C/C++ Preference OptionsC/C++ Preference Options
 	
 		
 		
 	
 	
 		
              Follow unindexed header files when producing the outline viewFollow unindexed header files when producing the outline view
 			Activate to do a more exhaustive search of header paths to build a more complete outline view.
 		
              
 	              
 
 
   
              
-      
-      
-      
+      
+      
+      
@@ -74,8 +74,8 @@
   
              The Call Hierarchy view context menu commands include:
              
     
              Command
              Name
              Description
              Command
              Name
              Description
              		
     
              
     
              
       
              Show Next Reference icon
              		
   
              
-      
-      
+      
+      
@@ -91,7 +91,7 @@
     
-      
+      
@@ -99,7 +99,7 @@
     
-      
+      
              
     
              Name
              Description
              Name
              Description
              		
     
              
     
              
       Show Reference
              
     
              
       Refactor...Opens the Rename global function dialog.Opens the Rename global function dialog.
     
              
     
              
       Declarations
              
     
              
       ReferencesSearch the workspace, project, or working set for all function references and shows the result in the Search view.Search the workspace, project, or working set for all function references and shows the result in the Search view.
     
              
   
              
 
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_code_temp.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_code_temp.htm
index 353523583a3..8e11cc21425 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_code_temp.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_code_temp.htm
@@ -11,46 +11,46 @@
 
 
              Templates preferences
              
 
-
              Use the Templates preference panel to manipulate any of the common templates predefined within CDT or create your own. To modify, delete, export, 
-import, or create your own templates click Window > Preferences > C/C++ > Templates.
              
+
              Use the Templates preference panel to manipulate any of the common templates predefined within CDT or create your own. To modify, delete, export, 
+import, or create your own templates click Window > Preferences > C/C++ > Templates.
              
 Templates Preferences
 	
-	
+	
-			
-			
+			
+			
-			
-			
+			
+			
-			
+			
-			
+			
-			
+			
-			
+			
-			
+			
-			
+			
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_console_view.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_console_view.htm
index 2183741aab7..f00a4ce113e 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_console_view.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_console_view.htm
@@ -21,26 +21,26 @@ The console shows three different kinds of text, each in a different color:
 
            • Standard input
              • You can choose the different colors for these kinds of text on the preferences pages 
-(Window > Preferences > Debug > Console).
+(Window > Preferences > Debug > Console).
 
              Console View Context Menu
              
 
-
              When you right-click in the Console view
-(or when you press Shift+F10 when the focus is on the Console view),
+
              When you right-click in the Console view
+(or when you press Shift+F10 when the focus is on the Console view),
 you see the following options:
 
              
 
              Edit options: Cut, Copy, Paste, Select All
              
 
              These options perform the standard edit operations.
 Which options are available depends on where the focus is in the 
-Console view.
+Console view.
 For example, you cannot paste text into the program output,
 but you can paste text to the bottom of the file.
 
              
 
              Find/Replace
              
-
              Opens a Find/Replace dialog
-that operates only on the text in the Console view.
              
+
              Opens a Find/Replace dialog
+that operates only on the text in the Console view.
              
 
              Go to Line
              
 
              Opens a dialog that moves the focus to the line you specify.
 The dialog also indicates the total number of lines in the console buffer.
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_cproj_view.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_cproj_view.htm
index 877a38d38c7..4744f7f9865 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_cproj_view.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_cproj_view.htm
@@ -35,24 +35,24 @@ Files that you select in the C/C++ Projects view  affect the information that is
 	 
 	
              
-		
+		
-		
+		
-	
+	
+			 Go Into command. The hover help for this button tells you where it will take you. This command is similar to the Back button in a web browser.
-		
+		
-		
+		
-		
+		
-		
+		
-		
+		
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_search.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_search.htm
index c45183028bb..93a55932483 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_search.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_search.htm
@@ -9,7 +9,7 @@
 
              Search Menu actions
              
-
              Search menu commands open the search dialog. There are specialized tabs on the general Search dialog to help you search for:
              
+
              Search menu commands open the search dialog. There are specialized tabs on the general Search dialog to help you search for:
                
 
              • Files, or for text in files
                • 
 
              • Elements in C/C++ files
                • 
@@ -26,22 +26,22 @@
 	
              
-	
+	
-	
+	
-	
+	
-	
+	
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_window.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_window.htm
index fe7c6bc517f..d0c78dd58da 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_window.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_window.htm
@@ -16,97 +16,97 @@
 	
-		
+		
-		
+		
-		
+		
+				From the Other... submenu you can open any perspective.
-		
+		
-		
+		
+				The first three (File > New, Window > Open Perspective, Window > Show View) control which actions appear as top level items in their respective menus. 
+				The last category (Other) controls which action sets are visible in the perspective.
-		
+		
+				You can open more perspectives of this type using the Window > Open Perspective > Other menu item once you have saved a perspective.
-		
+		
-		
+		
-		
+		
-		
+		
-		
+		
-		
+		
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_make_settings_pref.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_make_settings_pref.htm
index 146bc683a4e..369ec8a3d68 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_make_settings_pref.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_make_settings_pref.htm
@@ -12,38 +12,38 @@
 
 
              Settings preferences
              
 
-
              Use the Settings preference panel in the Preferences window to specify the Makefile style and include directories.
              
+
              Use the Settings preference panel in the Preferences window to specify the Makefile style and include directories.
              Settings Preferences Window
              Templates Preference OptionsTemplates Preference Options
 	
 		
 		
 	
 	
 		
              New...Opens the New Template dialog to create a new template.New...Opens the New Template dialog to create a new template.
 		
              
 		
              Edit...Opens the Edit Template dialog to edit the selected template.Edit...Opens the Edit Template dialog to edit the selected template.
 		
              
 		
              RemoveRemove
 			Removes the selected templates from the list.
 		
              
 		
              Restore RemovedRestore Removed
 			Restores templates deleted by the last Remove action.
 		
              
 		
              Revert to DefaultRevert to Default
 			Removes the last edits made to the selected template restoring it to it's unmodified state.
 		
              
 		
              Import...Import...
 			Imports a template.
 		
              
 		
              Export...Export...
 			Exports the selected templates.
 		
              
 		
              Use code formatterUse code formatter
 			Enable to apply the currently selected code style to the template.
 		
              
 	              
 
 
 
 
 
              
 		Minimize IconMinimizeMinimize
 		Minimizes the view.
 	
              
 	
              
 		Maximize IconMaximizeMaximize
 		Maximizes the view.
 	
              
 	
              
 	Back IconBackBack
 	This command displays the hierarchy that was displayed immediately prior to the current display. 
 			For example, if you Go Into a resource, then the Back command in the resulting display returns the view to the same hierarchy from which you activated the
-			 Go Into command. The hover help for this button tells you where it will take you. This command is similar to the Back button in a web browser.
 	
              
 	
              
 		Forward IconForwardForward
 		This command displays the hierarchy that was displayed immediately after the current display. 
 				For example, if you've just selected the Back command, then selecting the Forward command in the resulting display returns the view to the same hierarchy from which you activated the Back command. The
 				hover help for this button tells you where it will take you.
@@ -60,36 +60,36 @@ Files that you select in the C/C++ Projects view  affect the information that is
 	
              
 	
              
 	Up IconUpUp
 		This command displays the hierarchy of the parent of the current highest level resource. The hover help for this button tells you where it will take you.
 	
              
 	
              
 		Collapse All IconCollapse AllCollapse All
 		This command collapses the tree expansion state of all resources in the view.
 	
              
 	
              
 		Link with Editor IconLink with EditorLink with Editor
 		This command toggles whether the view selection is linked to the active editor. 
 				When this option is selected, changing the active editor will automatically update the selection to the resource being edited.
 	
              
 	
              
 		Menu IconMenuMenu
 		Click the black upside-down triangle icon to open a menu of items specific to the view.

              
 									
              
 										
              Select Working Set
              
-											
              Opens the Select Working Set dialog to allow selecting a working set for the view.
              
+											
              Opens the Select Working Set dialog to allow selecting a working set for the view.
              
 										
              Deselect Working Set
              
 											
              Deselects the current working set. 
              
 										
              Edit Active Working Set
              
-											
              Opens the Edit Working Set dialog to allow changing the current working set.
              
+											
              Opens the Edit Working Set dialog to allow changing the current working set.
              
 										
              Sort
              
 											
              This command sorts the resources in the view according to the selected schema:
              
 												
                
-													
              • By Name:  Resources are sorted alphabetically, according to the full name of the resource (e.g., A.TXT, then B.DOC, then C.HTML, etc.)
                • 
-													
              • By Type:  Resources are sorted alphabetically by file type/extension (e.g., all DOC files, then all HTML files, then all TXT files, etc.).
                • 
+													
              • By Name:  Resources are sorted alphabetically, according to the full name of the resource (e.g., A.TXT, then B.DOC, then C.HTML, etc.)
                • 
+													
              • By Type:  Resources are sorted alphabetically by file type/extension (e.g., all DOC files, then all HTML files, then all TXT files, etc.).
                • 
 												
              
 										
              Filters
              
 											
              This command allows you to select filters to apply to the view so that you can show or hide various resources as needed. 
@@ -107,8 +107,8 @@ Files that you select in the C/C++ Projects view  affect the information that is
 
 
-    
-    
+    
+    
-  
+  
              
   
              IconDescriptionIconDescription
   
              
   
              
     
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_create_make_target.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_create_make_target.htm
index 35bb2c2a1cb..8b1445bb94e 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_create_make_target.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_create_make_target.htm
@@ -20,7 +20,7 @@
   
              Target Name
              Name of the Make Target.
              
   
              Make Target
              The reference to the make section in your makefile.
              
   
              Use default
              Select this checkbox to use the default make command. Clear the check box to specify a new make command.
              
-  
              Build command
              If you clear the Use default checkbox type a new make command in this field.
              
+  
              Build command
              If you clear the Use default checkbox type a new make command in this field.
              
   
              Stop on first build error
               
              Stops the build when an error occurs.
              
   
              Run all project builders
              Runs additional project builders such as discovery.
              
 
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dbg_brkpt_actions.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dbg_brkpt_actions.htm
index 7844648b2b4..eed298139fe 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dbg_brkpt_actions.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dbg_brkpt_actions.htm
@@ -11,28 +11,28 @@
 
 
              Breakpoint Actions preferences
              
 
-
              Use the Breakpoint Actions  page in the Preferences window to create, edit, and remove breakpoint actions. The breakpoint actions defined here are available to all projects in the current workspace.
              
+
              Use the Breakpoint Actions  page in the Preferences window to create, edit, and remove breakpoint actions. The breakpoint actions defined here are available to all projects in the current workspace.
              
 
              Breakpoint Actions preference page
              
 
 
-	
+	
-			
-			
+			
-			
-			
+			
+			
-			
-			
+			
+			
              Breakpoint Actions Preference OptionsBreakpoint Actions Preference Options
 	
 		
 		
 	
 	
 		
              New...
              To create a new breakpoint action, click New. 
              
+			              		New...
              To create a new breakpoint action, click New. 
              
 	                      		
 		
              
 		
              Edit...To edit the currently selected action, click Edit. In the  Action dialog box that appears, edit the action settings, then click OK. Edit...To edit the currently selected action, click Edit. In the  Action dialog box that appears, edit the action settings, then click OK. 
 		
              
 		
              DeleteTo delete the currently selected action, click Delete. DeleteTo delete the currently selected action, click Delete. 
 		
              
 	              
 
              
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dbg_pref.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dbg_pref.htm
index 68159ef2555..0fb9c84d4c3 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dbg_pref.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dbg_pref.htm
@@ -11,41 +11,41 @@
 
 
              Debug preferences
              
 
-
              The C/C++ Debug panel controls general settings for C/C++ debugging.
              
+
              The C/C++ Debug panel controls general settings for C/C++ debugging.
              
 
              C/C++ Debug preferences panel
              
 
-	
+	
-			
+			
-			
+			
-			
+			
-			
+			
-			
+			
-			
+			
-		  
+		  
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dbg_src.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dbg_src.htm
index 652b4dc5383..27b2a53f41c 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dbg_src.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dbg_src.htm
@@ -11,13 +11,13 @@
 
 
              Common Source Lookup Path preference
              
 
-
              Use the Common Source Lookup Path preference page to add or remove source containers.
              
+
              Use the Common Source Lookup Path preference page to add or remove source containers.
              Debug Source Code Locations Preferences
              C/C++ Debug Preference OptionsC/C++ Debug Preference Options
 	
 		
 		
 	
 	
 		
              Show full pathsShow full paths
 			Displays the full path of resources.
 		
              
 		
              Default variable formatDefault variable format
 			Specifies the number system in which to display variables (Natural, Hexadecimal, Decimal, or Binary).
 		
              
 		
              Default expression formatDefault expression format
 			Specifies the number system in which to display expressions (Natural, Hexadecimal, Decimal, or Binary).
 		
              
 		
              Default register formatDefault register format
 			Specifies the number system in which to display registers (Natural, Hexadecimal, Decimal, or Binary).
 		
              
 		
              Maximum number of displayed instructionsMaximum number of displayed instructions
 			The maximum number of assembler instructions displayed in the Disassembly view.
 		
              
 		
              Color of source linesColor of source lines
 			The color of source lines in the Disassembly view if mixed source/disassembly code is shown.
 		
              
 		
              Show source files in binaries Show source files in binaries 
 		  Show source files associated with project binaries. 
 	  
              
 	              
 
 
 
   
              @@ -25,8 +25,8 @@
     
-        
-        
+        
-        
-        
+        
+        
-        
+        
-        
+        
-        
+        
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dbg_view.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dbg_view.htm
index e0d24858e0a..de4b643cb4f 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dbg_view.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dbg_view.htm
@@ -14,7 +14,7 @@
 
 
              Debug view
              
 
-
              The Debug view shows the target debugging information in a tree hierarchy.
              
+
              The Debug view shows the target debugging information in a tree hierarchy.
              Debug view
              The number beside the thread label is a reference counter, not a 
 thread identification number (TID).
              
@@ -78,42 +78,42 @@ from Debug view.
              
-    
+    
-    
+    
-    
+    
-    
+    
-    
+    
-    
+    
@@ -121,48 +121,48 @@ debugging attached processes).
-    
+    
-    
+    
-    
+    
-    
+    
-    
+    
-    
+    
-    
+    
              The Debug view context menu commands   include:
              
     
-      Common Source Lookup Path Options 
+      Common Source Lookup Path Options 
     
     
       

     
       
              Add...
              Opens the Add Source dialog to insert a new source container of one of the following types:
              
+                      		Add...
              Opens the Add Source dialog to insert a new source container of one of the following types:
              
           
                
 		  
              • File System Directory
                • 
 		  
              • Path Mapping
                • 
@@ -37,19 +37,19 @@
         
              		
       
              
       
              Edit...Opens the Edit File System Directory dialog to modify the currently selected souce container.Edit...Opens the Edit File System Directory dialog to modify the currently selected souce container.
       
              
       
              RemoveRemove
         Remove the currently selected souce container.
       
              
       
              UpUp
         Move the currently selected source container higher in the list.
       
              
       
              DownDown
         Move the currently selected source container lower in the list.
       
              
                   
 
 
     
                    
              
         Remove all Terminated launches icon
         
                                		Remove All Terminated Launches Remove All Terminated Launches 
     Clears all terminated processes in Debug view
   
              
   
              
           
              
         Restart icon
         
                                		RestartRestart
     Starts a new debug session for the selected process
   
              
   
              
     
              
       Resume icon
     
                                		ResumeResume
     Select the Resume command to resume  execution of the currently suspended debug target.
   
              
   
              
     
              
       Suspend icon
     
                                		SuspendSuspend
     Select the Suspend command to halt  execution of the currently selected thread in a debug target.
   
              
   
              
           
              
         Terminate icon
         
                                		Terminate Terminate 
     Ends the selected debug session and/or process. The impact of this action depends on the type of the item selected in the Debug view.
   
              
   
              
           
              
         Disconnect icon
         
                                		DisconnectDisconnect
     Detaches the debugger from the selected process (useful for 
 debugging attached processes).
   
              
     
              
       Step Into icon
     
                                		Step Into Step Into 
     Select  to execute the current line, including any routines, and proceed to the next statement.
   
              
   
              
     
              
       Step Over icon
     
                                		Step Over Step Over 
     Select to execute the current line, following execution inside a routine.
   
              
   
              
     
              
       Step Return icon
     
                                		Step Return Step Return 
     Select to continue execution to the end of the current routine, then follow execution to the routine’s caller.
   
              
   
              
     
              
       Drop to Frame icon
     
                                		Drop to Frame Drop to Frame 
     Select the Drop to Frame command to re-enter the selected stack frame in the Debug view.
   
              
   
              
     
              
       Instruction Stepping Mode icon
     
                                		Instruction Stepping Mode Instruction Stepping Mode 
     Activate to enable instruction stepping mode to examine a program as it steps into disassembled code. 
   
              
   
              
     
              
       Use Step Filters icon
     
                                		Use Step Filters Use Step Filters 
     Select the Use Step Filters command to change whether step filters should be used in the Debug view.
   
              
   
              
     
              
     
                                		MenuMenu
     
              Use the Debug view menu to:
              
       
                
         
              • change the layout of debug view (tree vs. breadcrumb)
                • 
@@ -178,112 +178,112 @@ debugging attached processes).
              		
   
   
              
-      
-      
-      
+      
+      
+      
-      
+      
-      
+      
-      
+      
-      
+      
-      
+      
-      
+      
-      
+      
-      
+      
-      
+      
-      
+      
-      
+      
-      
+      
-      
+      
-      
+      
-      
+      
@@ -291,54 +291,54 @@ debugging attached processes).
-      
+      
-      
+      
-      
+      
-      
+      
-      
+      
-      
+      
-      
+      
-      
-      
+      
+      
              
     
              IconsNameDescriptionIconsNameDescription
     
              
     
              
       
              
         Copy Stack icon
       
                                  		Copy Stack Copy Stack 
       Copies the selected stack of suspended threads as well as the state of the running threads to the clipboard. 
     
              
     
              
       
              
       
                                  		Find...Find...
       Opens the debug view element searching dialog.
     
              
     
              
       
              
         Drop to Frame icon
       
                                  		Drop To Frame Drop To Frame 
       Select the Drop to Frame command to re-enter the selected stack frame in the Debug view.
     
              
     
              
                 
              
           Restart icon
               
                                  		RestartRestart
       Starts a new debug session for the selected process
     
              
     
              
                 
              
           Step Into icon
               
                                  		Step Into Step Into 
       Select  to execute the current line, including any routines, and proceed to the next statement.
     
              
     
              
                 
              
           Step Over icon
               
                                  		Step Over Step Over 
       Select to execute the current line, following execution inside a routine.
     
              
     
              
                 
              
           Step Return icon
               
                                  		Step Return Step Return 
       Select to continue execution to the end of the current routine, then follow execution to the routine’s caller.
     
              
     
              
               
              
           Instruction Stepping Mode icon
         
                                  		Instruction Stepping Mode Instruction Stepping Mode 
       Activate to enable instruction stepping mode to examine a program as it steps into disassembled code. 
     
              
     
              
               
              
         Use Step Filters icon
       
                                  		Use Step Filters Use Step Filters 
       Toggles step filters on/off. When on, all step functions apply step filters.
     
              
     
              
       
              
         Resume without signal icon
       
                                  		Resume Without Signal Resume Without Signal 
       Resume program execution after receiving the signal. 
     
              
     
              
                 
              
           Resume icon
               
                                  		ResumeResume
       Select the Resume command to resume  execution of the currently suspended debug target.
     
              
     
              
                 
              
           Suspend icon
               
                                  		SuspendSuspend
       Select the Suspend command to halt  execution of the currently selected thread in a debug target.
     
              
     
              
                 
              
           Terminate icon
               
                                  		Terminate Terminate 
       Ends the selected debug session and/or process. The impact of this action depends on the type of the item selected in the Debug view.
     
              
     
              
       
              
         Terminate and Relaunch icon
       
                                  		Terminate and Relaunch Terminate and Relaunch 
       Select the Terminate and Relaunch command to  terminate the selected debug target and then relaunch it.
     
              
     
              
                 
              
           Disconnect icon
               
                                  		DisconnectDisconnect
       Detaches the debugger from the selected process (useful for 
         debugging attached processes)
     
              
       
                        
              
           Remote all Terminated icon
               
                                  		Remove All Terminated Remove All Terminated 
       Clears all terminated processes in Debug view
     
              
     
              
       
              
         Relaunch icon
       
                                  		RelaunchRelaunch
       This command relaunches the selected debug target. 
     
              
     
              
       
              
       
                                  		Edit...Edit...
       Opens the launch configuration dialog, allowing you to make changes. 
     
              
     
              
       
              
         Edit Source Lookup icon
       
                                  		Edit Source Lookup... Edit Source Lookup... 
       Opens the source lookup dialog, allowing you to make changes. 
     
              
     
              
       
              
       
                                  		Lookup Source Lookup Source 
       Select  to force a source lookup to take place. 
     
              
     
              
       
              
         Terminate and Remove icon
       
                                  		Terminate and Remove Terminate and Remove 
       Terminates the selected debug target and removes it from the view. 
     
              
     
              
       
              
         Terminate all icon
       
                                  		Terminate All Terminate All 
       Terminates all active launches in the view. 
     
              
     
              
       
              
       
                                  		PropertiesOpens the Properties for window showing the process properties. PropertiesOpens the Properties for window showing the process properties. 
     
              
   
              
 
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_debug.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_debug.htm
index bbdccffa64c..1dd9229d80c 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_debug.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_debug.htm
@@ -11,7 +11,7 @@
 
 
              Debug page, Preferences window
              
 
-
              You can manipulate any of the common predefined debug settings by clicking Window > Preferences > C/C++ > Debug.
              
+
              You can manipulate any of the common predefined debug settings by clicking Window > Preferences > C/C++ > Debug.
              
 
 Debug Preferences
 
              
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dissassembly_view.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dissassembly_view.htm
index 4d38940d42a..5fd84e252d4 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dissassembly_view.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dissassembly_view.htm
@@ -11,7 +11,7 @@
 
 
              Disassembly view
              
 
-
              The Disassembly view shows the loaded program as assembler instructions mixed with source code for comparison. The currently executing line is indicated by an arrow marker and highlighted in the view. You can do the following tasks in the Disassembly view:
              
+
              The Disassembly view shows the loaded program as assembler instructions mixed with source code for comparison. The currently executing line is indicated by an arrow marker and highlighted in the view. You can do the following tasks in the Disassembly view:
              
 
                
   
              • Set breakpoints at the start of any assembler instruction
                • 
   
              • Enable and disable  breakpoints and their set their properties 
                • 
@@ -26,9 +26,9 @@
   
                The Disassembly view context menu commands   include:
                
   
-      
-      
-      
+      
+      
+      
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_environment_pref.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_environment_pref.htm
index c225628e207..b7693fc9a76 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_environment_pref.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_environment_pref.htm
@@ -12,11 +12,11 @@
 
 
                Environment  preferences
                
 
-
                Define environment variables and how they are used in the Environment preference panel. 
                
+
                Define environment variables and how they are used in the Environment preference panel. 
                Environment Preference
                
     
                Command
                Name
                Description
                Command
                Name
                Description
                		
     
                
     
                
       
                Run to line icon
                		
 
 
                @@ -24,36 +24,36 @@
 	
-			
+			
-			
-			
+			
+			
-			
-			
+			
+			
-		  
+		  
-		  
+		  
-		  
+		  
-		  
+		  
-		  
+		  
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_fileprop_discovery.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_fileprop_discovery.htm
index f8b71d95398..bd121c11c19 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_fileprop_discovery.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_fileprop_discovery.htm
@@ -20,7 +20,7 @@ of a C/C++ project's properties window.
                
 	
-	Environment Options
+	Environment Options
 	
 	
 		

 	
 		
                Environment variables to set Environment variables to set 
 			Shows a list of the environment variables and their value. 
 		
                
 		
                New...Click to open the New Variable dialog where you define the variable name and value. New...Click to open the New Variable dialog where you define the variable name and value. 
 		
                
 		
                Select...
                Click to open the Select variables dialog. 
                		                    		Select...
                Click to open the Select variables dialog. 
                		                    		
 		
                
 		
                Edit...Edit...
 		  Click to edit the currently selected variable and its value. 
 	  
                
 		
                RemoveRemove
 		  Click to remove the currently selected variable. 
 	  
                
 		
                UndefineUndefine
 		  
                Click to undefine the currently selected variable.
                
 	      
                NOTE: Some variables, like PATH, have special meaning and cannot be undefined. 
                		
 	  
                
 		
                Append variables to native environment Append variables to native environment 
 		  Activate this checkbox to append the variables to the native environment during execution. 
 	  
                
 		
                Replace native environment with specified one Replace native environment with specified one 
 		  Activate this checkbox to replace the native environment with these variables, restoring the native environment upon completion. 
 	  
                
 	                
 
 

                
-		
+		
                @@ -28,15 +28,15 @@ of a C/C++ project's properties window.
                
-			
+			
-			
+			
-			
+			
@@ -44,28 +44,28 @@ of a C/C++ project's properties window.
                
-			
-			
+			
+			
-			
+			
-			
-			
+			
+			
-			
+			
-			
-			
+			
-			
-			
+			
+			
                
 	Discovery optionsDiscovery options
 		
 	
 		

 	
 	 
 		
                ConfigurationConfiguration
 			Click here for a description.
 		
                
 		
                Manage configurationsManage configurations
 			Click here for a description.
 		
                
 		
                Exclude resource from buildExclude resource from build
 			Excludes the selected file from the build process.
 		
                
 		
                
 			Shows a list of language specific compilers. Select a language from the list.
 		
                
 		
                Automate discovery of paths and symbolsScans the build output to populate the path and symbol tables, such as symbol definitions, system include directories, local include directories, macros files, and include files. If this option is not selected, the Discovery profile options below do not appear.Automate discovery of paths and symbolsScans the build output to populate the path and symbol tables, such as symbol definitions, system include directories, local include directories, macros files, and include files. If this option is not selected, the Discovery profile options below do not appear.
 		
                
 				
                Report path detection problemsReport path detection problems
 			Sets the notification of diagnostic errors for include paths that the Eclipse CDT is unable to resolve as it parses the build output.
 		
                
 		
                Discovery profile optionsIndicates the discovery profile to use for paths and symbol detection. The type of Configuration and Discovery Profile Scope you specify determine what which Discovery Profile options display on this tab. This set of controls is profile-specific. It may vary from one profile to another.Discovery profile optionsIndicates the discovery profile to use for paths and symbol detection. The type of Configuration and Discovery Profile Scope you specify determine what which Discovery Profile options display on this tab. This set of controls is profile-specific. It may vary from one profile to another.
 		
                		
 		
                Enable generate scanner info commandEnable generate scanner info command
 			Enables the retrieval of information from the scanner. If it is not selected, the includes will be populated with default gcc system includes; Eclipse gathers the compiler settings based on the specified toolchain. This means that the Eclipse CDT can obtain the default gcc system includes to associate with the project. 
-				
                When selected, you can specify any required compiler specific commands in the Compiler invocation command field.
                
+				
                When selected, you can specify any required compiler specific commands in the Compiler invocation command field.
                
 			                		
 		
                
 		
                Compiler invocation commandIndicates the compiler specific command used to invoke the compiler (such as gcc, or more complicated commands used to perform all necessary steps for compiling C/C++ source files into .o files, and linking the object files and libraries into an executable program. For example, the command gcc -E -P -v hello.c | hello.cpp reads a compiler's configuration file and prints out information that includes the compiler's internally defined preprocessor symbols and include search paths. The information is complementary to the scanner configuration discovered when the output is parsed (if you've enabled the Enable build output scanner info discovery option), and is added to the project's scanner configuration. You can click Browse to locate this command, if required.
+			Compiler invocation commandIndicates the compiler specific command used to invoke the compiler (such as gcc, or more complicated commands used to perform all necessary steps for compiling C/C++ source files into .o files, and linking the object files and libraries into an executable program. For example, the command gcc -E -P -v hello.c | hello.cpp reads a compiler's configuration file and prints out information that includes the compiler's internally defined preprocessor symbols and include search paths. The information is complementary to the scanner configuration discovered when the output is parsed (if you've enabled the Enable build output scanner info discovery option), and is added to the project's scanner configuration. You can click Browse to locate this command, if required.
 			
-			
                Note: The parsing of build output for scanner information is compiler specific. For example, the GNU toolchain compilers (gcc and g++) use -I for include paths, and -D for symbol definitions. Consult your compiler specific documentation for more information about scanner information commands, such as the following gcc commands:
                
+			
                Note: The parsing of build output for scanner information is compiler specific. For example, the GNU toolchain compilers (gcc and g++) use -I for include paths, and -D for symbol definitions. Consult your compiler specific documentation for more information about scanner information commands, such as the following gcc commands:
                
      
                  
         
                • -D name
                  • 
         
                • -I
                  •      
@@ -84,8 +84,8 @@ of a C/C++ project's properties window.
                  
 			
                		
 		
                
 			
                BrowseClick to browse for a file to include in the compiler invocation command. This button is only visible when Configuration is set to Release and the Discovery Profiles Scope is set to Configuration-wide.BrowseClick to browse for a file to include in the compiler invocation command. This button is only visible when Configuration is set to Release and the Discovery Profiles Scope is set to Configuration-wide.
 		
                
 		                
 
                
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_fileprop_lang_mapp.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_fileprop_lang_mapp.htm
index 55a71cdd0ad..5a69e7a758d 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_fileprop_lang_mapp.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_fileprop_lang_mapp.htm
@@ -17,7 +17,7 @@
 
 @@ -25,15 +25,15 @@
 	
-			
+			
-		  
+		  
-			
+			
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_fileprop_lng.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_fileprop_lng.htm
index afc5a8a30e3..6071fe8e00e 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_fileprop_lng.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_fileprop_lng.htm
@@ -8,7 +8,7 @@
 
                C/C++ File Properties, Language mappings
                
-
                Customize the use of C/C++ language associations in the Language Mappings preference panel for individual files. 
                
+
                Customize the use of C/C++ language associations in the Language Mappings preference panel for individual files. 
                C/C++ Project Properties, Language mapping
                
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_fileprop_toolsettings.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_fileprop_toolsettings.htm
index 343c7316532..e079abf5178 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_fileprop_toolsettings.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_fileprop_toolsettings.htm
@@ -14,7 +14,7 @@ Customizes the tools and tool options used in your build configuration.
 
                
 	
-	Language Mappings Options
+	Language Mappings Options
 	
 	
 		

 	
 		
                Content Type Content Type 
 			The content type associated with the language. 
 		
                
 		
                ConfigurationConfiguration
 		  Shows the list of configurations for the selected content type. 
 	  
                
 	  		
                LanguageLanguage
 			Shows the list of corresponding languages associated with the configurations in the list for the specific content type. 
 		
                
 	                
 
 
 
 
 

                
-		
+		
                @@ -22,11 +22,11 @@ Customizes the tools and tool options used in your build configuration.
 	
-			
+			
-			
+			
@@ -39,7 +39,7 @@ Customizes the tools and tool options used in your build configuration.
 	
                
 	Tool Settings optionsTool Settings options
 		
 	
 		

 	 
 		
                ConfigurationConfiguration
 			Click here for a description.
 		
                
 		
                Manage configurationsManage configurations
 			Click here for a description.
 		
                
 		
                
 
                
 
                
-
                Available for: CDT source files
                
+
                Available for: CDT source files
                
 
 
                Related reference
 
 
                C/C++ Find/Replace
                
-
                Ctrl+F (or Edit > Find/Replace) displays the Find/Replace dialog.
+
                Ctrl+F (or Edit > Find/Replace) displays the Find/Replace dialog.
 Here you can specify text to search for and optionally text with which to replace it.
 
                
 
                Find and Replace Dialog Box
                
 
                You can specify:
                
 
                  
 
                • The direction (forward or back from the current cursor location)
                  • 
-
                • The scope (All for the whole file or Selected Lines to search only 
+
                • The scope (All for the whole file or Selected Lines to search only 
 within the highlighted area)
                  • 
-
                • Whether the search is Case Sensitive or Whole Word.
+
                • Whether the search is Case Sensitive or Whole Word.
 You can also specify whether the search wraps at the end of the file.
                  • 
 
                
 
-
                If you close the Find/Replace dialog with text in the Find field,
-you can use Ctrl+K (or Edit > Find Next) or 
-Ctrl+Shift+K (or Edit > Find Previous) to go to the next
+
                If you close the Find/Replace dialog with text in the Find field,
+you can use Ctrl+K (or Edit > Find Next) or 
+Ctrl+Shift+K (or Edit > Find Previous) to go to the next
 occurrence of that text.
 The directions for "Next" and "Previous" 
-are not affected by the Direction setting in the Find/Replace dialog.
+are not affected by the Direction setting in the Find/Replace dialog.
 
                
 
 
                Note: 
@@ -34,17 +34,17 @@ Wildcards are not currently supported for searches.
                
 
 
                Incremental Find
                
 
-
                You can also choose Incremental Find from the Find/Replace dialog.
-With this option selected, each letter you type in the Find field
+
                You can also choose Incremental Find from the Find/Replace dialog.
+With this option selected, each letter you type in the Find field
 causes the editor focus to move to the first complete occurrence of the text
 you are typing.
-You can also use incremental find by pressing Ctrl+J (Edit > Incremental Find). 
+You can also use incremental find by pressing Ctrl+J (Edit > Incremental Find). 
 In this case, the text you type appears in the Status Line at the bottom of
 the Eclipse window.
 
                
 
 
                Note: 
-The settings in the Find/Replace dialog do not affect the operation
+The settings in the Find/Replace dialog do not affect the operation
 of incremental find in the Status Line.
                
 
 
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_fprop_discovery.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_fprop_discovery.htm
index 43fa32d1fb3..6d72e48c54e 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_fprop_discovery.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_fprop_discovery.htm
@@ -20,7 +20,7 @@ of a C/C++ project's properties window.
                
 
 
                
-		
+		
                @@ -28,15 +28,15 @@ of a C/C++ project's properties window.
                
-			
+			
-			
+			
-			
+			
@@ -44,28 +44,28 @@ of a C/C++ project's properties window.
                
-			
-			
+			
+			
-			
+			
-			
-			
+			
+			
-			
+			
-			
-			
+			
-			
-			
+			
+			
                
 	Discovery optionsDiscovery options
 		
 	
 		

 	
 	 
 		
                ConfigurationConfiguration
 			Click here for a description.
 		
                
 		
                Manage configurationsManage configurations
 			Click here for a description.
 		
                
 		
                Exclude resource from buildExclude resource from build
 			Excludes the selected folder from the build process.
 		
                
 		
                
 			Shows a list of language specific compilers. Select a language from the list.
 		
                
 		
                Automate discovery of paths and symbolsScans the build output to populate the path and symbol tables, such as symbol definitions, system include directories, local include directories, macros files, and include files. If this option is not selected, the Discovery profile options below do not appear.Automate discovery of paths and symbolsScans the build output to populate the path and symbol tables, such as symbol definitions, system include directories, local include directories, macros files, and include files. If this option is not selected, the Discovery profile options below do not appear.
 		
                
 				
                Report path detection problemsReport path detection problems
 			Sets the notification of diagnostic errors for include paths that the Eclipse CDT is unable to resolve as it parses the build output.
 		
                
 		
                Discovery profile optionsIndicates the discovery profile to use for paths and symbol detection. The type of Configuration and Discovery Profile Scope you specify determine what which Discovery Profile options display on this tab. This set of controls is profile-specific. It may vary from one profile to another.Discovery profile optionsIndicates the discovery profile to use for paths and symbol detection. The type of Configuration and Discovery Profile Scope you specify determine what which Discovery Profile options display on this tab. This set of controls is profile-specific. It may vary from one profile to another.
 		
                		
 		
                Enable generate scanner info commandEnable generate scanner info command
 			Enables the retrieval of information from the scanner. If it is not selected, the includes will be populated with default gcc system includes; Eclipse gathers the compiler settings based on the specified toolchain. This means that the Eclipse CDT can obtain the default gcc system includes to associate with the project. 
-				
                When selected, you can specify any required compiler specific commands in the Compiler invocation command field.
                
+				
                When selected, you can specify any required compiler specific commands in the Compiler invocation command field.
                
 			                		
 		
                
 		
                Compiler invocation commandIndicates the compiler specific command used to invoke the compiler (such as gcc, or more complicated commands used to perform all necessary steps for compiling C/C++ source files into .o files, and linking the object files and libraries into an executable program. For example, the command gcc -E -P -v hello.c | hello.cpp reads a compiler's configuration file and prints out information that includes the compiler's internally defined preprocessor symbols and include search paths. The information is complementary to the scanner configuration discovered when the output is parsed (if you've enabled the Enable build output scanner info discovery option), and is added to the project's scanner configuration. You can click Browse to locate this command, if required.
+			Compiler invocation commandIndicates the compiler specific command used to invoke the compiler (such as gcc, or more complicated commands used to perform all necessary steps for compiling C/C++ source files into .o files, and linking the object files and libraries into an executable program. For example, the command gcc -E -P -v hello.c | hello.cpp reads a compiler's configuration file and prints out information that includes the compiler's internally defined preprocessor symbols and include search paths. The information is complementary to the scanner configuration discovered when the output is parsed (if you've enabled the Enable build output scanner info discovery option), and is added to the project's scanner configuration. You can click Browse to locate this command, if required.
 			
-			
                Note: The parsing of build output for scanner information is compiler specific. For example, the GNU toolchain compilers (gcc and g++) use -I for include paths, and -D for symbol definitions. Consult your compiler specific documentation for more information about scanner information commands, such as the following gcc commands:
                
+			
                Note: The parsing of build output for scanner information is compiler specific. For example, the GNU toolchain compilers (gcc and g++) use -I for include paths, and -D for symbol definitions. Consult your compiler specific documentation for more information about scanner information commands, such as the following gcc commands:
                
      
                  
         
                • -D name
                  • 
         
                • -I
                  •      
@@ -84,8 +84,8 @@ of a C/C++ project's properties window.
                  
 			
                		
 		
                
 			
                BrowseClick to browse for a file to include in the compiler invocation command. This button is only visible when Configuration is set to Release and the Discovery Profiles Scope is set to Configuration-wide.BrowseClick to browse for a file to include in the compiler invocation command. This button is only visible when Configuration is set to Release and the Discovery Profiles Scope is set to Configuration-wide.
 		
                
 		                
 
                
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_fprop_toolsettings.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_fprop_toolsettings.htm
index e7bfa6d9e47..15246c4c213 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_fprop_toolsettings.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_fprop_toolsettings.htm
@@ -18,7 +18,7 @@ Customizes the tools and tool options used in your build configuration.
 
 
                
-		
+		
                @@ -26,11 +26,11 @@ Customizes the tools and tool options used in your build configuration.
 	
-			
+			
-			
+			
@@ -43,7 +43,7 @@ Customizes the tools and tool options used in your build configuration.
 	
                
 	Tool settings optionsTool settings options
 		
 	
 		

 	 
 		
                ConfigurationConfiguration
 			Click here for a description.
 		
                
 		
                Manage configurationsManage configurations
 			Click here for a description.
 		
                
 		
                
 
                
 
                
-
                Available for: CDT projects, folders and source files
                
+
                Available for: CDT projects, folders and source files
                
 
 
                Related referenceDebug GDB MI page, Preferences window
 
-
                You can manipulate certain GDB timeout settings Window > Preferences > C/C++ > Debug > GDB MI.
                
+
                You can manipulate certain GDB timeout settings Window > Preferences > C/C++ > Debug > GDB MI.
                
 
 Debug GDB MI Preferences
 
                
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_icons.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_icons.htm
index 63cd9c58710..9202f4a3399 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_icons.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_icons.htm
@@ -18,8 +18,8 @@ END INFOPOP-->
 
 
-    
-    
+    
+    
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
-  
+  
+  
-  
-  
+  
+  
                
   
                IconDescriptionIconDescription
   
                
   
                
     
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_indexer_preference.html b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_indexer_preference.html
index b3fdfffacdc..eeed9ef85b2 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_indexer_preference.html
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_indexer_preference.html
@@ -8,13 +8,13 @@
 
 
 
                Indexer Preference page
                
-
                Use the Indexer preference page to select the indexer used by default for new projects and configure its behavior.
                
+
                Use the Indexer preference page to select the indexer used by default for new projects and configure its behavior.
                
 
                 Indexer Preferences Window
                
 
                
 @@ -22,55 +22,55 @@
   
-      
+      
-      
+      
-      
+      
-      
+      
-      
+      
-      
+      
-      
+      
-      
+      
-      
+      
-      
+      
-      
+      
-      
+      
-      
+      
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_language_mapping_pref.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_language_mapping_pref.htm
index 66b1726e3be..d741356d80b 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_language_mapping_pref.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_language_mapping_pref.htm
@@ -12,12 +12,12 @@
 
 
                Language Mappings preferences
                
 
-
                Customize the use of C/C++ language associations in the Language Mappings preference panel for the workspace. 
                
+
                Customize the use of C/C++ language associations in the Language Mappings preference panel for the workspace. 
                Language Mappings preferences
                
   
-  Indexer  Options
+  Indexer  Options
   
   
   

   
     
                Select Indexer Select Indexer 
       Select the indexer to use by default for all new projects. 
     
                
     
                Index all files (files neither built nor included, also) Index all files (files neither built nor included, also) 
       Activate this checkbox to index all files 
     
                
     
                Skip all references (Call Hierarchy and Search will not work) Skip all references (Call Hierarchy and Search will not work) 
       Activate this checkbox to not index references to save space and gain performance. This prevents some portions of CDT from working, like Call Hierarchy and search for references. 
     
                
     
                Skip type references (Search for type references will not work) Skip type references (Search for type references will not work) 
       Activate this checkbox to not index type references. This prevents some portions of CDT from working, like Search for type references. 
     
                
     
                Skip macro references (Search for macro references will not work) Skip macro references (Search for macro references will not work) 
       Activate this checkbox to not index macro references. This prevents some portions of CDT from working, like Search for macro references. 
     
                
     
                Files to index up-front Files to index up-front 
       Type a comma separated list of files that should always be indexed immediately. 
     
                
     
                Automatically update the index Automatically update the index 
       Activate this checkbox to have the index automatically update as it requires. 
     
                
     
                Update index immediately after every file change Update index immediately after every file change 
       Activate this checkbox to force an index update whenever a file is saved. 
     
                
     
                Use active build configuration Use active build configuration 
       Activate this checkbox to always use the active build configuration indexer settings to build the index. 
     
                
     
                Use the build configuration specified in the project's indexer settings Use the build configuration specified in the project's indexer settings 
       Activate this checkbox to always use the project's indexer settings to build the index. 
     
                
     
                Limit relative to the maximum heap size Limit relative to the maximum heap size 
       Specify the relative size limit the index can reach based on the maximum heap size. 
     
                
     
                Index database cache: Absolute limit Index database cache: Absolute limit 
       Specify the  maximum size the index database cache is limited to. 
     
                
     
                Header file cache: Absolute limit Header file cache: Absolute limit 
       Specify the  maximum size the header file cache is limited to. 
     
                
                   
 
 
 
                @@ -25,20 +25,20 @@
 	
-			
+			
-			
+			
-			
-			
+			
-		  
+		  
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_edit.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_edit.htm
index 7aa165581ff..ef597b5f797 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_edit.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_edit.htm
@@ -19,166 +19,166 @@
  	
-	
+	 
-	
+	
-	
+	
-	
+	
-	
+	
-	
+	
- 	
+ 	
- 	
+ 	
- 	
+ 	 	
-	
+	
-	
+	
-	
+	
- 	
+ 	
- 	
+ 	
- 	
+ 	
- 	
+ 	
- 	
+ 	
-  	
+  	
-  	
+  	
- 	
+ 	
- 	
+ 	
-	
+	
+			Window > Preferences > C/C++ > Editor > Templates and go to the Editor preference page 
+			Window > Preferences > C/C++ > Editor > Content Assist for configuring the behaviour of content assist.
- 	
+ 	
- 	
+ 	
- 	
+ 	
- 	
+ 	
- 	
+ 	
-	
+	
@@ -187,7 +187,7 @@
 
                
 
 
-
                Note:  Other Edit options are used with the JDT. Refer to the Java Development User Guide for details. 
                
+
                Note:  Other Edit options are used with the JDT. Refer to the Java Development User Guide for details. 
                
 IBM Copyright Statement
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_file.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_file.htm
index 223d32e1bf4..f37a94d8bbb 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_file.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_file.htm
@@ -19,115 +19,115 @@
  
                
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
-  
+  
+  
-  
-  
+  
+  
-  
+  
-  
+  
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_navigate.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_navigate.htm
index b14d55aead6..2632b30d7b1 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_navigate.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_navigate.htm
@@ -20,100 +20,100 @@
 
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
+For example, during a search this entry becomes Previous Match.
-
+
-
+
@@ -121,14 +121,14 @@ Editor only.
-
+
-
+
@@ -138,9 +138,9 @@ Editor only.
                
 	
-	Language Mappings  Options
+	Language Mappings  Options
 	
 	
 		

 	
 		
                Content Type Content Type 
 			The content type associated with the language. 
 		
                
 		
                LanguageLanguage
 			The language associated with the content type. 
 		
                
 		
                Add
                Click to show the Add Mapping dialog where you define the content type and language associated with it. 
                
+			                		Add
                Click to show the Add Mapping dialog where you define the content type and language associated with it. 
                
 		    
                Add Mapping dialog
                		
 		
                
 		
                RemoveRemove
 		  Click to remove the selected langauge mapping. 
 	  
                
 	
                Keyboard Shortcut
 
                
 
                UndoUndo
 	Revert the last change in the editor
  	 Ctrl+Z
 
                
 
 
                Redo Redo 
 	Revert an undone change
  	 Ctrl+Y
  
                
  
 
                CutCut
 	Copies the currently selected text or element to the clipboard and removes the element. On elements, the remove is not performed before the clipboard is pasted.
  	 Ctrl+X
 
                
 
 
                CopyCopy
 	Copies the currently selected text or elements to the clipboard
  	 Ctrl+C
 
                
 
 
                Paste Paste 
  	Paste the current content as text to the editor, or as a sibling or child element to the a currently selected element. 
  	 Ctrl+V
 
                
 
 
                Delete Delete 
  	Delete the current text or element selection.
  	 Delete
 
                
 
 
                Select AllSelect All
  	Select all the editor content..
  	 Ctrl+A
 
                
 
 
                Find / ReplaceFind / Replace
  	Open the Find / Replace dialog. Editor only.
  	 Ctrl+F
  
                
  
  
                Find NextFind Next
  	Finds the next occurrence of the currently selected text. Editor only.
  	 Ctrl+K
 
                
 
 
                Find PreviousFind Previous
  	Finds the previous occurrence of the currently selected text. Editor only.
  	 Ctrl+Shift+K
 
                
 
 
                Incremental Find NextIncremental Find Next
  	Starts the incremental find mode. After invocation, enter the search text as instructed in the status bar. Editor only.
  	 Ctrl+J
 
                
 
 
                Incremental Find PreviousIncremental Find Previous
  	Starts the incremental find mode. After invocation, enter the search text as instructed in the status bar. Editor only.
  	 Ctrl+Shift+J
 
                
 
   
                Add Bookmark...Add Bookmark...
  	Add a bookmark to the current text selection or selected element.
  	  
  
                
  
  
                Add Task...Add Task...
  	Add a user defined task to the current text selection or selected element. Alt+Enter Alt+Enter
  
                
  
 
                Add to working setAdd to working set
  	Add current resource to selected Working Set
  	 Ctrl+I
 
                
 
 
                Remove from working setRemove from working set
  	Remove current resource from Working Set
  	 Ctrl+Shift+I
 
                
  
 
                Smart Insert ModeSmart Insert Mode
  	Toggles editor's Smart Insert Mode
  	 Ctrl+Shift+Insert
 
                
 
 
                Show Tooltip DescriptionShow Tooltip Description
  	Displays tooltip description, where applicable.
  	F2
 
                
 
 
                Word CompletionWord Completion
  	Completes current word in editor.
  	Alt+/
 
                
 
 
                Quick fixQuick fix
  	Call quick fix dialog for selected warning/error.
  	 Ctrl+1
 
                
  
 
                Content AssistContent Assist
  	Opens a context assist dialog at the current cursor position to bring up Java code assist proposals and templates. See the Templates preference page for available templates 
-			Window > Preferences > C/C++ > Editor > Templates and go to the Editor preference page 
-			Window > Preferences > C/C++ > Editor > Content Assist for configuring the behaviour of content assist.
  	 Ctrl+Space
 
                
 
 
                Parameter HintsParameter Hints
  	Opens Parameter Hints dialog. Editor only
  	Ctrl+Shift+Space
 
                
 
 
 
                Shift RightShift Right
  	Shifts text Right. Editor only
  	 
 
                
 
 
                Shift LeftShift Left
  	Shifts text Right. Editor only
  	 
 
                
 
 
                FormatFormat
  	Formats text. Editor only
  	Ctrl+Shift+F
 
                
 
 
                Add IncludeAdd Include
  	Add include to current file. Editor only 
  	Ctrl+Shift+N
 
                
 
 
                Set Encoding... Set Encoding... 
  	Toggles the encoding of the currently shown text content.
  	 
  
                
 
 
                NameFunctionKeyboard Shortcut
                
 
  
                NewNew
   Create a new project, folder, or file.
   Alt+Shift+N
  
                
  
  
                Open File...Open File...
   Open existing file.
    
  
                
  
  
                CloseClose
   Close the current editor. 
   If the editor contains unsaved data, a save request dialog is shown.
   Ctrl+F4
  
                
  
  
                Close AllClose All
   Close all editors. 
   If editors contains unsaved data, a save request dialog will be shown.
   Ctrl+Shift+F4
  
                
  
  
                SaveSave
   Save the content of the current editor. 
   Disabled if the editor does not contain unsaved changes.
   Ctrl+S
  
                
  
  
                Save AsSave As
   Save the content of the current editor under a new name.
    
  
                
  
  
                Save AllSave All
   Save the content of the current editor. 
   Disabled if no editor contains unsaved changes.
   Ctrl+Shift+S
  
                
  
  
                RevertRevert
   Revert the content of the current editor back to the content of the saved file. 
   Disabled if the editor does not contain unsaved changes.
    
  
                
  
  
                MoveMove
   Move a resource.
    
  
                
  
  
                RenameRename
   Renames a resource.
   F2
  
                
  
  
                RefreshRefresh
   Refreshes the content of the selected element with the local file system.
   When launched from no specific selection, this command refreshes all projects.
   F5
  
                
 
  
                Convert Line Delimiters to (submenu)Convert Line Delimiters to (submenu)
   Changes line delimiters either to Windows, or UNIX, or Mac OS9 format.
    
  
                
   
  
                PrintPrint
   Prints the content of the current editor. Enabled when an editor has the focus.
   Ctrl+P
  
                
  
   
                Switch workspace...Switch workspace...
   Relaunches Eclipse with a new workspace.
    
  
                
   
  
                ImportOpens the Import dialog and shows all import wizards.ImportOpens the Import dialog and shows all import wizards.
    
  
                
  
  
                ExportOpens the Export dialog and shows all export wizards.ExportOpens the Export dialog and shows all export wizards.
    
  
                
  
  
                PropertiesProperties
   Opens the property pages of the select elements.
   Alt+Enter
  
                
  
  
                ExitExit
   Exit Eclipse
    
  
                
 
 
                Go IntoGo Into
 Sets the view input to the currently selected element.
  
 
                
 
 
                Go ToGo To
 
                  
-	
                • Back:  This command displays the hierarchy that was displayed immediately prior to the current display.  
+	
                • Back:  This command displays the hierarchy that was displayed immediately prior to the current display.  
 			For example, if you Go Into a resource, then the Back command in the resulting display returns the view to the same hierarchy from which you activated the Go Into command.  
 			This command is similar to the Back button in an HTML browser.
                  • 
-	
                • Forward:  This command displays the hierarchy that was displayed immediately after the current display.  
+	
                • Forward:  This command displays the hierarchy that was displayed immediately after the current display.  
 			For example, if you've just selected the Back command, then selecting the Forward command in the resulting display returns the view to the same hierarchy from which you activated the 
 			Back command.  This command is similar to the Forward button in an HTML browser.
                  • 
-	
                • Up one level:  This command displays the hierarchy of the parent of the current highest-level resource.
                  • 
-	
                • Resource: This command allows you to navigate quickly to a resource. For more information see the links to related tasks below.
                  • 
+	
                • Up one level:  This command displays the hierarchy of the parent of the current highest-level resource.
                  • 
+	
                • Resource: This command allows you to navigate quickly to a resource. For more information see the links to related tasks below.
                  • 
 
                
                 		
  
 
                
 
 
                Open Type HierarchyOpen Type Hierarchy
 Opens Type Hierarchy view for selected object
 F4
 
                
 
 
                Open Call HierarchyOpen Call Hierarchy
 Opens Call Hierarchy view for selected object
 Ctrl+Alt+H
 
                
 
 
                Open DeclarationOpen Declaration
 Opens Declaration for selected object (class, variable...)
 F3
 
                
 
 
                Toggle Source/HeaderToggle Source/Header
 Switches between source and corresponding header files.
  
 
                
 
 
                Open Element...Open Element...
 Brings up the Open Element selection dialog to open an element in the editor. This dialog shows all types existing in the workspace. 
 Ctrl+Shift+T
 
                
 
 
 
                Open ResourceOpen Resource
 This command displays a dialog that lets you select any resource in the workspace to open it in an editor.
 
 Ctrl+Shift+R
 
                
 
 
                Show InShow In
 This sub-menu is used to find and select the currently selected resource in another view. If an editor is active, these commands are used to select the resource currently being edited in another view.
 Ctrl+Shift+W
 
                
 
 
                Quick OutlineQuick Outline
 Displays outline view for current source file.
  
 
                
 
 
                NextThe "next" definition is based on where the focus is. For example, during a search this entry becomes Next Match.NextThe "next" definition is based on where the focus is. For example, during a search this entry becomes Next Match.
 Ctrl+.
 
                
 
 
                PreviousPrevious
 The "previous" definition is based on
 where the focus is.
-For example, during a search this entry becomes Previous Match.
 Ctrl+,
 
                
 
 
                Last Edit LocationLast Edit Location
 Moves the cursor to the line that contains the last edit.
 Editor only.
 Ctrl+Q
 
                
  
 
                Go to LineGo to Line
 Open a dialog where you can specify the line number 
 to which to move the cursor. 
 Editor only.
 
                
  
 
                BackBack
 Moves the focus to the previous file.
 Editor only.
 Ctrl+Q
 
                
  
 
                ForwardForward
 Returns the focus from the previous file.
 Editor only.
 Ctrl+Q
 
                
 
                
 
-
                Note: 
-Other Navigate options are used with the JDT.
-Refer to the Java Development User Guide for details.
+
                Note: 
+Other Navigate options are used with the JDT.
+Refer to the Java Development User Guide for details.
 
                
 
 
                
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_project.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_project.htm
index f3c147a0fb1..7b9a4995c19 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_project.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_project.htm
@@ -18,27 +18,27 @@
 
 
                NameFunctionKeyboard Shortcut
                
 
                Open ProjectOpen Project
   Shows a dialog that can be used to select a closed project and open it.
    
 
                
   
                Close ProjectClose Project
   Closes the currently selected projects.
    
 
                
 
                Build AllBuild All
   Builds all projects in the workspace. This is a full build; all files are built.
     Ctrl+B
 
                
 
                Build parallelBuild parallel
   Builds all (or selected) configurations of given project(s). Each configuration is built as separate parallel task.
      
 
                
 
                Build ConfigurationsBuild Configurations
   Submenu which allows to:
     
                  
       
                • Delete resource configurastion for file/folder
@@ -49,36 +49,36 @@
     
                		 
 
                
 
                Build ProjectBuild Project
   Builds the currently selected project. This is a full build; all files in the project are built. 
    
 
                
 
                Build Working SetBuild Working Set
   Builds the current working set.
    
 
                
 
                CleanClean
   Invokes the make clean defined in the makefile
    
 
                
 
                Build AutomaticallyBuild Automatically
   When checked, the CDT will perform a build whenever a file in a project is saved. You should turn this feature off for very large projects.
    
 
                
 
                Make TargetSubmenu wich allows create or build a target in the Make Targets view.Make TargetSubmenu wich allows create or build a target in the Make Targets view.
    
 
                
 
                PropertiesDisplays the Properties dialog. From that dialog you can display the properties of resources in Info, 
-	External Tools Builders, C/C++ Build (managed only) File Types, Indexer options, 
-	C/C++ Make Project (standard only), C/C++ Project Paths (standard only), 
-	Include Paths and Symbols (standard only), and Project References. PropertiesDisplays the Properties dialog. From that dialog you can display the properties of resources in Info, 
+	External Tools Builders, C/C++ Build (managed only) File Types, Indexer options, 
+	C/C++ Make Project (standard only), C/C++ Project Paths (standard only), 
+	Include Paths and Symbols (standard only), and Project References. 
    
 
                
 
                
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_refactor.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_refactor.htm
index e5b9dcea80f..3c8791fd7e2 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_refactor.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_refactor.htm
@@ -18,7 +18,7 @@
 
 
              NameFunctionKeyboard Shortcut
              
 
              Rename...Rename...
   Renames selected object (variable, method, etc...) and propagates changes to other files in project.
   Alt+Shit+R
 
              
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_run.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_run.htm
index 6e8f8dcb587..7b4feabe4b5 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_run.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_run.htm
@@ -18,55 +18,55 @@
  
              NameFunctionKeyboard Shortcut
              
 
  
              RunRun
    This command allows you to quickly repeat the most recent launch in run mode.
   Ctrl+F11
  
              
  
  
              DebugDebug
    This command allows you to quickly repeat the most recent launch in debug mode.
   F11
  
              
  
  
              Run HistoryRun History
    Presents a sub menu of the recent history of launch configurations launched in run mode.
    
  
              
  
   
              Run AsRun As
   Presents a sub menu of registered run launch shortcuts. Launch shortcuts provide support for workbench or active editor selection sensitive launching.
    
  
              
  
  
              Open Run Dialog...Open Run Dialog...
   This command realizes the launch configuration dialog to manage run mode launch configurations. 
    
  
              
  
  
              Debug HistoryDebug History
   Presents a sub menu of the recent history of launch configurations launched in debug mode.
    
  
              
  
  
              Debug AsDebug As
   Presents a sub menu of registered debug launch shortcuts. Launch shortcuts provide support for workbench or active editor selection sensitive launching.
    
  
              
  
  
              Open Debug Dialog...Open Debug Dialog...
   This command realizes the launch configuration dialog to manage debug mode launch configurations.
    
  
              
  
  
              External ToolsExternal Tools
   Presents a sub menu of links to external run configuration dialogs to manage run mode launch configurations.
    
  
              
 
  
 
              Keyboard Shortcut 
 
               
 
              C/C++...C/C++...
 	Opens the search dialog on the C/C++ search page
 	 
 
              
 
              Search...Search...
 	Opens the search dialog for your current editor
 	Ctrl + H  
 
               
 
              File...File...
 	Opens the search dialog on the File search page
 	 
  
              
 
              TextText
 	Opens the submenu for full-text search in given scope (workspace, project, file or working set)
 	 
  
              NameFunctionKeyboard Shortcut
              
 
 	
              New WindowNew Window
 		Opens new Window 
 		 
 	
              
 
 	
              New EditorNew Editor
 		This command opens a new empty editor in this Workbench window. 
 		 
 	
              
 
 	
              Open PerspectiveOpen Perspective
 		This command opens a new perspective in this Workbench window. 
-				This preference can be changed in the Window > Preferences > Workbench > Perspectives page. 
+				This preference can be changed in the Window > Preferences > Workbench > Perspectives page. 
 				All of the perspectives that are open within the Workbench window are shown on the shortcut bar. 
 				The perspectives you will likely want to open are listed first.This list is dependent on the current perspective. 
-				From the Other... submenu you can open any perspective.
 		 
 	
              
 	
              Show ViewShow View
 		This command displays the selected view in the current perspective. 
-				You can configure how views are opened in the Window > Preferences > Workbench > Perspectives page. 
+				You can configure how views are opened in the Window > Preferences > Workbench > Perspectives page. 
 				Views you are likely to want to open are listed first.This list is dependent on the current perspective. 
-				From the Other... submenu you can open any view. 
+				From the Other... submenu you can open any view. 
 				The views are sorted into categories in the Show View dialog.
 		 
 	
              
 
 	
              Customize PerspectiveCustomize Perspective
 		Each perspective includes a predefined set of actions that are accessible from the menu bar and Workbench toolbar.
 				Related actions are grouped into action sets. 
 				This command allows you to customize the current perspective by showing or hiding various action sets. 
-				The first three (File > New, Window > Open Perspective, Window > Show View) control which actions appear as top level items in their respective menus. 
-				The last category (Other) controls which action sets are visible in the perspective.
 		 
 	
              
 
 	
              Save Perspective AsSave Perspective As
 		This command allows you to save the current perspective, creating your own custom perspective. 
-				You can open more perspectives of this type using the Window > Open Perspective > Other menu item once you have saved a perspective.
 		 
 	
              
 
 	
              Reset PerspectiveReset Perspective
 		This command changes the layout of the current perspective to its original configuration.
 		 
 	
              
 
 	
              Close PerspectiveClose Perspective
 		This command closes the active perspective.
 		 
 	
              
 
 	
              Close All PerspectivesClose All Perspectives
 This command closes all open perspectives in the Workbench window.
 		 
 	
              
 
 	
              NavigationNavigation
 		This submenu contains shortcut keys for navigating between the views, perspectives, and editors in the Workbench window.
 		
                
-			
              • Show System Menu: Shows the menu that is used for resizing, closing or pinning the current view or editor.
                • 
-			
              • Show View Menu: Shows the drop down menu that is available in the toolbar of the active view.
                • 
-			
              • Maximize Active View or Editor: Maximizes the current view or editor to fill the workbench.
                • 
-			
              • Activate Editor: Makes the current editor active.
                • 
-			
              • Next Editor: Activates the next open editor in the list of most recently used editors.
                • 
-			
              • Previous Editor: Activates the previous open editor in the list of most recently used editors.
                • 
-			
              • Next View: Activates the next open view in the list of most recently used views.
                • 
-			
              • Previous View: Activates the previous open view in the list of most recently used views.
                • 
-			
              • Next Perspective: Activates the next open perspective in the list of most recently used perspectives.
                • 
-			
              • Previous Perspective: Activates the previous open perspective in the list of most recently used perspectives.
                • 
+			
              • Show System Menu: Shows the menu that is used for resizing, closing or pinning the current view or editor.
                • 
+			
              • Show View Menu: Shows the drop down menu that is available in the toolbar of the active view.
                • 
+			
              • Maximize Active View or Editor: Maximizes the current view or editor to fill the workbench.
                • 
+			
              • Activate Editor: Makes the current editor active.
                • 
+			
              • Next Editor: Activates the next open editor in the list of most recently used editors.
                • 
+			
              • Previous Editor: Activates the previous open editor in the list of most recently used editors.
                • 
+			
              • Next View: Activates the next open view in the list of most recently used views.
                • 
+			
              • Previous View: Activates the previous open view in the list of most recently used views.
                • 
+			
              • Next Perspective: Activates the next open perspective in the list of most recently used perspectives.
                • 
+			
              • Previous Perspective: Activates the previous open perspective in the list of most recently used perspectives.
                • 
 		
              
 		              		 
 	
              
 
 	
              Working setsWorking sets
 		Dialog displayed to edit working sets
 		 
 	
              
 
 	
              PreferencesPreferences
 		This command allows you to indicate your preferences for using the Workbench.  	
 				There are a wide variety of preferences for configuring the appearance of the Workbench and its views, and for customizing the behavior of all tools that are installed in the Workbench.
 				See the C/C++ Page Preference Window section for more details on the CDT preferences.
 
 
 
              
-	
+	
-			
+			
-			
+			
-			
-			
+			
+			
-			
+			
-			
+			
-			
+			
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_makefile_settings_pref.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_makefile_settings_pref.htm
index 12322ddfe11..70dd16921d9 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_makefile_settings_pref.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_makefile_settings_pref.htm
@@ -12,40 +12,40 @@
 
 
              Makefile Editor preferences
              
 
-
              Use the Makefile Editor preference panel in the Preferences window to set syntax and folding options for the Makefile editor.
              
+
              Use the Makefile Editor preference panel in the Preferences window to set syntax and folding options for the Makefile editor.
              Makefile Editor Syntax tab
              Settings Preference OptionsSettings Preference Options
 	
 		
 		
 	
 	
 		
              Posix MakePosix Make
 			Enable to generate makefiles that are POSIX Make compatible.
 		
              
 		
              GNU MakeGNU Make
 			Enable to generate makefiles that are GNU Make compatible.
 		
              
 		
              New...Opens the Browse for Folder dialog to select a directory.New...Opens the Browse for Folder dialog to select a directory.
 		
              
 		
              RemoveRemove
 			Click to remove the currently selected directory from the Makefile include directories list.
 		
              
 		
              UpUp
 			Click to move the currently selected directory up in the list.
 		
              
 		
              DownDown
 			Click to move the currently selected directory down in the list.
 		
              
 	              
 
 
 
              
-	
+	
-			
+			
-			
-			
+			
+			
-			
-			
+			
+			
              Makefile Editor Syntax OptionsMakefile Editor Syntax Options
 	
 		
 		
 	
 	
 		
              ColorColor
 			Click to set the selected syntax item to a specific color.
 		
              
 		
              BoldIf enabled, set the selected syntax item to bold.BoldIf enabled, set the selected syntax item to bold.
 		
              
 		
              ItalicIf enabled, set the selected syntax item to italic.ItalicIf enabled, set the selected syntax item to italic.
 		
              
 	              
 
              
 
              Makefile Editor Folding tab
              
 
-	
+	
-			
+			
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_memoryview.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_memoryview.htm
index 2ccffd2c883..d074b5af909 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_memoryview.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_memoryview.htm
@@ -13,17 +13,17 @@
 
 
              Memory view
              
 
-
              The Memory view of the Debug
+
              The Memory view of the Debug
 perspective lets you monitor and modify your process memory. The process memory
-is presented as a list of so called memory monitors. Each monitor represents
-a section of memory specified by it's location called base address. Each
-memory monitor can be displayed in different predefined data formats -- memory
-renderings. The debugger supports five rendering types -- hexadecimal
-(default), ascii, signed integer and unsigned integer. The
+is presented as a list of so called memory monitors. Each monitor represents
+a section of memory specified by it's location called base address. Each
+memory monitor can be displayed in different predefined data formats -- memory
+renderings. The debugger supports five rendering types -- hexadecimal
+(default), ascii, signed integer and unsigned integer. The
 default rendering is displayed automatically on the monitor creation.
              Memory View
              The Memory view contains two
-panes -- the Memory Monitors pane and the Memory Renderings pane. The
+panes -- the Memory Monitors pane and the Memory Renderings pane. The
 Memory Monitors pane displays the list of memory monitors added to the debug
 session currently selected in the Debug view. The content of the Memory
 Renderings pane is controlled by the selection in the Memory Monitors pane and
@@ -34,9 +34,9 @@ configured to display two renderings simultaneously.
              The table below lists the icons displayed in the Memory view toolbar.
              Makefile Editor Folding Tab OptionsMakefile Editor Folding Tab Options
 	
 		
 		
 	
 	
 		
              Enable folding when opening a new editorEnable folding when opening a new editor
 			If enabled, activate folding when a new Makefile editor is opened.
 		
              
 	              
 
 
 
 
              
-    
-    
-    
+    
+    
+    
@@ -78,9 +78,9 @@ configured to display two renderings simultaneously.
              
@@ -93,9 +93,9 @@ configured to display two renderings simultaneously.
              The Monitors pane context menu inside the Memory view  includes:
              
   
              Command
              Name
              Description
              Command
              Name
              Description
              		
   
              
   
              
     
              New Memory View icon
              		
     Menu > Preferences 
     
              Opens the Preferences window allowing you to set:
              
       
                
-	  
              • Reset Memory Monitor - set to reset only visible or all renderings when reseting a memory monitor 
                • 
-	  
              • Padded String - enter strings to show unretrievable memory 
                • 
-	  
              • Select Codepages - specify the standard to convert memory to ASCII and EBCDIC strings 
                • 
+	  
              • Reset Memory Monitor - set to reset only visible or all renderings when reseting a memory monitor 
                • 
+	  
              • Padded String - enter strings to show unretrievable memory 
                • 
+	  
              • Select Codepages - specify the standard to convert memory to ASCII and EBCDIC strings 
                • 
     
                
              
   
              
      
   
   
              
-      
-      
-      
+      
+      
+      
@@ -118,9 +118,9 @@ configured to display two renderings simultaneously.
              The Rendering pane context menu inside the Memory view  includes:
              
     
              Command
              Name
              Description
              Command
              Name
              Description
              		
     
              
     
              
       
              Add Memory Monitor icon
              		
   
   
              
-      
-      
-      
+      
+      
+      
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_modules_view.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_modules_view.htm
index d3e3854e0db..2a081adbc14 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_modules_view.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_modules_view.htm
@@ -14,7 +14,7 @@
 
 
              Modules view
              
 
-
              The Modules view of the Debug
+
              The Modules view of the Debug
 perspective lets you view information about the modules loaded in the current
 debug session, including executables and shared libraries. The view consists
 of two areas: the modules tree and the detail pane. The detail pane displays
@@ -30,9 +30,9 @@ source files, etc.
              
     
              Command
              Name
              Description
              Command
              Name
              Description
              		
     
              
     
              
       
              Add Rendering icon
              		
 
 
              
-  
-  
-  
+  
+  
+  
@@ -47,9 +47,9 @@ source files, etc.
              
 
              CommandNameDescriptionCommandNameDescription
 
              
 
              
   Load Symbols for all modules icon
 
 
              
-  
-  
-  
+  
+  
+  
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_navigator_view.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_navigator_view.htm
index 62b54a3d294..360d11ab897 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_navigator_view.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_navigator_view.htm
@@ -23,24 +23,24 @@
 	 
-		
+		
-		
+		
-	
+	
+			 Go Into command. The hover help for this button tells you where it will take you. This command is similar to the Back button in a web browser.
-		
+		
-		
+		
-		
+		
-		
+		
-		
+		
-      
+      
-      
+      
-      
+      
-      
+      
-      
+      
-      
+      
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_name.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_name.htm
index 3ffdd0438f9..90879eb5ad5 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_name.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_name.htm
@@ -9,8 +9,8 @@
 
              New Project Wizard - Select Name and Location
              Select a name for the project. You can also enter a new path for
-your project by deselecting the Use Default Location checkbox
-and entering the new path in the Location text box.
              
+your project by deselecting the Use Default Location checkbox
+and entering the new path in the Location text box.
              New Project Wizard - Select Name and Location
              
@@ -21,17 +21,17 @@ and entering the new path in the Location text box.
              
-      
+      
-      
+      
-      
-      
+      
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_toolchain.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_toolchain.htm
index 2e0f107a101..65d4bb05d8c 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_toolchain.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_toolchain.htm
@@ -22,11 +22,11 @@
       
-      
+      
-      
+      
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_type.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_type.htm
index 0763656e00e..715bfd8fc53 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_type.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_type.htm
@@ -19,15 +19,15 @@
       
-      
+      
-      
+      
+        If unchecked, lists all known project types in the Project
+        Type list.
              
 
              CommandNameDescriptionCommandNameDescription
 
              
 
              
   load symbols for all icon
              
 	
              
 		Minimize iconMinimizeMinimize
 		Minimizes the Navigator view.
 	
              
 	
              
 		Maximize iconMaximizeMaximize
 		Maximizes the Navigator view.
 	
              
 	
              
 	Back IconBackBack
 	This command displays the hierarchy that was displayed immediately prior to the current display. 
 			For example, if you Go Into a resource, then the Back command in the resulting display returns the view to the same hierarchy from which you activated the
-			 Go Into command. The hover help for this button tells you where it will take you. This command is similar to the Back button in a web browser.
 	
              
 	
              
 		Forward IconForwardForward
 		This command displays the hierarchy that was displayed immediately after the current display. 
 				For example, if you've just selected the Back command, then selecting the Forward command in the resulting display returns the view to the same hierarchy from which you activated the Back command. The
 				hover help for this button tells you where it will take you.
@@ -48,36 +48,36 @@
 	
              
 	
              
 	Up IconUpUp
 		This command displays the hierarchy of the parent of the current highest level resource. The hover help for this button tells you where it will take you.
 	
              
 	
              
 		Collapse All IconCollapse AllCollapse All
 		This command collapses the tree expansion state of all resources in the view.
 	
              
 	
              
 		Link with Editor IconLink with EditorLink with Editor
 		This command toggles whether the Navigator view selection is linked to the active editor. 
 				When this option is selected, changing the active editor will automatically update the Navigator selection to the resource being edited.
 	
              
 	
              
 		Menu IconMenuMenu
 		Click the black upside-down triangle icon to open a menu of items specific to the Navigator view.

              
 									
              
 										
              Select Working Set
              
-											
              Opens the Select Working Set dialog to allow selecting a working set for the Navigator view.
              
+											
              Opens the Select Working Set dialog to allow selecting a working set for the Navigator view.
              
 										
              Deselect Working Set
              
 											
              Deselects the current working set. 
              
 										
              Edit Active Working Set
              
-											
              Opens the Edit Working Set dialog to allow changing the current working set.
              
+											
              Opens the Edit Working Set dialog to allow changing the current working set.
              
 										
              Sort
              
 											
              This command sorts the resources in the Navigator view according to the selected schema:
              
 												
                
-													
              • By Name:  Resources are sorted alphabetically, according to the full name of the resource (e.g., A.TXT, then B.DOC, then C.HTML, etc.)
                • 
-													
              • By Type:  Resources are sorted alphabetically by file type/extension (e.g., all DOC files, then all HTML files, then all TXT files, etc.).
                • 
+													
              • By Name:  Resources are sorted alphabetically, according to the full name of the resource (e.g., A.TXT, then B.DOC, then C.HTML, etc.)
                • 
+													
              • By Type:  Resources are sorted alphabetically by file type/extension (e.g., all DOC files, then all HTML files, then all TXT files, etc.).
                • 
 												
              
 										
              Filters
              
 											
              This command allows you to select filters to apply to the view so that you can show or hide various resources as needed. 
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz.htm
index 0dc48e61b75..d1a13aa369c 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz.htm
@@ -8,18 +8,18 @@
 	
 
 
              New Project Wizard
              
-
              The New Project wizard helps you create a new C or C++ project in the workbench.
+
              The New Project wizard helps you create a new C or C++ project in the workbench.
 To access the wizard, from the menu bar select
-File > New > Project.
-The New Project wizard appears:
+File > New > Project.
+The New Project wizard appears:
 
              
 
 
              New Project Wizard
              
 
-
              With the New Project wizard you can choose to:
              
+
              With the New Project wizard you can choose to:
              
 
                
-
              • Create C Project
                • 
-
              • Create C++ Project
                • 
+
              • Create C Project
                • 
+
              • Create C++ Project
                • 
 
              
 
              
 You can either provide your makefile to build new project, 
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_config.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_config.htm
index cf2cba66045..422aeb4cad6 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_config.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_config.htm
@@ -19,30 +19,30 @@
       
              		Function
     
              
     
              Project typeProject type
       Selected project type.
     
              
     
              Tool-chainsTool-chains
       One or more selected tool chains
     
              
     
              ConfigurationsConfigurations
       List of all build configurations to be created. 
           Check items you want to create. 
           At least one configuration must be checked.
       
     
              
     
              Select allSelect all
       Checks all configurations
     
              
     
              Deselect allDeselect all
       Unchecks all configurations
     
              
     
              Advanced settings ...Advanced settings ...
       Displays properties dialog for new project.
     
              
                 
 
 
 
 
       
              Function
     
              
     
              NameName
       Specifies the name of the project.
     
              
     
              Use Default LocationUse Default Location
       When selected, creates the new project in the default
 workspace location.
     
              
     
              LocationIf Use Default Location is not selected, specifies
+      LocationIf Use Default Location is not selected, specifies
 the location where the project is to be created.
     
              
   
              Function
     
              
     
              ToolchainToolchain
       Specifies toolchains available for selected project type.
     
              
     
              Show Project Types and toolchains only if they are supported on the platformShow Project Types and toolchains only if they are supported on the platform
       When selected (default), the list is filtered so that only toolchains
         that are buildable on the host system are shown.
              
         If it is not selected, the list displays all known toolchains.              		Function
     
              
     
              Project TypeProject Type
       Specifies a project type from the list provided.
     
              
     
              Show Project Types and toolchains only if they are supported on the platformShow Project Types and toolchains only if they are supported on the platform
       If checked (default), list is filtered so that only project
 types that are buildable on the host system are shown.
              
-        If unchecked, lists all known project types in the Project
-        Type list.              		
     
              
                 
 
              
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_behavior.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_behavior.htm
index 9818189b37e..d59ab67aa4d 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_behavior.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_behavior.htm
@@ -10,11 +10,11 @@
 
 
 
              Makefile Project - Behavior page
              
-
              You can define build behavior on the Behavior page of the Makefile Project panel in the  Preferences window.
              
+
              You can define build behavior on the Behavior page of the Makefile Project panel in the  Preferences window.
              
 
              Makefile project - behavior page
              
 @@ -22,35 +22,35 @@
   
-      
+      
-      
+      
-      
+      
-      
+      
-      
+      
-      
-      
+      
+      
-      
+      
-      
+      
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_buildset.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_buildset.htm
index faf99a3bbc7..f09aabcf822 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_buildset.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_buildset.htm
@@ -10,11 +10,11 @@
 
              Makefile Project - Builder Settings page
              
-
              You can define build settings on the Builder Settings page of the Makefile Project preference panel in the  Preferences window.
              
+
              You can define build settings on the Builder Settings page of the Makefile Project preference panel in the  Preferences window.
              Make Builder Preferences window
              
   
-  Makefile Project - Behavior options
+  Makefile Project - Behavior options
   
   
   

   
     
              Stop on first build error Stop on first build error 
       Stops the build when an error occurs.
     
              
     
              Use parallel build Use parallel build 
       Activate to generate parallel builds. 
     
              
     
              Use optimal jobs number Use optimal jobs number 
       Activate to let the system determine the optimal number of parallel jobs to perform. 
     
              
     
              Use parallel jobs Use parallel jobs 
       Set the maximum number of parallel jobs to perform. 
     
              
     
              Build on resource save (Auto build) Build on resource save (Auto build) 
       Defines what the standard builder will call when a file is saved, it is not recommended to enable Auto Build for C/C++ projects.
     
              
     
              Make build target Define what the standard builder will call by default when told to build, rebuild, clean, etc.  You can change these so that new projects will use different targets if the defaults are not appropriate. Click Variables to open the Select build variable dialog. Make build target Define what the standard builder will call by default when told to build, rebuild, clean, etc.  You can change these so that new projects will use different targets if the defaults are not appropriate. Click Variables to open the Select build variable dialog. 
     
              
     
              Build (Incremental build) Build (Incremental build) 
       Defines what the standard builder will call when an incremental build is performed.
     
              
     
              CleanClean
       Defines what the standard builder will call when a clean is performed.
     
              
                 
 
 
 
 
              @@ -22,28 +22,28 @@
   
-      
+      
-      
+      
-      
-      
+      
+      
-      
+      
-      
+      
-      
-      
+      
+      
              
   
-  Makefile Project - Builder Settings options
+  Makefile Project - Builder Settings options
   
   
   

   
     
              Builder type Builder type 
       Select the type of builder used by the project. 
     
              
     
              Use default build command Use default build command 
       Select this checkbox to use the default make command. Clear the check box to specify a new make command.
     
              
     
              Build command If you clear the Use default build command checkbox type a new make command in this field.Build command If you clear the Use default build command checkbox type a new make command in this field.
     
              
     
              Generate Makefiles automatically Generate Makefiles automatically 
       Activate to generate makefiles automatically during a build operation. 
     
              
     
              Expand Env. Variable Refs in Makefiles Expand Env. Variable Refs in Makefiles 
       Activate to expand environment variable references in the generated makefile. 
     
              
     
              Build directory Type the build directory path, or click Workspace, File system, or Variables to specify the build directory. Build directory Type the build directory path, or click Workspace, File system, or Variables to specify the build directory. 
     
              
                 
 
              
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_discovery_options.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_discovery_options.htm
index 14fccaf9f15..4884c53fc85 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_discovery_options.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_discovery_options.htm
@@ -11,11 +11,11 @@
 
 
              Makefile Project - Discovery Options page
              
 
-
              You can configure various options for the scanner configuration on the Discovery Options page of the Makefile Project panel in the Preferences window.
              
+
              You can configure various options for the scanner configuration on the Discovery Options page of the Makefile Project panel in the Preferences window.
              
 
              Makefile project - discovery options page
              
 @@ -23,36 +23,36 @@
   
-      
+      
-      
+      
-      
+      
-      
+      
-      
+      
-      
-      
+      
+      
-      
+      
-      
-      
+      
+      
              
   
-  Makefile Project - Discovery Options page
+  Makefile Project - Discovery Options page
   
   
   

   
     
              Discovery profiles scope Discovery profiles scope 
       Define the scope as configuration-wide or per language for this profile. 
     
              
     
              Automate discovery of paths and symbolsAutomate discovery of paths and symbols
       Activate this checkbox to scan the build output to populate the paths and symbol tables.
     
              
     
              Report path detection problems Report path detection problems 
       Activate this checkbox to report all path detection problems. 
     
              
     
              Discovery profile Discovery profile 
       Select the discovery profile to use for paths and symbol detection. 
     
              
     
              Enable build output scanner info discovery Enable build output scanner info discovery 
       Activate this checkbox to configure the scanner to parse the output from a build.
     
              
     
              Local build output from file Click Browse to select a file from disk or click Variables to open the Select Variables window to define the build output file. Local build output from file Click Browse to select a file from disk or click Variables to open the Select Variables window to define the build output file. 
     
              
     
              Enable generate scanner info command Enable generate scanner info command 
       Activate this checkbox to specify  use of the default scanner information command
     
              
     
              Compiler invocation command Type the command that invokes the compiler, for example: gcc, or click Browse to locate it. Compiler invocation command Type the command that invokes the compiler, for example: gcc, or click Browse to locate it. 
     
              
                 
 
              
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_parser_binary.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_parser_binary.htm
index e9fdf8c6e4e..146e321dc6e 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_parser_binary.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_parser_binary.htm
@@ -12,11 +12,11 @@
 
 
              Makefile Project - Binary Parsers page
              
 
-
              You can view a list of binary parsers on the Binary Parser page of the Makefile Project preference panel in the Preferences window.
              
+
              You can view a list of binary parsers on the Binary Parser page of the Makefile Project preference panel in the Preferences window.
              
 
              Binary Parser Preferences Window
              
 @@ -24,19 +24,19 @@
   
-      
+      
-      
+      
-      
+      
-      
+      
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_parser_error.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_parser_error.htm
index 13ef0e2d64f..d6eb90d6e20 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_parser_error.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_parser_error.htm
@@ -12,12 +12,12 @@
 
 
              Makefile Project - Error Parsers page 
              
 
-
              You can view a list of the filters that detect error patterns in the build output log, on the Error Parsers page of the Makefile Project panel in the Preferences window.
              
+
              You can view a list of the filters that detect error patterns in the build output log, on the Error Parsers page of the Makefile Project panel in the Preferences window.
              Make Error Parser Preferences Dialog Box
              
   
-  Makefile Project - Binary Parsers options
+  Makefile Project - Binary Parsers options
   
   
   

   
     
              Binary ParserBinary Parser
       Select binary parsers from the list, and changed the order in which they are used.
     
              
     
              Move Up Move Up 
       Moves the selected binary parser higher in the list.
     
              
     
              Move Down Move Down 
       Moves the selected binary parser lower in the list.
     
              
     
              Binary Parser OptionsBinary Parser Options
       If a binary parser has parser options you can define them in this section.
     
              
                 
 
 
 
              @@ -25,23 +25,23 @@
   
-      
+      
-      
+      
-      
+      
-      
+      
-      
+      
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_outline_view.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_outline_view.htm
index 8beb6c8307b..1c0ff3fa9f9 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_outline_view.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_outline_view.htm
@@ -23,8 +23,8 @@ open in the editor area, by listing the structural elements. 
              
   
-  Makefile Project - Error Parser options
+  Makefile Project - Error Parser options
   
   
   

   
     
              Error ParsersError Parsers
       Lists the various error parsers which can be enabled or disabled.
     
              
     
              Move Up Move Up 
       Moves the selected error parser higher in the list.
     
              
     
              Move Down Move Down 
       Moves the selected error parser lower in the list.
     
              
     
              Check All Check All 
       Selects all error parsers.
     
              
     
              Uncheck All Uncheck All 
       Clears all error parsers.
     
              
                 
 
 
              
-  
-  
+  
+  
@@ -51,8 +51,8 @@ open in the editor area, by listing the structural elements. 
              
 
              IconDescriptionIconDescription
 
              
 
              
   Hide Fields Icon
 
 
              
-    
-    
+    
+    
-		
+		
-		
+		
-		
+		
-		
+		
-		
+		
+		
              @@ -24,31 +24,31 @@ you specify which tools the builder needs to include when it builds the project
 	
-			
+			
-			
+			
-			
+			
-			
+			
-			
-			
+			
+			
-			
-			
+			
+			
-			
+			
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_build_variables.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_build_variables.htm
index 55339c832d0..3614fec4a74 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_build_variables.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_build_variables.htm
@@ -15,7 +15,7 @@ you control the environment variables used by the build to for the purposes of b
 
              
   
              IconDescriptionIconDescription
   
              
   
              
     
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_pref_multi_cfg.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_pref_multi_cfg.htm
index 5d401446383..784686fc4de 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_pref_multi_cfg.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_pref_multi_cfg.htm
@@ -24,9 +24,9 @@ it is not obvious how to concatenate them, if they differ.
              
   
              Specifies how values will be shown.
              
   There are 2 options: conjunction or disjunction.
   
                
-  
              • Conjunction shows common elements only, so if 1st configuration has 
+  
              • Conjunction shows common elements only, so if 1st configuration has 
   value <A, B, C> and 2nd configuration has <B, C, D>, <B, C> will be shown. 
-  
              • Disjunction shows all existing elements except doubles, so if 1st configuration has 
+  
              • Disjunction shows all existing elements except doubles, so if 1st configuration has 
   value <A, B, C> and 2nd configuration has <B, C, D>, <A, B, C, D> will be shown. 
   
              
   Note that Display mode can be changed directly on each tab which deals with string lists.
@@ -36,12 +36,12 @@ it is not obvious how to concatenate them, if they differ.
              
   
              Specifies how values will be saved.
              
   There are 2 options: modify or replace.
   
                
-  
              • Modify mode adds, changes or removes elements affected by user's actions.
+  
              • Modify mode adds, changes or removes elements affected by user's actions.
   Elements which were not touched by user are left unchanged.
                   
   Example: cfg1 has <A, B, C>; cfg2 has <B, C, D>.
                
   User removed B and added F.
                
   Result: cfg1 has <A, C, F>; cfg2 has <C, D, F>.
-  
              • Replace mode puts currently visible elements to all configurations.
+  
              • Replace mode puts currently visible elements to all configurations.
   Old contents will be lost.
                
   Example: cfg1 has <A, B, C>; cfg2 has <B, C, D>.
                
   Visible list depends of Display mode: <B, C> or <A, B, C, D>.
                
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_problems_view.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_problems_view.htm
index f33c36d954d..47f1c936154 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_problems_view.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_problems_view.htm
@@ -11,12 +11,12 @@
 
 
                Problems view
                
 
-
                If you encounter any errors during a build they will be displayed in the Problems view.  
                
+
                If you encounter any errors during a build they will be displayed in the Problems view.  
                
 
 
                Problems View
                
 
-
                Errors are passed up from your C++ compiler. The Problems view lists the error, filename and folder.  
-If you select an error the associated file will open in the C/C++ Editor view and the cursor will display the line where the error was encountered.
                
+
                Errors are passed up from your C++ compiler. The Problems view lists the error, filename and folder.  
+If you select an error the associated file will open in the C/C++ Editor view and the cursor will display the line where the error was encountered.
                
 
 
                C/C++ Perspective in Eclipse showing code errors
                
 
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_project_explorer_view.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_project_explorer_view.htm
index 1fa05043512..ff3f6a4847a 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_project_explorer_view.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_project_explorer_view.htm
@@ -35,40 +35,40 @@ Files that you select in the Project Explorer view  affect the information that
 	 
              
 	
              
 		Minimize iconMinimizeMinimize
 		Minimizes the view.
 	
              
 	
              
 		Maximize iconMaximizeMaximize
 		Maximizes the view.
 	
              
 	
              
 	
              
 		Collapse All IconCollapse AllCollapse All
 		This command collapses the tree expansion state of all resources in the view.
 	
              
 	
              
 		Link with Editor IconLink with EditorLink with Editor
 		This command toggles whether the view selection is linked to the active editor. 
 				When this option is selected, changing the active editor will automatically update the selection to the resource being edited.
 	
              
 	
              
 		Menu IconMenuMenu
 		Click the black upside-down triangle icon to open a menu of items specific to the view.

              
 									
              
 										
              Top Level Elements
              
 											
              Choose whether to show working sets or projects as top level elements. 
 											Chosing working sets allows easy grouping of projects in large workspaces.
              
 										
              Select Working Set
              
-											
              Opens the Select Working Set dialog to allow selecting a working set for the view.
              
+											
              Opens the Select Working Set dialog to allow selecting a working set for the view.
              
 										
              Deselect Working Set
              
 											
              Deselects the current working set. 
              
 										
              Edit Active Working Set
              
-											
              Opens the Edit Working Set dialog to allow changing the current working set.
              
+											
              Opens the Edit Working Set dialog to allow changing the current working set.
              
 										
              Customize View
              
 											
              This command allows customization of view filters and content modules. 
 											The previous will allow you to supress the display of certain types of files 
@@ -87,8 +87,8 @@ Files that you select in the Project Explorer view  affect the information that
 
 
-    
-    
+    
+    
+		
              @@ -23,11 +23,11 @@ Customizes the tools and tool options used in your build configuration.
 	
-			
+			
-			
+			
@@ -40,7 +40,7 @@ Customizes the tools and tool options used in your build configuration.
 	
              
   
              IconDescriptionIconDescription
   
              
   
              
     
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_all.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_all.htm
index 3ac5937060a..df9002fd2bd 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_all.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_all.htm
@@ -16,7 +16,7 @@ to handle configurations.
 
              
 
              
-		
+		
              @@ -24,13 +24,13 @@ to handle configurations.
 	
-			
-			
+			
+			
-			
+			
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_build.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_build.htm
index 18c66319367..4155741d9db 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_build.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_build.htm
@@ -11,9 +11,9 @@
 
 
              C/C++ Project Properties, C/C++ Build
              This page serves as the main window that contains all builder-specific property pages.
-In addition, directly from this window you can define preferences for the Builder settings and Behaviour properties.
+In addition, directly from this window you can define preferences for the Builder settings and Behaviour properties.
 
              
-
              Note: Modifying some settings, such as the Generate makefiles automatically option, might affect other parameters (setting them from enabled to disabled in some situations)
+
              Note: Modifying some settings, such as the Generate makefiles automatically option, might affect other parameters (setting them from enabled to disabled in some situations)
 and, moreover, change the visibility of other property pages. 
 
              
 
@@ -21,7 +21,7 @@ and, moreover, change the visibility of other property pages.
 
 
              
 	Configuration management propertiesConfiguration management properties
 		
 	
 		

 	 
 		
              ConfigurationSpecifies the type of configuration(s) for the selected project. A Debug configuration lets you see what's going on "inside" a program as it executes. To debug your application, you must use executables compiled for debugging. These executables contain additional debug information that lets the debugger make direct associations between the source code and the binaries generated from the original source. A Release configuration provides the tools with options set to create an application with the best performance.ConfigurationSpecifies the type of configuration(s) for the selected project. A Debug configuration lets you see what's going on "inside" a program as it executes. To debug your application, you must use executables compiled for debugging. These executables contain additional debug information that lets the debugger make direct associations between the source code and the binaries generated from the original source. A Release configuration provides the tools with options set to create an application with the best performance.
 		
              
 		
              Manage configurationsManage configurations
 			Opens the Manage Configurations dialog where you can set which configurations are active based on the toolchain(s) that were specified for the selected project. In addition, you can also create new configurations, rename an existing configuration, or remove ones that are no longer required.
-		
              Note:The Configuration selection that you specify in this dialog (unlike the behavior of CDT 3.x) affects only these property pages. This means that the selected configuration is not made the active configuration (the one used to build project).
              
+		
              Note:The Configuration selection that you specify in this dialog (unlike the behavior of CDT 3.x) affects only these property pages. This means that the selected configuration is not made the active configuration (the one used to build project).
              
 		              		
 		
              
                  
 

              
-		
+		
              @@ -29,54 +29,54 @@ and, moreover, change the visibility of other property pages.
 	
-			
+			
-			
+			
-			
-			
+			
+			
-			
-			
+			
+			
-			
-			
+			
+			
-			
+			
-			
+			
-			
+			
-			
-			
+			
+			
-			
-			
+			
+			
-			
-			
+			
+			
-			
-			
+			
+			
              
 	Builder settings preferencesBuilder settings preferences
 		
 	
 		

 	 
 		
              ConfigurationConfiguration
 			Click here for its description.
 		
              
 		
              Manage configurationsManage configurations
 			Click here for its description.
 		
              
 		
              Builder typeSpecifies the type of builder to use: Internal builder (builds C/C++ programs using a compiler that implements the C/C++ Language Specificationt) and External builder (external tools let you configure and run programs and Ant buildfiles using the Workbench, which can saved and run at a later time to perform a build).Builder typeSpecifies the type of builder to use: Internal builder (builds C/C++ programs using a compiler that implements the C/C++ Language Specificationt) and External builder (external tools let you configure and run programs and Ant buildfiles using the Workbench, which can saved and run at a later time to perform a build).
 		
              
 		
              Use default build commandWhen enabled, this option indicates that you want to use the default make command. When disabled, it indicates the use of a new make command. This option is only available when the Build type option is set to External.Use default build commandWhen enabled, this option indicates that you want to use the default make command. When disabled, it indicates the use of a new make command. This option is only available when the Build type option is set to External.
 		
              
 				
              Build commandSpecifies the default command used to start the build utility for your specific toolchain. Use this field if you want to use a build utility other than the default make command (when the Use default build command is not selected the field is active, and when you use an external builder or a custom makefile, you can provide your specific commands).Build commandSpecifies the default command used to start the build utility for your specific toolchain. Use this field if you want to use a build utility other than the default make command (when the Use default build command is not selected the field is active, and when you use an external builder or a custom makefile, you can provide your specific commands).
 		
              
 		
              VariablesVariables
 			Opens the Select build variable dialog where you can add environment variables and custom variables to the build command.
 			
              C/C++ Project Properties, C/C++ Build, Select build variable
              
 			
              
      	
              
 		
              Generate Makefiles automaticallyGenerate Makefiles automatically
 			When selected, Eclipse changes between two different CDT modes: it either uses the customer's makefile for the build (referred to as a 'Standard Make project' in CDT 3.x) if one exists, or it generate makefiles for the user (called 'Managed build project' in CDT 3.x). By default, this option is automatically set.
 		
              		
 		
              Expand Env. Variable Refs in MakefilesExpand Env. Variable Refs in Makefiles
 			Defines whether environment variables ( ${xxx} ) should be expanded in makefile. By default, this option is automatically set.
 		
              
 		
              Build directoryDefines the location where the build operation takes place. This location will contain the generated artifacts from the build process. This option is disabled when the Generate Makefiles automatically option is enabled.Build directoryDefines the location where the build operation takes place. This location will contain the generated artifacts from the build process. This option is disabled when the Generate Makefiles automatically option is enabled.
 		
              
 		
              WorkspaceOpens the Folder Selection dialog where you can select a workspace location for the project. This is the directory that will contain the plug-ins and features to build, including any generated artifacts. This button is only visible when Generate makefiles automatically is set not selected.WorkspaceOpens the Folder Selection dialog where you can select a workspace location for the project. This is the directory that will contain the plug-ins and features to build, including any generated artifacts. This button is only visible when Generate makefiles automatically is set not selected.
 		
              
 		
              File systemOpens the file system navigator where you can specify another file system to use. This button is only visible when Generate makefiles automatically is set not selected.File systemOpens the file system navigator where you can specify another file system to use. This button is only visible when Generate makefiles automatically is set not selected.
 		
              
 		
              VariablesOpens the Select build variable dialog where you can select a variable to specify as an argument for the build directory, or create and configure simple build variables which you can reference in build configurations that support variables. This button is only visible when Generate makefiles automatically is set not selected.VariablesOpens the Select build variable dialog where you can select a variable to specify as an argument for the build directory, or create and configure simple build variables which you can reference in build configurations that support variables. This button is only visible when Generate makefiles automatically is set not selected.
 		
              
 		              
 
              
@@ -86,7 +86,7 @@ and, moreover, change the visibility of other property pages.
 
 
              
-		
+		
              @@ -94,64 +94,64 @@ and, moreover, change the visibility of other property pages.
 	
-			
+			
+			
              Note: If this option is not selected, it is helpful for building large projects because it tells make to continue making other independent rules even when one rule fails.
              
-			
+			
-			
+			
-			
+			
-			
-			
+			
+			
-			
+			
-			
+			
-			
-			
+			
+			
-			
-			
+			
+			
-			
-			
+			
+			
-			
-			
+			
+			
-			
-			
+			
+			
              
 	Behaviour preferencesBehaviour preferences
 		
 	
 		

 	 
 		
              Stop on first build errorStop on first build error
 			Stops building when Eclipse encounters an error. 
-			
              Note: If this option is not selected, it is helpful for building large projects because it tells make to continue making other independent rules even when one rule fails.
              		
 		
              
 		
              Use parallel buildUse parallel build
 			When enabled, this option indicates the activation of the generation of parallel builds.
 			
 			
              If you enable this option, you need to determine the number of parallel jobs to perform:
              
 			
                
-				
              • Use optimal jobs number - Lets the system determine the optimal number of parallel jobs to perform.
                • 
-				
              • Use parallel jobs - Lets you specify the maximum number of parallel jobs to perform.
                • 
+				
              • Use optimal jobs number - Lets the system determine the optimal number of parallel jobs to perform.
                • 
+				
              • Use parallel jobs - Lets you specify the maximum number of parallel jobs to perform.
                • 
 			
              
 		              		
 		
              
 		
              Workbench build behaviorWorkbench build behavior
 			By default, the following settings are what the builder uses when instructed to build, rebuild, clean, and so on.  You can change these settings so that new projects can use different targets if these defaults are not appropriate.
 		
              
 		
              Build on resource save (Auto build)Build on resource save (Auto build)
 			When selected, builds your project whenever resources are saved. By default, this option is selected and builds occur automatically each time resources are modified. When this option is not selected, a build occurs only manually using a menu item. If you require more control over when builds occur (for example, when a build should wait until you finish a large assortment of changes), disable this option and manually invoke builds yourself.
 		
              
 					
              make build target ( for Build on resource save (Auto build))To build your project when resources are saved and change the default make build target, enable the Build on resource save (Auto Build) option, and specify a new build target in the Make build target field.make build target ( for Build on resource save (Auto build))To build your project when resources are saved and change the default make build target, enable the Build on resource save (Auto Build) option, and specify a new build target in the Make build target field.
 		
              
 		
              VariablesVariables
 			Opens the Select build variable dialog where you can add variables to the build command.
 			
              C/C++ Project Properties, C/C++ Build, Select build variable
              
 		
              		
 		
              Build (Incremental build)Build (Incremental build)
 			Defines what the builder calls when an incremental build is performed. When this option is enabled, an incremental build occurs meaning that only resources that have changed since the last build are considered. If this option is disabled, a full build occurs, meaning that all resources within the scope of the build are considered.
 			
 		
              
 			
              make build target (for Build (Incremental build))To change the build default make build target, enable the Build (Incremental build) option, and specify a new build target in the Make build target field.make build target (for Build (Incremental build))To change the build default make build target, enable the Build (Incremental build) option, and specify a new build target in the Make build target field.
 			
 		
              
 		
              VariablesOpens the Select build variable dialog where you can add variables to the make build target command.VariablesOpens the Select build variable dialog where you can add variables to the make build target command.
 		
              
 		
              CleanDefines what the builder calls when a clean is performed. The make clean is defined in the makefile.CleanDefines what the builder calls when a clean is performed. The make clean is defined in the makefile.
 		
              
         
              make build target (for Clean)To change the rebuild default make build target, enable the Clean option, and specify a new build target in the Make build target field.make build target (for Clean)To change the rebuild default make build target, enable the Clean option, and specify a new build target in the Make build target field.
 			
 		
              
 		
              VariablesOpens the Select build variable dialog where you can add variables to the make build target command.VariablesOpens the Select build variable dialog where you can add variables to the make build target command.
 		
              
 		              
 
              
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_build_discovery.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_build_discovery.htm
index b306951bb9f..b5a0040ace9 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_build_discovery.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_build_discovery.htm
@@ -15,7 +15,7 @@
 
 
              
-		
+		
              @@ -23,21 +23,21 @@
 	
-			
+			
-			
+			
-			
+			
-			
+			
-			
+			
-			
-			
+			
+			
-			
-			
+			
+			
-			
-			
+			
-			
-			
+			
+			
-			
-			
+			
+			
-			
-			
+			
+			
-			
+			
-			
-			
+			
-			
-			
+			
+			
              
 	Discovery options preferencesDiscovery options preferences
 		
 	
 		

 	 
 		
              ConfigurationConfiguration
 			Click here for a description.
 		
              
 		
              Manage configurationsManage configurations
 			Click here for a description.
 		
              
 		
              Discovery Profiles ScopeDiscovery Profiles Scope
 			Specifies the type of profile to set for discovery:
 			  
                
-			    
              • Per Language - Enables the association of different profiles with different resource types (different tools and input types), to have different settings discovered, e.g. for C and C++ source files and for different tools used by the project.
+			    
              • Per Language - Enables the association of different profiles with different resource types (different tools and input types), to have different settings discovered, e.g. for C and C++ source files and for different tools used by the project.
 In addition, selecting this option lets you have different profile settings for different folders; however, only project profile types are allowed.
 			    
-			    
              • Configuration-wide - The Eclipse CDT uses only one profile for discovering scanner information for
+			    
              • Configuration-wide - The Eclipse CDT uses only one profile for discovering scanner information for
 the entire project (configuration). This means that both the project and per-file discovery profiles are allowed.
 			    
 			  
              			
@@ -49,50 +49,50 @@ the entire project (configuration). This means that both the project and per-fil
 			              		Shows a list of language specific compilers. Select a language from the list.
 		
              
 		
              Automate discovery of paths and symbolsAutomate discovery of paths and symbols
 			Scans the build output to populate the path and symbol tables, such as symbol definitions, system include directories, local include directories, macros, and include files.
 		
              
 				
              Report path detection problemsReport path detection problems
 			Sets the notification of diagnostic errors for include paths that the Eclipse CDT is unable to resolve as it parses the build output.
 		
              
 		
              Discovery profileIndicates the discovery profile to use for paths and symbol detection. The type of Configuration and Discovery Profile Scope you specify determine what which Discovery Profile options display on this tab.Discovery profileIndicates the discovery profile to use for paths and symbol detection. The type of Configuration and Discovery Profile Scope you specify determine what which Discovery Profile options display on this tab.
 		
              		
 		
              Enable build output scanner info discoveryConfigures the scanner to parse the output from a build for compiler commands with options that specify the definition of preprocessor symbols, and include search paths (for GCC compiler, -D and -I respectively). This button is only visible when Configuration is set to Release and the Discovery Profiles Scope is set to Configuration-wide.Enable build output scanner info discoveryConfigures the scanner to parse the output from a build for compiler commands with options that specify the definition of preprocessor symbols, and include search paths (for GCC compiler, -D and -I respectively). This button is only visible when Configuration is set to Release and the Discovery Profiles Scope is set to Configuration-wide.
 		
              
 		
              LoadLets you load a file to discover paths and symbols based on a previous builds' output. To activate the discovery select a build log file and then the Load button. This button is only visible when Configuration is set to Release and the Discovery Profiles Scope is set to Configuration-wide.
-			
              Note: Click Variables to open the Select Variables window to define a build output file.
              
+			              		LoadLets you load a file to discover paths and symbols based on a previous builds' output. To activate the discovery select a build log file and then the Load button. This button is only visible when Configuration is set to Release and the Discovery Profiles Scope is set to Configuration-wide.
+			
              Note: Click Variables to open the Select Variables window to define a build output file.
              
 			              		
 		
              
 		
              Load build output from fileSpecifies the name of the file you selected to load the build output from. This button is only visible when Configuration is set to Release and the Discovery Profiles Scope is set to Configuration-wide.Load build output from fileSpecifies the name of the file you selected to load the build output from. This button is only visible when Configuration is set to Release and the Discovery Profiles Scope is set to Configuration-wide.
 		
              
 		
              BrowseClick to locate a previously built output file to load the build output from. This button is only visible when Configuration is set to Release and the Discovery Profiles Scope is set to Configuration-wide.BrowseClick to locate a previously built output file to load the build output from. This button is only visible when Configuration is set to Release and the Discovery Profiles Scope is set to Configuration-wide.
 		
              
 		
              VariablesClick to specify an argument for, or create and configure simple launch variables which you can reference in launch configurations that support variables. This button is only visible when Configuration is set to Release and the Discovery Profiles Scope is set to Configuration-wide.VariablesClick to specify an argument for, or create and configure simple launch variables which you can reference in launch configurations that support variables. This button is only visible when Configuration is set to Release and the Discovery Profiles Scope is set to Configuration-wide.
 		
              
 		
              Enable generate scanner info commandEnable generate scanner info command
 			Enables the retrieval of information from the scanner. If it is not selected, the includes will be populated with default gcc system includes; Eclipse gathers the compiler settings based on the specified toolchain. This means that the Eclipse CDT can obtain the default gcc system includes to associate with the project. 
-				
              When selected, you can specify any required compiler specific commands in the Compiler invocation command field.
              
+				
              When selected, you can specify any required compiler specific commands in the Compiler invocation command field.
              
 			              		
 		
              
 		
              Compiler invocation commandIndicates the compiler specific command used to invoke the compiler (such as gcc, or more complicated commands used to perform all necessary steps for compiling C/C++ source files into .o files, and linking the object files and libraries into an executable program. For example, the command gcc -E -P -v hello.c | hello.cpp reads a compiler's configuration file and prints out information that includes the compiler's internally defined preprocessor symbols and include search paths. The information is complementary to the scanner configuration discovered when the output is parsed (if you've enabled the Enable build output scanner info discovery option), and is added to the project's scanner configuration. You can click Browse to locate this command, if required.
+			Compiler invocation commandIndicates the compiler specific command used to invoke the compiler (such as gcc, or more complicated commands used to perform all necessary steps for compiling C/C++ source files into .o files, and linking the object files and libraries into an executable program. For example, the command gcc -E -P -v hello.c | hello.cpp reads a compiler's configuration file and prints out information that includes the compiler's internally defined preprocessor symbols and include search paths. The information is complementary to the scanner configuration discovered when the output is parsed (if you've enabled the Enable build output scanner info discovery option), and is added to the project's scanner configuration. You can click Browse to locate this command, if required.
 			
-			
              Note: The parsing of build output for scanner information is compiler specific. For example, the GNU toolchain compilers (gcc and g++) use -I for include paths, and -D for symbol definitions. Consult your compiler specific documentation for more information about scanner information commands, such as the following gcc commands:
              
+			
              Note: The parsing of build output for scanner information is compiler specific. For example, the GNU toolchain compilers (gcc and g++) use -I for include paths, and -D for symbol definitions. Consult your compiler specific documentation for more information about scanner information commands, such as the following gcc commands:
              
      
                
         
              • -D name
                • 
         
              • -I
                •      
@@ -111,8 +111,8 @@ the entire project (configuration). This means that both the project and per-fil
 			
              		
 		
              
 			
              BrowseClick to browse for a file to include in the compiler invocation command. This button is only visible when Configuration is set to Release and the Discovery Profiles Scope is set to Configuration-wide.BrowseClick to browse for a file to include in the compiler invocation command. This button is only visible when Configuration is set to Release and the Discovery Profiles Scope is set to Configuration-wide.
 		
              
                 
 
              
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_build_environment.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_build_environment.htm
index 24a0a0239c2..30d31fad0eb 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_build_environment.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_build_environment.htm
@@ -16,7 +16,7 @@ Customizes the build environment for all projects in the workspace; it lets you
 
 
              
-		
+		
              @@ -24,56 +24,56 @@ Customizes the build environment for all projects in the workspace; it lets you
 	
-			
+			
-			
+			
-			
+			
-			
+			
-			
+			
-			
+			
-			
+			
-			
+			
-			
+			
-			
+			
-			
+			
-			
+			
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_build_settings_artifact.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_build_settings_artifact.htm
index bd2e2fd2f8b..0ae2ad2aa68 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_build_settings_artifact.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_build_settings_artifact.htm
@@ -15,7 +15,7 @@
 
 
              
 	Environment preference optionsEnvironment preference options
 		
 	
 		

 	 
 		
              ConfigurationConfiguration
 			Click here for a description.
 		
              
 		
              Manage configurationsManage configurations
 			Click here for a description.
 		
              
 		
              Environment variables to setEnvironment variables to set
 			Shows the current list of environment variables and their corresponding value. These are the environment variable values used when building.
 		
              		
 		
              VariableVariable
 			Specifies the name of the environment variable.
 		
              
 		
              ValueValue
 			Specifies the value of the environment variable.
 		
              
 				
              Append variables to native environmentAppend variables to native environment
 			Appends the variables to the native environment during its execution.
 		
              
 		
              Replace native environment with specified one Replace native environment with specified one 
 			Replaces the native environment with the specified variables, and then restores the native environment upon its completion.
 		
              		
 		
              NewNew
 			Opens a dialog to create a new environment variable and value. Custom environment variables that you create appear in bold within the list.
 			
              C/C++ Project Properties, Environment, New environment variable
                          
              
-            
              Click Variables to Select variables by name to include in the value. Select Add to all configurations to make this new environment variable available to all configurations for the selected project; otherwise, the variable is only available for the currently selected configuration.
              
+            
              Click Variables to Select variables by name to include in the value. Select Add to all configurations to make this new environment variable available to all configurations for the selected project; otherwise, the variable is only available for the currently selected configuration.
              
 			              		
 		
              
 		
              SelectSelect
 			Opens the Select variables dialog where you can choose from a list of system variables.
 			
              C/C++ Project Properties, Environment, New environment variable
              		
             
 		
              
 		
              EditEdit
 			Modifies the name and value of the selected environment variable.
 		
              
 		
              RemoveRemove
 			Removes the selected environment variables from the list.
 		
              
 		
              UndefineUndefine
 			Undefines the currently selected variable; however, some variables, such as the PATH variable, cannot be undefined. 
 			
 		

              
-		
+		
              @@ -23,33 +23,33 @@
 	
-			
+			
-			
+			
-			
-			
+			
+			
-			
+			
-			
+			
-			
+			
              
 	Build artifact optionsBuild artifact options
 		
 	
 		

 	 
 		
              ConfigurationConfiguration
 			Click here for a description.
 		
              
 		
              Manage configurationsManage configurations
 			Click here for a description.
 		
              
 		
              Artifact TypeShow the type for the selected artifact. Select an artifact type that is built by the currently selected build configuration (such as an Executable, Static library, and Shared library).Artifact TypeShow the type for the selected artifact. Select an artifact type that is built by the currently selected build configuration (such as an Executable, Static library, and Shared library).
 			
              		
 		
              Artifact nameArtifact name
 			Indicates the name of artifact. By default, the name is the same as project name.
 			
              		
 		
              Artifact extensionArtifact extension
 			Specifies the file extension for the specified artifact type.
 			
              		
 		
              Output prefixOutput prefix
 			Indicates a prefix that you want to prepend to the output results. 
 			
              		
 	              
 
              
 
              
-
              Available for: CDT projects.
              
+
              Available for: CDT projects.
              
 
 
              Related reference
 
 
              
-		
+		
              @@ -28,33 +28,33 @@ symbols of the object file using the C/C++ Projects view.
              
-			
+			
-			
+			
-			
+			
-			
+			
-			
-			
+			
+			
-			
-			
+			
+			
              
 	Binary parser optionsBinary parser options
 		
 	
 		

 	
 	 
 		
              ConfigurationConfiguration
 			Click here for a description.
 		
              
 		
              Manage configurationsManage configurations
 			Click here for a description.
 		
              
 		
              Binary Parser (top pane)Binary Parser (top pane)
 			Lists all of the binary parsers currently known to CDT. Select the parsers that you want to use, and select the corresponding line to edit parser's options, if required.
 			
              		
 		
              Binary Parser OptionBinary Parser Option
 			Shows the parameters for the currently selected parser in the list above. Depending on the parser you select, the options in the list will be different (in particular, some may have no options at all).
 			
              	
 		
              Move upMoves the selected parser higher in list. Note: The order matters for selected parsers only: they are applied to binaries in the same sequence as defined by the user. The order is not preserved for unchecked parsers, so you do not have to move them.Move upMoves the selected parser higher in list. Note: The order matters for selected parsers only: they are applied to binaries in the same sequence as defined by the user. The order is not preserved for unchecked parsers, so you do not have to move them.
 			
              		
 		
              Move downMove the selected parser lower in list. Note: The order matters for selected parsers only: they are applied to binaries in the same sequence as defined by the user. The order is not preserved for unchecked parsers, so you do not have to move them.Move downMove the selected parser lower in list. Note: The order matters for selected parsers only: they are applied to binaries in the same sequence as defined by the user. The order is not preserved for unchecked parsers, so you do not have to move them.
 			
              		
 	              
 
              
 
              
-
              Available for: CDT projects.
              
+
              Available for: CDT projects.
              
 
 
              Related tasks
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_build_settings_errparser.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_build_settings_errparser.htm
index 5b8c3716f90..6921b29ace1 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_build_settings_errparser.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_build_settings_errparser.htm
@@ -15,7 +15,7 @@ build output log.
              
 
 
              
-		
+		
              @@ -23,37 +23,37 @@ build output log.
              
-			
+			
-			
+			
-			
+			
-			
-			
+			
+			
-			
-			
+			
+			
-			
+			
-			
+			
              
 	Binary parser optionsBinary parser options
 		
 	
 		

 	
 	 
 		
              ConfigurationConfiguration
 			Click here for a description.
 		
              
 		
              Manage configurationsManage configurations
 			Click here for a description.
 		
              
 		
              Error ParsersError Parsers
 			Lists all of the error parsers currently known to CDT. Select the parsers that you want to use, and select the corresponding line to edit parser's options, if required.
 			
              		
 		
              Move upMoves the selected parser higher in list. Note: The order matters for selected parsers only: they are applied to error logs in the same sequence as defined by the user. The order is not preserved for unchecked parsers, so you do not have to move them.Move upMoves the selected parser higher in list. Note: The order matters for selected parsers only: they are applied to error logs in the same sequence as defined by the user. The order is not preserved for unchecked parsers, so you do not have to move them.
 			
              		
 		
              Move downMove the selected parser lower in list. Note: The order matters for selected parsers only: they are applied to error logs in the same sequence as defined by the user. The order is not preserved for unchecked parsers, so you do not have to move them.Move downMove the selected parser lower in list. Note: The order matters for selected parsers only: they are applied to error logs in the same sequence as defined by the user. The order is not preserved for unchecked parsers, so you do not have to move them.
 			
              	
 					
              Check allCheck all
 			Selects all error parsers in the list.
 			
              	
 								
              Uncheck allUncheck all
 			Makes all error parsers in the list unselected.
 			
              		
 	              
 
              
 
              
-
              Available for: CDT projects.
              
+
              Available for: CDT projects.
              
 
 
              Related tasks
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_build_settings_steps.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_build_settings_steps.htm
index 9f8b8fb26b0..ed09cc7fcfa 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_build_settings_steps.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_build_settings_steps.htm
@@ -16,7 +16,7 @@ processing executes.
              
  alt="C/C++ Properties, Build, Settings, Build Steps tab">
              
 
              
 
-
              Note: To ensure reasonable custom build step behavior, sensible input must
+
              Note: To ensure reasonable custom build step behavior, sensible input must
 be provided when specifying custom build step information. Custom build steps
 are not verified for correctness in any regard and are passed exactly
 as entered into the build stream. 
              
@@ -28,7 +28,7 @@ including pre-build or post-build steps.
              
 
 
              
-		
+		
              @@ -36,45 +36,45 @@ including pre-build or post-build steps.
              
-			
+			
-			
+			
-			
+			
-			
+			
-			
+			
-			
+			
-			
+			
-			
+			
              
 	Build step optionsBuild step options
 		
 	
 		

 	
 	 
 		
              ConfigurationConfiguration
 			Click here for a description.
 		
              
 		
              Manage configurationsManage configurations
 			Click here for a description.
 		
              
 		
              Pre-build StepsPre-build Steps
 			Identifies any steps that are to occur before the build takes place.
-			
              Note: The pre-build step is not executed if the state of the main build is determined to be up to date; otherwise it is executed. An attempt to execute the main build will occur regardless of the success or failure of executing the pre-build step.
              
+			
              Note: The pre-build step is not executed if the state of the main build is determined to be up to date; otherwise it is executed. An attempt to execute the main build will occur regardless of the success or failure of executing the pre-build step.
              
 			              		
 			
              		
 		
              CommandCommand
 			Specifies one or more commands to execute immediately before the execution of the build. Use semicolons to separate multiple commands.
 		
              
 		
              DescriptionDescription
 			Specifies optional descriptive text associated with the pre-build step that is displayed in the build output immediately before the execution of the pre-build step command (or commands).
 		
              
 		
              Post-build stepsPost-build steps
 			Identifies any steps that are to occur after the build takes place.
-			
              Note: The post-build step is not executed if the state of the main build is determined to be up to date. It will be executed only if the main-build has executed successfully.
              
+			
              Note: The post-build step is not executed if the state of the main build is determined to be up to date. It will be executed only if the main-build has executed successfully.
              
 			              		
 		
              
 		
              CommandCommand
 			Specifies one or more commands to execute immediately after the execution of the build. Use semicolons to separate multiple commands.
 		
              
 		
              DescriptionDescription
 			Specifies optional descriptive text associated with the post-build step that is displayed in the build output immediately after the execution of the post-build step command (or commands).
 		
              				
 	              
 
              
 
              
-
              Available for: CDT projects.
              
+
              Available for: CDT projects.
              
 
 
              Related reference
 	
              
-		
              Tool settings optionsTool settings options
 		
 	
 		

 	 
 		
              ConfigurationConfiguration
 			Click here for a description.
 		
              
 		
              Manage configurationsManage configurations
 			Click here for a description.
 		
              
 		
              
 
              
 
              
-
              Available for: CDT projects and source files
              
+
              Available for: CDT projects and source files
              
 
 
              Related reference
 	
              
-		
              Tool chain editor propertiesTool chain editor properties
 		
 	
 		

 	 
 		
              ConfigurationConfiguration
 			Click here for a description.
 		
              
 		
              Manage configurationsManage configurations
 			Click here for a description.
 		
              
 		
              Display compatible toolchains onlyDisplay compatible toolchains only
 			When selected, it shows a list of toochains that are only compatible with the current configuration. When this option is not selected, it shows a list of all toolchains known to the Eclipse CDT. A Toolchain is compatible if it can run on given platform. .
 		
              
 		
              Current toolchainCurrent toolchain
 			Indicates the toolchain to use with the current configuration. A toolchain is a set of tools (such as a compiler, linker, and assembler) intended to build your project. Additional tools, such as a debugger, can be associated with a toolchain. There can be several toolchains available, depending on the compilers installed on your system.
 		
              
 				
              Current builderIndicates the builder used to build the selected configuration. A builder refers to an external make utility, such as GNU make, that the Eclipse CDT uses (and relies on) to build a project. The CDT can generate makefiles automatically when you create a Make C or C++ project, or you have the option of creating a C or C++ Make project where you provide the makefile yourself.Current builderIndicates the builder used to build the selected configuration. A builder refers to an external make utility, such as GNU make, that the Eclipse CDT uses (and relies on) to build a project. The CDT can generate makefiles automatically when you create a Make C or C++ project, or you have the option of creating a C or C++ Make project where you provide the makefile yourself.
 		
              
 		
              Used toolsShows a list of tools currently included for the selected toolchain. You can click Select Tools to modify this list.Used toolsShows a list of tools currently included for the selected toolchain. You can click Select Tools to modify this list.
 		
              		
 		
              Select ToolsSelect Tools
 			Opens the Select Tools dialog that lets you add or remove tools from the list of tools for the selected toolchain.
 		
              
 	              
 

              
-		
+		
              @@ -23,48 +23,48 @@ you control the environment variables used by the build to for the purposes of b
 	
-			
+			
-			
+			
-			
+			
-			
-			
+			
+			
-			
+			
-			
+			
-			
+			
-			
+			
-			
+			
-			
+			
-			
-			
+			
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_builders.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_builders.htm
index e40a33779b5..1d23ad49822 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_builders.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_builders.htm
@@ -16,7 +16,7 @@ which order they are used.
              
 	Variables preferencesVariables preferences
 		
 	
 		

 	 
 		
              Environment variables to setEnvironment variables to set
 			Shows the current list of environment variables and their corresponding value. These are the environment variable values used when running an application.
 		
              		
 		
              ConfigurationConfiguration
 			Click here for a description.
 		
              
 		
              Manage configurationsManage configurations
 			Click here for a description.
 		
              
 		
              (The variables table)Lists the CDT build variables and system variables, by Name, Type, and the Value. Custom Build variables are identified by the name being highlighted using a bold font.(The variables table)Lists the CDT build variables and system variables, by Name, Type, and the Value. Custom Build variables are identified by the name being highlighted using a bold font.
 		
              
 		
              NameName
 			Indicates the name of the variable, either a user defined variable or a system variable.
 		
              
 			
              TypeType
 			Shows the type for the variable.
 		
              
 			
              ValueValue
 			Specifies the value of the variable.
 		
              
 				
              Show system variablesShow system variables
 			When selected, system variables are included in the Variables table; otherwise, they are excluded so that only user defined variables appear in the Variables list.
 		
              
 		
              AddAdd
             Creates a new variable and corresponding value.
             
 		
              		
 		
              EditEdit
 			Modifies the name and value of the selected variable.
              
 		
              DeleteRemoves the selected variables from the list. Note: Some variables are read-only and cannot be removed. 
+			DeleteRemoves the selected variables from the list. Note: Some variables are read-only and cannot be removed. 
 			
 		
              
 	              
 
 

              
-		
+		
              @@ -24,49 +24,49 @@ which order they are used.
              
-			
+			
-			
+			
+		
              The Ant Builder option lets you configure and deploy projects; however, if you want to use some other tool or prefer to do it yourself, you can set up a Program external tool project builder. This type allows you to customize the deployment of your project as you require, while maintaining the convenience of automatically running your script every time your project is built.
              
+		
              The Program option lets you to define an external tool for any executable file that is accessible on your local or network file system. For example, if instead of Ant you prefer to use your own shell scripts or Windows .bat files to package and deploy your Eclipse projects, you can then create a Program external tool that would specify where and how to execute that script.
              
-			
+			
-			
+			
-			
+			
-			
+			
-			
+			
              
 	Builder propertiesBuilder properties
 		
 	
 		

 	
 	 
 		
              Configure the builders for the projectConfigure the builders for the project
 			Selects which builders to enable from the list. You can disable the CDT Builder and you can control when the CDT Builder runs with respect to the project builders that you define.
 			
 		
              
 		
              New...New...
 			Opens the Choose configuration type dialog so that you can add a new builder to the list. 
              
 		
              C/C++ Project Properties, Builders, Choose configuration type
              
-		
              The Ant Builder option lets you configure and deploy projects; however, if you want to use some other tool or prefer to do it yourself, you can set up a Program external tool project builder. This type allows you to customize the deployment of your project as you require, while maintaining the convenience of automatically running your script every time your project is built.
              
-		
              The Program option lets you to define an external tool for any executable file that is accessible on your local or network file system. For example, if instead of Ant you prefer to use your own shell scripts or Windows .bat files to package and deploy your Eclipse projects, you can then create a Program external tool that would specify where and how to execute that script.
              
 	    
              Import...Import...
 			Opens the Import launch configuration dialog so that you can import a builder to include it in the list.
              
 			
              Import launch configuration
 			
              
 	    
              Edit...Edit...
 			Opens the Configure Builder dialog that lets you specify when to run the selected builder.
              
 			
              Configure Builder
 			
              
 			
              When you configure a builder, you have the following options:
 			
                
-				
              • After a "Clean" - When enabled, the selected builder is scheduled to run after a clean operation occurs.
-				
              • During manual builds - When enabled, the selected build is initiated when you explicitly select a menu item or press its corresponding shortcut key combination.
-				
              • During auto builds - When enabled, automatic builds are performed as resources are saved (they are incremental and operate over an entire workspace). Note: running your project builder during auto builds is possible, although it is not recommended because of performance concerns.
-				
              • During a "Clean" - When enabled, the selected builder is scheduled to run during a clean operation.
+				
              • After a "Clean" - When enabled, the selected builder is scheduled to run after a clean operation occurs.
+				
              • During manual builds - When enabled, the selected build is initiated when you explicitly select a menu item or press its corresponding shortcut key combination.
+				
              • During auto builds - When enabled, automatic builds are performed as resources are saved (they are incremental and operate over an entire workspace). Note: running your project builder during auto builds is possible, although it is not recommended because of performance concerns.
+				
              • During a "Clean" - When enabled, the selected builder is scheduled to run during a clean operation.
 			
              
 			
              
 	    
              RemoveRemove
 			Removes the selected builder from the list.
              
 	    
              UpUp
 			Moves the currently selected builder higher in the list to change the builder order.
              
  	    
              DownDown
 			Moves the currently selected builder lower in the list to change the builder order.
              
                  
 
              
 
 
              
-  
              Available for: Any projects, folders and files regardless of project kind.
              
+  
              Available for: Any projects, folders and files regardless of project kind.
              
 
 
              Related reference
              
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_general_idx.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_general_idx.htm
index a9d844858ec..7246e5a116f 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_general_idx.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_general_idx.htm
@@ -18,7 +18,7 @@ assist.
              
   
              Enable project specific settings
              
   
              Check this box if you need specific index settings for this project. Else common settings (defined in Preferences) will be applied. In this case, all controls below are disabled.
              
   
              Select indexer
              
-  
              Specifies the Indexer to use for this project; No Indexer
+  
              Specifies the Indexer to use for this project; No Indexer
 disables indexing. Every indexer may have its own set of options.
   
              
   
              Build configuration for the indexer
              
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_general_lng.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_general_lng.htm
index d6783d354a7..92988789793 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_general_lng.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_general_lng.htm
@@ -8,7 +8,7 @@
 
 
 
              C/C++ Project Properties, Language mappings
              
-
              Customize the use of C/C++ language associations in the Language Mappings preference panel for a project. 
              
+
              Customize the use of C/C++ language associations in the Language Mappings preference panel for a project. 
              
 
              C/C++ Project Properties, Language mapping
              
 
              
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_general_pns_ref.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_general_pns_ref.htm
index 6d1abb4cadb..74deec61128 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_general_pns_ref.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_general_pns_ref.htm
@@ -12,7 +12,7 @@
 Project references are a powerful way of expressing dependencies between
 Build configurations in different projects. Specifically they perform 2 roles:
 
                
-
              • Automatic propogation of Exported Settings from one project
+
              • Automatic propogation of Exported Settings from one project
 to another which depends on it
                • 
 
              • Build, if necessary, referenced projects before dependent project
                • 
 
               
@@ -20,19 +20,19 @@ to another which depends on it
 Unlike the Eclipse Common References page, 
 this page allows setting references to specific configurations.
 
-
               Since CDT 7 this functionality has been improved:
+
               Since CDT 7 this functionality has been improved:
 
                
 
              • 
-  Referenced projects are ordered
                 and this order can be changed using the buttons provided.
+  Referenced projects are ordered
                 and this order can be changed using the buttons provided.
 Referenced projects are built in the order listed in the dialog, and the order is used in the build for setting
 up the Include paths and Library link lines.
 
                • 
 
              • 
-  Can reference another configuration in the same project
                It's allowed to reference another configuration 
+  Can reference another configuration in the same project
                It's allowed to reference another configuration 
   in the same project.
 
                • 
 
              • 
-  Referenced projects which don't exist in the workspace are shown in gray.
+  Referenced projects which don't exist in the workspace are shown in gray.
 
                • 
 
              
 
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_resource.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_resource.htm
index 043cf33c32c..3c6c38f2116 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_resource.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_resource.htm
@@ -15,7 +15,7 @@
  
              
 
              
-		
+		
              @@ -23,52 +23,52 @@
 	
-			
+			
-			
-			
+			
+			
-			
+			
-			
+			
-			
-			
+			
+			
-			
+			
-			
+			
-			
+			
-			
+			
-			
-			
+			
+			
              
 	Resource propertiesResource properties
 		
 	
 		

 	 
 		
              PathPath
 			Specifies the location of the selected resource type within the workspace. For example, similar to folders, projects map to directories in the file system.
 		
              
 		
              TypeIndicates the type for the selected resource: Folder, Project, or File.TypeIndicates the type for the selected resource: Folder, Project, or File.
 		
              
 				
              LocationLocation
 			Specifics the location of the selected resource within the file system.
 		
              
         
              Last modifiedLast modified
 			Shows the date that the selected resource was last modified.
 		
              
 		
              Text file encodingSets an alternate text encoding. Because text files are encoded differently (depending on the locale and platform), use the default text file encoding for the locale of your host operating system. However, if you want to work with text files that originate from another source (for example, to work with text files that use a different encoding scheme than your native one, so that you can easily exchange files with another team), choose Other and select an appropriate one from the list.Text file encodingSets an alternate text encoding. Because text files are encoded differently (depending on the locale and platform), use the default text file encoding for the locale of your host operating system. However, if you want to work with text files that originate from another source (for example, to work with text files that use a different encoding scheme than your native one, so that you can easily exchange files with another team), choose Other and select an appropriate one from the list.
 		
              
 		
              Inherited from containerInherited from container
 			When enabled, the selected resource inherits the text encoding specified for it's container resource.
 		
              
 		
              OtherOther
 			When enabled, the selected resource uses an alternate text encoding other than that specified for its container resource. You can enable this option if you want to work with text files that originate from another source (ones that use a different encoding scheme than your native one), so that you can easily exchange files with others.
 		
 		
              
 		
              New text file line delimiterNew text file line delimiter
 			Specifies the end of line character(s) to use for new text files being created.
 		
              
 		
              Inherited from containerInherited from container
 			When enabled, the selected resource inherits the character line ending for new text files specified for it's container resource.
 		
              
 		
              OtherWhen enabled, the selected resource uses an alternate end of line character(s) for new text files other than that specified for its container resource. For example, you can set the Text file encoding option to UTF-8, and then set the line endings character for new files to Unix, so that text files are saved in a format that is not specific to the Windows operating system, and the files can easily be shared amongst various developer systems.OtherWhen enabled, the selected resource uses an alternate end of line character(s) for new text files other than that specified for its container resource. For example, you can set the Text file encoding option to UTF-8, and then set the line endings character for new files to Unix, so that text files are saved in a format that is not specific to the Windows operating system, and the files can easily be shared amongst various developer systems.
 		
 		
              
                  
 
              
 
 
              
-  
              Available for: Any projects, folders and files regardless of project kind.
              
+  
              Available for: Any projects, folders and files regardless of project kind.
              
 
 
              Related reference
              
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_properties.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_properties.htm
index 33190a38851..3594a57fb9e 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_properties.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_properties.htm
@@ -13,7 +13,7 @@
 
              CDT Properties
              
 
              This section describes C/C++ Properties.
              
 
              Properties can be obtained for CDT projects, folders and separate files. 
-To select object properties, right click on object in view and select Properties.
              
+To select object properties, right click on object in view and select Properties.
              
 
              Selecting C/C++ Project Properties
              
 
 
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_properties_view.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_properties_view.htm
index be59f38fa61..b808d84ad87 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_properties_view.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_properties_view.htm
@@ -26,22 +26,22 @@
 	 
              
 	
              
 	Show Categories IconShow CategoriesShow Categories
 	This command, when selected, lists the properties in sorted categories.
 	
              
 	
              
 		Show Advanced Properties IconShow Advanced PropertiesShow Advanced Properties
 		This command, when selected, shows advanced properties.  By default, advanced properties are filtered.
 	
              
 	
              
 	Restore Default IconRestore DefaultRestore Default
 		This command returns any modified properties to their default values.
 	
              
 	
              
 		Menu IconMenuMenu
 		Click the black upside-down triangle icon to open a menu of items specific to the Properties view.

              
 									
              
 										
              Show Categories
              
@@ -52,12 +52,12 @@
 	
              	
 	
              
 		Minimize iconMinimizeConsoleMinimizeConsole
 		Minimizes the Console view.
 	
              
 	
              
 		Maximize iconMaximize ConsoleMaximize Console
 		Maximizes the Console view.
 	
              
 
   
   
              
-      
-      
-      
+      
+      
+      
-      
+      
@@ -52,14 +52,14 @@ stops. 
              The Registers view context menu commands   include:
              
     
              Command
              Name
              Description
              Command
              Name
              Description
              		
     
              
     
              
       
              Show Type Names icon
              		
       
              Show Type Names 
              Displays the type, (such as int) beside each register value.
              Displays the type, (such as int) beside each register value.
              		
     
              
     
              
       
              Show Logical Structure icon
              		
   
   
              
-      
-      
-      
+      
+      
+      
-      
+      
@@ -69,12 +69,12 @@ stops. 
              
-      
+      
-      
+      
@@ -109,12 +109,12 @@ stops. 
              
-      
+      
-      
+      
@@ -124,12 +124,12 @@ stops. 
              
-      
+      
-      
+      
@@ -139,7 +139,7 @@ stops. 
              
-      
+      
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_arg.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_arg.htm
index 5a9850003fe..9da5d2bd64c 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_arg.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_arg.htm
@@ -21,13 +21,13 @@ that an application uses and the working directory for a run or debug configurat
 
 
              
     
              Command
              Name
              Description
              Command
              Name
              Description
              		
     
              
     
              
       
              		
       Add Register Group Open the Register Group dialog which allows you to define a register group that is shown in the Registers view. Open the Register Group dialog which allows you to define a register group that is shown in the Registers view. 
     
              
     
              
       
              		
     
              
       
              Cast to Type icon
              		
       Cast To Type... Open the Cast To Type dialog. Open the Cast To Type dialog. 
     
              
     
              
       
              Change Value icon
              		
       Change Value... Open the Set Value dialog to change the selected registers value. Open the Set Value dialog to change the selected registers value. 
     
              
     
              
       
              		
     
              
       
              Display as Array icon
              		
       Display As Array...Open the Display As Array dialog which allows you to specify the start and length of the array. Open the Display As Array dialog which allows you to specify the start and length of the array. 
     
              
     
              
        
       Edit Register Group Open the Register Group dialog to edit the selected register group. Open the Register Group dialog to edit the selected register group. 
     
              
     
              
       
              Enable icon
              		
     
              
       
              		
       Find...Open the Find dialog which allows you to find specific elements within the view.Open the Find dialog which allows you to find specific elements within the view.
     
              
     
              
       
              		
       Find/ReplaceOpen the Find / Replace dialog.Open the Find / Replace dialog.
     
              
     
              
       
              		
     
              
       
              		
       Max Length... Open the Configure Details Pane dialog to set the maximum number of characters to display. Default is 10000. Open the Configure Details Pane dialog to set the maximum number of characters to display. Default is 10000. 
     
              
     
              
       
              
-
-
-
-
-
-
-
+
+
+
+
+
+
+
              
 
              ComponentDescription
              Program argumentsSpecifies the arguments that are passed on the command line.
              Variables...Select variables by name to include in the program arguments list.
              Working directorySpecifies the run/debug configuration working directory.
              Use defaultCheckmark to specify the local directory or uncheck to specify a different workspace, a file system location, or variable.
              Workspace...Specifies the path of, or browse to, a workspace relative working directory.
              File System...Specifies the path of, or browse to, a file system directory.
              Variables...Select variables by name to include in the working directory.
              Program argumentsSpecifies the arguments that are passed on the command line.
              Variables...Select variables by name to include in the program arguments list.
              Working directorySpecifies the run/debug configuration working directory.
              Use defaultCheckmark to specify the local directory or uncheck to specify a different workspace, a file system location, or variable.
              Workspace...Specifies the path of, or browse to, a workspace relative working directory.
              File System...Specifies the path of, or browse to, a file system directory.
              Variables...Select variables by name to include in the working directory.
              
 
              
 
 
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_comm.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_comm.htm
index ac5d9d043ec..5462af7311b 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_comm.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_comm.htm
@@ -21,17 +21,17 @@ the location in which to store your run configuration and how you access it, how
 
 
-
-
-
              
-
-
-
-
-
-
-
-
+
+
+
              
+
+
+
+
+
+
+
+
              
 
              ComponentDescription
              Local fileSaves the launch configuration locally.
              Shared fileSpecifies the path of, or browse to, a workspace to store the launch configuration file, and be able to commit it to CVS.
              Display in favorites menuAdd configuration name to Run or Debug menus for easy selection.
              Console EncodingSpecify encoding scheme to use for console output.
              Allocate Console (necessary for input)Check to assign a console view to receive the output.
              FileSpecify file name to save output.
              Browse Workspace...Specifies the path of, or browse to, a workspace to store the output file.
              Browse File System...Specifies the path of, or browse to, a file system directory to store the output file.
              Variables...Select variables by name to include in the output file.
              AppendCheck to append output. Uncheck to recreate file each time.
              Launch in backgroundCheck to launch configuration in background mode.
              Local fileSaves the launch configuration locally.
              Shared fileSpecifies the path of, or browse to, a workspace to store the launch configuration file, and be able to commit it to CVS.
              Display in favorites menuAdd configuration name to Run or Debug menus for easy selection.
              Console EncodingSpecify encoding scheme to use for console output.
              Allocate Console (necessary for input)Check to assign a console view to receive the output.
              FileSpecify file name to save output.
              Browse Workspace...Specifies the path of, or browse to, a workspace to store the output file.
              Browse File System...Specifies the path of, or browse to, a file system directory to store the output file.
              Variables...Select variables by name to include in the output file.
              AppendCheck to append output. Uncheck to recreate file each time.
              Launch in backgroundCheck to launch configuration in background mode.
              
 
              
 
 
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_dbg.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_dbg.htm
index 6b8e8f83d81..acf30e40641 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_dbg.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_dbg.htm
@@ -20,12 +20,12 @@
 
 
-
-
-
+
+
              
-
+
              
 
              ComponentDescription
              DebuggerSelects debugger type from the list.
              Stop on startup atStops program at specified location.
              AdvancedOpens the Advanced Options dialog.
              		DebuggerSelects debugger type from the list.
              Stop on startup atStops program at specified location.
              AdvancedOpens the Advanced Options dialog.
              Advanced Options dialog
 
              Debugger OptionsDisplays options specific to the selected debugger type.
              Debugger OptionsDisplays options specific to the selected debugger type.
              
 
              
 
 
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_env.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_env.htm
index 39bd0c9e692..1713f75a585 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_env.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_env.htm
@@ -21,14 +21,14 @@ set environment variables and values to use when an application runs.
              
 
 
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
              
 
              ComponentDescription
              NameDisplays the name of environment variables.
              ValueDisplays the value of environment variables.
              NewCreates a new environment variable.
              Select...Select one or more environment variables to set.
              EditModifies the name and value of an environment variable.
              RemoveRemoves selected environment variables from the list.
              Append environment to native environmentAppend the environment variables shown to the current native environment.
              Replace native environment with specified environmentReplaces the current native environment with the specified environment set shown.
              NameDisplays the name of environment variables.
              ValueDisplays the value of environment variables.
              NewCreates a new environment variable.
              Select...Select one or more environment variables to set.
              EditModifies the name and value of an environment variable.
              RemoveRemoves selected environment variables from the list.
              Append environment to native environmentAppend the environment variables shown to the current native environment.
              Replace native environment with specified environmentReplaces the current native environment with the specified environment set shown.
              
 
              
 
 
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_launch_group.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_launch_group.htm
index 4170bf1e96c..d3fd15ba0d4 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_launch_group.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_launch_group.htm
@@ -13,44 +13,44 @@
 
 
              Launch Group
              
 
-
              The user can launch multiple applications at the same time or in sequential order. This is made possible by the launch configuration type: Launch Group.
              
+
              The user can launch multiple applications at the same time or in sequential order. This is made possible by the launch configuration type: Launch Group.
              
 
 
              Launches tab
              
 
              
 
-The Launches tab lets you add and delete launch configurations to the group.
+The Launches tab lets you add and delete launch configurations to the group.
 It also allows you to temporarily disable, re-order and edit properties of the elements in the group.
 
 
              
-
+Run Configuration dialog, Launch group
 
              
-
              
+
 
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
              
 
              ComponentDescription
              Name
              		Displays the name of the launch configuration and a checkbox for enabling or disabling the configuration.
              Mode
              		Displays the mode the configuration will run in when the group is launched.
              Action
              		Displays the optional action that will be carried after the configuration is launched.
              Up
              		Move selected configuration(s) up
              Down
              		Move selected configuration(s) down
              Add...
              		Opens a dialog to add a new configuration.
              Edit...
              		Opens a dialog to edit values for configuration(s).
              Remove
              		Removes selected configuration(s) from the list.
              NameDisplays the name of the launch configuration and a checkbox for enabling or disabling the configuration.
              ModeDisplays the mode the configuration will run in when the group is launched.
              ActionDisplays the optional action that will be carried after the configuration is launched.
              UpMove selected configuration(s) up
              DownMove selected configuration(s) down
              Add...Opens a dialog to add a new configuration.
              Edit...Opens a dialog to edit values for configuration(s).
              RemoveRemoves selected configuration(s) from the list.
              
 
 
              
-
              
+
 
 
              Common tab
              
 
-The Common tab lets you select where the configuration is stored, see Common tab reference page for details.
+The Common tab lets you select where the configuration is stored, see Common tab reference page for details.
 
 
              Add and Edit launch configuration Dialog
              
 
              
-
+Edit Launch Configuration dialog
 
              
-
              
+
 
-
+
-
-
-
+
+
+
-
              
 
              ComponentDescription
              Launch Mode
              Launch Mode
   The Launch Mode combobox at the top of the dialog serves a dual purpose.
              
    1. It dictates the desired mode for the launch configuration being added,
 and 
              
@@ -62,9 +62,9 @@ that support being invoked in 'debug' mode appear. Also, (2) when the launch
 group is invoked, that particular child launch configuration will be invoked in
 'debug' mode.
   
              Filter input
              		Type in filter input to filter list of configurations by name
              Configurations tree
              		Lists all available launch configurations for the selected Launch Mode, filtered by Filter input.
              Use default mode when launching
              Filter inputType in filter input to filter list of configurations by name
              Configurations treeLists all available launch configurations for the selected Launch Mode, filtered by Filter input.
              Use default mode when launching
   
 This checkbox acts as a sort of override to whatever mode is set in the Launch Mode
 combobox. Checking this option indicates that the child launch configuration
@@ -82,7 +82,7 @@ Note that "Use default..." control can allow you to create a launch group
 that will not be successful. For example when one or more launch configurations
 selected cannot be launched in the mode dictated by launch group mode.
   
              Post launch action
              		
+
              Post launch action
 There are several actions available that control what should be done after each launch:
 
            • Delay - Waits a specified number of second before launching the next configuration in the group
              • 
 
            • Wait until terminated - Waits until current launch is terminated
              • 
@@ -90,7 +90,7 @@ There are several actions available that control what should be done after each
 
              
 
 
              
-
              
+
 
 
 
              
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_main.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_main.htm
index 979caa273d7..b8f8802ffc1 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_main.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_main.htm
@@ -20,10 +20,10 @@
 
 
-
-
-
-
+
+
+
+
              
 
              ComponentDescription
              ProjectSpecifies the name of the project.
              C/C++ ApplicationSpecifies the name of the application.
              Search Project...Specifies the binary or binaries to run within the project.
              Connect process input output to a terminal 
              ProjectSpecifies the name of the project.
              C/C++ ApplicationSpecifies the name of the application.
              Search Project...Specifies the binary or binaries to run within the project.
              Connect process input output to a terminal 
              
 
              
 
 
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_srce.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_srce.htm
index f8afad0c418..aef28492b85 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_srce.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_srce.htm
@@ -22,13 +22,13 @@ application. By default, this information is taken from the build path of your p
 
 
-
-
-
              
-
-
-
-
+
+
+
              
+
+
+
+
              
 
              ComponentDescription
              AddAdds new source containers to the Source Lookup Path search list.
              Edit...Modifies the content of the selected source container.
              RemoveRemoves selected items from the Source Lookup Path list.
              UpMoves selected items up the Source Lookup Path list.
              DownMoves selected items down the Source Lookup Path list.
              Restore DefaultRestores the default source search list.
              Search for duplicate source files on the pathControls whether to continue search for files with the same name.
              AddAdds new source containers to the Source Lookup Path search list.
              Edit...Modifies the content of the selected source container.
              RemoveRemoves selected items from the Source Lookup Path list.
              UpMoves selected items up the Source Lookup Path list.
              DownMoves selected items down the Source Lookup Path list.
              Restore DefaultRestores the default source search list.
              Search for duplicate source files on the pathControls whether to continue search for files with the same name.
              
 
              
 
 
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_search.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_search.htm
index 21ec42a3b52..6e795c5da67 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_search.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_search.htm
@@ -39,43 +39,43 @@ in the search string precisely.
              
         
              		Description
       
              
       
              Class/StructClass/Struct
         Includes classes and structs in your search.
       
              
       
              FunctionFunction
         Searches for global functions or functions in a namespace
 (functions that are not members of a class, struct, or union).
       
              
       
              VariableVariable
         Searches for variables that are not members of a class,
 struct, or union.
       
              
       
              UnionUnion
         Searches for unions.
       
              
       
              MethodMethod
         Searches for methods that are members of a class, struct,
 or union.
       
              
       
              FieldField
         Searches for fields that are members of a class, struct, or
 union.
       
              
       
              EnumerationEnumeration
         Searches for enumerations.
       
              
       
              EnumeratorEnumerator
         Searches for enumerators.
       
              
       
              NamespaceNamespace
         Searches for namespaces.
       
              
       
              
         
       
              
       
              Any ElementAny Element
         Includes all elements in the search.
       
              
     
         
              Description
       
              
       
              DeclarationsDeclarations
         Limits the search to declarations.
       
              
       
              DefinitionsDefinitions
         Limits the search to definitions (for functions, methods,
 variables, and fields).
       
              
       
              ReferencesReferences
         Limits the search to references.
       
              
       
              All OccurrencesAll Occurrences
         Includes declarations, definitions, and references in the
 search.
       
              
         
              Description
       
              
       
              WorkspaceWorkspace
         all elements
         Searches in the full workspace
       
              
       
              Selected ResourcesSelected Resources
         all elementsSearches the resources selected in the Projects viewSearches the resources selected in the Projects view
       
              
       
              
         
         
       
              
       
              Workings SetWorkings Set
         all elements
         Searches in a working set
       
              
 
 
 
 
 
   
   
              @@ -27,22 +27,22 @@ debugger handles each one.
              
-        
+        
-        
+        
-        
+        
-        
+        
@@ -57,18 +57,18 @@ debugger handles each one.
              
-        
+        
-        
+        
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_views.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_views.htm
index 935f1f291fa..3c2764bb096 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_views.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_views.htm
@@ -11,7 +11,7 @@
 
              Selecting Views and Editors
              
 
-
              To see a list of all views, from the menu bar choose Window > Show View > Others. 
              
+
              To see a list of all views, from the menu bar choose Window > Show View > Others. 
              Show View Dialog Box
              
 
 The following views comprise the C/C++ Projects View:
@@ -19,16 +19,16 @@ The following views comprise the C/C++ Projects View:
 
              Basic views
              
 	
              Console
              Displays the application's output.
              
-	
              Project Explorer
              Displays the file system under the launchdir/workspace directory.
              
+	
              Project Explorer
              Displays the file system under the launchdir/workspace directory.
              
 	
              Outline
              Displays the functions and header files in your source files. Open a source file in an editor to view its outline.
              
 	
              Problems
               
              Displays problems.
              
-	
              Properties
              Displays the name, path, size, permissions, and last modified date of the resource highlighted in the  Project Explorer view.
              
+	
              Properties
              Displays the name, path, size, permissions, and last modified date of the resource highlighted in the  Project Explorer view.
              
 	
              Search
              Displays the results of file or text searches.
              
 
              C views
              
-
              C/C++ Projects
               
              Displays your current projects. This is similar to the Project Explorer  view.
              
+
              C/C++ Projects
               
              Displays your current projects. This is similar to the Project Explorer  view.
              
 
              
 
 
@@ -39,7 +39,7 @@ The following views comprise the C/C++ Projects View:
 
 
 
              Editor view
              
-The Editor view is not listed under  Window > Show View  or  Window > Show View > Others, it is opened whenever an editable file is opened from the C/C++ Projects or Project Explorer views.
+The Editor view is not listed under  Window > Show View  or  Window > Show View > Others, it is opened whenever an editable file is opened from the C/C++ Projects or Project Explorer views.
 
 
              
 Red Hat Copyright Statement
              
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_build_task.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_build_task.htm
index c8fdc478780..2b10b9aa823 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_build_task.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_build_task.htm
@@ -18,7 +18,7 @@
 	Adding include paths and symbols
              
 	Selecting a project type
              
 	Building manually
              
-	Removing the Build Automatically setting
              
+	Removing the Build Automatically setting
              
 	Autosaving on a build
              
 	Creating a make target
              
 	Configuring Project References
              
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_add_brk_action.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_add_brk_action.htm
index 46c5dd3d66d..2a43af181a8 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_add_brk_action.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_add_brk_action.htm
@@ -14,23 +14,23 @@
 
 
              To add a new breakpoint action:
                
-  
              1. Click Window > Preferences.
                2. 
-  
              2. Expand C/C++ > Debug and click Breakpoint Actions.

                Breakpoint Actions preference dialog
                3. 
-  
              3. In the Breakpoint Actions page, click New. 

                
+  
              4. Click Window > Preferences.
                5. 
+  
              5. Expand C/C++ > Debug and click Breakpoint Actions.

                Breakpoint Actions preference dialog
                6. 
+  
              6. In the Breakpoint Actions page, click New. 

                
     New Breakpoint Action dialog
                
   
                7. 
-  
              7. In the New Breakpoint Action dialog box, type a name for the action in the Action name box.
                8. 
-  
              8. Select an action  from the Action type list. 
                9. 
+  
              9. In the New Breakpoint Action dialog box, type a name for the action in the Action name box.
                10. 
+  
              10. Select an action  from the Action type list. 
                11. 
   
              11. Set the action's attributes: 
                12. 
   
                  
     
                • For a sound action, select a sound file.
                  • 
     
                • For a log action, type a message. 
                  • 
-    
                • For a resume action, set the Resume after time in seconds. 
                  • 
-    
                • For an external tool action, click Choose to select a  program.
                  • 
+    
                • For a resume action, set the Resume after time in seconds. 
                  • 
+    
                • For an external tool action, click Choose to select a  program.
                  • 
   
                
-  
              12. Click OK. 
                13. 
+  
              13. Click OK. 
                14. 
 
              
-
              The new breakpoint actions appears in the Actions available for any breakpoint in the workspace  list. 
              
+
              The new breakpoint actions appears in the Actions available for any breakpoint in the workspace  list. 
              Related concepts
 
              
 C/C++ Development perspective
              
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_add_brkpnts.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_add_brkpnts.htm
index 9b4db317ffc..abe6cf17962 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_add_brkpnts.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_add_brkpnts.htm
@@ -25,15 +25,15 @@ enabled when you debug, the execution suspends before that line of code
 executes.
              To add a breakpoint point, double click the marker bar located in the left margin of the 
-  C/C++ Editor beside the line of code where you want to add a breakpoint. A dot 
+  C/C++ Editor beside the line of code where you want to add a breakpoint. A dot 
   Icon: Breakpoint object is 
-  displayed in the marker bar and in the Breakpoints view, along with the name of the associated file.
              
+  displayed in the marker bar and in the Breakpoints view, along with the name of the associated file.
              Edit view with the cursor highlighting a breakpoint  
              
   
-
              For more information on marker bar icons, see Workbench User Guide > 
+
              For more information on marker bar icons, see Workbench User Guide > 
 Reference > User interface information > Icons and buttons > Editor area 
-marker bar.
              
+marker bar.
              Related concepts
 
              
 C/C++ Development perspective
              
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_add_codetemp.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_add_codetemp.htm
index ae587b9972c..2b14f39b985 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_add_codetemp.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_add_codetemp.htm
@@ -15,46 +15,46 @@
 
              To create a template:
                
-  
              1. Click Window > Preferences.
                2. 
-  
              2. Expand C/C++, expand Editor and select Templates.
                3. 
-  
              3. Click New.

                
+  
              4. Click Window > Preferences.
                5. 
+  
              5. Expand C/C++, expand Editor and select Templates.
                6. 
+  
              6. Click New.

                
   Creating a new Code Template Window
                
 
                
   
                7. 
   
              7. Do the following: (if required)
                
 	
                  
-  		
                • In the Name field, type a template name.
                  • 
-  		
                • In the Context drop down list, select the context type for the new template; either  C/C++ or a Comment.
                  • 
-  		
                • In the Description field, type a description for the new template.
                  • 
-  		
                • In the Pattern field, type the code for this template.
                  • 
-  		
                • Click Insert Variable to add a variable from the list to the code you have entered in the Pattern field.
                  • 
+  		
                • In the Name field, type a template name.
                  • 
+  		
                • In the Context drop down list, select the context type for the new template; either  C/C++ or a Comment.
                  • 
+  		
                • In the Description field, type a description for the new template.
                  • 
+  		
                • In the Pattern field, type the code for this template.
                  • 
+  		
                • Click Insert Variable to add a variable from the list to the code you have entered in the Pattern field.
                  • 
 	
                
  
                8. 
- 
              8. Click OK.
                
+ 
              9. Click OK.
                
  The new template displays in the Templates list. 
                10. 
 
              To edit a template:
                
-  
              1. Click Window > Preferences.
                2. 
-  
              2. Expand C/C++, expand Editor and select Templates.
                3. 
-  
              3. Click Edit. The Edit Template dialog opens.

                
+  
              4. Click Window > Preferences.
                5. 
+  
              5. Expand C/C++, expand Editor and select Templates.
                6. 
+  
              6. Click Edit. The Edit Template dialog opens.

                
   Editing a Code Template
                
   
                7. 
   
              7. Do the following:
                
 	
                  
-  		
                • In the Name field, change the template name to create a new 
+  		
                • In the Name field, change the template name to create a new 
         template based on the current template. 
                  • 
-  		
                • In the Context drop down list, select the context type for the new template; either  C/C++ or a Comment.
                  • 
-  		
                • In the Description field, change the description of the code 
+  		
                • In the Context drop down list, select the context type for the new template; either  C/C++ or a Comment.
                  • 
+  		
                • In the Description field, change the description of the code 
         template to reflect your changes.
                  • 
-  		
                • In the Pattern field, edit the code.
                  • 
-  		
                • Click Insert Variable to add a variable from the list to the 
-        code you edited in the Pattern field.
                  • 
+  		
                • In the Pattern field, edit the code.
                  • 
+  		
                • Click Insert Variable to add a variable from the list to the 
+        code you edited in the Pattern field.
                  • 
 	
                
  
                8. 
- 
              8. Click OK.
                9. 
+ 
              9. Click OK.
                10. 
 
              Related concepts
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_add_custom_persp.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_add_custom_persp.htm
index 8b514ad03fa..731eca5d362 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_add_custom_persp.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_add_custom_persp.htm
@@ -12,18 +12,18 @@
  
 
              Adding Convert to a C/C++ Make Project to the New menu
              
 
-
              If Convert to a C/C++ Make Project is not available in your menubar, you can add it by clicking Window > Customize Perspective
              
+
              If Convert to a C/C++ Make Project is not available in your menubar, you can add it by clicking Window > Customize Perspective
              Window - Customize Perspective menu selection
              
 
 
 
-
              From the Customize Perspecive Wizard select Convert to a C/C++ Make Project and click OK.
              
-
              Note:  Ensure New is selected in the Submenus: list. 
              
+
              From the Customize Perspecive Wizard select Convert to a C/C++ Make Project and click OK.
              
+
              Note:  Ensure New is selected in the Submenus: list. 
              Customize Perspective Wizard
               
              
 
-
              The File > New > Convert to a C/C++ Make Project option will now be available.
              
+
              The File > New > Convert to a C/C++ Make Project option will now be available.
              File New Menu showing Convert to a C/C++ Make Project
              
 
 
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_add_watch.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_add_watch.htm
index c7201377994..fcb17b0cda0 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_add_watch.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_add_watch.htm
@@ -24,13 +24,13 @@ true, regardless of when or where it occurred. You can set a watchpoint on a glo
 
 
                
   
              1. Highlight the variable in the editor, or select it in the Outline view.
                2. 
-  
              2. Click Run > Toggle Watchpoint.
                3. 
+  
              3. Click Run > Toggle Watchpoint.
                4. 
   
              4. Do any of the following:
                5. 
   
                • To stop execution when the watch expression is read, select the
-  Read check box.
                  • 
-  
                • To stop execution when  the watch expression is written to, select the Write 
+  Read check box.
                  • 
+  
                • To stop execution when  the watch expression is written to, select the Write 
   check box.
                
-  
              5. The watchpoint appears in the Breakpoints view 
+  
              6. The watchpoint appears in the Breakpoints view 
   list.
                7. 
 
              
 
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_addmaketarget.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_addmaketarget.htm
index 7057e259ae5..eeda34ba8ba 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_addmaketarget.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_addmaketarget.htm
@@ -15,8 +15,8 @@
 
              To create a make target:
                
-  
              1. Right click on a project and select Make Target > Create.
                2. 
-  
              2. Enter the Target name and build options and click Create.
                
+  
              3. Right click on a project and select Make Target > Create.
                4. 
+  
              4. Enter the Target name and build options and click Create.
                
   Create Make Target Window
                 
                5. 
   
              5. The make target will appear in the Make Targets view.
                
   Make Targets View
                 
                6. 
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_addrmv_brk_action.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_addrmv_brk_action.htm
index 38e055a8f43..d5721a0c86e 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_addrmv_brk_action.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_addrmv_brk_action.htm
@@ -12,32 +12,32 @@
 
 
                Attaching or removing breakpoint actions
                
 
-
                You can attach one or more breakpoint actions to a single breakpoint. For example, when the breakpoint is hit you could both log a message and play a sound. Actions are executed in the order they appear in the Actions for this breakpoint list. 
                
+
                You can attach one or more breakpoint actions to a single breakpoint. For example, when the breakpoint is hit you could both log a message and play a sound. Actions are executed in the order they appear in the Actions for this breakpoint list. 
                
 
                To  attach or remove a breakpoint action from a breakpoint: 
                
 
                  
-  
                1. In the Breakpoints view, right-click the breakpoint, and select Properties.
                  2. 
-  
                2. In the Properties for C/C++ Breakpoint  dialog box, click Actions.
                  
+  
                3. In the Breakpoints view, right-click the breakpoint, and select Properties.
                  4. 
+  
                4. In the Properties for C/C++ Breakpoint  dialog box, click Actions.
                  
   Actions page in Breakpoint Properties Dialog Box
                  5. 
-  
                5. In the Available actions list:
+  
                6. In the Available actions list:
     
                    
-      
                  • Select an action and click Attach to link it to the breakpoint. Repeat as required. 
                    • 
-      
                  • To add a new breakpoint action, click New.
                    • 
-      
                  • To edit the selected breakpoint action, click Edit.
                    • 
-      
                  • To delete the selected action, click Delete. 
                    
-          
                    NOTE: Deleting a breakpoint action removes it from the workspace. 
                    
+      
                  • Select an action and click Attach to link it to the breakpoint. Repeat as required. 
                    • 
+      
                  • To add a new breakpoint action, click New.
                    • 
+      
                  • To edit the selected breakpoint action, click Edit.
                    • 
+      
                  • To delete the selected action, click Delete. 
                    
+          
                    NOTE: Deleting a breakpoint action removes it from the workspace. 
                    
       
                    • 
     
                  
   
                  7. 
 
-  
                7. In the Actions for this breakpoint list you can:
+  
                8. In the Actions for this breakpoint list you can:
     
                    
-      
                  • Click Remove to delete the selected action from the list.
                    • 
-      
                  • Click Up to move the selected action up in the list.
                    • 
-      
                  • Click Down to move the selected action down in the list.
                    • 
+      
                  • Click Remove to delete the selected action from the list.
                    • 
+      
                  • Click Up to move the selected action up in the list.
                    • 
+      
                  • Click Down to move the selected action down in the list.
                    • 
     
                  
   
                  9. 
 
-  
                9. Click OK.
                  10. 
+  
                10. Click OK.
                  11. 
 
                
 
 
                Related tasks
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_autobuild.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_autobuild.htm
index 948b084e46e..de7cb1157d4 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_autobuild.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_autobuild.htm
@@ -12,8 +12,8 @@
 However, for C/C++ development you should disable this option,
 otherwise your entire project will be rebuilt whenever, for example,
 you save a change to your makefile or source files.
-Click Project > Build Automatically and ensure there is no
-checkmark beside the Build Automatically menu item.
                
+Click Project > Build Automatically and ensure there is no
+checkmark beside the Build Automatically menu item.
                
 
                Menubar showing Project selection
                
 
                Related concepts
 
 
                To save resources before manual builds:
                
 
                  
-  
                1. Click Window > Preferences. 
                  2. 
-  
                2. Select General > Workspace from the list.
                  
+  
                3. Click Window > Preferences. 
                  4. 
+  
                4. Select General > Workspace from the list.
                  
   Workbench Properties options window
                  5. 
-  
                5. On the Workspace page, select the Save automatically before build check box.
-  
                6. Click OK.
                  7. 
+  
                7. On the Workspace page, select the Save automatically before build check box.
+  
                8. Click OK.
                  9. 
 
                
 
                Eclipse will now save your resources when you build a project.
                
 
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_cbuild_pref.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_cbuild_pref.htm
index 8e221d3d2f1..d1aa9a756a1 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_cbuild_pref.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_cbuild_pref.htm
@@ -12,22 +12,22 @@
 building a project or the programs output when running/debugging.
                
 
                To set Console view preferences
                
 
                  
-  
                1. Click Window > Preferences.
                  2. 
-  
                2. Expand C/C++ and click Build Console.
                  
+  
                3. Click Window > Preferences.
                  4. 
+  
                4. Expand C/C++ and click Build Console.
                  
     Build Console Properties
                  5. 
-  
                5. To display information on the latest build only, select the Always
-clear console before building check box.
                  6. 
-  
                6. To open the Console view when a project is built, select the Open
-console when building check box.
                  7. 
+  
                7. To display information on the latest build only, select the Always
+clear console before building check box.
                  8. 
+  
                8. To open the Console view when a project is built, select the Open
+console when building check box.
                  9. 
   
                9. To display the console if it is already open when a project is
-built, select the Bring the console to top when building (if
-present) check box.
                  10. 
+built, select the Bring the console to top when building (if
+present) check box.
   
                10. To change the number of lines the console stores in its history,
-enter a new value in the text field next to Limit console output (#
-lines).
                  11. 
+enter a new value in the text field next to Limit console output (#
+lines).
   
                11. To change the number of spaces displayed by a tab, enter the
-number in the txt field next to Display tab width.
                  12. 
-  
                12. Click OK.
                  13. 
+number in the txt field next to Display tab width.
+  
                13. Click OK.
                  14. 
 
                
 
                Related concepts
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_comment_out.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_comment_out.htm
index ea513f2f0e5..b2a2d3e4058 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_comment_out.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_comment_out.htm
@@ -15,7 +15,7 @@
 
                You can comment out one or more lines of code. The leading characters // 
 are added to the beginning of each line.
                
 
-
                Tip: The characters /* */ on lines that already are 
+
                Tip: The characters /* */ on lines that already are 
 already commented out are not affected when you comment and uncomment code as 
 described above.
                
 
@@ -25,13 +25,13 @@ described above.
                
   
              6. In the C/C++ editor, select the line(s) of code that you want to comment out.  If no lines are selected comments will be added (or removed) at the current cursor positition.
                7. 
   
              7. Right-click and do one of the following:
                8. 
   
                  
-  
                • To comment out the selected code, select Comment.
                  • 
+  
                • To comment out the selected code, select Comment.
                  • 
   
                • To remove the leading // characters from the selected 
-  line(s) of code, select Uncomment.
                  • 
+  line(s) of code, select Uncomment.
   
                
 
              
 
-Tip: Instead of using the context menu (right click) you can quickly comment out by pressing CTRL+/ or remove comments by pressing CTRL+\.
+Tip: Instead of using the context menu (right click) you can quickly comment out by pressing CTRL+/ or remove comments by pressing CTRL+\.
 
  
              Related concepts
 
              
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_contentassist.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_contentassist.htm
index 79dd088d121..876fb8c90f1 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_contentassist.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_contentassist.htm
@@ -19,7 +19,7 @@ commonly-used snippets of code.
                
   
              1. In the C/C++ editor, type at least the first letter of a template or 
-  element then Ctrl+Space.
                
+  element then Ctrl+Space.
                
   A list displays the templates 
     Templates icon followed by the elements that start with the letter combination you typed.

                2. 
 	Editor View showing Content Assist Example
@@ -29,27 +29,27 @@ commonly-used snippets of code.
                
     
              2. Continue typing. The list shortens. When there is only one item in the 
     list, it is automatically inserted.
                3. 
     
              3. Double-click an item in the list to insert it into your code. 
                4. 
-    
              4. Press Esc to close the Content Assist Window.
                5. 
+    
              5. Press Esc to close the Content Assist Window.
                6. 
   
   
 
              To set Content Assist preferences:
                
-  
              1. Click Window > Preferences.
                2. 
-  
              2. Expand C/C++ and Editor.
                3. 
-  
              3. Select Content Assist.
                
+  
              4. Click Window > Preferences.
                5. 
+  
              5. Expand C/C++ and Editor.
                6. 
+  
              6. Select Content Assist.
                
   Content Assist Preferences
                7. 
   
              7. Do the following: 
   
                  
 	
                • To insert an element when you open Content Assist and it is the only 
-    item in the list, select the Insert single proposals automatically check box.
                  • 
-    
                • To automatically insert a common prefix of all proposals, select the Insert common prefixes automatically checkbox.
                  • 
-    
                • To display proposals in alphabetical order, rather than by relevance, select the Present proposals in alphabetical order checkbox. 
                  • 
-	
                • To change Auto-Activation of content assist for ".", "->" or "::" triggers, select the appropriate checkboxes.
                  • 
+    item in the list, select the Insert single proposals automatically check box.
+    
                • To automatically insert a common prefix of all proposals, select the Insert common prefixes automatically checkbox.
                  • 
+    
                • To display proposals in alphabetical order, rather than by relevance, select the Present proposals in alphabetical order checkbox. 
                  • 
+	
                • To change Auto-Activation of content assist for ".", "->" or "::" triggers, select the appropriate checkboxes.
                  • 
   
                
   
                8. 
-  
              8. Click OK.
                9. 
+  
              9. Click OK.
                10. 
 
              Related concepts
 
              
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_controldebug.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_controldebug.htm
index 653d1da7c4b..8d30ea256c6 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_controldebug.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_controldebug.htm
@@ -22,14 +22,14 @@ core set of debug controls. 
              To control a debug execution:
                
-  
              1. In the Debug view, select a thread.
                2. 
+  
              2. In the Debug view, select a thread.
                3. 
   
              3. To control the debug session, click:
                4. 
-  
                • Run > Resume
                  • 
-  
                • Run > Suspend
                  • 
-  
                • Run > Terminate
                  • 
-  
                • Run > Disconnect
                  • 
-  
                • Run > Remove All Terminated Launches
                  • 
-  
                • Run > Restart
                  • 
+  
                  • Run > Resume
                    • 
+  
                  • Run > Suspend
                    • 
+  
                  • Run > Terminate
                    • 
+  
                  • Run > Disconnect
                    • 
+  
                  • Run > Remove All Terminated Launches
                    • 
+  
                  • Run > Restart
                    • 
  
                  
  
              
 
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_conv_proj.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_conv_proj.htm
index 3bcf405c435..fc76883ea6e 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_conv_proj.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_conv_proj.htm
@@ -17,14 +17,14 @@
 
              To assign a C or C++ nature to a project
                
-  
              1. Click File > New > Other.
                
+  
              2. Click File > New > Other.
                
   New Project window
                3. 
-  
              3. Click C or C++.
                4. 
-  
              4. Click Convert to C/C++ Make Project.
                5. 
-  
              5. Click Next.
                6. 
+  
              6. Click C or C++.
                7. 
+  
              7. Click Convert to C/C++ Make Project.
                8. 
+  
              8. Click Next.
                9. 
   
              9. In the Candidates for conversion list, select the projects to convert.
                10. 
-  
              10. In the Convert to C or C++ box, click C Project or C++ Project.
                11. 
-  
              11. Click Finish. 
                12. 
+  
              12. In the Convert to C or C++ box, click C Project or C++ Project.
                13. 
+  
              13. Click Finish. 
                14. 
   
              Related concepts
 
              
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_convert_cdt_proj.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_convert_cdt_proj.htm
index c5848216b83..a58b09d4a78 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_convert_cdt_proj.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_convert_cdt_proj.htm
@@ -14,28 +14,28 @@
 
 
              How you update your CDT 1.x project to CDT 3.1 depends upon whether the 
 project is a Standard Make project or a Managed Make project. For a Standard 
-Make project, see Convert to C/C++ Make Project Wizard below.
              
+Make project, see Convert to C/C++ Make Project Wizard below.
              Updating a Managed Make Project 
              For a Managed Make project, the Managed Build system will prompt you to 
 convert your project when it attempts to read the Managed Build project 
 information and discovers that the project needs to be updated.  You will be prompted to update the project.
               Update Managed Builder dialog box
              
-
              Click Yes and the project will be updated.  The updated Managed 
-Build information can no longer be loaded by CDT 1.x or CDT 2.x.  Select 
-No and the project will not be updated.  You will be able to view the 
+
              Click Yes and the project will be updated.  The updated Managed 
+Build information can no longer be loaded by CDT 1.x or CDT 2.x.  Select 
+No and the project will not be updated.  You will be able to view the 
 Managed Build settings, but no changes will be saved when you close the project 
 or exit Eclipse.
              Convert to C/C++ Make Project Wizard
              
 
-
              Select File > New > Convert to a C/C++ Make Project. If that selection is not available, you can find the instructions for adding it here.
              
+
              Select File > New > Convert to a C/C++ Make Project. If that selection is not available, you can find the instructions for adding it here.
              File - New - Convert to a C/C++ Make Project menu selection
              
  
-
              From the Convert to C/C++ Make Project Wizard select the project you want to convert and click Finish.
              
+
              From the Convert to C/C++ Make Project Wizard select the project you want to convert and click Finish.
              Convert to C/C++ Make Project Wizard
              
 
-
              Note: You may need to manually enable Path Discovery for CDT 1.x Standard Make projects, depending on how your CDT project was configured.  
+
              Note: You may need to manually enable Path Discovery for CDT 1.x Standard Make projects, depending on how your CDT project was configured.  
 See Set Discovery Options for details.
              
 
 
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_convert_mbs20_proj.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_convert_mbs20_proj.htm
index f2fb156405e..f5df8df9e78 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_convert_mbs20_proj.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_convert_mbs20_proj.htm
@@ -16,9 +16,9 @@
 convert your project when it attempts to read the Managed Build project 
 information and discovers that the project needs to be updated.  You will be prompted to update the project.
               Update CDT 2.x Managed Builder dialog box
              
-
              Click Yes and the project will be updated.  The updated Managed 
-Build information can no longer be loaded by CDT 2.x.  Select 
-No and the project will not be updated.  You will be able to view the 
+
              Click Yes and the project will be updated.  The updated Managed 
+Build information can no longer be loaded by CDT 2.x.  Select 
+No and the project will not be updated.  You will be able to view the 
 Managed Build settings, but no changes will be saved when you close the project 
 or exit Eclipse.
              
 
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_create_make_target.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_create_make_target.htm
index 5dcfd0a53e4..b876fb089ac 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_create_make_target.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_create_make_target.htm
@@ -14,9 +14,9 @@
 
 
              To create a make target:
                
-  
              1. Right click on the project and select Create Make Target...

                2. 
+  
              2. Right click on the project and select Create Make Target...

                3. 
   Select Create Make Target
                 
-  
              3. Enter the Target name and build options and click Create.
                
+  
              4. Enter the Target name and build options and click Create.
                
   Create Make Target Window
                 
                5. 
   
              5. The make target will appear in the Make Targets view.
                
   Make Targets View
                 
                6. 
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_cust_cpp_editor.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_cust_cpp_editor.htm
index ae0b73ef2d6..96cd4423d23 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_cust_cpp_editor.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_cust_cpp_editor.htm
@@ -26,18 +26,18 @@ END INFOPOP-->
 
                To customize the C/C++ editor preferences:
                
 
 
                  
-  	
                1. Click Window > Preferences.

                  2. 
-  	
                2. Expand C/C++, and click C/C++ Editor.

                  3. 
-	
                3. To set general preferences for the editor click the General tab.
                  
+  	
                4. Click Window > Preferences.

                  5. 
+  	
                5. Expand C/C++, and click C/C++ Editor.

                  6. 
+	
                6. To set general preferences for the editor click the General tab.
                  
 	Editor General Preferences Window
                  7. 
-	
                7. On the General Page set your preferences and click Apply. For a description of the General preferences click here.

                  8. 
+	
                8. On the General Page set your preferences and click Apply. For a description of the General preferences click here.

                  9. 
 
-	
                9. To customize the color of the text in the editable area of the C/C++ editor, click the Colors tab.
                  
+	
                10. To customize the color of the text in the editable area of the C/C++ editor, click the Colors tab.
                  
 	Editor Color Preferences Window
                  11. 
 		 
-	
                11. On the Colors page set your preferences and click Apply. For a description of the Color preferences click here.

                  12. 
-	
                12. To customize Content Assist preferences, click the Content Assist tab. For more information, see Using Content Assist

                  13. 
-	
                13. Click OK.

                  14. 
+	
                14. On the Colors page set your preferences and click Apply. For a description of the Color preferences click here.

                  15. 
+	
                15. To customize Content Assist preferences, click the Content Assist tab. For more information, see Using Content Assist

                  16. 
+	
                16. Click OK.

                  17. 
 
                
 
 
                Related concepts 
                
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_debug_exes.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_debug_exes.htm
index 689adee976e..d276863e376 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_debug_exes.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_debug_exes.htm
@@ -18,39 +18,39 @@ ul, li	{ padding: 3px 0px}
 
   
                Importing Executables for Debugging 
                
   
                  
-    
                1. Select the File > Import... menu item.
                  2. 
-    
                2. In the Import wizard dialog, click C/C++ and select C/C++ Executable.
                  
+    
                3. Select the File > Import... menu item.
                  4. 
+    
                4. In the Import wizard dialog, click C/C++ and select C/C++ Executable.
                  
       
                  Import dialog
                  5. 
-    
                5. Click Next.
                  6. 
-   
                6. In the Import C/C++ Executable Files page of the Import Executable dialog:
                  
+    
                7. Click Next.
                  8. 
+   
                8. In the Import C/C++ Executable Files page of the Import Executable dialog:
                  
    
                    
-   	
                  • Choose a parser from the Select binary parser list.
                    • 
-   	
                  • Type the executable path in the Select executable box or click Browse to locate the executable.
                    • 
-    
                  • Type or click Browse to enter a directory path in the Search directory box, then select one or more executables from the C/C++ Executable Files list.
                    • 
+   	
                  • Choose a parser from the Select binary parser list.
                    • 
+   	
                  • Type the executable path in the Select executable box or click Browse to locate the executable.
                    • 
+    
                  • Type or click Browse to enter a directory path in the Search directory box, then select one or more executables from the C/C++ Executable Files list.
                    • 
    
                  
    
                  Import Executable dialog
                  
-   
                  NOTE You can import any executable, but only those built with debug symbols will be let you step through source code and see variable values. 
                  
+   
                  NOTE You can import any executable, but only those built with debug symbols will be let you step through source code and see variable values. 
                  
    
                  9. 
-   
                9. Click Next.
                  10. 
-   
                10. In the Choose Project page of the Import Executable dialog:
                  
+   
                11. Click Next.
                  12. 
+   
                12. In the Choose Project page of the Import Executable dialog:
                  
    
                    
-   	
                  • To import as a new project, activate New project name and type the project name.
                    • 
-   	
                  • To import into an existing project, activate Existing project and click Search.
                    • 
-   	
                  • To add a launch configuration, activate Create a Launch Configuration and select the configuration from the list, then type a name into the Name box.
                    • 
+   	
                  • To import as a new project, activate New project name and type the project name.
                    • 
+   	
                  • To import into an existing project, activate Existing project and click Search.
                    • 
+   	
                  • To add a launch configuration, activate Create a Launch Configuration and select the configuration from the list, then type a name into the Name box.
                    • 
    
                  
    
                  Import Executable dialog
                  
    
                  13. 
-  
                13. Click Finish.
                  
-    
                  The executable is added to the C/C++ Projects view.
                  14. 
-  
                14. If Create a Launch Configuration was activated, the Debug dialog appears.
                  
+  
                15. Click Finish.
                  
+    
                  The executable is added to the C/C++ Projects view.
                  16. 
+  
                16. If Create a Launch Configuration was activated, the Debug dialog appears.
                  
       
                  Debug launch configuration dialog
                  
   
                  17. 
-  
                17. Click Debug.
                  
+  
                18. Click Debug.
                  
   
                  The debugger launches and you can begin debugging the executable.
                  19. 
   
                
   
   
                Setting breakpoints 
                
-  
                Expand the executable in the C++ Projects view to see the list of source files. Only executables built with debug symbols will show a list of source files. The source files can be opened in the editor so you can set breakpoints. Use these files only for debugging, you can not change them and rebuild the executable with this project. 
                
+  
                Expand the executable in the C++ Projects view to see the list of source files. Only executables built with debug symbols will show a list of source files. The source files can be opened in the editor so you can set breakpoints. Use these files only for debugging, you can not change them and rebuild the executable with this project. 
                
      
                C++ Projects View
                
  
 
                Related concepts 
                
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_debug_prog.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_debug_prog.htm
index b0d79900592..02f97d75068 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_debug_prog.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_debug_prog.htm
@@ -22,16 +22,16 @@ program.
                
 
                  
   
                1. In  C/C++ Projects view, select a project. 
   
                  2. 
-  
                2. Click Run > Debug.
                  3. 
-  
                3. In the Debug dialog box, select a debug configuration type from the Configurations 
+  
                4. Click Run > Debug.
                  5. 
+  
                5. In the Debug dialog box, select a debug configuration type from the Configurations 
   list.
                  6. 
-  
                6. Click New.
                  7. 
-  
                7. In the Name box, type a descriptive name for this debug configuration.
                  8. 
-  
                8. In the Project box, type the name of the project containing 
+  
                9. Click New.
                  10. 
+  
                10. In the Name box, type a descriptive name for this debug configuration.
                  11. 
+  
                11. In the Project box, type the name of the project containing 
         the application you want to debug.
                  12. 
-  
                12. In the C/C++ Application box, type the name of the executable 
+  
                13. In the C/C++ Application box, type the name of the executable 
         that you want to run.
                  14. 
-  
                14. Click Debug.
                  15. 
+  
                15. Click Debug.
                  16. 
   
                  The debug perspective is opened and the  application window opens on 
   top. The C/C++ editor window is repositioned in the perspective.
                  
 
                
@@ -57,10 +57,10 @@ program.
                
 program.
                
 
 
                  
-  
                1. Click Run > Debug.
                  2. 
+  
                2. Click Run > Debug.
                  3. 
   
                3. In the Debug dialog box, select a debug configuration from the Configurations 
   list.
                  4. 
-  
                4. Click Debug. 
                  5. 
+  
                5. Click Debug. 
                  6. 
 
                
 
 
                Related concepts
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_disassembly.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_disassembly.htm
index 58b165cf3ae..3804eefb74e 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_disassembly.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_disassembly.htm
@@ -17,10 +17,10 @@
 
                Disassembly view lets you can examine your program as it steps into 
 disassembled code. This is useful when the instruction pointer enters 
 a function for which it does not have the source.
-To open the Disassembly view select Window > Show View > 
-Disassembly menu.
                
+To open the Disassembly view select Window > Show View > 
+Disassembly menu.
                
 
-
                To activate the insruction step mode check the Instruction Stepping Mode option 
+
                To activate the insruction step mode check the Instruction Stepping Mode option 
 on the Debug view toolbar. Debugger switches to the instruction stepping mode automatically 
 when the Disassembly view has focus.
                
 
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_discovery.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_discovery.htm
index 172a063d372..307b2cbbadf 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_discovery.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_discovery.htm
@@ -8,16 +8,16 @@
 
 
 
                Set Discovery Options
                
-
                For most make projects, you will want to parse the output of
+
                For most make projects, you will want to parse the output of
 the build to populate your paths and symbols tables. 
                
-
                To populate your tables:
                
+
                To populate your tables:
                
 
                  
-	
                1. Right-click on a project and select Properties.
-	
                2. Expand C/C++ Build and select Discovery options.
-	
                3. Select the Automate discovery of paths and symbols option so that it is enabled.
+	
                4. Right-click on a project and select Properties.
+	
                5. Expand C/C++ Build and select Discovery options.
+	
                6. Select the Automate discovery of paths and symbols option so that it is enabled.
 	
                7. For the scanner configuration on the Discovery Options page of the C/C++ Properties window, you have the following options:
 
-
                  There are various discovery profiles available on a Per project basis - all discovered paths and symbols are associated with the project; all files use this information. 
                  
+
                  There are various discovery profiles available on a Per project basis - all discovered paths and symbols are associated with the project; all files use this information. 
                  
 
 
                  
   
                  Enable generate scanner info command
                  
@@ -30,7 +30,7 @@ the build to populate your paths and symbols tables. 
                  
 
 
                  
 
                  For both profiles, there is an option to discover paths and symbols
-based on a previous builds' output. To activate the discovery, click Browse to select a
+based on a previous builds' output. To activate the discovery, click Browse to select a
 build log file, and then click the Load
 button.
                  
 
                  
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_endis_able_brk_wtch.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_endis_able_brk_wtch.htm
index 918cdef4604..103b4bcf37d 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_endis_able_brk_wtch.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_endis_able_brk_wtch.htm
@@ -22,13 +22,13 @@ information it contains.
                  
   
                8. In the Breakpoints view, do one of the following:
   
                    
     
                  • Select the breakpoints and watchpoints that you want to remove.
                    • 
-    
                  • Click Edit > Select All.
                    • 
-    
                  • Right-click, and select Select All.
                    • 
+    
                  • Click Edit > Select All.
                    • 
+    
                  • Right-click, and select Select All.
                    • 
   
                  
   
                  9. 
   
                9. In the Breakpoints view, right-click the highlighted breakpoints and watchpoints and 
-  click 
-  Disable or Enable. 
                  10. 
+  click 
+  Disable or Enable. 
                  10. 
 
                
 
 
                Related concepts
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_expressions.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_expressions.htm
index b0b40a03034..48dc177c526 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_expressions.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_expressions.htm
@@ -20,9 +20,9 @@ view is part of the Debug perspective.
                
 
                To add an expression:
                
 
 
                  
-  
                1. Select Add Watch Expression in the context menu of the Expressions view.
                  2. 
+  
                2. Select Add Watch Expression in the context menu of the Expressions view.
                  3. 
   
                3. Type the expression that you want to evaluate. For example, (x-5)*3 .
                  4. 
-  
                4. Click OK.
                  The expression and its value appear in the 
+  
                5. Click OK.
                  The expression and its value appear in the 
   Expressions view. When the execution of a program is suspended, all expressions 
   are reevaluated.
                  6. 
 
                
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_filtererror.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_filtererror.htm
index 85bcb3543cd..2c5633715b0 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_filtererror.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_filtererror.htm
@@ -19,11 +19,11 @@
 
                To filter errors:
                
 
 
                  
-  
                1. In Problems view, click the Filters icon
+  
                2. In Problems view, click the Filters icon
   Filters icon.
                  3. 
-  
                3. To view all errors and warnings, select all checkboxes in the Show items of type 
-  list, and click On any resource.
                  4. 
-  
                4. Click OK.
                  5. 
+  
                5. To view all errors and warnings, select all checkboxes in the Show items of type 
+  list, and click On any resource.
                  6. 
+  
                6. Click OK.
                  7. 
 
                
 
 
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_imp_code_temp.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_imp_code_temp.htm
index 71cb257f412..6dd7225e858 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_imp_code_temp.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_imp_code_temp.htm
@@ -13,7 +13,7 @@
 
 
                You can import and export templates.
                
 
-
                Note: A template must be an .xml file formatted as follows:
                
+
                Note: A template must be an .xml file formatted as follows:
                
 
 
                <?xml version="1.0" encoding="UTF-8" ?> 
 <templates>
@@ -23,22 +23,22 @@
 
 
                To import a template
                
 
                  
-  
                1. Click Window > Preferences.
                  2. 
-  
                2. Expand C/C++, expand Editor and click Templates.
+  
                3. Click Window > Preferences.
                  4. 
+  
                4. Expand C/C++, expand Editor and click Templates.
   
                  5. 
-  
                5. Click Import.
                  6. 
+  
                6. Click Import.
                  7. 
   
                7. Select the template file that you want to import.
                  8. 
-  
                8. Click OK.
                  
+  
                9. Click OK.
                  
   The template list is updated to include the template that you imported.
                  10. 
 
                
 
                To export a template
                
 
 
                  
-  
                1. Click Window > Preferences.
                  2. 
-  
                2. Expand C/C++, expand Editor and click Templates.
                  3. 
-  
                3. Select the templates that you want to export and click the Export... button. The Export Templates dialog opens.
                  4. 
-  
                4. In File name box, type the path  where you want your templates file to be saved.
                  5. 
-  
                5. Click Save.
                  
+  
                6. Click Window > Preferences.
                  7. 
+  
                7. Expand C/C++, expand Editor and click Templates.
                  8. 
+  
                8. Select the templates that you want to export and click the Export... button. The Export Templates dialog opens.
                  9. 
+  
                9. In File name box, type the path  where you want your templates file to be saved.
                  10. 
+  
                10. Click Save.
                  
   The templates.xml file containing the templates you exported is saved in your file system.
                  11. 
 
                
 
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_jumperror.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_jumperror.htm
index 55fcb778df0..8b130922af6 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_jumperror.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_jumperror.htm
@@ -20,8 +20,8 @@ determine the location of an error, it is added to the Console view.
                
 
                To jump to the source of an error:
                
 
 
                  
-  
                • In  the Console view, double-click the Error iconError iconor 
-  the Warning iconWarning icon.
                  
+  
                • In  the Console view, double-click the Error iconError iconor 
+  the Warning iconWarning icon.
                  
   
                  The file opens in the C/C++ editor and the cursor moves to the  line with the error.
                  
   
                  • 
 
                
@@ -29,7 +29,7 @@ determine the location of an error, it is added to the Console view.
                
 
                To jump to errors sequentially:
                
 
 
                  
-  
                • Click Jump to next or Jump to previous. 
                  • 
+  
                • Click Jump to next or Jump to previous. 
                  • 
 
                
 
 
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_manualbuild.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_manualbuild.htm
index b06f2accaa6..73ed1edc111 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_manualbuild.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_manualbuild.htm
@@ -15,32 +15,32 @@ of the make utility in the console.
                
  alt="Sample build in console view">
                
 
                
   
                Incremental Builds
                
-  
                To incrementally build all open projects, you can select Project
-> Build All or type CTRL+B.
                
+  
                To incrementally build all open projects, you can select Project
+> Build All or type CTRL+B.
                
   
                Build Individual Projects
                
-  
                To build individual projects click Project > Build Project.
                
+  
                To build individual projects click Project > Build Project.
                
   
                Rebuild Projects
                
-  
                To rebuild a project right click on the project and select Rebuild
-Project.
                
-    Note: This will rebuild projects that this project
+  
                To rebuild a project right click on the project and select Rebuild
+Project.
                
+    Note: This will rebuild projects that this project
 references as well, but will not rebuild projects that references this
 one.
                
   
                Build Automatically
                
   
                This performs a Build All whenever any project file is saved,
-such as your makefile. 
                
-    Tip: For C/C++ projects, this feature should be turned off.
-If there is a checkmark beside Build Automatically the feature
-is on. To turn it off, select Build Automatically.
                
+such as your makefile. 
                
+    Tip: For C/C++ projects, this feature should be turned off.
+If there is a checkmark beside Build Automatically the feature
+is on. To turn it off, select Build Automatically.
 
                
-
                Tip: If you get the error message:
                
+
                Tip: If you get the error message:
                
 
                Exec error:Launching failed
                
 
                then CDT cannot locate the build command, (usually make).
 Either your path is not configured correctly or you do not have make
 installed on your system.
                
-
                Tip: The menubar item Project > Build Working Set
+
                Tip: The menubar item Project > Build Working Set
 submenu for C/C++ projects simply creates a link to the build all
-target as defined in your makefile, and is no different from an Incremental
-Build.
                
+target as defined in your makefile, and is no different from an Incremental
+Build.
                
 
                Related concepts
 
                
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_memory.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_memory.htm
index 266344964d3..ffa7aabb4fd 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_memory.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_memory.htm
@@ -54,7 +54,7 @@ The "Add Memory Rendering" dialog appears.
 
              To change process memory:
              
 
-
              Warning:
+
              Warning:
 Changing process memory can cause a program to crash.
                
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_new_cpp.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_new_cpp.htm
index 17ac681418c..2111ee4984f 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_new_cpp.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_new_cpp.htm
@@ -20,26 +20,26 @@ function changeSize(theImage,wd,ht) {
 the editor area to the right of the C/C++ Projects view.
                
 
                The marker bar on the left margin of the C/C++ editor, displays
 icons for errors, warnings, bookmarks, breakpoints and tasks.
                
-
                For more information on the marker bar, see Workbench User Guide
+
                For more information on the marker bar, see Workbench User Guide
 > Reference > User interface information > Views and editors
-> Editor area.
                
+> Editor area.
                
 
                To create a C++ file:
                
 
                  
-  
                1. In the C++ Projects view, right-click a project, and
-select New > File.
                  
+  
                2. In the C++ Projects view, right-click a project, and
+select New > File.
                  
     New > File in Projects View
                  3. 
   
                3. In the list of projects, verify that the correct project is
 selected.
                  4. 
-  
                4. In the File name box, type a name followed by the
+  
                5. In the File name box, type a name followed by the
 appropriate extension.
                  6. 
-  
                6. Click Finish.
                  
+  
                7. Click Finish.
                  
     New File Wizard
                  8. 
   
                  The file will open in the C/C++ editor.
                  
   
                8. Enter your code in the editor view..
                  
     Editor view with a sample code
                  9. 
-  
                9. Type CTRL+S to save the file.
                  10. 
+  
                10. Type CTRL+S to save the file.
                  11. 
 
                
 
                Related concepts
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_new_make.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_new_make.htm
index bf7050711e4..7654dd9d6db 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_new_make.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_new_make.htm
@@ -26,16 +26,16 @@ function changeSize(theImage,wd,ht) {
 view.
                
 
                To create a makefile:
                
 
                  
-  
                1. In the C++ Projects view, right-click a project, and select New > File.
                  
+  
                2. In the C++ Projects view, right-click a project, and select New > File.
                  
   New > File in Projects View
                  3. 
-  
                3. In the File name box, type makefile.
                  4. 
+  
                4. In the File name box, type makefile.
                  5. 
   
                5. In the list of projects, verify that the correct project is selected.
                  6. 
-  
                6. Click Finish.
                  
+  
                7. Click Finish.
                  
   New File Wizard
                  8. 
    
                8. The C/C++ editor opens. Type makefile instructions  in the C/C++ editor.
                  
   Editor view with a sample code
                  9. 
-  
                9. Click File > 
-  Save.
                
+  
              1. Click File > 
+  Save.
              Related concepts
 
              
 Makefile
              
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_new_run_config.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_new_run_config.htm
index 7af268163ea..a2d3544f5e9 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_new_run_config.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_new_run_config.htm
@@ -17,9 +17,9 @@
 
 
                
   
              1. In  the C/C++ Projects view, select a project.
                2. 
-  
              2. Click Run > Run or Run > Debug.
                3. 
-  
              3. In the Configurations box, expand C/C++ Local.
                4. 
-  
              4. Click New. The name of the new project is displayed in the 
+  
              5. Click Run > Run or Run > Debug.
                6. 
+  
              6. In the Configurations box, expand C/C++ Local.
                7. 
+  
              7. Click New. The name of the new project is displayed in the 
   Configurations box. The default name is the name of the project.
                
   Run Configuration window 
                8. 
   
              8. To change the default name of the new run/debug configuration, see
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_open_declarations.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_open_declarations.htm
index 6dd0e5aeccd..c14b6be08a6 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_open_declarations.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_open_declarations.htm
@@ -20,13 +20,13 @@ element declarations on successfully compiled programs.
                
 
 
                  
   
                1. In the C/C++ editor, select an object.
                  2. 
-  
                2. Right-click the selected element, select Open Declaration.
                  
+  
                3. Right-click the selected element, select Open Declaration.
                  
   Editor View showing Open Declaration option
   
                  4. 
 
                
 
 
                For more information, see:
                  
-  
                •  Workbench User Guide > Tasks> Navigating and finding resources
                  • 
+  
                •  Workbench User Guide > Tasks> Navigating and finding resources
                  • 
   
                
 
 
                Related concepts
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_build_set.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_build_set.htm
index d2638e5b2de..e27664fd750 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_build_set.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_build_set.htm
@@ -8,7 +8,7 @@
 
 
 
                Defining Project Build settings
                
-
                The Builder Settings page lets you:
                
+
                The Builder Settings page lets you:
                
 
                  
   
                • Select whether CDT-generated makefile should be used or custom one.
                  • 
   
                • Select internal or external builder (for generated makefile only).
                  • 
@@ -20,35 +20,35 @@
 
                
 
 
                To define build settings:
                
-In the C/C++ Projects view, right-click your project, and select Properties. 
-Select C/C++ Build  from the list.
                9. 
+In the C/C++ Projects view, right-click your project, and select Properties. 
+Select C/C++ Build  from the list.
 
                
 
 
                Defining Project Build settings
                
 
 
                  
-  
                • To stop the build when an error is encountered, select Stop
-on first build error.
                  • 
+  
                • To stop the build when an error is encountered, select Stop
+on first build error.
                  • 
   
                • Select one of the following build command settings:
                  • 
   
                    
-    
                  • To use the default make command, select the Use Default
+    
                  • To use the default make command, select the Use Default
 check box.
                    • 
-    
                  • To use a build utility other than the default make command Build
-Command box, clear the Use Default check box .
                    • 
+    
                  • To use a build utility other than the default make command Build
+Command box, clear the Use Default check box .
                    • 
   
                  
   
                • In the Workbench Build Behavior box, do the following:
                  • 
   
                    
     
                  • To build your project when resources are saved and change the
-default make build target, select the Build on resource save (Auto
-Build) check box. Enter a new build target in the Make build
-target box.
                    • 
-    
                  • To change the build default make build target, select the Build
-(Incremental Build) check box. Enter a new build target in the Make
-build target box.
                    • 
-    
                  • To change the rebuild default make build target, select the Rebuild
-(Full Build) check box. Enter a new build target in the Make
-build target box.
                    • 
+default make build target, select the Build on resource save (Auto
+Build) check box. Enter a new build target in the Make build
+target box.
+    
                  • To change the build default make build target, select the Build
+(Incremental Build) check box. Enter a new build target in the Make
+build target box.
                    • 
+    
                  • To change the rebuild default make build target, select the Rebuild
+(Full Build) check box. Enter a new build target in the Make
+build target box.
                    • 
   
                  
   
                • Click OK.
                  • 
 
                
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_error_parser.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_error_parser.htm
index 37711a72676..afd2b7abf90 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_error_parser.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_error_parser.htm
@@ -32,22 +32,22 @@ project properties in the Preferences window for future make projects.
                
  	
            • To set properties for makefile projects, do the following:
 		
                
-		
              1. Select Window > Preferences . 
-		
              2. Expand C/C++.
-		
              3. Expand New CDT project wizard.
-		
              4. Click Makefile Project.
                5. 
+		
              5. Select Window > Preferences . 
+		
              6. Expand C/C++.
+		
              7. Expand New CDT project wizard.
+		
              8. Click Makefile Project.
                9. 
 		
              
 	  
            • For a typical make project, do the following:
 		
                
-			
              1. In the C/C++ Projects view, right-click the project, and select Properties.  
-			
              2. Expand C/C++ Build.
                3. 
-	  
              3. Select Settings.  
+			
              4. In the C/C++ Projects view, right-click the project, and select Properties.  
+			
              5. Expand C/C++ Build.
                6. 
+	  
              6. Select Settings.  
 	
              
 
              • 
-  
            • Click the Error Parsers tab.
              • 
-  
            • In the Error parsers list, select error parsers.
              • 
-  
            • Click OK.
              • 
+  
            • Click the Error Parsers tab.
              • 
+  
            • In the Error parsers list, select error parsers.
              • 
+  
            • Click OK.
              • Related concepts
 
              
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_new.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_new.htm
index 22c5b30aa57..75ad692afa3 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_new.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_new.htm
@@ -17,35 +17,35 @@
 
              To create a project:
                
-  
              1. Click File > New > Project.
+  
              2. Click File > New > Project.
   
                
   
                
   File >New > Project
   
                
   
                3. 
-  
              3. In the New Project wizard, open C or C++ folder and select corresponding project.
+  
              4. In the New Project wizard, open C or C++ folder and select corresponding project.
   
                
   
                
   New Project Wizard
                5. 
   
                
-  
              5. Click Next.
                6. 
-  
              6. In the Project Name box, type a name.
                7. 
-  
              7. To specify a different directory in which to save your project, clear the 
-  Use Default Location check box, and enter the path in the Location 
+  
              8. Click Next.
                9. 
+  
              9. In the Project Name box, type a name.
                10. 
+  
              10. To specify a different directory in which to save your project, clear the 
+  Use Default Location check box, and enter the path in the Location 
   box.
                11. 
-  
              11. Select Project type on the left pane. For more information, see Selecting a 
+  
              12. Select Project type on the left pane. For more information, see Selecting a 
   project type.
                13. 
   
              13. Select one or more toolchains from the list on the right pane.
                14. 
-  
              14. You can change build configurations list for the project. To do it, press Next. 
+  
              15. You can change build configurations list for the project. To do it, press Next. 
   But usually you need not to do it.
                16. 
-  
              16. To create your project, click Finish.
+  
              17. To create your project, click Finish.
   
                
   
                
   New Project Wizard
                18. 
   
   
                
   
              18. If a message box prompts 
-  you to switch perspectives, click Yes.
                19. 
+  you to switch perspectives, click Yes.
   
              19. Define your project 
   properties. For more information, 
   see Defining project properties.
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_new_with_template.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_new_with_template.htm
index 439bb3e6290..4afa2d7895d 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_new_with_template.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_new_with_template.htm
@@ -20,7 +20,7 @@ aspects of the generated project may be customized by the user as part of the ne
 
 
                  
   
-  
                1. Click File > New > C Project or File > New > C++ Project.
+  
                2. Click File > New > C Project or File > New > C++ Project.
   
                  
   
                  
   File >New > C++ Project
@@ -32,14 +32,14 @@ aspects of the generated project may be customized by the user as part of the ne
   project type This shows the template projects that you can use as a basis
   for your new project. CDT comes with some simple templates, but ISVs can add further templates by using the
   org.eclipse.cdt.core.templates extension point.
                  
-  In the Project Name box, type a name. The example uses "HelloWorld"
                  3. 
+  In the Project Name box, type a name. The example uses "HelloWorld"
   
                  
   
                  
   New Project Wizard
   
                  
   
   
-  
                3. Click Next.
                  4. 
+  
                4. Click Next.
                  5. 
   
                5. The next page is dependent on the type of template you selected. It will consist of a number of input fields, maybe with
   default values, that will be fed into the template you create.
                  6. 
   
                  
@@ -54,7 +54,7 @@ aspects of the generated project may be customized by the user as part of the ne
   New Project Wizard
   
                  
   
-  
                6. To create your project, click Finish.
+  
                7. To create your project, click Finish.
   
   
                8. In the Project Explorer you will see that the new project has been created. You will see that the source file has
   been customized with the values you entered earlier in the wizard.
@@ -65,7 +65,7 @@ aspects of the generated project may be customized by the user as part of the ne
   
                  9. 
   
   
                9. Sometimes values you enter into the template wizard will be remembered between sessions in order that you do not
-  need enter them each time. If you want to change these you can use Window > Preferences > C/C++ > Template Default Values
+  need enter them each time. If you want to change these you can use Window > Preferences > C/C++ > Template Default Values
   
                  
   
                  
   New Project Wizard
                  10. 
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_parser.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_parser.htm
index f7df57574a6..5a8a83d9219 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_parser.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_parser.htm
@@ -23,23 +23,23 @@ for binary parser are got from Preferences during project creation.
                  
 
                  You can modify these settings in the Preferences window, to be used in future projects.
                  
 
                  To set properties for future projects with user-provided Makefile :
                  
 
                    
-  
                  1. Click Window > Preferences > C/C++ > New CDT Project wizard > Makefile project
                    2. 
-  
                  2. Click the Binary Parser tab.
                    
+  
                  3. Click Window > Preferences > C/C++ > New CDT Project wizard > Makefile project
                    4. 
+  
                  4. Click the Binary Parser tab.
                    
     Select Binary Parser window
                    5. 
-  
                  5. In the Binary Parser list, click:
                    6. 
+  
                  6. In the Binary Parser list, click:
                    7. 
   
                      
-    
                    • Elf Parser, if you are a Solaris, UNIX, or Linux user.
                      • 
-    
                    • PE Windows Parser, if you are a Windows user.
                      • 
-    
                    • Cygwin PE Parser, if you are using Cygwin.
                      • 
+    
                    • Elf Parser, if you are a Solaris, UNIX, or Linux user.
                      • 
+    
                    • PE Windows Parser, if you are a Windows user.
                      • 
+    
                    • Cygwin PE Parser, if you are using Cygwin.
                      • 
   
                    
-  
                  7. Click OK.
                    8. 
+  
                  8. Click OK.
                    9. 
 
                  
 
                  To change binary parsers for existing project:
                  
 
                    
-  
                  1. In the C/C++ Projects view, right-click the project, and select Properties.
                    2. 
-  
                  2. Select C/C++ Build > Settings from the list.
                    3. 
-  
                  3. Click the Binary Parser tab.
                    
+  
                  4. In the C/C++ Projects view, right-click the project, and select Properties.
                    5. 
+  
                  5. Select C/C++ Build > Settings from the list.
                    6. 
+  
                  6. Click the Binary Parser tab.
                    
 Select Binary Parser window
   
                    7. 
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_paths.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_paths.htm
index 685f4bdfec3..715a97dcc61 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_paths.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_paths.htm
@@ -17,30 +17,30 @@ function newWin(url) {
 preprocessor symbols for the parser. This lets the parser understand the contents of the C/C++ source code so that you can more effectively use the search and code completion features. 
                    
 
 
                    If Autodiscovery is enabled, after a build finishes, any
-discovered paths and symbols will be displayed in the Discoverd Paths
+discovered paths and symbols will be displayed in the Discoverd Paths
 section. You can also define the properties on a per project basis in
 the C/C++ Projects or Navigator views.
                    
 
                    To add include paths and symbols:
                    
 
                      
   
                    1. To set properties for your project, right-click your CDT
-project and select Properties. Alternatively, to set properties
+project and select Properties. Alternatively, to set properties
 for a specific source file in your project, right-click a source file
 within your make project and select Properties. 
                      2. 
-  
                    2. Expand C/C++ General and select Paths and Symbols.
+  
                    3. Expand C/C++ General and select Paths and Symbols.
  

                      Click here to see an illustration (displayed in a separate window).

                      
 
                      4. 
-  
                    4. Click Add to define new element (Include Path, Symbol, Library path etc).
+  
                    5. Click Add to define new element (Include Path, Symbol, Library path etc).
   
                      6. 
-  
                    6. Click Edit to change selected element (Include Path, Symbol, Library path etc).
+  
                    7. Click Edit to change selected element (Include Path, Symbol, Library path etc).
   
                      8. 
-  
                    8. Click Delete to remove selected element (Include Path, Symbol, Library path etc).
+  
                    9. Click Delete to remove selected element (Include Path, Symbol, Library path etc).
   
                      10. 
-  
                    10. Click Export to make selected element (Include Path, Symbol, Library path etc) exported.
+  
                    11. Click Export to make selected element (Include Path, Symbol, Library path etc) exported.
   
                      12. 
-  
                    12. Click Unexport to remove selected element (Include Path, Symbol, Library path etc) from export list.
+  
                    13. Click Unexport to remove selected element (Include Path, Symbol, Library path etc) from export list.
   
                      14. 
-  
                    14. Click Move up and Move down to set elements (Include Paths, Library paths etc) order.
+  
                    15. Click Move up and Move down to set elements (Include Paths, Library paths etc) order.
   
                      16. 
 
                    
 
                    Related conceptsShow Project Types and toolchains only if they are supported on the platform box.
+  Show Project Types and toolchains only if they are supported on the platform box.
 
                    
 
                    
   Some project types (Executable and Makefile, in our case) can contain one or more templates
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_referenced_configs.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_referenced_configs.htm
index b2944211aec..0cfe9355d90 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_referenced_configs.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_referenced_configs.htm
@@ -19,12 +19,12 @@ write modular software built with CDT's managedbuild.
 
                      
 
                    • 
 Project References Page under
                      
-Right click > Properties > C/C++ General > Paths and Symbols
+Right click > Properties > C/C++ General > Paths and Symbols
 
                      • 
 
                    • 
 Export Settings Page under
                      
-Right click > Properties > C/C++ General > Export Settings 
                      
-If this page is missing, enable it under Window > Preferences > C/C++ > Property Page Settings 
+Right click > Properties > C/C++ General > Export Settings 
                      
+If this page is missing, enable it under Window > Preferences > C/C++ > Property Page Settings 
 
                      • 
 
                    
 
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_rename.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_rename.htm
index 58ceceda58f..1a64bf6a849 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_rename.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_rename.htm
@@ -17,7 +17,7 @@
 
                    To rename a project:
                    
 
 
                      
-  
                    1. In the C/C++ Projects view, right-click a project, and select  Rename.
+  
                    2. In the C/C++ Projects view, right-click a project, and select  Rename.
   
                      
   
                      
   Project Properties menu highlighting Rename
                      3. 
@@ -25,10 +25,10 @@
   
                      
   
                    3. The edit box is activated for the selected project. Type a new name.
   
                      4. 
-  
                    4. Press Enter.
                      5. 
+  
                    5. Press Enter.
                      6. 
 
                    
 
-
                    Note: 
+
                    Note: 
 Renaming a project causes it to be re-indexed. 
 This can take a significant amount of time for very large projects. The new name must be unique within the  workspace.
 
                    
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_prvw_hide_files.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_prvw_hide_files.htm
index 93d3e6f69bb..c9adc242644 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_prvw_hide_files.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_prvw_hide_files.htm
@@ -16,12 +16,12 @@
 view.
                    
 
                    To hide files by type:
                    
 
                      
-  
                    1. In the C/C++ Projects view, click the Menu iconC/C++ Projects view, Menu.
                      
+  
                    2. In the C/C++ Projects view, click the Menu iconC/C++ Projects view, Menu.
                      
   Filters from Projects View
                      3. 
-  
                    3. Click Filters.
                      
+  
                    4. Click Filters.
                      
       C Element Filters Window
                      5. 
   
                    5. Select the file types that you want to hide.
                      6. 
-  
                    6. Click OK.
                      7. 
+  
                    7. Click OK.
                      8. 
   
                      The C/C++ Projects view refreshes automatically.
                    
 
 
                    Related concepts
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_refactoring.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_refactoring.htm
index 6610642804a..3407f178eec 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_refactoring.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_refactoring.htm
@@ -12,12 +12,12 @@
 
 
                    Refactoring
                    
 
-
                    Use the C/C++ Projects, Outline, or the Editor view Refactor > Rename context menu to refactor class & type names, methods, function & member names.
                    
+
                    Use the C/C++ Projects, Outline, or the Editor view Refactor > Rename context menu to refactor class & type names, methods, function & member names.
                    
 
-
                    To refactor an object select the object, right click and select Refactor > Rename...
                    
+
                    To refactor an object select the object, right click and select Refactor > Rename...
                    
 
                     Editor View showing Refactor option
                    
 
- The refactoring engine will rename all instances of the object in all referenced files. You can Undo refactoring by right clicking a second time and selecting Refactor > Undo
                    
+ The refactoring engine will rename all instances of the object in all referenced files. You can Undo refactoring by right clicking a second time and selecting Refactor > Undo
                    
  
                     Editor View showing Refactor Undo option
                    
 
 
                    Related concepts
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_registers.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_registers.htm
index e9a5c5da174..63fbe5c909e 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_registers.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_registers.htm
@@ -19,9 +19,9 @@
 
                    To modify Registers:
                    
 
 
                      
-  
                    1. In the Registers view, right-click a register and click Change Register Value.
                      2. 
+  
                    2. In the Registers view, right-click a register and click Change Register Value.
                      3. 
   
                    3. Type a new value.
                      4. 
-  
                    4. Press Enter.
                      5. 
+  
                    5. Press Enter.
                      6. 
   
                      The Register value is highlighted in red whether or not it was changed.
                      
   
                    
 
@@ -30,11 +30,11 @@
 
                    You can change the number system used to display register values.
                    
 
 
                      
-  
                    1. In the Registers view, right-click a register, and select Format.
                      2. 
+  
                    2. In the Registers view, right-click a register, and select Format.
                      3. 
   
                    3. Type a new value.
                      4. 
   
                    4. Do one of the following:
                      5. 
-
                      • Click Natural.
                      • Click Decimal.
                      • Click 
-  Hexadecimal.
                      
+
                      • Click Natural.
                      • Click Decimal.
                      • Click 
+  Hexadecimal.
                      
   
                    
 
 
                    Related concepts
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_rem_wtch_brk.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_rem_wtch_brk.htm
index 18d2a8ffd5b..0b2261192db 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_rem_wtch_brk.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_rem_wtch_brk.htm
@@ -22,16 +22,16 @@ where it was inserted and the Breakpoints view.
                    
   
                  7. In the Breakpoints view, do one of the following:
   
                      
     
                    • Select the breakpoints and watchpoints you want to remove.
                      • 
-    
                    • Right-click, click Select All.
                      • 
+    
                    • Right-click, click Select All.
                      • 
   
                    
   
                    8. 
-  
                  8. In the Breakpoints view, right-click and select 
-  Remove or Remove All. 
                    9. 
+  
                  9. In the Breakpoints view, right-click and select 
+  Remove or Remove All. 
                    10. 
 
                  
 
-
                  For more information on marker bar icons, see Workbench User Guide > 
+
                  For more information on marker bar icons, see Workbench User Guide > 
 Reference > User interface information > Icons and buttons > Editor area 
-marker bar.
                  
+marker bar.
                  
 
 
                  Related concepts
 
                  
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_run_arg.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_run_arg.htm
index 44195f194bb..f3be6dea1df 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_run_arg.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_run_arg.htm
@@ -19,19 +19,19 @@ for a run configuration.
                  
 
 
                    
   
                  1. In  the C/C++ Projects view, select a project.
                    2. 
-  
                  2. Click Run > Run or Run > Debug.
                    3. 
-  
                  3. In the Configurations box, expand C/C++ Local.
                    4. 
+  
                  4. Click Run > Run or Run > Debug.
                    5. 
+  
                  5. In the Configurations box, expand C/C++ Local.
                    6. 
   
                  6. Select a run or debug configuration.
                    7. 
-  
                  7. Click the Arguments tab.
                    
+  
                  8. Click the Arguments tab.
                    
   Run Arguments window
 
   
   
                    9. 
-  
                  9. In the C/C++ Program Arguments box, type the arguments that you 
+  
                  10. In the C/C++ Program Arguments box, type the arguments that you 
   want to pass to the command line.
                    11. 
   
                  11. To specify a local directory or a different project in your workspace, 
-  clear the Use default working directory check box.
                    12. 
-  
                  12. Click Run or do the following, as required:
              
     
-      Signals Columns
+      Signals Columns
     
     
     

     
     
       
              NameName
         Displays the name of the signal.
       
              
       
              PassPass
         Where "yes" 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.
       
              
       
              SuspendSuspend
         Where "yes" is displayed, the debugger  suspends your program when this 
   signal is handled.
       
              
       
              DescriptionDescription
         Displays a description of the signal.
       
              
                   
     
       
              
         
              
-          Command
+          Command
         
                                    		
         
              
-          Name
+          Name
         
                                    		
         
              
-          Description
+          Description
         
                                    		
       
              
       
              
          Signal Properties... Signal Properties... 
         
              Opens the properties window for the selected signal enabling you to:
           
                
               
              • pass or not pass the signal to the program
                • 
@@ -80,7 +80,7 @@ debugger handles each one.
                
           Resume with Signal Icon
         
         
              		Resume With SignalResume With Signal
         Resume program execution after receiving the signal. 
       
              
                   
 
 
 
 
 
 
 
 
 
 
   
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
   
 
 
 
 
 
 
 
 
 
 
 
 
 
 
   	  
   
 
   
 
 
              
-		
+		
-		
+		
-		
+		
-		
+		
              
 	
              Search stringSearch string
 		this is the name of the element you are looking for. See C/C++ search for more information on how to specify wildcard searches and how to further refine your searches by using fully qualified names
 	
              
 	
              Search For Search For 
 		this is the element type that you wish to search for. You can also select to search on ‘Any Element’ which will perform the search on a combination of all elements
 	
              
 	
              Limit ToLimit To
 		this allows you to limit your search to declarations, definitions or references. You can also select ‘All Occurrences’ which will search for declarations, definitions and references that match the element
 	
              
 	
              ScopeScope
 		this allows the user to limit the scope of the search. The three available scopes are:
 		
-				
+				
-				
+				
-				
+				
              
 			
              WorkspaceWorkspace
 				this searches all of the open projects in the workspace
 			
              
 			
              Selected ResourcesSelected Resources
 				this option becomes enabled whenever something is selected in one of the following views in the C/C++ perspective:
 				
                
 					
              • C/C++ Projects
                • 
@@ -67,7 +67,7 @@ The info required to do a search is:
 				
              		
 			
              
 			
              Working SetWorking Set
 				working sets can be selected and created 
 				
              		
 			
              
@@ -77,9 +77,9 @@ The info required to do a search is:
 
 
              There are 3 main ways for initiating a C/C++ search:
 
                
-	
              • Using the C/C++ Search dialog
                • 
-	
              • Selecting an element in the Editor view
                • 
-	
              • Selecting an element in the C/C++ Projects view or Selecting an element from the Outline view
                • 
+	
              • Using the C/C++ Search dialog
                • 
+	
              • Selecting an element in the Editor view
                • 
+	
              • Selecting an element in the C/C++ Projects view or Selecting an element from the Outline view
                • 
 
              
 
              
 
@@ -89,22 +89,22 @@ The info required to do a search is:
 
               Search dialog box
              
 
 
                
-	
              1. Enter the search string in the Search String field (optional mark it case sensitive). 
                
-	Note: that previous search queries (from the same work session) are remembered and can be accessed via the drop down list.
                2. 
-	
              2. Select the Search For element.
                3. 
-	
              3. Select the Limit To.
                4. 
-	
              4. Select the Scope.
                5. 
-	
              5. Press Search.
                6. 
+	
              6. Enter the search string in the Search String field (optional mark it case sensitive). 
                
+	Note: that previous search queries (from the same work session) are remembered and can be accessed via the drop down list.
                7. 
+	
              7. Select the Search For element.
                8. 
+	
              8. Select the Limit To.
                9. 
+	
              9. Select the Scope.
                10. 
+	
              10. Press Search.
                11. 
 
              
-
              Results are displayed in the Search view.
              
+
              Results are displayed in the Search view.
              
 
 
 
              Selecting an element in the Editor view
              
 
                
 	
              1. Select the desired element in the editor.
                2. 
-	
              2. Right click and select All Declarations or All References and the scope you wish to search.
                3. 
+	
              3. Right click and select All Declarations or All References and the scope you wish to search.
                4. 
 
              
-
              Results are displayed in the Search view.
              
+
              Results are displayed in the Search view.
              
 
 
 
@@ -112,15 +112,15 @@ The info required to do a search is:
 
 
                
 	
              1. Select the desired element in the tree.
                2. 
-	
              2. Right click and select All Declarations or All References and the scope you wish to search.
                3. 
+	
              3. Right click and select All Declarations or All References and the scope you wish to search.
                4. 
 
              
-
              Results are displayed in the Search view.
              
+
              Results are displayed in the Search view.
              
 
 
 
              For more information, see:
-
            • Workbench User Guide > Concepts > Views > Search view
              • 
-
            • Workbench User Guide > Concepts > Workbench > Working Set
              • 
-
            • Workbench User Guide > Tasks > Navigating and finding resources
              • 
+
            • Workbench User Guide > Concepts > Views > Search view
              • 
+
            • Workbench User Guide > Concepts > Workbench > Working Set
              • 
+
            • Workbench User Guide > Tasks > Navigating and finding resources
              • 
 
 
 
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_sel_search.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_sel_search.htm
index b83a7dc1142..2f7828e93ee 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_sel_search.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_sel_search.htm
@@ -31,16 +31,16 @@ include paths and symbols are correctly defined. For more information, see
 
 
                
   
              1. Highlight the element you want to search.
                2. 
-  
              2. Right click and select Search For from the context menu.
                
+  
              3. Right click and select Search For from the context menu.
                
   Editor View showing Selection Search options
                4. 
-  
              4. Select All Declarations or All References.
                5. 
-  
              5. Select Workspace or Working Set....
                6. 
+  
              6. Select All Declarations or All References.
                7. 
+  
              7. Select Workspace or Working Set....
                8. 
   
              8. The search results will appear in the Search View
                
-  Search View Selection Search options
                9. 
+  Search View Selection Search options
   
              
 
              For more information, see:
-
            • Workbench User Guide > Concepts > Views > Search view
              • 
-
            • Workbench User Guide > Tasks > Navigating and finding resources
              • 
+
            • Workbench User Guide > Concepts > Views > Search view
              • 
+
            • Workbench User Guide > Tasks > Navigating and finding resources
              • 
 
 
 
              Related concepts
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_set_src_fold.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_set_src_fold.htm
index 68fa731b02c..0e418fa2670 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_set_src_fold.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_set_src_fold.htm
@@ -8,9 +8,9 @@
 
 
 
              Setting Source Folders
              
-
              Note that source folders can only be currently used with Standard
+
              Note that source folders can only be currently used with Standard
 Make projects. Managed Make projects treat the entire project as a
-source folder.
              
+source folder.
              
 
              Source folders are a way to cut down on a project’s indexing scope.
 You can mark the folders that are part of your day to day work or part
 of a subsystem that you work on. All files inside source folders will
@@ -20,20 +20,20 @@ a file inside a source folder will also be indexed. 
              
 
              To setup source folders:
 
              
 
                
-  
              1. Right click on the project and select Properties > C/C++
-Project Paths
                2. 
-  
              2. Click on the Source tab
                
+  
              3. Right click on the project and select Properties > C/C++
+Project Paths
                4. 
+  
              4. Click on the Source tab
                
 By default the entire project is a source folder, which means
 everything will be indexed. This is reasonable for smaller projects but
 definitely not recommended for large projects. 
                5. 
-  
              5. Click Add folder to add the folders. A dialog will
+  
              6. Click Add folder to add the folders. A dialog will
 explain exclusion filters have been added to nesting folders. You will
 see that the folder you added will be excluded from the project folder
 (in order to avoid including a folder twice). Repeat until all the
 folders have been added. 
                
-    Note: Don't forget to remove the project folder (which
+    Note: Don't forget to remove the project folder (which
 appears by default) otherwise everything will be indexed.
                7. 
-  
              7. Click OK. Your view in C/C++ projects will now change.
+  
              8. Click OK. Your view in C/C++ projects will now change.
 You should see your source folders designated with a "C" and all other
 source and header files icons that are in a non-source folder will
 change to a "hollow" C or H.
                9. 
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_setreminder.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_setreminder.htm
index 59315fe42fe..69b731f64c3 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_setreminder.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_setreminder.htm
@@ -22,15 +22,15 @@ want to verify.
                
 
                To set a reminder:
                
 
 
                  
-  
                1. In  Tasks view, right-click the Tasks pane, and select New Task.
                  2. 
-  
                2. In the Description box, type a new task.
                  3. 
-  
                3. Click OK.
                  4. 
+  
                4. In  Tasks view, right-click the Tasks pane, and select New Task.
                  5. 
+  
                5. In the Description box, type a new task.
                  6. 
+  
                6. Click OK.
                  7. 
 
                
 
 
                For more information on the Tasks view, see:
                  
-  
                •  Workbench User Guide > Concepts> Views > Tasks view
                  • 
-  
                •  Workbench User Guide > Reference > User interface information > 
-  Views and editors > Tasks view
                  • 
+  
                •  Workbench User Guide > Concepts> Views > Tasks view
                  • 
+  
                •  Workbench User Guide > Reference > User interface information > 
+  Views and editors > Tasks view
                  • 
   
                
 
 
                Related concepts
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_shift_code.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_shift_code.htm
index 1718ae40a79..0ceae020375 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_shift_code.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_shift_code.htm
@@ -22,10 +22,10 @@ editor.
                
 
                  
   
                1. In the C/C++ editor, select the full length of the lines that you want to shift.
                  2. 
   
                2. Do one of the following:
                  3. 
-  
                  • To move the text to the right, press Tab.
                    • 
-	
                  • To move the text to the right, click Edit > Shift Right.
                    • 
-	
                  • To move the text to the left, press Shift+Tab.
                    • 
-	
                  • To move the text to the left, click Edit > Shift Left.
                    • 
+  
                    • To move the text to the right, press Tab.
                      • 
+	
                    • To move the text to the right, click Edit > Shift Right.
                      • 
+	
                    • To move the text to the left, press Shift+Tab.
                      • 
+	
                    • To move the text to the left, click Edit > Shift Left.
                      • 
   
                    
   
                
 
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_show_proj_files.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_show_proj_files.htm
index 83005767a5c..619cab6c96b 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_show_proj_files.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_show_proj_files.htm
@@ -18,11 +18,11 @@ view. You can display or hide all file components in the C/C++ Projects view.
                To display file components
                
 
 
                  
-  
                1. Click Window > Preferences.
                  2. 
-  
                2. In the Preferences dialog box, select C/C++ > Appearance from the list.
                  
+  
                3. Click Window > Preferences.
                  4. 
+  
                4. In the Preferences dialog box, select C/C++ > Appearance from the list.
                  
   Screen Capture of the C/C++ Appearance Preferences dialog box
                  5. 
-  
                5. Select the Show translation unit members check box.
                  6. 
-  
                6. Click OK.
                  7. 
+  
                7. Select the Show translation unit members check box.
                  8. 
+  
                8. Click OK.
                  9. 
   
                9. In the C/C++ Projects view, double-click a file component.
                  
 	  The component is  highlighted in the C/C++ editor.
                  
 	  C/C++ Projects view with file components
                  10. 	  
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_variables.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_variables.htm
index 2f2fedc5ded..dbe67fbaf6f 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_variables.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_variables.htm
@@ -20,7 +20,7 @@ or disable variable values.
                  
 
                  To display variable type names:
                  
 
 
                    
-  
                  • In Variables view, click the Show Type Names toggle button.
                    • 
+  
                  • In Variables view, click the Show Type Names toggle button.
                    • 
 
                  
 
 
                  To change a variable value while debugging:
                  
@@ -29,7 +29,7 @@ or disable variable values.
                  
 program handles a particular value or to speed through a loop.
                  
 
 
                    
-  
                  1. In Variables view, right-click a variable, and select Change Value.
                    2. 
+  
                  2. In Variables view, right-click a variable, and select Change Value.
                    3. 
   
                  3. Type a value.
                    4. 
 
                  
 
@@ -40,7 +40,7 @@ value from the target. This is useful if the target is very sensitive or the
 variable is specified as volatile.
                  
 
 
                    
-  
                  • In Variables view, right-click a variable, and select Disable.
                    • 
+  
                  • In Variables view, right-click a variable, and select Disable.
                    • 
 
                  
 
 
                  Related concepts