diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_menu_toggle_comments.png b/doc/org.eclipse.cdt.doc.user/images/cdt_menu_toggle_comments.png new file mode 100755 index 00000000000..524c13a74ec Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/cdt_menu_toggle_comments.png differ diff --git a/doc/org.eclipse.cdt.doc.user/images/create_make_target.png b/doc/org.eclipse.cdt.doc.user/images/create_make_target.png index b7bee691766..929061a8c24 100644 Binary files a/doc/org.eclipse.cdt.doc.user/images/create_make_target.png and b/doc/org.eclipse.cdt.doc.user/images/create_make_target.png differ diff --git a/doc/org.eclipse.cdt.doc.user/images/create_make_target_win.png b/doc/org.eclipse.cdt.doc.user/images/create_make_target_win.png index 95c06202b23..d47c50532a5 100644 Binary files a/doc/org.eclipse.cdt.doc.user/images/create_make_target_win.png and b/doc/org.eclipse.cdt.doc.user/images/create_make_target_win.png differ diff --git a/doc/org.eclipse.cdt.doc.user/images/new_proj_convert.png b/doc/org.eclipse.cdt.doc.user/images/new_proj_convert.png index e1e5b89c5c5..32b6dab45ce 100644 Binary files a/doc/org.eclipse.cdt.doc.user/images/new_proj_convert.png and b/doc/org.eclipse.cdt.doc.user/images/new_proj_convert.png differ diff --git a/doc/org.eclipse.cdt.doc.user/images/new_proj_convert_candidate.png b/doc/org.eclipse.cdt.doc.user/images/new_proj_convert_candidate.png new file mode 100755 index 00000000000..2b9dd856496 Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/new_proj_convert_candidate.png differ diff --git a/doc/org.eclipse.cdt.doc.user/images/view_make_targets.png b/doc/org.eclipse.cdt.doc.user/images/view_make_targets.png index 6526578b7ec..4ea803abcaa 100644 Binary files a/doc/org.eclipse.cdt.doc.user/images/view_make_targets.png and b/doc/org.eclipse.cdt.doc.user/images/view_make_targets.png differ diff --git a/doc/org.eclipse.cdt.doc.user/images/view_projects.png b/doc/org.eclipse.cdt.doc.user/images/view_projects.png index 1cd7ec405af..edb26a269b4 100644 Binary files a/doc/org.eclipse.cdt.doc.user/images/view_projects.png and b/doc/org.eclipse.cdt.doc.user/images/view_projects.png differ diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_view_executables.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_view_executables.htm index 3bf55a99095..f74dd676390 100644 --- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_view_executables.htm +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_view_executables.htm @@ -26,7 +26,7 @@

In addition, an Executables project is created in the Project Explorer view. The binaries shown in the Executables project can be deleted which also removes them from the Executables view. For binaries outside the workspace you must import them into the Executables view so their symbolics can be used during the debug session. You can also drag and drop executables into the view.

Executables view

The Executables view consists of the Executable Name and Source File Name panes described in the table below. Use the Columns button in the toolbar to show or hide specific columns in each pane. Columns can be sorted and rearranged in the order desired.

- +
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 d1aa9a756a1..8c0448312f6 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 @@ -8,25 +8,19 @@

Customizing the Console view

-

The Console view displays the output of the utilities invoked when +

The Console view displays the output of the utilities invoked when 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.
    - Build Console Properties
    3. -
  3. To display information on the latest build only, select the Always -clear console before building check box.
    4. -
  4. To open the Console view when a project is built, select the Open -console when building check box.
    5. -
  5. 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.
    6. -
  6. 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).
    7. -
  7. To change the number of spaces displayed by a tab, enter the -number in the txt field next to Display tab width.
    8. +
  8. Expand C/C++ and Build, then click Console.
    + Console Properties
    9. +
  9. To display information on the latest build only, select the Always clear console before building check box.
    10. +
  10. To open the Console view when a project is built, select the Open console when building check box.
    11. +
  11. To display the console if it is already open when a project is built, select the Bring console to top when building (if present) check box.
    12. +
  12. 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).
    13. +
  13. To change the number of spaces displayed by a tab, enter the number in the txt field next to Display tab width.
    14. +
  14. To customize the colors used in the Console view, click a color control and select the new color.
  15. Click OK.

Related conceptsDisplay tab width.

Related reference
Views

+
IBM Copyright Statement 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 b2a2d3e4058..1d389968c70 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 @@ -12,26 +12,32 @@

Commenting out code

-

You can comment out one or more lines of code. The leading characters // -are added to the beginning of each line.

+

You can comment out one or more lines of code in any C/C++ editor view. +The leading characters // are added to the beginning of each line when commenting one or more lines of code. +You can also block comment multiple lines of code using the characters /* */.

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

-

To comment out code:

+

Commenting out code menu choices

+ +

To toggle // comments on code:

    -
  1. 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.
    2. -
  2. Right-click and do one of the following:
    3. -
-Tip: Instead of using the context menu (right click) you can quickly comment out by pressing CTRL+/ or remove comments by pressing CTRL+\. +

To block comment /* */ code:

