diff --git a/debug/org.eclipse.cdt.debug.application.doc/images/debug_gdb_pref.png b/debug/org.eclipse.cdt.debug.application.doc/images/debug_gdb_pref.png
deleted file mode 100644
index c781cb25f27..00000000000
Binary files a/debug/org.eclipse.cdt.debug.application.doc/images/debug_gdb_pref.png and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.application.doc/images/debug_pref.png b/debug/org.eclipse.cdt.debug.application.doc/images/debug_pref.png
index 31cf49179e9..45cfa3d7bf7 100644
Binary files a/debug/org.eclipse.cdt.debug.application.doc/images/debug_pref.png and b/debug/org.eclipse.cdt.debug.application.doc/images/debug_pref.png differ
diff --git a/debug/org.eclipse.cdt.debug.application.doc/reference/cdt_o_ref.htm b/debug/org.eclipse.cdt.debug.application.doc/reference/cdt_o_ref.htm
index 05c8058bf5b..ab094430e74 100644
--- a/debug/org.eclipse.cdt.debug.application.doc/reference/cdt_o_ref.htm
+++ b/debug/org.eclipse.cdt.debug.application.doc/reference/cdt_o_ref.htm
@@ -62,7 +62,6 @@
   <img src="../images/trans.gif" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_debug.htm">Debug preferences</a><br>
   <img src="../images/trans.gif" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_dbg_brkpt_actions.htm">Breakpoint Actions</a><br>
   <img src="../images/trans.gif" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_dbg_src.htm">Source Lookup Path</a><br>
-  <img src="../images/trans.gif" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_gdb_mi.htm">GDB MI preferences</a><br>
   
   <img src="../images/trans.gif" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_gen.htm">Editor preferences</a><br>
   <img src="../images/trans.gif" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_con_assist.htm">Content Assist</a><br>
diff --git a/debug/org.eclipse.cdt.debug.application.doc/reference/cdt_u_debug.htm b/debug/org.eclipse.cdt.debug.application.doc/reference/cdt_u_debug.htm
index 7fbad746f99..735108d26a8 100644
--- a/debug/org.eclipse.cdt.debug.application.doc/reference/cdt_u_debug.htm
+++ b/debug/org.eclipse.cdt.debug.application.doc/reference/cdt_u_debug.htm
@@ -27,33 +27,13 @@
 			<th id="option"><strong>Options</strong></th>
 			<th id="description"><strong>Description</strong></th>
 		</tr>
-		<tr>
-			<td headers="option"><strong>Show Full Paths</strong></td>
-			<td headers="description">Select this checkbox to show the full path to files and directories.</td>
-		</tr>
-		<tr>
-			<td headers="option"><strong>Default variable format</strong></td>
-			<td headers="description">Select the default variable format from either Default, Hexadecimal, Decimal, Octal or Binary.</td>
-		</tr>
-		<tr>
-			<td headers="option"><strong>Default expression format</strong></td>
-			<td headers="description">Select the default expression format from either Default, Hexadecimal, Decimal, Octal or Binary.</td>
-		</tr>
-		<tr>
-			<td headers="option"><strong>Default register format</strong></td>
-			<td headers="description">Select the default register format from either Default, Hexadecimal, Decimal, Octal or Binary.</td>
-		</tr>
 		<tr>
 			<td headers="option"><strong>Character encoding</strong></td>
-			<td headers="description">Select a character encoding scheme from the dropdown list.</td>
+			<td headers="description">Use this option to specify the charset used by the <var>char</var> type of the inferior (target) program</td>
 		</tr>
 		<tr>
-			<td headers="option"><strong>Maximum number of displayed instructions</strong></td>
-			<td headers="description">Enter the maximum number of disassembly instruction to be shown in the Disassembly view.</td>
-		</tr>
-		<tr>
-			<td headers="option"><strong>Color of source lines</strong></td>
-			<td headers="description">Select the color of source lines in the mixed source/disassembly mode.</td>
+			<td headers="option"><strong>Wide character encoding</strong></td>
+			<td headers="description">Use this option to specify the charset used by the <var>wchar_t</var> type of the inferior (target) program</td>
 		</tr>
 		<tr>
 			<td headers="option"><strong>Show source files in binaries</strong></td>
@@ -64,4 +44,4 @@
 
 <p><img src="../images/ng00_04a.gif" ALT="IBM Copyright Statement" ></p>
 </div></body>
