The patch from Sunil Davasam that updates the configuration management documentation

doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_build.htm

@@ -22,7 +22,7 @@ configuration.</dd>
   <dd>Specifies the selected build configuration from the list
 provided.</dd>
   <dt>Manage...</dt>
-  <dd>Adds, removes, renames and manages configurations.</dd>
+  <dd>Adds, removes, renames and converts configurations.</dd>
   <dt>Configuration Settings</dt>
   <dd>Sets build options for the configuration.</dd>
   <dt>Restore Defaults</dt>
@@ -64,6 +64,7 @@ References</a><br>
 <a href="cdt_u_mprop_info.htm">C++ Project Properties, Managed, Info</a><br>
 <a href="cdt_u_mprop_builders.htm">C++ Project Properties, Managed,
 Builders</a><br>
+<a href="cdt_u_mprop_manage.htm">C++ Project Properties, Managed, Manage Configuration Dialog</a><br>
 <a href="cdt_u_mprop_tool_settings.htm">C++ Project Properties,
 Managed, C/C++ Build, Tool Settings</a><br>
 <a href="cdt_u_mprop_build_settings.htm">C++ Project Properties,

doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_build_settings.htm

@@ -19,7 +19,7 @@ configuration.</dd>
   <dt>Configuration:</dt>
   <dd>Specifies the selected build configuration from the list provided.</dd>
   <dt>Manage...</dt>
-  <dd>Adds, removes, renames and manages configurations.</dd>
+  <dd>Adds, removes, renames and converts configurations.</dd>
   <dt>Configuration Settings, Build Settings</dt>
   <dd>Sets the build command, build flags, the name of the build goal,
 and whether to expand build environment macros in the generated make
@@ -65,6 +65,7 @@ References</a><br>
 Builders</a><br>
 <a href="cdt_u_mprop_build.htm">C++ Project Properties, Managed, C/C++
 Build</a><br>
+<a href="cdt_u_mprop_manage.htm">C++ Project Properties, Managed, Manage Configuration Dialog</a><br>
 <a href="cdt_u_mprop_tool_settings.htm">C++ Project Properties,
 Managed, C/C++ Build, Tool Settings</a><br>
 <a href="cdt_u_mprop_dcbs.htm">C++ Project Properties, Managed, C/C++

doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_dcbs.htm

@@ -23,7 +23,7 @@ configuration.</dd>
   <dt>Configuration:</dt>
   <dd>Specifies the selected build configuration from the list provided.</dd>
   <dt>Manage...</dt>
-  <dd>Adds, removes, rename and manages configurations.</dd>
+  <dd>Adds, removes, renames and converts configurations.</dd>
   <dt>Pre-build Step</dt>
   <dt>&nbsp;&nbsp;&nbsp; Command</dt>
   <dd>Specifies a command, or a list of semicolon separated commands,
@@ -74,6 +74,7 @@ File, Info</a><br>
 Builders</a><br>
 <a href="cdt_u_mprop_build.htm">C++ Project Properties, Managed, C/C++
 Build</a><br>
+<a href="cdt_u_mprop_manage.htm">C++ Project Properties, Managed, Manage Configuration Dialog</a><br>
 <a href="cdt_u_mprop_tool_settings.htm">C++ Project Properties,
 Managed, C/C++ Build, Tool Settings</a><br>
 <a href="cdt_u_mprop_build_settings.htm">C++ Project Properties,

doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_env.htm

@@ -30,7 +30,7 @@ configuration.</dd>
   <dt>Configuration:</dt>
   <dd>Specifies the selected build configuration from the list provided.</dd>
   <dt>Manage...</dt>
-  <dd>Adds, removes, renames and manages configurations.</dd>
+  <dd>Adds, removes, renames and converts configurations.</dd>
   <dt>Configuration Settings</dt>
   <dd>Adds, removes and edits environment variables for a project or
 configuration.&nbsp; Each tab contains two tables - one for
