diff --git a/doc/org.eclipse.cdt.doc.user/images/mprop_manage.png b/doc/org.eclipse.cdt.doc.user/images/mprop_manage.png new file mode 100644 index 00000000000..8327a9d3d7d Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/mprop_manage.png differ diff --git a/doc/org.eclipse.cdt.doc.user/images/mprop_new.png b/doc/org.eclipse.cdt.doc.user/images/mprop_new.png new file mode 100644 index 00000000000..5f2d33cb14b Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/mprop_new.png differ diff --git a/doc/org.eclipse.cdt.doc.user/images/mprop_rename.png b/doc/org.eclipse.cdt.doc.user/images/mprop_rename.png new file mode 100644 index 00000000000..0b674f4943c Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/mprop_rename.png differ diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_build.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_build.htm index 9c53d32fa59..2b43d0830f9 100644 --- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_build.htm +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_build.htm @@ -22,7 +22,7 @@ configuration.
Users can define and delete macros for any given project configuration, for the entire project or for the entire workspace.
-<<<<<<< cdt_u_mprop_macros.htm -The value of a build macro will be searched for in -the order specified above. If macro is not found for the currently -selected file context, the currently selected option context will be -used, if not found, the currently selected configuration context will -be used, etc.
-To define a new macro the "New" button should be -pressed. A dialog will appear representing the macro definition.
-=======The value of a build macro will be searched for in the order specified above. If macro is not found for the currently selected file context, the currently selected option context will be @@ -152,7 +143,6 @@ macro. Overriding MBS pre-defined macros can have unanticipated consequences.
To define a new macro the "New" button should be pressed. A dialog will appear representing the macro definition.
->>>>>>> 1.3The "Name" field contains the list of macros that are already @@ -742,6 +732,7 @@ References
+C++ Project Properties, Managed, Info
+C++ Project Properties, Managed, Builders
+C++ Project Properties, Managed, New Configuration Dialog
+C++ Project Properties, Managed, Rename Configuration Dialog
+C++ Project Properties, Managed, C/C++ Build, Tool Settings
+C++ Project Properties, Managed, C/C++ Build, Build Settings
+C++ Project Properties, Managed, C/C++ Build, Build Steps
+C++ Project Properties, Managed, C/C++ Build, Error Parsers
+C++ Project Properties, Managed, C/C++ Build, Binary Parser
+C++ Project Properties, Managed, C/C++ Build, Environment
+C++ Project Properties, Managed, C/C++ Build, Macros
+C++ Project Properties, Managed, C/C++ Documentation
+C++ Project Properties, Managed, Project References
+
+
+C++ Project Properties, Managed, Info
+C++ Project Properties, Managed, Builders
+C++ Project Properties, Managed, Manage Configuration Dialog
+C++ Project Properties, Managed, Rename Configuration Dialog
+C++ Project Properties, Managed, C/C++ Build, Tool Settings
+C++ Project Properties, Managed, C/C++ Build, Build Settings
+C++ Project Properties, Managed, C/C++ Build, Build Steps
+C++ Project Properties, Managed, C/C++ Build, Error Parsers
+C++ Project Properties, Managed, C/C++ Build, Binary Parser
+C++ Project Properties, Managed, C/C++ Build, Environment
+C++ Project Properties, Managed, C/C++ Build, Macros
+C++ Project Properties, Managed, C/C++ Documentation
+C++ Project Properties, Managed, Project References
+
+
+C++ Project Properties, Managed, Info
+C++ Project Properties, Managed, Builders
+C++ Project Properties, Managed, Manage Configuration Dialog
+C++ Project Properties, Managed, New Configuration Dialog
+C++ Project Properties, Managed, C/C++ Build, Tool Settings
+C++ Project Properties, Managed, C/C++ Build, Build Settings
+C++ Project Properties, Managed, C/C++ Build, Build Steps
+C++ Project Properties, Managed, C/C++ Build, Error Parsers
+C++ Project Properties, Managed, C/C++ Build, Binary Parser
+C++ Project Properties, Managed, C/C++ Build, Environment
+C++ Project Properties, Managed, C/C++ Build, Macros
+C++ Project Properties, Managed, C/C++ Documentation
+C++ Project Properties, Managed, Project References
+
+