-</html>
\ No newline at end of file
+</html>
diff --git a/debug/org.eclipse.cdt.debug.application.doc/reference/cdt_u_gdb_mi.htm b/debug/org.eclipse.cdt.debug.application.doc/reference/cdt_u_gdb_mi.htm
deleted file mode 100644
index 05f0e859ed1..00000000000
--- a/debug/org.eclipse.cdt.debug.application.doc/reference/cdt_u_gdb_mi.htm
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> 
-<html lang="en">
-
-<head>
-	<meta http-equiv="Content-Language" content="en-us">
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<title>Debug GDB MI page, Preferences window</title>
-	<link rel="stylesheet" type="text/css" href="../help.css">
-	<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-	
-</head>
-<body>
-
-<div role="main"><h1>Debug GDB MI page, Preferences window</h1>
-
-<p>Use the <img src="../images/command_link.png" alt="" > <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.cdt.ui.preferneces.CBuildConsolePreferernces)")'>GDB MI</a> preference panel to manipulate certain GDB timeout settings.</p>
-<p><img src="../images/debug_gdb_pref.png"  alt="Debug GDB MI Preferences"></p>
-
-<table width="700px" cellpadding="5" cellspacing="0" border="1" bordercolor="#DDDDDD" >
-	<caption><strong>GDB MI Preference Options</strong></caption>
-	<colgroup>
-		<col width="30%" valign="top" >
-		<col width="70%" valign="top" >
-	</colgroup>
-	<thead>
-		<tr>
-			<th id="option"><strong>Option</strong></th>
-			<th id="description"><strong>Description</strong></th>
-		</tr>
-	</thead>
-	<tbody>
-		<tr valign="top" >
-			<td headers="option"><strong>Debugger timeout (ms)</strong></td>
-			<td headers="description">Sets the timeout value for the debugger. Default setting is 10000 milliseconds.</td>
-		</tr>
-		<tr valign="top" >
-			<td headers="option"><strong>Launch timeout (ms)</strong></td>
-			<td headers="description">Sets the Launch timeout for a debug session. Default setting is 30000 milliseconds.</td>
-		</tr>
-		<tr valign="top" >
-			<td headers="option"><strong>Automatically refresh modules</strong></td>
-			<td headers="description">Controls the updates of the Modules view.</td>
-		</tr>
-		<tr valign="top" >
-			<td headers="option"><strong>Support distinct code and data memory spaces</strong></td>
-			<td headers="description">Toggle to swap between showing separate code and data memory spaced or not.</td>
-		</tr>
-	</tbody>
-</table>
-<p><img src="../images/ngref.gif" ALT="Related reference" width="143" height="21"> <br>
-<a href="../reference/cdt_u_dsfgdb.htm">GDB Debugging preferences</a></p>
-<hr >
-<p><img src="../images/ng00_04a.gif" ALT="IBM Copyright Statement" ></p>
-</div></body>
-
-</html>
\ No newline at end of file
diff --git a/debug/org.eclipse.cdt.debug.application.doc/toc.xml b/debug/org.eclipse.cdt.debug.application.doc/toc.xml
index 32ede5afdd3..c3c5983971f 100644
--- a/debug/org.eclipse.cdt.debug.application.doc/toc.xml
+++ b/debug/org.eclipse.cdt.debug.application.doc/toc.xml
@@ -129,7 +129,6 @@
 		<topic label="Debug preferences" href="reference/cdt_u_debug.htm">
 			<topic label="Breakpoint Actions" href="reference/cdt_u_dbg_brkpt_actions.htm"/>
 			<topic label="Source Lookup Path" href="reference/cdt_u_dbg_src.htm"/>
-			<topic label="GDB MI" href="reference/cdt_u_gdb_mi.htm"/>
 			<topic label="GDB" href="reference/cdt_u_dsfgdb.htm"/>
 		</topic>
 		
diff --git a/doc/org.eclipse.cdt.doc.user/images/debug_gdb_pref.png b/doc/org.eclipse.cdt.doc.user/images/debug_gdb_pref.png
deleted file mode 100644
index c781cb25f27..00000000000
Binary files a/doc/org.eclipse.cdt.doc.user/images/debug_gdb_pref.png and /dev/null differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/debug_pref.png b/doc/org.eclipse.cdt.doc.user/images/debug_pref.png
index 31cf49179e9..45cfa3d7bf7 100644
Binary files a/doc/org.eclipse.cdt.doc.user/images/debug_pref.png and b/doc/org.eclipse.cdt.doc.user/images/debug_pref.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 ecadbf38a86..92f1fecc5e3 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
@@ -62,7 +62,6 @@
   <img src="../images/trans.gif" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_debug.htm">Debug preferences</a><br>
   <img src="../images/trans.gif" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_dbg_brkpt_actions.htm">Breakpoint Actions</a><br>
   <img src="../images/trans.gif" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_dbg_src.htm">Source Lookup Path</a><br>
-  <img src="../images/trans.gif" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_gdb_mi.htm">GDB MI preferences</a><br>
   
   <img src="../images/trans.gif" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_gen.htm">Editor preferences</a><br>
   <img src="../images/trans.gif" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_con_assist.htm">Content Assist</a><br>
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 7fbad746f99..735108d26a8 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
@@ -27,33 +27,13 @@
 			<th id="option"><strong>Options</strong></th>
 			<th id="description"><strong>Description</strong></th>
 		</tr>