@@ -224,6 +224,7 @@ References</a><br>
 Builders</a><br>
 <a href="cdt_u_mprop_build.htm">C++ Project Properties, Managed, C/C++
 Build</a><br>
+<a href="cdt_u_mprop_manage.htm">C++ Project Properties, Managed, Manage Configuration Dialog</a><br>
 <a href="cdt_u_mprop_tool_settings.htm">C++ Project Properties,
 Managed, C/C++ Build, Tool Settings</a><br>
 <a href="cdt_u_mprop_build_settings.htm">C++ Project Properties,

doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_macros.htm

@@ -28,7 +28,7 @@ configuration.</dd>
   <dt>Configuration:</dt>
   <dd>Specifies the selected build configuration from the list provided.</dd>
   <dt>Manage...</dt>
-  <dd>Adds, removes, renames and manages configurations.</dd>
+  <dd>Adds, removes, renames and converts configurations.</dd>
   <dt>Configuration Settings</dt>
   <dd>Adds, removes, edits and manages build macros for a project or
 configuration.&nbsp; <br>
@@ -133,15 +133,6 @@ environment variables defined in the environment passed to Eclipse. </p>
 <p class="MsoNormal">Users can define and delete macros for any given
 project configuration, for the entire project or for the entire
 workspace.</p>
-&lt;&lt;&lt;&lt;&lt;&lt;&lt; cdt_u_mprop_macros.htm
-<p class="MsoNormal">The value of a build macro will be searched for in
-the order specified above.&nbsp;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.&nbsp; </p>
-<p class="MsoNormal">To define a new macro the "New" button should be
-pressed. A dialog will appear representing the macro definition.</p>
-=======
 <p class="MsoNormal">The value of a build macro will be searched for in
 the order specified above.&nbsp;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.</p>
 <p class="MsoNormal">To define a new macro the "New" button should be
 pressed. A dialog will appear representing the macro definition.</p>
-&gt;&gt;&gt;&gt;&gt;&gt;&gt; 1.3
 <p class="MsoNormal"><img border="0"
  src="../images/mprop_macros_new_file.PNG" width="426" height="321"></p>
 <p>The "Name" field contains the list of macros that are already
@@ -742,6 +732,7 @@ References</a><br>
 Builders</a><br>
 <a href="cdt_u_mprop_build.htm">C++ Project Properties, Managed, C/C++
 Build</a><br>
+<a href="cdt_u_mprop_manage.htm">C++ Project Properties, Managed, Manage Configuration Dialog</a><br>
 <a href="cdt_u_mprop_tool_settings.htm">C++ Project Properties,
 Managed, C/C++ Build, Tool Settings</a><br>
 <a href="cdt_u_mprop_build_settings.htm">C++ Project Properties,

doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_manage.htm

