diff --git a/doc/org.eclipse.cdt.doc.user/images/Idea.jpg b/doc/org.eclipse.cdt.doc.user/images/Idea.jpg new file mode 100644 index 00000000000..119ce70c26a Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/Idea.jpg differ diff --git a/doc/org.eclipse.cdt.doc.user/images/code_templates.png b/doc/org.eclipse.cdt.doc.user/images/code_templates.png new file mode 100644 index 00000000000..29d37c83aac Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/code_templates.png differ diff --git a/doc/org.eclipse.cdt.doc.user/images/contentAssist_example.gif b/doc/org.eclipse.cdt.doc.user/images/contentAssist_example.gif new file mode 100644 index 00000000000..0ed9e53ff9d Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/contentAssist_example.gif differ diff --git a/doc/org.eclipse.cdt.doc.user/images/contentAssist_preferences.png b/doc/org.eclipse.cdt.doc.user/images/contentAssist_preferences.png new file mode 100644 index 00000000000..49221495c65 Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/contentAssist_preferences.png differ diff --git a/doc/org.eclipse.cdt.doc.user/images/editor_annotations_preferences.png b/doc/org.eclipse.cdt.doc.user/images/editor_annotations_preferences.png new file mode 100644 index 00000000000..7e9542a368d Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/editor_annotations_preferences.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 new file mode 100644 index 00000000000..e3851fd04c0 Binary files /dev/null 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_general_preferences.png b/doc/org.eclipse.cdt.doc.user/images/editor_general_preferences.png new file mode 100644 index 00000000000..aa6020c8aed Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/editor_general_preferences.png differ diff --git a/doc/org.eclipse.cdt.doc.user/images/search.png b/doc/org.eclipse.cdt.doc.user/images/search.png new file mode 100644 index 00000000000..979ea082317 Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/search.png differ diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_ceditor_pref.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_ceditor_pref.htm index b8ddf1cc732..d4382fa2cac 100644 --- a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_ceditor_pref.htm +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_ceditor_pref.htm @@ -2,54 +2,49 @@ - - - - -C/C++ editor, code templates and search preferences - + + + C/C++ editor, code templates and search preferences + -

C/C++ editor, code templates and search preferences

+

C/C++ editor, code template, and search preferences

-

This section describes the preferences pages for the C/C++ editor, code -templates and search features.

+

This section describes how to set preferences for the C/C++ editor, code +templates, and the search feature.

- + - - + + - - + + - + - + - + - + diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_anno.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_anno.htm index 57cd1a088a6..c493f808eee 100644 --- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_anno.htm +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_anno.htm @@ -2,12 +2,10 @@ - - - - -Annotations page, Preferences window - + + + Annotations page, Preferences window +

Annotations page, Preferences window

-

The Annotations page of the Preferences window lets you customize the -appearance of annotations in the C/C++ editor.

+

You can customize the appearance of annotations in the C/C++ editor on the Annotations page of the Preferences Window.

+

Editor Annotations Preferences Dialog Box

Annotation Presentation Options
-
Lists items that can be displayed in a specified color.
+
Lists items, such as breakpoints, bookmarks, or index markers, for which you can specify a color.
Show in Text
-
Displays the selected annotation type in the text. The - corresponding text is underlined.
+
Displays in the text the selected type of annotation. The corresponding text is underlined.
Show in Overview Ruler
Displays the selected annotation type in the overview ruler.
Annotations Color
-
Specifies the color in which to display an annotation.
+
Specifies the color in which to display the selected item.

Related concepts
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 ac1477d97af..05377317da9 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 @@ -2,12 +2,10 @@ - - - - -Colors page, Preferences window - + + + Colors page, Preferences window +

Colors page, Preferences window

-

The Colors page of the Preferences window lets you customize the appearance of the C/C++ editor.

+

You can customize the appearance of the C/C++ editor on the Colors page of the Preferences window.

+

Editor Color Preferences Dialog Box

System Default
-
Uses the system default background color.
+
Uses the system default for the background color.
Custom
Changes the background color.
Foreground
-
Lists items that can be displayed in a specified color.
+
Lists items, such as comments, keywords, and strings, for which you can specify a color.
Color
Specifies the color in which to display the selected item.
Bold
-
Bolds the selected item.
+
Makes the selected item bold.

Related concepts
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 ef6f682fbec..bf5163b4500 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 @@ -2,12 +2,10 @@ - - - - -Content Assist page, Preferences window - + + + Content Assist page, Preferences window +

Content Assist page, Preferences window

-

The Contents Assist page of the Preferences window, lets you customize how the Content Assist feature works.

+

You can customize the Content Assist feature on the Contents Assist page of the C/C++ Editor Preferences window. To change the Content Assist preferences click +Window > Preferences > C/C++ > C++ Editor > Content Assist.

+

+Content Assist Preferences Dialog Box +

+
-
Insert single proposals automatically
-
Inserts an element into your code when it is the only item in the Content Assist - list.
-
Enable auto activation
-
Opens Content Assist when you type the first letter - of an element in the C/C++ editor for which there is a code template or an - element that begins with the same letter.
-
Auto activation delay
-
Specifies the number of seconds before Content Assist is - activated.
-
Auto activation triggers for C:
-
Specifies a character that, if typed in the C/C++ editor, causes code assist to - be invoked immediately  before the delay times out.
-
Background for completion proposals
-
Specifies the background color for the Content Assist dialog box.
+