-		<tr>
-			<td headers="option"><strong>Show Full Paths</strong></td>
-			<td headers="description">Select this checkbox to show the full path to files and directories.</td>
-		</tr>
-		<tr>
-			<td headers="option"><strong>Default variable format</strong></td>
-			<td headers="description">Select the default variable format from either Default, Hexadecimal, Decimal, Octal or Binary.</td>
-		</tr>
-		<tr>
-			<td headers="option"><strong>Default expression format</strong></td>
-			<td headers="description">Select the default expression format from either Default, Hexadecimal, Decimal, Octal or Binary.</td>
-		</tr>
-		<tr>
-			<td headers="option"><strong>Default register format</strong></td>
-			<td headers="description">Select the default register format from either Default, Hexadecimal, Decimal, Octal or Binary.</td>
-		</tr>
 		<tr>
 			<td headers="option"><strong>Character encoding</strong></td>
-			<td headers="description">Select a character encoding scheme from the dropdown list.</td>
+			<td headers="description">Use this option to specify the charset used by the <var>char</var> type of the inferior (target) program</td>
 		</tr>
 		<tr>
-			<td headers="option"><strong>Maximum number of displayed instructions</strong></td>
-			<td headers="description">Enter the maximum number of disassembly instruction to be shown in the Disassembly view.</td>
-		</tr>
-		<tr>
-			<td headers="option"><strong>Color of source lines</strong></td>
-			<td headers="description">Select the color of source lines in the mixed source/disassembly mode.</td>
+			<td headers="option"><strong>Wide character encoding</strong></td>
+			<td headers="description">Use this option to specify the charset used by the <var>wchar_t</var> type of the inferior (target) program</td>
 		</tr>
 		<tr>
 			<td headers="option"><strong>Show source files in binaries</strong></td>
@@ -64,4 +44,4 @@
 
 <p><img src="../images/ng00_04a.gif" ALT="IBM Copyright Statement" ></p>
 </div></body>
-</html>
\ No newline at end of file
+</html>
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
deleted file mode 100644
index 05f0e859ed1..00000000000
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_gdb_mi.htm
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> 
-<html lang="en">
-
-<head>
-	<meta http-equiv="Content-Language" content="en-us">
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<title>Debug GDB MI page, Preferences window</title>
-	<link rel="stylesheet" type="text/css" href="../help.css">
-	<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-	
-</head>
-<body>
-
-<div role="main"><h1>Debug GDB MI page, Preferences window</h1>
-
-<p>Use the <img src="../images/command_link.png" alt="" > <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.cdt.ui.preferneces.CBuildConsolePreferernces)")'>GDB MI</a> preference panel to manipulate certain GDB timeout settings.</p>
-<p><img src="../images/debug_gdb_pref.png"  alt="Debug GDB MI Preferences"></p>
-
-<table width="700px" cellpadding="5" cellspacing="0" border="1" bordercolor="#DDDDDD" >
-	<caption><strong>GDB MI Preference Options</strong></caption>
-	<colgroup>
-		<col width="30%" valign="top" >
-		<col width="70%" valign="top" >
-	</colgroup>
-	<thead>
-		<tr>
-			<th id="option"><strong>Option</strong></th>
-			<th id="description"><strong>Description</strong></th>
-		</tr>
-	</thead>
-	<tbody>
-		<tr valign="top" >
-			<td headers="option"><strong>Debugger timeout (ms)</strong></td>
-			<td headers="description">Sets the timeout value for the debugger. Default setting is 10000 milliseconds.</td>
-		</tr>
-		<tr valign="top" >
-			<td headers="option"><strong>Launch timeout (ms)</strong></td>
-			<td headers="description">Sets the Launch timeout for a debug session. Default setting is 30000 milliseconds.</td>
-		</tr>
-		<tr valign="top" >
-			<td headers="option"><strong>Automatically refresh modules</strong></td>
-			<td headers="description">Controls the updates of the Modules view.</td>
-		</tr>
-		<tr valign="top" >
-			<td headers="option"><strong>Support distinct code and data memory spaces</strong></td>
-			<td headers="description">Toggle to swap between showing separate code and data memory spaced or not.</td>
-		</tr>
-	</tbody>
-</table>
-<p><img src="../images/ngref.gif" ALT="Related reference" width="143" height="21"> <br>
-<a href="../reference/cdt_u_dsfgdb.htm">GDB Debugging preferences</a></p>
-<hr >
-<p><img src="../images/ng00_04a.gif" ALT="IBM Copyright Statement" ></p>
-</div></body>
-
-</html>
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/topics_Reference.xml b/doc/org.eclipse.cdt.doc.user/topics_Reference.xml
index a5f9848358b..5d56d274f15 100755
--- a/doc/org.eclipse.cdt.doc.user/topics_Reference.xml
+++ b/doc/org.eclipse.cdt.doc.user/topics_Reference.xml
@@ -76,7 +76,6 @@
 		<topic label="Debug preferences" href="reference/cdt_u_debug.htm">
 			<topic label="Breakpoint Actions" href="reference/cdt_u_dbg_brkpt_actions.htm"/>
 			<topic label="Source Lookup Path" href="reference/cdt_u_dbg_src.htm"/>
-			<topic label="GDB MI" href="reference/cdt_u_gdb_mi.htm"/>
 			<topic label="GDB" href="reference/cdt_u_dsfgdb.htm"/>
 		</topic>