@@ -0,0 +1,47 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<html lang="en">
+
+<head>
+	<meta http-equiv="Content-Language" content="en-us">
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+	<title>C/C++ Project Properties, Managed,  Manage Configuration Dialog</title>
+	<link rel="stylesheet" type="text/css" href="../help.css">
+</head>
+<body>
+
+<h1>C/C++ Project Properties, Managed, Manage Configuration Dialog</h1>
+Manages the configurations defined for the project. Select a button to add,
+rename, remove or convert a configuration.<p><img img src="../images/mprop_manage.png" alt="C/C++ Project Properties, Managed,  Manage Configuration Dialog"></p>
+
+<p><dl>
+	<dt>Manage Configurations:</dt><dd>Displays the list of defined configurations for the given project.</dd>
+	<dt>Tool chain conversion targets:</dt><dd>The list of Tool chain conversion targets available for the selected configuration.</dd>
+	<dt>Convert</dt><dd>Converts the configuration selected in manage configurations list. </dd>
+	<dt>New</dt><dd>Displays the new configuration dialog that can be used to create a new configuration.</dd>
+	<dt>Remove</dt><dd>Removes the selected configuration from the list, prompts the user to confirm the action.</dd>
+	<dt>Rename</dt><dd>Displays the rename configuration dialog that can be used to rename the configuration name & description.</dd>
+	<dt>OK</dt><dd>Closes the manage configuration dialog</dd>
+</dl></p>
+
+<p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21"><br>
+<a href="cdt_u_mprop_info.htm">C++ Project Properties, Managed, Info</a><br>
+<a href="cdt_u_mprop_builders.htm">C++ Project Properties, Managed, Builders</a><br>
+<a href="cdt_u_mprop_new.htm">C++ Project Properties, Managed, New Configuration Dialog</a><br>
+<a href="cdt_u_mprop_rename.htm">C++ Project Properties, Managed, Rename Configuration Dialog</a><br>
+<a href="cdt_u_mprop_tool_settings.htm">C++ Project Properties, Managed, C/C++ Build, Tool Settings</a><br>
+<a href="cdt_u_mprop_build_settings.htm">C++ Project Properties, Managed, C/C++ Build, Build Settings</a><br>
+<a href="cdt_u_mprop_dcbs.htm">C++ Project Properties, Managed, C/C++ Build, Build Steps</a><br>
+<a href="cdt_u_mprop_merror.htm">C++ Project Properties, Managed, C/C++ Build, Error Parsers</a><br>
+<a href="cdt_u_mprop_mbinary.htm">C++ Project Properties, Managed, C/C++ Build, Binary Parser</a><br>
+<a href="cdt_u_mprop_env.htm">C++ Project Properties, Managed, C/C++ Build, Environment</a><br>
+<a href="cdt_u_mprop_macros.htm">C++ Project Properties, Managed, C/C++ Build, Macros</a><br>
+<a href="cdt_u_mprop_documentation.htm">C++ Project Properties, Managed, C/C++ Documentation</a><br>
+<a href="cdt_u_mprop_ref.htm">C++ Project Properties, Managed, Project References</a></p>
+<a href="cdt_u_mfile_build.htm">C++ Project Properties, Managed Make File, C/C++ Build</a></p>
+
+<p>
+<img src="../images/ng00_04a.gif" ALT="IBM Copyright Statement" >  
+</p>
+</body>
+
+</html>

doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_mbinary.htm

@@ -22,7 +22,7 @@ configuration.</dd>
   <dt>Configuration:</dt>
   <dd>Specifies the selected build configuration from the list provided.</dd>
   <dt>Manage...</dt>
-  <dd>Adds, removes, renames and manages configurations.</dd>
+  <dd>Adds, removes, renames and converts configurations.</dd>
   <dt>Configuration Settings, Binary Parser</dt>
   <dd>Specifies a binary parser from the list provided.</dd>
   <dt>Binary Parser Options</dt>
@@ -74,6 +74,7 @@ References</a><br>
 Builders</a><br>
 <a href="cdt_u_mprop_build.htm">C++ Project Properties, Managed, C/C++
 Build</a><br>
+<a href="cdt_u_mprop_manage.htm">C++ Project Properties, Managed, Manage Configuration Dialog</a><br>
 <a href="cdt_u_mprop_tool_settings.htm">C++ Project Properties,
 Managed, C/C++ Build, Tool Settings</a><br>
 <a href="cdt_u_mprop_build_settings.htm">C++ Project Properties,

doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_merror.htm

@@ -19,7 +19,7 @@ configuration.</dd>
   <dt>Configuration:</dt>
   <dd>Specifies the selected build configuration from the list provided.</dd>
   <dt>Manage...</dt>
-  <dd>Adds, removes, renames and manages configurations.</dd>
+  <dd>Adds, removes, renames and converts configurations.</dd>
   <dt>Configuration Settings, Error Parsers</dt>
   <dd>Lists the various error parsers which can be enabled or disabled.</dd>
   <dt>Up</dt>
