diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_proj_prop_pages.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_proj_prop_pages.htm index f86929cab23..eaeb7b732e9 100644 --- a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_proj_prop_pages.htm +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_proj_prop_pages.htm @@ -19,7 +19,7 @@ Error Parsers preferences
Discovery Options preferences
Builder Settings preferences
- Behaviour preferences
+ Behavior preferences

Nokia Copyright Statement
IBM Copyright Statement

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 9b259cce64a..57ea4e6f199 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 @@ -29,7 +29,7 @@ - Default Proposal Kindsy + Default Proposal Kinds Specifies the types of proposals Content Assist uses and the key bindings assigned. 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 0538079d507..afa0c6b65ac 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 @@ -75,7 +75,7 @@

Related reference
C/C++ editor preferences

-Code Style preferences

+Code Style preferences

IBM Copyright Statement 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 56cbacd2081..794a8376af7 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 @@ -77,7 +77,7 @@

Related reference
C/C++ editor preferences

-Code Style preferences

+Code Style preferences

IBM Copyright Statement 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 3b90ee7b8cb..a1343b6d922 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 @@ -15,7 +15,7 @@

Console View

The output console shows several different kinds of text, each in a different color: -

+

  • Run/Debug Settings page -

    +

    Intel Copyright Statement

    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 8c11c4da3b9..5e82dcad7fe 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 @@ -48,7 +48,7 @@
  • Project Properties, C/C++ General category - Language Mapping page
  • File Properties, C/C++ General category - Language Mapping page -

    +

    Nokia Copyright Statement

    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 6071fe8e00e..0f11f223a60 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 @@ -31,7 +31,7 @@
  • Language Mapping page -

    +

    IBM Copyright Statement

    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 e079abf5178..a7b2f7f6d44 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 @@ -98,7 +98,7 @@ Customizes the tools and tool options used in your build configuration.
  • C/C++ Project Properties, Project References page
  • C/C++ Project Properties, Run/Debug Settings page -

    +

    Intel Copyright Statement

    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 6d72e48c54e..6176316882a 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 @@ -115,7 +115,7 @@ of a C/C++ project's properties window.
  • Run/Debug Settings page -

    +

    Intel Copyright Statement

    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 15246c4c213..a2900486b5c 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 @@ -102,7 +102,7 @@ Customizes the tools and tool options used in your build configuration.
  • C/C++ Project Properties, Project References page
  • C/C++ Project Properties, Run/Debug Settings page -

    +

    Intel Copyright Statement

    diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_gdb_mi.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_gdb_mi.htm index d59e745ceae..b128a62ecb6 100644 --- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_gdb_mi.htm +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_gdb_mi.htm @@ -16,7 +16,7 @@ Debug GDB MI Preferences
    Debugger timeout (ms)
    -
    Sets the timout value for the debugger.
    +
    Sets the timeout value for the debugger.
    Launch timeout (ms)
    Sets the Launch timeout for a debug session.
    Automatically refresh modules
    diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_include_browser_view.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_include_browser_view.htm index fb989428718..36802ea40bb 100644 --- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_include_browser_view.htm +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_include_browser_view.htm @@ -40,7 +40,7 @@

    Show Next Include -

    +

    @@ -53,7 +53,7 @@

    Show Previous Include -

    +

    @@ -66,7 +66,7 @@

    Hide System Includes -

    +

    @@ -79,7 +79,7 @@

    Hide Includes from Inactive Code -

    +

    @@ -92,7 +92,7 @@

    Show Includers -

    +

    @@ -105,7 +105,7 @@

    Show Included Files -

    +

    @@ -118,7 +118,7 @@

    Show History List -

    +

    @@ -131,7 +131,7 @@

    Refresh View Content -

    +

    @@ -144,7 +144,7 @@

    View Menu -

    +

    @@ -158,7 +158,7 @@

  • Hide System Includes
  • Hide Inactive Includes
    • -

    +

    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 f46d8c50d7f..89d22b970e9 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 @@ -62,7 +62,7 @@
  • Language Mapping page -

    +

    Nokia Copyright Statement

    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 ef597b5f797..ca04876236d 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 @@ -93,7 +93,7 @@ Add Bookmark... Add a bookmark to the current text selection or selected element. -   +   @@ -142,7 +142,7 @@ Content 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. + Window > Preferences > C/C++ > Editor > Content Assist for configuring the behavior of content assist. Ctrl+Space @@ -184,7 +184,7 @@ -

    +

    Note: Other Edit 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_file.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_file.htm index f37a94d8bbb..1f600184990 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 @@ -132,7 +132,7 @@   -

    +

    IBM Copyright Statement 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 2632b30d7b1..1ac9f6ec988 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 @@ -136,7 +136,7 @@ Editor only. -

    +

    Note: Other Navigate options are used with the JDT. 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 7b9a4995c19..e99903617d0 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 @@ -41,7 +41,7 @@ Build Configurations Submenu which allows to:

      -
    • Delete resource configurastion for file/folder +
    • Delete resource configuration for file/folder
    • Set active build configuration
    • Manage (add, remove, rename) build configurations
    @@ -70,7 +70,7 @@ Make Target - Submenu wich allows create or build a target in the Make Targets view. + Submenu which allows create or build a target in the Make Targets view.   @@ -81,7 +81,7 @@ Include Paths and Symbols (standard only), and Project References.   -

    +

    IBM Copyright Statement 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 3c8791fd7e2..38aa4a9e810 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 @@ -20,8 +20,8 @@ Rename... Renames selected object (variable, method, etc...) and propagates changes to other files in project. - Alt+Shit+R -

    + Alt+Shift+R +

    Intel Copyright Statement 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 d0c78dd58da..231d7708218 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 @@ -112,7 +112,7 @@ See the C/C++ Page Preference Window section for more details on the CDT preferences.   -

    +

    IBM Copyright Statement diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_make_targets_view.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_make_targets_view.htm index 3e6f2e08591..3de1f71e633 100644 --- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_make_targets_view.htm +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_make_targets_view.htm @@ -65,7 +65,7 @@ Hide Empty Folders Toggles the display of empty folders in the Make Targets view. -

    +

    Related tasks 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 9aa6a597c0f..9a7b0c709f2 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 @@ -89,8 +89,8 @@ configured to display two renderings simultaneously.

    View 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
      • +
    • Reset Memory Monitor - set to reset only visible or all renderings when resetting a memory monitor
      • +
    • Padded String - enter strings to show un-retrievable memory
    • Select Codepages - specify the standard to convert memory to ASCII and EBCDIC strings
    @@ -101,8 +101,8 @@ configured to display two renderings simultaneously.

    - Tradional Rendering Preferences - Opens the Tradionaly Memory Rendering pane in the Preferences dialog box. + Traditional Rendering Preferences + Opens the Traditionally Memory Rendering pane in the Preferences dialog box. 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 f25e0bda6bf..01cf66bbce1 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 @@ -74,25 +74,25 @@ 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.

    +
    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.).
      • -

    +

    Filters
    This command allows you to select filters to apply to the view so that you can show or hide various resources as needed. - File types selected in the list will not be shown in the Navigator.

    + File types selected in the list will not be shown in the Navigator.

    Link with Editor
    -
    See the toolbar item description above.

    +
    See the toolbar item description above.

    -

    +

    In addition to these menu items, the Navigator view menu shows a list of recently used working sets that have been selected in the view.

    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 d1a13aa369c..5a5148449f3 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 @@ -25,7 +25,7 @@ The New Project wizard appears: You can either provide your makefile to build new project, or let CDT generate makefile automatically. In CDT 3.x, there were 2 different project types: -"Managed make" and "Standard make", resp. +"Managed make" and "Standard make", respectivelly

    Currently, these features are combined in the single 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 422aeb4cad6..a368cdec4b4 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 @@ -47,7 +47,7 @@ -

    +

    Related concepts
    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 90879eb5ad5..889142de3cc 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 @@ -36,7 +36,7 @@ the location where the project is to be created. -

    +

    Related concepts
    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 65d4bb05d8c..6c7b89c219e 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 @@ -33,7 +33,7 @@ -

    +

    Related concepts
    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 715bfd8fc53..0c3374d560c 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 @@ -31,7 +31,7 @@ types that are buildable on the host system are shown.
    -

    +

    Related concepts
    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 c8b2d9fcaf8..cea5a48a291 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,7 +10,7 @@

    Makefile Project - Behavior page

    -

    Use the Behaviour page in the Makefile Projects preference panel to define build behavior.

    +

    Use the Behavior page in the Makefile Projects preference panel to define build behavior.

    Makefile project - behavior page