diff --git a/doc/org.eclipse.cdt.doc.user/images/code_templates.png b/doc/org.eclipse.cdt.doc.user/images/code_templates.png index edfc7c103fc..eae5d39f033 100644 Binary files a/doc/org.eclipse.cdt.doc.user/images/code_templates.png and b/doc/org.eclipse.cdt.doc.user/images/code_templates.png differ diff --git a/doc/org.eclipse.cdt.doc.user/images/editor_color_preferences.png b/doc/org.eclipse.cdt.doc.user/images/editor_color_preferences.png index 8e0dee77ef5..888b89f7f71 100644 Binary files a/doc/org.eclipse.cdt.doc.user/images/editor_color_preferences.png and b/doc/org.eclipse.cdt.doc.user/images/editor_color_preferences.png differ diff --git a/doc/org.eclipse.cdt.doc.user/images/editor_folding_preferences.png b/doc/org.eclipse.cdt.doc.user/images/editor_folding_preferences.png index 1b89829abba..c3eb6e98e2b 100644 Binary files a/doc/org.eclipse.cdt.doc.user/images/editor_folding_preferences.png and b/doc/org.eclipse.cdt.doc.user/images/editor_folding_preferences.png differ diff --git a/doc/org.eclipse.cdt.doc.user/images/editor_hover_preferences.png b/doc/org.eclipse.cdt.doc.user/images/editor_hover_preferences.png index d535618a326..d33d29295ef 100644 Binary files a/doc/org.eclipse.cdt.doc.user/images/editor_hover_preferences.png and b/doc/org.eclipse.cdt.doc.user/images/editor_hover_preferences.png differ diff --git a/doc/org.eclipse.cdt.doc.user/images/editor_mark_preferences.png b/doc/org.eclipse.cdt.doc.user/images/editor_mark_preferences.png new file mode 100755 index 00000000000..5ec7a3b77bd Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/editor_mark_preferences.png differ diff --git a/doc/org.eclipse.cdt.doc.user/images/editor_save_actions_preferences.png b/doc/org.eclipse.cdt.doc.user/images/editor_save_actions_preferences.png new file mode 100755 index 00000000000..90391346f16 Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/editor_save_actions_preferences.png differ diff --git a/doc/org.eclipse.cdt.doc.user/images/editor_scalability_preferences.png b/doc/org.eclipse.cdt.doc.user/images/editor_scalability_preferences.png index f5cb582d7e9..529f94196c8 100644 Binary files a/doc/org.eclipse.cdt.doc.user/images/editor_scalability_preferences.png and b/doc/org.eclipse.cdt.doc.user/images/editor_scalability_preferences.png differ diff --git a/doc/org.eclipse.cdt.doc.user/images/editor_typing_preferences.png b/doc/org.eclipse.cdt.doc.user/images/editor_typing_preferences.png index bbd29c2a1a9..5da772cfde0 100644 Binary files a/doc/org.eclipse.cdt.doc.user/images/editor_typing_preferences.png and b/doc/org.eclipse.cdt.doc.user/images/editor_typing_preferences.png differ diff --git a/doc/org.eclipse.cdt.doc.user/plugin.xml b/doc/org.eclipse.cdt.doc.user/plugin.xml index 2809ed4d8ea..c5f1f0b4e5c 100644 --- a/doc/org.eclipse.cdt.doc.user/plugin.xml +++ b/doc/org.eclipse.cdt.doc.user/plugin.xml @@ -30,7 +30,8 @@ file="topics_Tasks.xml"> + file="topics_Reference.xml" + primary="true"> 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 dbca3c638f0..6a1abac7c96 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 @@ -15,14 +15,15 @@

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

+ + + + + - - + + 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 4e03347a922..ab620369538 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 @@ -6,22 +6,29 @@ Syntax Coloring preferences +

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.

+

Use the Syntax Coloring preference panel to specify 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

-
Code Style Preference Options
- Option - - Description - OptionDescription
+
+ + + + + + 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 e22ace7f427..32392687f5c 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 @@ -6,12 +6,13 @@ Folding preferences +

Folding preferences

-

You can customize the C/C++ editor folding behavior in the Folding panel of the Preferences window.

