diff --git a/doc/org.eclipse.cdt.doc.user/images/make_settings_prefs.png b/doc/org.eclipse.cdt.doc.user/images/make_settings_prefs.png index 21392b17889..5fe338c8596 100644 Binary files a/doc/org.eclipse.cdt.doc.user/images/make_settings_prefs.png and b/doc/org.eclipse.cdt.doc.user/images/make_settings_prefs.png differ diff --git a/doc/org.eclipse.cdt.doc.user/images/make_targets.png b/doc/org.eclipse.cdt.doc.user/images/make_targets.png index d39f8d49de1..9875ceb6a32 100644 Binary files a/doc/org.eclipse.cdt.doc.user/images/make_targets.png and b/doc/org.eclipse.cdt.doc.user/images/make_targets.png differ diff --git a/doc/org.eclipse.cdt.doc.user/images/makefile_editor_folding_prefs.png b/doc/org.eclipse.cdt.doc.user/images/makefile_editor_folding_prefs.png index 673bb5400ce..57362ecd77f 100644 Binary files a/doc/org.eclipse.cdt.doc.user/images/makefile_editor_folding_prefs.png and b/doc/org.eclipse.cdt.doc.user/images/makefile_editor_folding_prefs.png differ diff --git a/doc/org.eclipse.cdt.doc.user/images/makefile_editor_prefs.png b/doc/org.eclipse.cdt.doc.user/images/makefile_editor_prefs.png index b7815199bc6..baaa0a5f617 100644 Binary files a/doc/org.eclipse.cdt.doc.user/images/makefile_editor_prefs.png and b/doc/org.eclipse.cdt.doc.user/images/makefile_editor_prefs.png differ diff --git a/doc/org.eclipse.cdt.doc.user/images/pref_panel_code_templates.png b/doc/org.eclipse.cdt.doc.user/images/pref_panel_code_templates.png new file mode 100755 index 00000000000..6715294bc23 Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/pref_panel_code_templates.png differ diff --git a/doc/org.eclipse.cdt.doc.user/images/pref_panel_edit_template_dlg.png b/doc/org.eclipse.cdt.doc.user/images/pref_panel_edit_template_dlg.png new file mode 100755 index 00000000000..e04f709e1c4 Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/pref_panel_edit_template_dlg.png differ diff --git a/doc/org.eclipse.cdt.doc.user/images/view_environment_prefs.png b/doc/org.eclipse.cdt.doc.user/images/view_environment_prefs.png index 6af702f139a..e1aa99d7535 100644 Binary files a/doc/org.eclipse.cdt.doc.user/images/view_environment_prefs.png and b/doc/org.eclipse.cdt.doc.user/images/view_environment_prefs.png differ 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 deleted file mode 100644 index 38bd7159be0..00000000000 --- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_build_pref.htm +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - -Console preferences - - - - - -

Console preferences

- -

You can customize the appearance of the messages that appear in the Console view.

-

Console Preferences Panel

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Console Preference Options
Always clear console before buildingSelect this option to clear the contents of the Console view every time you perform a build.
Open console when buildingSelect this option to open the Console view when you perform a build.
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)Specify the maximum number of lines that can display in the Console view.
Display tab widthSpecify the number of spaces for a tab.
Output text colorCustomize the color of text in the Console view.
Information message text colorCustomize the color of information text messages in the Console view.
Error message text colorCustomize the color of error messages in the Console view.
Background colorCustomize the background color in the Console view.
Background color for build problemsCustomize the background color of build problems in the Console view.
Highlighting color for build problemsCustomize the highlighting color of build problems in the Console view.
- -

Related concepts -
-Build overview

-

Related tasks -
-Defining Project Build settings
-Building projects

-

Related reference
-Views

-
-IBM Copyright Statement - - - - \ No newline at end of file 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 c7e07ed110f..dbca3c638f0 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 @@ -6,18 +6,19 @@ Code Style preferences +

Code Style preferences

-

Use the Code Style preference panel to configure your global 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 your global 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

- Action + Option Description 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 cb9d228f255..c7a89108567 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 @@ -14,10 +14,9 @@ Code templates

