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">
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.
- Option - | -- Description - | +Option | +Description |
---|
Option | +Description | +||||||||||||||||||||||||||||||||||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Enable semantic highlighting | 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 @@
Option | Description | Default | @@ -41,6 +42,11 @@If 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. | 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 @@
Option | +Description | +|
---|---|---|
Enable editor problem annotation | @@ -28,6 +35,10 @@Text 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 hovering | +Enter a key modifier for the selected hover name. | +
Indicate your preferences for the Mark Occurrences settings on the C/C++ > Editor > Mark Occurrences preference page.
- Option - |
-
- Description - |
-
- Default - |
+ Option | +Description | +Default | ||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
- 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 |
Option | +Description | +||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Remove trailing whitespace | 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 @@
Option | +Description | +|
---|---|---|
Alert me when scalability mode will be turned on | @@ -53,7 +60,7 @@If enabled, content assist proposals which require parsing the file will not be available. | |
Disable content assist auto activation | +Disable content assist auto-activation | If enabled, content assist will not be activated automatically on trigger sequences, like '.', '::' or '->'. |
Option | +Description | +|
---|---|---|
"Strings" | @@ -37,7 +45,7 @@If enabled, automatically close curly braces. | |
Tab key indents the current line | +Tab 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 braces | +New 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) |
Option | +Description | +
---|---|
New... | 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 @@