diff --git a/doc/org.eclipse.cdt.doc.user/images/run_debug_arguments.png b/doc/org.eclipse.cdt.doc.user/images/run_debug_arguments.png
new file mode 100644
index 00000000000..f7049ffcb98
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/run_debug_arguments.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/run_debug_common.png b/doc/org.eclipse.cdt.doc.user/images/run_debug_common.png
new file mode 100644
index 00000000000..c9b4b6da5f7
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/run_debug_common.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/run_debug_debugger.png b/doc/org.eclipse.cdt.doc.user/images/run_debug_debugger.png
new file mode 100644
index 00000000000..80420ed2bda
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/run_debug_debugger.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/run_debug_debugger_advopt.png b/doc/org.eclipse.cdt.doc.user/images/run_debug_debugger_advopt.png
new file mode 100644
index 00000000000..9beda0ef400
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/run_debug_debugger_advopt.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/run_debug_environment.png b/doc/org.eclipse.cdt.doc.user/images/run_debug_environment.png
new file mode 100644
index 00000000000..8ab6cffde07
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/run_debug_environment.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/run_debug_main.png b/doc/org.eclipse.cdt.doc.user/images/run_debug_main.png
new file mode 100644
index 00000000000..c35be7b5de3
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/run_debug_main.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/run_debug_source.png b/doc/org.eclipse.cdt.doc.user/images/run_debug_source.png
new file mode 100644
index 00000000000..b72c14175eb
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/run_debug_source.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_arg.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_arg.htm
index 7103d943c64..f5d047afb99 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_arg.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_arg.htm
@@ -13,19 +13,22 @@
 
 <h1>Arguments page, Run or Debug dialog boxes</h1>
 
-<p>The Arguments page of the Run dialog box and the Debug dialog box lets you specify the execution arguments 
-that an application uses and the working directory 
-for a run configuration.</p>
+<p>The Arguments page of the Run or Debug dialog box lets you specify the program arguments 
+that an application uses and the working directory for a run or debug configuration.</p>
+
+<img src="../images/run_debug_arguments.png" />
+<p />
 <dl>
-  <dt>C/C++ Project Arguments</dt>
-  <dd>Specifies the arguments that are passed on the command line.</dd>
-  <dt>Use default working directory</dt>
-  <dd>Clears the check box to specify a local directory or a different project in 
-  your workspace.</dd>
-  <dt>Local directory</dt>
-  <dd>Specifies the path of, or browse to, a local directory.</dd>
-  <dt>Workspace</dt>
-  <dd>Specifies the path of, or browse to, a workspace relative working directory.</dd>
+<table width="580" fgcolor="#DDD" border="1" cellpadding="2" cellspacing="0" >
+<tr bgcolor="#CCC"><th>Component</th><th>Description</th></tr>
+<tr><td width="30%"><dt>Program arguments</dt></td><td>Specifies the arguments that are passed on the command line.</td></tr>
+<tr><td><dt>Variables...</dt></td><td>Select variables by name to include in the program arguments list.</td></tr>
+<tr><td><dt>Working directory</dt></td><td>Specifies the run/debug configuration working directory.</td></tr>
+<tr><td><dt>Use default</dt></td><td>Checkmark to specify the local directory or uncheck to specify a different workspace, a file system location, or variable.</td></tr>
+<tr><td><dt>Workspace...</dt></td><td>Specifies the path of, or browse to, a workspace relative working directory.</td></tr>
+<tr><td><dt>File System...</dt></td><td>Specifies the path of, or browse to, a file system directory.</td></tr>
+<tr><td><dt>Variables...</dt></td><td>Select variables by name to include in the working directory.</td></tr>
+</table>
 </dl>
 
 <p><img border="0" src="../images/ngconcepts.gif" ALT="Related concepts" width="143" height="21">
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_comm.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_comm.htm
index ed080c443ce..b4b4d64a44a 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_comm.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_comm.htm
@@ -13,25 +13,26 @@
 
 <h1>Common page, Run or Debug dialog box</h1>
 
-<p>The Main page of the Run dialog box and the Debug dialog box lets you specify 
-the location in which to store your run configuration and how you access it and what 
-perspective to open when running an application.</p>
+<p>The Main page of the Run and Debug dialog boxes lets you specify 
+the location in which to store your run configuration and how you access it, how standard input and output is handled, and if background launches are enabled or not.</p>
+
+<img src="../images/run_debug_common.png" />
+<p />
 <dl>