@@ -79,6 +79,7 @@ References</a><br>
 Builders</a><br>
 <a href="cdt_u_mprop_build.htm">C++ Project Properties, Managed, C/C++
 Build</a><br>
+<a href="cdt_u_mprop_manage.htm">C++ Project Properties, Managed, Manage Configuration Dialog</a><br>
 <a href="cdt_u_mprop_tool_settings.htm">C++ Project Properties,
 Managed, C/C++ Build, Tool Settings</a><br>
 <a href="cdt_u_mprop_build_settings.htm">C++ Project Properties,

doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_new.htm

@@ -0,0 +1,46 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<html lang="en">
+
+<head>
+	<meta http-equiv="Content-Language" content="en-us">
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+	<title>C/C++ Project Properties, Managed,  Manage Configuration Dialog</title>
+	<link rel="stylesheet" type="text/css" href="../help.css">
+</head>
+<body>
+
+<h1>C/C++ Project Properties, Managed, New Configuration Dialog</h1>
+Creates a new configuration based on either an existing configuration or a default configuration.<p><img img src="../images/mprop_new.png" alt="C/C++ Project Properties, Managed,  New Configuration Dialog"></p>
+
+<p><dl>
+	<dt>Name:</dt><dd>Name of the new configuration.</dd>
+	<dt>Description:</dt><dd>Description of the new configuration.</dd>
+	<dt>Default configuration:</dt><dd>A list of default configurations available for the current project. </dd>
+	<dt>Existing configuration:</dt><dd>A list of existing configurations of the current project.</dd>
+	<dt>Show unsupported configurations:</dt><dd>Check box to show unsupported configurations</dd>
+	<dt>OK</dt><dd>Creates a new configuration with name & description provided.</dd>
+	<dt>Cancel</dt><dd>Discard the changes and go back to manage configuration dialog.</dd>
+</dl></p>
+
+<p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21"><br>
+<a href="cdt_u_mprop_info.htm">C++ Project Properties, Managed, Info</a><br>
+<a href="cdt_u_mprop_builders.htm">C++ Project Properties, Managed, Builders</a><br>
+<a href="cdt_u_mprop_manage.htm">C++ Project Properties, Managed, Manage Configuration Dialog</a><br>
+<a href="cdt_u_mprop_rename.htm">C++ Project Properties, Managed, Rename Configuration Dialog</a><br>
+<a href="cdt_u_mprop_tool_settings.htm">C++ Project Properties, Managed, C/C++ Build, Tool Settings</a><br>
+<a href="cdt_u_mprop_build_settings.htm">C++ Project Properties, Managed, C/C++ Build, Build Settings</a><br>
+<a href="cdt_u_mprop_dcbs.htm">C++ Project Properties, Managed, C/C++ Build, Build Steps</a><br>
+<a href="cdt_u_mprop_merror.htm">C++ Project Properties, Managed, C/C++ Build, Error Parsers</a><br>
+<a href="cdt_u_mprop_mbinary.htm">C++ Project Properties, Managed, C/C++ Build, Binary Parser</a><br>
+<a href="cdt_u_mprop_env.htm">C++ Project Properties, Managed, C/C++ Build, Environment</a><br>
+<a href="cdt_u_mprop_macros.htm">C++ Project Properties, Managed, C/C++ Build, Macros</a><br>
+<a href="cdt_u_mprop_documentation.htm">C++ Project Properties, Managed, C/C++ Documentation</a><br>
+<a href="cdt_u_mprop_ref.htm">C++ Project Properties, Managed, Project References</a></p>
+<a href="cdt_u_mfile_build.htm">C++ Project Properties, Managed Make File, C/C++ Build</a></p>
+
+<p>
+<img src="../images/ng00_04a.gif" ALT="IBM Copyright Statement" >  
+</p>
+</body>
+
+</html>

doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_rename.htm