+ +
    +
  1. In the C/C++ editor, select multiple line(s) of code to comment out.
    2. +
  2. To comment out multiple code lines right-click and select Source > Add Block Comment. (CTRL+SHIFT+/)
    3. +
  3. To uncomment multiple code lines right-click and select Source > Remove Block Comment. (CTRL+SHIFT+\)
    4. + +

Related concepts
@@ -43,6 +49,7 @@ described above.

Related reference
C/C++ editor preferences

+
IBM Copyright Statement 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 fc76883ea6e..9ccf489f3c2 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 @@ -12,7 +12,7 @@

Converting a C or C++ nature for a project

-

You can assign a C nature to a C++ file or vice versa.

+

Use the Convert to a C/C++ Project wizard to assign a C nature to a C++ project or vice versa.

To assign a C or C++ nature to a project

@@ -21,9 +21,11 @@ New Project window
  • Click C or C++.
  • Click Convert to C/C++ Make Project.
    • -
  • Click Next.
    • -
  • In the Candidates for conversion list, select the projects to convert.
    • -
  • In the Convert to C or C++ box, click C Project or C++ Project.
    • +
  • Click Next.
    + Convert C/C++ Project window
    • +
  • In the Candidates for conversion list, select the projects to convert.
    • +
  • In the Convert to C or C++ group, click C Project or C++ Project.
    • +
  • In the Project options group, you can specify the Project Type and Toolchain if the Specify project type option is enabled.
  • Click Finish. 

    • Related concepts @@ -36,7 +38,7 @@

    Related reference
    Project properties

    - +
    IBM Copyright Statement 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 b876fb089ac..7c7579a5ba7 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,14 +14,13 @@

    To create a make target:

      -
    1. Right click on the project and select Create Make Target...

      2. - Select Create Make Target
        -
    2. Enter the Target name and build options and click Create.
      - Create Make Target Window
       
      3. -
    3. The make target will appear in the Make Targets view.
      - Make Targets View
       
      4. +
    4. Right click on the project and select Make Targets > Create...

      5. + Select Make Target, then Create
        +
    5. Enter the Target name and build options and click OK.
      + Create Make Target Window
       
      6. +
    6. The make target appear in the Make Targets view.
      + Make Targets View
       
    -

    Related concepts
    Build overview

    @@ -32,8 +31,8 @@

    Related reference
    Create a Make Target
    Make Target View

    +
    IBM Copyright Statement - \ No newline at end of file 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 3804eefb74e..0ea26d5535c 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 @@ -14,15 +14,14 @@

    Stepping into disassembled code

    -

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

    The Disassembly view lets you 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 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.

    +

    To activate the instruction step mode check the Instruction Stepping Mode option (Instruction Stepping Mode icon) +on the Debug view toolbar. The Debugger switches to the instruction stepping mode automatically +when the Disassembly view has focus.

    Related concepts
    @@ -34,6 +33,7 @@ when the Disassembly view has focus.

    Related reference
    Debug views

    +
    IBM Copyright Statement diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_search.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_search.htm index ebc45d05da5..5007637239e 100644 --- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_search.htm +++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_search.htm @@ -33,7 +33,11 @@ include paths and symbols are correctly defined. For more information, see The info required to do a search is: -
    Executables View Options
    Pane
    +
    + + + + @@ -84,7 +88,6 @@ The info required to do a search is:

    -

    Using the C/C++ Search dialog

    Search dialog box

    @@ -96,7 +99,7 @@ The info required to do a search is:
  • Select the Scope.
  • Press Search.
    • -

    Results are displayed in the Search view.

    +

    Results are displayed in the Search view.

    Selecting an element in the Editor view

    @@ -106,8 +109,6 @@ The info required to do a search is:

    Results are displayed in the Search view.

    - -

    Selecting an element in C/C++ Projects or Outline View

      @@ -140,9 +141,8 @@ The info required to do a search is:

      Related reference
      C/C++ search page, Search dialog box

      -

       

      +
      IBM Copyright Statement - \ No newline at end of file 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 619cab6c96b..05edf04b683 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 @@ -12,23 +12,23 @@

      Displaying C/C++ file components in the C/C++ Projects view

      -

      File components are displayed in the C/C++ Projects view and in the Outline +

      File components are displayed in the C/C++ Projects view and in the Outline 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.
        - Screen Capture of the C/C++ Appearance Preferences dialog box
        3. +
      3. In the Preferences dialog box, select C/C++ > Appearance from the list.
        + Screen Capture of the C/C++ Appearance Preferences dialog box
      4. Select the Show translation unit members check box.
      5. Click OK.
        6. -
      6. In the C/C++ Projects view, double-click a file component.
        - The component is highlighted in the C/C++ editor.
        +
      7. 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
      -

      The C/C++ Projects view can also be filtered to show certain types of file +

      The C/C++ Projects view can also be filtered to show certain types of file components. For more information, see Hiding files by type in the C/C++ Projects view.

      @@ -47,8 +47,8 @@ view

      Related reference
      C/C++ editor preferences

      +
      IBM Copyright Statement - \ No newline at end of file
    OptionExplanation
    Search 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