The - -Opens the 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.

+ +Code Templates preference panel lets you configure the format of newly generated code stubs, comments and files.

+

Code Templates Preferences Window

The code templates page contains templates that are used by actions that generate code and/or source files. E.g. the New Class wizard uses source and header file templates to create new files and code templates to insert generated method stubs. @@ -26,17 +25,17 @@ Templates contain variables that are substituted when the template is applied. S

-

Action

+ Options
-

Description

+ Description
-

New...

+ New...

Opens the Code Template dialog to create a new file template.

@@ -44,7 +43,7 @@ Templates contain variables that are substituted when the template is applied. S
-

Edit...

+ Edit...

Opens the Code Template dialog to edit the currently selected code template.

@@ -52,7 +51,7 @@ Templates contain variables that are substituted when the template is applied. S
-

Remove

+ Remove

Removes a user added file template. Predefined templates cannot be removed.

@@ -60,7 +59,7 @@ Templates contain variables that are substituted when the template is applied. S
-

Import...

+ Import...

Imports templates from the file system.

@@ -68,7 +67,7 @@ Templates contain variables that are substituted when the template is applied. S
-

Export...

+ Export...

Exports all selected templates to the file system.

@@ -76,7 +75,7 @@ Templates contain variables that are substituted when the template is applied. S
-

Export All...

+ Export All...

Exports all templates to the file system.

@@ -92,17 +91,17 @@ Templates contain variables that are substituted when the template is applied. S
-

Template Name

+ Template Name
-

Specifies

+ Specifies
-

Files

+ Files

Header comment for new source or header files.

@@ -111,7 +110,7 @@ Templates contain variables that are substituted when the template is applied. S
-

Types

+ Types

The comment for new types.

@@ -120,7 +119,7 @@ Templates contain variables that are substituted when the template is applied. S
-

Fields

+ Fields

The comment for new fields.

@@ -128,7 +127,7 @@ Templates contain variables that are substituted when the template is applied. S
-

Constructors

+ Constructors

The comment for new constructors.

@@ -136,7 +135,7 @@ Templates contain variables that are substituted when the template is applied. S
-

Destructors

+ Destructors

The comment for new destructors.

@@ -144,7 +143,7 @@ Templates contain variables that are substituted when the template is applied. S
-

Methods

+ Methods

The comment for new methods.

@@ -160,17 +159,17 @@ Templates contain variables that are substituted when the template is applied. S
-

Template Name

+ Template Name
-

Description

+ Description
-

Method body

+ Method body

The 'Method body' templates are used when new method is created.

@@ -178,7 +177,7 @@ Templates contain variables that are substituted when the template is applied. S
-

Constructor body

+ Constructor body

The 'Constructor body' templates are used when a constructor is created.

@@ -186,7 +185,7 @@ Templates contain variables that are substituted when the template is applied. S
-

Destructor body

+ Destructor body

The 'Destructor body' templates are used when the destructor is created.

@@ -203,17 +202,17 @@ The New File from Template wizard can be used to create new files based on one o
-

Template Name

+ Template Name
-

Description

+ Description
-

Default C++ source template

+ Default C++ source template

Used by the New Class wizard and the New Source File wizard when a new C++ source file is created.

@@ -222,7 +221,7 @@ The New File from Template wizard can be used to create new files based on one o
-

Default C++ header template

+ Default C++ header template

Used by the New Class wizard and the New Header File wizard when a new C++ header file is created.

@@ -231,7 +230,7 @@ The New File from Template wizard can be used to create new files based on one o
-

Default C source template

+ Default C source template

Used by the New Source File wizard when a new C source file is created.

@@ -240,7 +239,7 @@ The New File from Template wizard can be used to create new files based on one o
-

Default C header template

+ Default C header template

Used by the New Header File wizard when a new C source file is created.

@@ -249,7 +248,7 @@ The New File from Template wizard can be used to create new files based on one o
-

Other file templates

+ Other file templates

File templates can be defined for other content types, e.g. Assembly or plain text.