+

Use the Folding preference panel to customize the C/C++ editor folding behavior.

Editor Folding Preferences Window

Syntax Coloring Preference Options
OptionDescription
Enable semantic highlighting
@@ -21,7 +22,7 @@ - + @@ -41,6 +42,11 @@ + + + + + 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 f1a14d648bc..3950ea97c0c 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 @@ -6,19 +6,26 @@ Hover preferences +

Hovers preferences

-

You can customize the appearance of the C/C++ editor hover behavior on the Hovers panel of the Preferences window.

-

Editor Hover Preferences Window

-
Folding Preference Options
Option Description DefaultIf enabled, fold preprocessor branches.  
Enable folding of control flow statements (if/else, do/while, for, switch)If enabled, fold control flow statements. 
Macros If enabled, fold macro definitions.
+

Use the Hovers preference panel to customize the C/C++ editor hover behavior.

+

Editor Hover Preferences Panel

+
+ + + + + + @@ -28,6 +35,10 @@ + + + +
Hovers Preference Options
OptionDescription
Enable editor problem annotationText 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.
Pressed key modifier while hoveringEnter a key modifier for the selected hover name.
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 2ca3efae82f..19aa96a6d1f 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 @@ -3,37 +3,46 @@ -Mark Occurrences +Mark Occurrences preferences + -

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.

- +

Mark Occurrences preferences

+

Use the Mark Occurrences preference panel to set annotations for the C/C++ Editor view.

+

Mark Occurrences Preference Panel

+ +
+ - - - + + + + + + + + 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 bef615d9c7c..abdfef3cce9 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 @@ -6,20 +6,27 @@ Editor preferences +

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 the C/C++ editor while saving a file.

+

Save Actions Preferences

Mark Occurrences Preference Options
-

Option

-
-

Description

-
-

Default

-
OptionDescriptionDefault
-

Mark occurrences of the selected element in the current file

+ Mark occurrences of the selected element in the current file
-

If enabled, then you'll see within a file, where a variable, function, method, type, macro or other element is referenced.

+ If enabled, then you'll see within a file, where a variable, function, method, type, macro or other element is referenced.
-

On

+ On +
+ Keep marks when the selection changes + + If enabled, don't change the location of the mark occurrence when a new selection is made. + + On
- + - - + + + + + + + + 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 4e9c52128c2..2b04e7dfd99 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 @@ -6,20 +6,27 @@ Editor Scalability preferences +

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.

-Scalability Preferences +

Use the Scalability preference panel to configure options for dealing with large source files.

+

Scalability Preferences

-
Editor Preference OptionsSave Actions Preference Options
OptionDescription
Remove trailing whitespace
+
- - + + + + + + + + @@ -53,7 +60,7 @@ - + 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 186e8a38c98..8ac43713caf 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 @@ -6,19 +6,27 @@ Typing preferences +

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.

-Typing Preferences -
Scalability Preference Options
OptionDescription
Alert me when scalability mode will be turned onIf 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 '->'.
+

Use the Typing preference panel to assist in formatting input as you type.

+

Typing Preferences

+ +
+ + + + + + @@ -37,7 +45,7 @@ - + @@ -53,7 +61,7 @@ - + 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 8e11cc21425..63e47337721 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 @@ -6,20 +6,27 @@ Templates preferences +

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

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 +

Templates Preferences

Typing Preference Options
OptionDescription
"Strings"If enabled, automatically close curly braces.
Tab key indents the current lineTab key adjusts indentation of the current line If enabled, indent the current line when the tab key is pressed.
If enabled, special characters in pasted strings are escaped when pasted into an existing string literal.
Automatically indent - New lines and bracesNew 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/topics_Reference.xml b/doc/org.eclipse.cdt.doc.user/topics_Reference.xml index 89c2496914a..07f54e6f762 100644 --- a/doc/org.eclipse.cdt.doc.user/topics_Reference.xml +++ b/doc/org.eclipse.cdt.doc.user/topics_Reference.xml @@ -67,45 +67,43 @@ - + - - - - + + + - - - - - - - - + + + + + + + + - - - + + - + - +
Templates Preference Options
OptionDescription
New...