Search scope for completion proposals
+
You can configure the Content Assist feature to select proposals from items contained only in the current file and included files, or from the current project.
+ +

Insert single proposals automatically
+
Inserts an element into your code when the Content Assist feature finds only one proposal.
+ +

Present proposals in alphabetical order
+
Proposals, by default, appear in order of relevance determined by context, scope and prefix. Alternatively, you can configure the Content Assist feature to order its proposals alphabetically.
+ +

Content Assist parsing timeout (in milliseconds) +
For very large projects, the Content Assist feature might slow the response of the plugin as the Content Assist feature searches the project for proposals. This setting stops the Content Assist search when it reaches the specified threshold.
+ +

Auto activation
+
Certain predefined triggers force the Content Assist feature to activate. You can disable the predefined triggers with these checkboxes. + +

Auto activation delay
+
Specifies the number of milliseconds before Content Assist is activated.
+ +

Background for completion proposals
+
Specifies the background color of the Content Assist dialog box.
+ +

Foreground for completion proposals
+
Specifies the foreground color of the Content Assist dialog box.
+

Related concepts
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 0ebeae5c392..69f5ad1557d 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 @@ -2,12 +2,10 @@ - - - - -General page, Preferences window - + + + General page, Preferences window +

General page, Preferences window

-

The General page of the Preferences window lets you customize the appearance of the C/C++ editor.

- +

You can customize the appearance of the C/C++ editor on the General page of the Preferences window.

+

Editor General Preferences Dialog Box

+
Text Font
+
Changes the font of the text in the workbench.
Displayed tab width
-
Specifies the tab width as a number of characters. For example 4, - means the tab width will be 4 characters wide.
+
Specifies the width of the tab as a number of characters. For example a value of 4, + means that the tab width is 4-characters wide.
Print margin column
-
Specifies the print margin width as a number of characters.
+
Specifies the width of the print margin as a number of characters. For example a value of + 80 means that the print area is 80-characters wide.
Insert space for tabs
-
Inserts spaces instead of a tab character when your press Tab.
+
Inserts a space instead of a tab character when you press Tab.
Highlight matching brackets
-
Highlights matching brackets.
+
When the cursor is beside a bracket, the matching bracket is highlighted.
Show line numbers
Displays line numbers in the left margin.
Highlight current line
@@ -36,11 +37,11 @@ END INFOPOP-->
Show overview ruler
Displays the overview ruler on the right margin.
Show print margin
-
Displays the print margin.
+
Displays the print margin in the editor.
Appearance color options
-
Lists items that can be displayed in a specified color.
+
Lists the items for which you can specify a color.
Color
-
Changes the color of the item selected in the list.
+
Changes the color of the item that is selected in the list.

Related concepts
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 4df5e313c27..83d45672814 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 @@ -2,12 +2,10 @@ - - - - -Code Templates page, Preferences window - + + + Code Templates page, Preferences window +

Code Templates page, Preferences window

-

The Code Templates page of the Preferences window lets you create, edit -import and export code templates.

+

You can manipulate any of the common code templates that are predefined within the CDT. To modify, delete, export, +import, or create your own templates click Window > Preferences > C/C++ > Code Templates.

+ +Code Templates Dialog Box
New
Creates a new code template.
Edit
-
Edits the code template selected in the list.
+
Edits the code template that is selected in the list.
Remove
Removes the selected code templates from the list.
Import
@@ -34,11 +34,9 @@ import and export code templates.

Export All
Exports all templates in the list.
Enable All
-
Makes all templates available when the Content Assist feature is - invoked.
+
Makes all templates available when you invoke the Content Assist feature.
Disable All
-
Makes all templates unavailable when the Content Assist feature is - invoked.
+
Makes all templates unavailable when you invoke the Content Assist feature.

Related concepts
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 82c5dc32c40..3d570c8f33b 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 @@ -2,12 +2,10 @@ - - - - -C/C++ search page, Search dialog box - + + + C/C++ search page, Search dialog box +

C/C++ search page, Search dialog box

-

The C/C++ search page of the Search dialog box lets you search for C/C++ -elements.

- +

You can search for C/C++ elements on the C/C++ search page of the Search dialog box.

+

Search Dialog Box

Search string
Specifies a search string.
@@ -29,7 +26,7 @@ elements.

(functions that are not members of a class, struct, or union).
Variable
Searches for variables that are not members of a class, - struct or union.
+ struct, or union.
Union
Searches for unions.
Method
@@ -48,14 +45,14 @@ elements.

Limits the search to declarations.
Definitions
Limits the search to definitions (for functions, methods, - variables and fields).
+ variables, and fields).
References
Limits the search to references.
All Occurrences
Includes declarations, definitions, and references in the search.
Workspace
-
Searches the eclipse workspace.
+
Searches the Eclipse workspace.
Selected Resources
Includes selected resources in the search.
Working Set
To learn aboutTo change preferences for See
General C/C++ editor preferencesGeneral page, - Preferences windowC/C++ editorGeneral page, Preferences window
C/C++ editor annotations preferencesAnnotations - page, Preferences windowC/C++ editor annotationsAnnotations page, Preferences window
C/C++ editor text color preferencesC/C++ editor text color Colors page, Preferences window
C/C++ editor preference Content Assist - preferencesC/C++ editor Content Assist Feature Content Assist page, Preferences window
C/C++ editor Code Templates preferencesC/C++ editor code template Code Templates page, Preferences window
C/C++ editor Search preferencesC/C++ editor search feature C/C++ search page, Search dialog box