@@ -259,13 +258,14 @@ The New File from Template wizard can be used to create new files based on one o

Edit Template dialog

+

Edit Template Dialog Box

The following fields and buttons appear in the dialog:

- +
-

Action

+ Options

Description

@@ -275,7 +275,7 @@ The New File from Template wizard can be used to create new files based on one o
-

Name

+ Name

The name of the template. Only available for file templates.

@@ -283,7 +283,7 @@ The New File from Template wizard can be used to create new files based on one o
-

Type

+ Type

The file type (content type) of the template. Only available for file templates.

@@ -291,7 +291,7 @@ The New File from Template wizard can be used to create new files based on one o
-

Description

+ Description

A description of the template

@@ -299,7 +299,7 @@ The New File from Template wizard can be used to create new files based on one o
-

Pattern

+ Pattern

The template pattern.

@@ -307,7 +307,7 @@ The New File from Template wizard can be used to create new files based on one o
-

Insert Variables...

+ Insert Variables...

Displays a list of pre-defined template specific variables.

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 b7693fc9a76..e03604060fa 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 @@ -6,14 +6,15 @@ Environment preferences + -

Environment preferences

+

Environment preferences

-

Define environment variables and how they are used in the Environment preference panel.

-

Environment Preference

+

Use the Environment preference panel to define environment variables and their use.

+

Environment Preference

+ + + + - - + + @@ -33,7 +38,7 @@ - + @@ -45,8 +50,8 @@ - + diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_make_pref.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_make_pref.htm index c92da915182..fa5058ab9e3 100644 --- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_make_pref.htm +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_make_pref.htm @@ -4,20 +4,47 @@ -Build Make Targets in the Background +Make Targets Preferences + -

Make page, Preferences window

+

Make Targets preferences

-

You can force the building of make targets in the background.

+

Use the Make Targets preference panel in the Preferences window to set make target options.

Make Targets Preferences Window

+
Environment Options @@ -23,9 +24,13 @@
OptionsDescription
Environment variables to set Shows a list of the environment variables and their value. Environment variables to set Shows a list of the environment variables and their value.
New...
Select...

Click to open the Select variables dialog.

Click to open the Select variables dialog.
Edit...
Undefine

Click to undefine the currently selected variable.

-

NOTE: Some variables, like PATH, have special meaning and cannot be undefined.

Click to undefine the currently selected variable.

+ NOTE: Some variables, like PATH, have special meaning and cannot be undefined.
Append variables to native environment
+ + + + + + + + + + + + + + + + + + + + + + + +
Make Targets Preference Options
OptionsDescription
Build Make target in the backgroundSelect this checkbox to perform builds in the background.
From selected folderRebuild make target from the currently selected folder.
From selected rootRebuild make target from the currently selected root.
+
-
Build Make target in the background
-
Select this checkbox to perform builds in the background.
+
+

Related concepts 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 369ec8a3d68..3434f682e43 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 @@ -6,13 +6,14 @@ Settings preferences +

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

@@ -22,6 +23,10 @@ + + + + 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 70dd16921d9..8824ee90b5a 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 @@ -6,13 +6,14 @@ Makefile Editor preferences +

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

OptionsDescription
Posix Make Enable to generate makefiles that are POSIX Make compatible.
@@ -22,6 +23,10 @@ + + + + @@ -36,6 +41,7 @@
OptionsDescription
Color Click to set the selected syntax item to a specific color.
+

Makefile Editor Folding tab

Makefile Editor Folding tab

@@ -44,6 +50,10 @@ + + + + diff --git a/doc/org.eclipse.cdt.doc.user/topics_Reference.xml b/doc/org.eclipse.cdt.doc.user/topics_Reference.xml index dc5ece569ff..89c2496914a 100644 --- a/doc/org.eclipse.cdt.doc.user/topics_Reference.xml +++ b/doc/org.eclipse.cdt.doc.user/topics_Reference.xml @@ -55,7 +55,7 @@ - +
Makefile Editor Folding Tab Options
OptionsDescription
Enable folding when opening a new editor If enabled, activate folding when a new Makefile editor is opened.