-  <dt>Local</dt>
-  <dd>Saves the launch configuration locally.</dd>
-  <dt>Shared</dt>
-  <dd>Saves the launch configuration to a project in your workspace, 
-  and be able to commit it to CVS.</dd>
-  <dt>Location of shared configuration</dt>
-  <dd>Specifies the location of a launch configuration.</dd>
-  <dt>Run mode</dt>
-  <dd>Selects a perspective to switch to when you run an application.</dd>
-  <dt>Debug mode</dt>
-  <dd>Selects a perspective to switch to when you debug an application.</dd>
-  <dt>Run</dt>
-  <dd>Displays &quot;Run&quot; in favorites menu.</dd>
-  <dt>Debug</dt>
-  <dd>Displays in &quot;Debug&quot; favorites menu.</dd>
+<table width="580" border="1" cellpadding="2" cellspacing="0" >
+<tr bgcolor="#CCC"><th>Component</th><th>Description</th></tr>
+<tr><td width="30%"><dt>Local file</dt></td><td>Saves the launch configuration locally.</td></tr>
+<tr><td><dt>Shared file</dt></td><td>Specifies the path of, or browse to, a workspace to store the launch configuration file, and be able to commit it to CVS.</td></tr>
+<tr><td><dt>Display in favorites menu</dt></td><td>Add configuration name to Run or Debug menus for easy selection.</td></p></tr>
+<tr><td><dt>Console Encoding</dt></td><td>Specify encoding scheme to use for console output.</td></tr>
+<tr><td><dt>Allocate Console (necessary for input)</dt></td><td>Check to assign a console view to receive the output.</td></tr>
+<tr><td><dt>File</dt></td><td>Specify file name to save output.</td></tr>
+<tr><td><dt>Browse Workspace...</dt></td><td>Specifies the path of, or browse to, a workspace to store the output file.</td></tr>
+<tr><td><dt>Browse File System...</dt></td><td>Specifies the path of, or browse to, a file system directory to store the output file.</td></tr>
+<tr><td><dt>Variables...</dt></td><td>Select variables by name to include in the output file.</td></tr>
+<tr><td><dt>Append</dt></td><td>Check to append output. Uncheck to recreate file each time.</td></tr>
+<tr><td><dt>Launch in background</dt></td><td>Check to launch configuration in background mode.</td></tr>
+</table>
 </dl>
 
 <p><img border="0" src="../images/ngconcepts.gif" ALT="Related concepts" width="143" height="21">
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_dbg.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_dbg.htm
index d3a72f12c9b..3bb3d830253 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_dbg.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_dbg.htm
@@ -13,17 +13,19 @@
 
 <h1>Debugger page, Run or Debug dialog box</h1>
 
-<p>The Debugger page of the Run dialog box and the Debug dialog box lets you select a debugger to use when debugging an application.</p>
+<p>The Debugger page of the Run and Debug dialog boxes lets you select a debugger to use when debugging an application.</p>
 
+<img src="../images/run_debug_debugger.png" />
+<p />
 <dl>
-  <dt>Debugger</dt>
-  <dd>Selects debugger type from the list.</dd>
-  <dt>Stop at main() on startup</dt>
-  <dd>Stops program at main().</dd>
-  <dt>Advanced</dt>
-  <dd>Opens the dialog with the advanced debugging options.</dd>
-  <dt>Debugger Options</dt>
-  <dd>Options specific to the selected debugger type.</dd>
+<table width="580" fgcolor="#DDD" border="1" cellpadding="2" cellspacing="0" >
+<tr bgcolor="#CCC"><th>Component</th><th>Description</th></tr>
+<tr><td width="30%"><dt>Debugger</dt></td><td>Selects debugger type from the list.</td></tr>
+<tr><td><dt>Stop on startup at</dt></td><td>Stops program at specified location.</td></tr>
+<tr><td valign="top"><dt>Advanced</dt></td><td>Opens the Advanced Options dialog.<br><p><img src="../images/run_debug_debugger_advopt.png" />
+</td></p></tr>
+<tr><td><dt>Debugger Options</dt></td><td>Displays options specific to the selected debugger type.</td></tr>
+</table>
 </dl>
 
 <p><img border="0" src="../images/ngconcepts.gif" ALT="Related concepts" width="143" height="21">
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_env.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_env.htm
index 5949e490abe..1e76a905d4d 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_env.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_env.htm
@@ -13,20 +13,23 @@
 
 <h1>Environment page, Run or Debug dialog box</h1>
 
-<p>The Environment page of the Run dialog box and the Debug dialog box lets you 
+<p>The Environment page of the Run and Debug dialog boxes lets you 
 set environment variables and values to use when an application runs.</p>
 
+<img src="../images/run_debug_environment.png" />
+<p />
 <dl>
