diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_pref-multi-cfg.png b/doc/org.eclipse.cdt.doc.user/images/cdt_pref-multi-cfg.png
index bc593fe53a6..ad7a53afb5a 100644
Binary files a/doc/org.eclipse.cdt.doc.user/images/cdt_pref-multi-cfg.png and b/doc/org.eclipse.cdt.doc.user/images/cdt_pref-multi-cfg.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_pref-prop-pages.png b/doc/org.eclipse.cdt.doc.user/images/cdt_pref-prop-pages.png
index 167a0ab303b..c10f770ffa0 100644
Binary files a/doc/org.eclipse.cdt.doc.user/images/cdt_pref-prop-pages.png and b/doc/org.eclipse.cdt.doc.user/images/cdt_pref-prop-pages.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_ref.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_ref.htm
index 2f51dc4bc50..e7d59b57345 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_ref.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_ref.htm
@@ -49,8 +49,8 @@
Appearance Build preferences Console
- Environment
- Make Targets
+ Environment
+ Make Targets Makefile Editor Settings Debug preferences
@@ -65,7 +65,7 @@
Folding Hovers Mark Occurrences
- Save Actions
+ Save Actions Scalability Syntax Coloring Templates
@@ -73,6 +73,10 @@
File Types Indexer Language Mappings
+
+ Property Pages Settings
+ Multi-Configuration Edit
+
New Make Projects properties preferences Make Builder preferences
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_pref_multi_cfg.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_pref_multi_cfg.htm
index 784686fc4de..e16e78fd92d 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_pref_multi_cfg.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_pref_multi_cfg.htm
@@ -6,56 +6,63 @@
Multi-Configuration Edit preferences
+
Multi-Configuration Edit preferences
-
-
Since CDT 5.0, user is able to edit properties for
-multiple project configurations simultaneously.
-
Either all configuations or some of them can be selected.
-
But, then we deal with string list property values,
-it is not obvious how to concatenate them, if they differ.
-
-
+
Use the Multi-Configuration Edit preference panel to simultaneously edit properties for multiple project configurations. Its possible to select one or more configurations for editing.
+
But, then we deal with string list property values, it is not obvious how to concatenate them, if they differ.
-
-
String list Display Mode
-
Specifies how values will be shown.
- There are 2 options: conjunction or disjunction.
-
-
Conjunction shows common elements only, so if 1st configuration has
- value <A, B, C> and 2nd configuration has <B, C, D>, <B, C> will be shown.
-
Disjunction shows all existing elements except doubles, so if 1st configuration has
- value <A, B, C> and 2nd configuration has <B, C, D>, <A, B, C, D> will be shown.
-
- Note that Display mode can be changed directly on each tab which deals with string lists.
- Result is immediate: data on the tab refereshed according to selected mode.
-
-
String list Write Mode
-
Specifies how values will be saved.
- There are 2 options: modify or replace.
-
-
Modify mode adds, changes or removes elements affected by user's actions.
- Elements which were not touched by user are left unchanged.
- Example: cfg1 has <A, B, C>; cfg2 has <B, C, D>.
- User removed B and added F.
- Result: cfg1 has <A, C, F>; cfg2 has <C, D, F>.
-
Replace mode puts currently visible elements to all configurations.
- Old contents will be lost.
- Example: cfg1 has <A, B, C>; cfg2 has <B, C, D>.
- Visible list depends of Display mode: <B, C> or <A, B, C, D>.
- User removed B and added F.
- Result: both cfgs will contain either <C, F> or <A, C, D, F> depending of Display mode.
-
- Note that Write mode can be changed directly on each tab which deals with string lists.
-
-
Restore Defaults
-
Sets all parameters to default values
-
Apply
-
Saves current settings.
-
+
+
Property Pages Settings Preference Options
+
+
+
+
+
+
+
Option
+
Description
+
+
+
+
+
String list Display Mode
+
Specifies how values are shown. The two options are:
+
+
Conjunction shows common elements only, so if 1st configuration has
+ value <A, B, C> and 2nd configuration has <B, C, D>, <B, C> will be shown.
+
Disjunction shows all existing elements except doubles, so if 1st configuration has
+ value <A, B, C> and 2nd configuration has <B, C, D>, <A, B, C, D> will be shown.
+
+ Note that Display mode can be changed directly on each tab which deals with string lists.
+ Result is immediate: data on the tab is refreshed according to selected mode.
+
+
+
String list Write Mode
+
Specifies how values are saved. The two options are:
+
+
Modify mode adds, changes or removes elements affected by user's actions.
+ Elements which were not touched by user are left unchanged.
+ Example: cfg1 has <A, B, C>; cfg2 has <B, C, D>.
+ User removed B and added F.
+ Result: cfg1 has <A, C, F>; cfg2 has <C, D, F>.
+
Replace mode puts currently visible elements to all configurations.
+ Old contents will be lost.
+ Example: cfg1 has <A, B, C>; cfg2 has <B, C, D>.
+ Visible list depends of Display mode: <B, C> or <A, B, C, D>.
+ User removed B and added F.
+ Result: both cfgs will contain either <C, F> or <A, C, D, F> depending of Display mode.
+
+ Note that Write mode can be changed directly on each tab which deals with string lists.