diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dbg_pref.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dbg_pref.htm
index 0de09b1901e..b583b5fca07 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dbg_pref.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dbg_pref.htm
@@ -28,9 +28,10 @@ selected stack frame.
Default register format
Specifies the number system in which to display registers (Natural, Hexadecimal or
Decimal).
- Automatically switch to disassembly mode
- Automatically examines your program in disassembly mode as it steps into
-functions for which you do not have source code, such as printf().
+ Maximum number of displayed instructions
+ The maximum number of assembler instructions displayed in the Disassembly view.
+ Color of source lines
+ The color of source lines in the Disassembly view if mixed source/disassembly code is shown.
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dbg_src.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dbg_src.htm
index bfcad4d9a2c..2cedbede700 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dbg_src.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dbg_src.htm
@@ -9,22 +9,22 @@
-Source Code Locations page, Preferences window
+Common Source Lookup Path page, Preferences window
-You can add or remove source code locations by clicking Window > Preferences > C/C++ > Debug > Source Code Locations.
+You can add or remove source containers by clicking Window > Preferences > C/C++ > Debug > Common Source Lookup Path.
- Add
- - Insert a new source code location.
- - Up
- - Move the currently selected source code location higher in the list.
- - Down
- - Move the currently selected source code location lower in the list.
+ - Insert a new source container.
+ - Edit
+ - Modify the currently selected souce container.
- Remove
- - Remove the currently selected souce code location.
- - Search for duplicate source files
- - Searches the source locations for duplicate entries.
+ - Remove the currently selected souce container.
+ - Up
+ - Move the currently selected source container higher in the list.
+ - Down
+ - Move the currently selected source container lower in the list.

diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dbg_view.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dbg_view.htm
index a0f288aaec2..667458ec3c7 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dbg_view.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dbg_view.htm
@@ -50,7 +50,7 @@ below with a sample of the possible icons:
The number beside the thread label is a reference counter, not a
thread identification number (TID).
The CDT displays stack frames as child elements. It displays the reason for
-the suspension beside the target, (such as end of stepping range, breakpoint
+the suspension beside the thread, (such as end of stepping range, breakpoint
hit, and signal received). When a program exits, the exit
code is displayed.
@@ -69,7 +69,7 @@ from Debug view.
Terminate |
 |
- Ends the selected process |
+ Ends the selected debug session and/or process. The impact of this action depends on the type of the item selected in the Debug view. |
Disconnect |
@@ -82,26 +82,26 @@ debugging attached processes)
Remove All Terminated |
 |
- Clears all the killed processes in Debug view |
+ Clears all terminated processes in Debug view |
Terminate and Remove |
 |
- Ends the selected process and remove it from Debug
+ | Ends the selected debug session and removes it from Debug
view |
Relaunch |
 |
- Restarts the process |
+ Starts a new debug session for the selected process |
Terminate All |
 |
- Ends all active processes in Debug view |
+ Ends all active debug sessions in Debug view |
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_debug.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_debug.htm
index 8e8bf1a29f0..bbdccffa64c 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_debug.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_debug.htm
@@ -17,10 +17,6 @@
- Show Full Paths
- Select this checkbox to show the full path to files and directories.
- - Automatically refresh registers
- - Select this checkbox to refresh registers before debugging.
- - Automatically refresh shared libraries
- - Select this checkbox to refresh links to shared libraries before debugging.
- Default variable format:
- Select the default variable format from either Natural, Decimal or Hexidecimal.
- Default expression format:
@@ -28,7 +24,9 @@
- Default register format:
- Select the default register format from either Natural, Decimal or Hexidecimal.
- Maximum number of instructions:
- - Enter the maximum number of disassembly instruction in the field provided.
+ - Enter the maximum number of disassembly instruction to be shown in the Disassembly view.
+ - Color of source lines:
+ - Select the color of source lines in the mixed source/disassembly mode.

diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_gdb_mi.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_gdb_mi.htm
index b6d81d2de18..2f2f625c241 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_gdb_mi.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_gdb_mi.htm
@@ -19,6 +19,8 @@
Sets the timout value for the debugger.
Launch timeout (ms)
Sets the Launch timeout for a debug session.
+ Automatically refresh modules
+ Controls the updates of the Modules view

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 8368f0124d1..d3a72f12c9b 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
@@ -17,17 +17,13 @@
- Debugger
- - Selects debugger from the list.
- - Run program in debugger
- - Runs the program in debug mode.
- - Attach to running process
- - Prompts you to select a process from a list at run-time.
+ - Selects debugger type from the list.
- Stop at main() on startup
- Stops program at main().
- - Enable variable bookkeeping
- - Updates variables in the
- Variables view. Individual variables can be updated manually in the Variables
- view.
+ - Advanced
+ - Opens the dialog with the advanced debugging options.
+ - Debugger Options
+ - Options specific to the selected debugger type.
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 1222b38e017..f2c2481fb78 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
@@ -17,23 +17,20 @@
application. By default, this information is taken from the build path of your
project.
- - Generic Source Locations
- - Displays the location of the project selected in the C/C++ Projects view
- and in any referenced projects.
- - Additional Source Locations
- - Lists projects and directories added to the debugger search list.
- - Select All
- - Selects all items in the Generic Source Locations list.
- - Deselect All
- - Deselects all items in the Generic Source Locations list.
- Add
- - Adds new projects and directories to the debugger search list.
+ - Adds new source containers to the debugger source search list.
+ - Edit
+ - Modifies the content of the selected source container.
+ - Remove
+ - Removes selected items from the debugger source search list.
- Up
- Moves selected items up the Additional Source Locations list.
- Down
- Moves selected items down the Additional Source Locations list.
- - Remove
- - Removes selected items from the Additional Source Locations list.
+ - Restore Defaults
+ - Restores the default source search list.
+ - Search for duplicate source files on the path
+ - Controls whether to continue search for files with the same name.