@@ -0,0 +1,43 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<html lang="en">
+
+<head>
+	<meta http-equiv="Content-Language" content="en-us">
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+	<title>C/C++ Project Properties, Managed,  Manage Configuration Dialog</title>
+	<link rel="stylesheet" type="text/css" href="../help.css">
+</head>
+<body>
+
+<h1>C/C++ Project Properties, Managed, Rename Configuration Dialog</h1>
+Renames the name and the description of the existing configuration.<p><img img src="../images/mprop_rename.png" alt="C/C++ Project Properties, Managed,  New Configuration Dialog"></p>
+
+<p><dl>
+	<dt>Name:</dt><dd>Name of the configuration.</dd>
+	<dt>Description:</dt><dd>Description of the configuration.</dd>
+	<dt>OK</dt><dd>Apply the changes made to name & description of the configuration.</dd>
+	<dt>Cancel</dt><dd>Discard the changes.</dd>
+</dl></p>
+
+<p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21"><br>
+<a href="cdt_u_mprop_info.htm">C++ Project Properties, Managed, Info</a><br>
+<a href="cdt_u_mprop_builders.htm">C++ Project Properties, Managed, Builders</a><br>
+<a href="cdt_u_mprop_manage.htm">C++ Project Properties, Managed, Manage Configuration Dialog</a><br>
+<a href="cdt_u_mprop_new.htm">C++ Project Properties, Managed, New Configuration Dialog</a><br>
+<a href="cdt_u_mprop_tool_settings.htm">C++ Project Properties, Managed, C/C++ Build, Tool Settings</a><br>
+<a href="cdt_u_mprop_build_settings.htm">C++ Project Properties, Managed, C/C++ Build, Build Settings</a><br>
+<a href="cdt_u_mprop_dcbs.htm">C++ Project Properties, Managed, C/C++ Build, Build Steps</a><br>
+<a href="cdt_u_mprop_merror.htm">C++ Project Properties, Managed, C/C++ Build, Error Parsers</a><br>
+<a href="cdt_u_mprop_mbinary.htm">C++ Project Properties, Managed, C/C++ Build, Binary Parser</a><br>
+<a href="cdt_u_mprop_env.htm">C++ Project Properties, Managed, C/C++ Build, Environment</a><br>
+<a href="cdt_u_mprop_macros.htm">C++ Project Properties, Managed, C/C++ Build, Macros</a><br>
+<a href="cdt_u_mprop_documentation.htm">C++ Project Properties, Managed, C/C++ Documentation</a><br>
+<a href="cdt_u_mprop_ref.htm">C++ Project Properties, Managed, Project References</a></p>
+<a href="cdt_u_mfile_build.htm">C++ Project Properties, Managed Make File, C/C++ Build</a></p>
+
+<p>
+<img src="../images/ng00_04a.gif" ALT="IBM Copyright Statement" >  
+</p>
+</body>
+
+</html>

doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_tool_settings.htm

@@ -19,7 +19,7 @@ configuration.</dd>
   <dt>Configuration:</dt>
   <dd>Specifies the selected build configuration from the list provided.</dd>
   <dt>Manage...</dt>
-  <dd>Adds, removes, renames and manages configurations.</dd>
+  <dd>Adds, removes, renames and converts configurations.</dd>
   <dt>Configuration Settings, Tool Settings</dt>
   <dd>Sets individual tool options.</dd>
   <dt>Restore Defaults</dt>
@@ -63,6 +63,7 @@ References</a><br>
 Builders</a><br>
 <a href="cdt_u_mprop_build.htm">C++ Project Properties, Managed, C/C++
 Build</a><br>
+<a href="cdt_u_mprop_manage.htm">C++ Project Properties, Managed, Manage Configuration Dialog</a><br>
 <a href="cdt_u_mprop_build_settings.htm">C++ Project Properties,
 Managed, C/C++ Build, Build Settings</a><br>
 <a href="cdt_u_mprop_dcbs.htm">C++ Project Properties, Managed, C/C++