-  <dt>Name</dt>
-  <dd>Displays the name of environment variables.</dd>
-  <dt>Value</dt>
-  <dd>Displays the value of environment variables.</dd>
-  <dt>New</dt>
-  <dd>Creates a new environment variable.</dd>
-  <dt>Edit</dt>
-  <dd>Modifies the name and value of an environment variable.</dd>
-  <dt>Remove</dt>
-  <dd>Removes selected environment variables from the list.</dd>
+<table width="580" fgcolor="#DDD" border="1" cellpadding="2" cellspacing="0" >
+<tr bgcolor="#CCC"><th>Component</th><th>Description</th></tr>
+<tr><td width="30%"><dt>Name</dt></td><td>Displays the name of environment variables.</td></tr>
+<tr><td><dt>Value</dt></td><td>Displays the value of environment variables.</td></tr>
+<tr><td><dt>New</dt></td><td>Creates a new environment variable.</td></tr>
+<tr><td><dt>Select...</dt></td><td>Select one or more environment variables to set.</td></tr>
+<tr><td><dt>Edit</dt></td><td>Modifies the name and value of an environment variable.</td></tr>
+<tr><td><dt>Remove</dt></td><td>Removes selected environment variables from the list.</td></tr>
+<tr><td><dt>Append environment to native environment</dt></td><td>Append the environment variables shown to the current native environment.</td></tr>
+<tr><td><dt>Replace native environment with specified environment</dt></td><td>Replaces the current native environment with the specified environment set shown.</td></tr>
+</table>
 </dl>
 
 <p><img border="0" src="../images/ngconcepts.gif" ALT="Related concepts" width="143" height="21">
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_main.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_main.htm
index a369dd99049..934e2ce266f 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_main.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_main.htm
@@ -15,11 +15,16 @@
 
 <p>The Main page of the Run dialog box and the Debug dialog box, identifies the project and application you want to run or debug.</p>
 
+<img src="../images/run_debug_main.png" />
+<p />
 <dl>
-  <dt>Project</dt>
-  <dd>Specifies the name of the project.</dd>
-  <dt>C/C++ Application</dt>
-  <dd>Specifies the name of the application.</dd>
+<table width="640" fgcolor="#DDD" border="1" cellpadding="2" cellspacing="0" >
+<tr bgcolor="#CCC"><th>Component</th><th>Description</th></tr>
+<tr><td width="30%"><dt>Project</dt></td><td>Specifies the name of the project.</td></tr>
+<tr><td><dt>C/C++ Application</dt></td><td>Specifies the name of the application.</td></tr>
+<tr><td><dt>Search Project...</dt></td><td>Specifies the binary or binaries to run within the project.</td></tr>
+<tr><td><dt>Connect process input output to a terminal</dt></td><td>&nbsp;</td></tr>
+</table>
 </dl>
 
 <p><img border="0" src="../images/ngconcepts.gif" ALT="Related concepts" width="143" height="21">
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_srce.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_srce.htm
index f2c2481fb78..7bde34dd761 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_srce.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_srce.htm
@@ -13,24 +13,23 @@
 
 <h1>Source page, Run or Debug dialog box</h1>
 
-<p>The Source page of the Run dialog box and the Debug dialog box lets you specify the location of source files used when debugging a C or C++ 
-application. By default, this information is taken from the build path of your 
-project.</p>
+<p>The Source page of the Run and Debug dialog boxes lets you specify the location of source files used when debugging a C or C++ 
+application. By default, this information is taken from the build path of your project.</p>
+
+
+<img src="../images/run_debug_source.png" />
+<p />
 <dl>
-  <dt>Add</dt>
-  <dd>Adds new source containers to the debugger source search list.</dd>
-  <dt>Edit</dt>
-  <dd>Modifies the content of the selected source container.</dd>
-  <dt>Remove</dt>
-  <dd>Removes selected items from the debugger source search list.</dd>
-  <dt>Up</dt>
-  <dd>Moves selected items up the Additional Source Locations list.</dd>
-  <dt>Down</dt>
-  <dd>Moves selected items down the Additional Source Locations list.</dd>
-  <dt>Restore Defaults</dt>
-  <dd>Restores the default source search list.</dd>
-  <dt>Search for duplicate source files on the path</dt>
-  <dd>Controls whether to continue search for files with the same name.</dd>
+<table width="580" fgcolor="#DDD" border="1" cellpadding="2" cellspacing="0" >
+<tr bgcolor="#CCC"><th>Component</th><th>Description</th></tr>
+<tr><td width="30%"><dt>Add</dt></td><td>Adds new source containers to the Source Lookup Path search list.</td></tr>
+<tr><td><dt>Edit...</dt></td><td>Modifies the content of the selected source container.</td></tr>
+<tr><td><dt>Remove</dt></td><td>Removes selected items from the Source Lookup Path list.</td></p></tr>
+<tr><td><dt>Up</dt></td><td>Moves selected items up the Source Lookup Path list.</td></tr>
+<tr><td><dt>Down</dt></td><td>Moves selected items down the Source Lookup Path list.</td></tr>
+<tr><td><dt>Restore Default</dt></td><td>Restores the default source search list.</td></tr>
+<tr><td><dt>Search for duplicate source files on the path</dt></td><td valign="top">Controls whether to continue search for files with the same name.</td></tr>
+</table>
 </dl>
 
 <p><img border="0" src="../images/ngconcepts.gif" ALT="Related concepts" width="143" height="21">