diff --git a/doc/org.eclipse.cdt.doc.user/images/prop_file_lang.png b/doc/org.eclipse.cdt.doc.user/images/prop_file_lang.png
new file mode 100644
index 00000000000..d4955157278
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/prop_file_lang.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_prop_file.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_prop_file.htm
index 452a7f27627..f7a9e00ce73 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_prop_file.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_prop_file.htm
@@ -26,6 +26,7 @@
 </ul>
 <li>C/C++ General</li>
 <ul>
+    <li><a href="cdt_u_fileprop_lng.htm">Language Mappings page</a>
     <li>Paths and Symbols</li>
     <ul>
        <li><a href="cdt_u_fileprop_inc.htm">Includes tab</a>
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_fileprop_lng.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_fileprop_lng.htm
new file mode 100644
index 00000000000..797ef489c86
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_fileprop_lng.htm
@@ -0,0 +1,38 @@
+<!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++ File Properties, Language mapping</title>
+  <link rel="stylesheet" type="text/css" href="../help.css">
+</head>
+<body>
+<h1>C/C++ File Properties, Language mappings</h1>
+<p>Customize the use of C/C++ language associations in the <b>Language Mappings</b> preference panel for individual files. </p>
+<p><img img="" src="../images/prop_file_lang.png"
+ alt="C/C++ Project Properties, Language mapping"></p>
+<p></p>
+<dl>
+  <dt>Language</dt>
+  <dd>The language to use for this file and build configuration.</dd>
+  <dt><br>Available for :</dt>
+  <dd>CDT source files</dd>
+</dl>
+<p><img border="0" src="../images/ngref.gif" alt="Related reference"
+ width="143" height="21"><br>
+
+<ul>
+<li>C/C++ Preferences
+   <ul type="disc"> 
+   <li><a href="cdt_u_language_mapping_pref.htm">Language Mapping page</a>
+   </ul>
+<li>Project Properties, C/C++ General category
+   <ul type="disc"> 
+   <li><a href="cdt_u_prop_general_lng.htm">Language Mapping page</a>
+   </ul>
+</ul>
+</p>
+<p><img src="../images/ng00_07.gif" ALT="IBM Copyright Statement" ></p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_language_mapping_pref.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_language_mapping_pref.htm
index 9b8abd802ae..fe4a588ab51 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_language_mapping_pref.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_language_mapping_pref.htm
@@ -44,6 +44,21 @@
 	</tbody>
 </table>
 
+<p><img border="0" src="../images/ngref.gif" alt="Related reference"
+ width="143" height="21"><br>
+
+<ul>
+<li>Project Properties, C/C++ General category
+   <ul type="disc"> 
+   <li><a href="cdt_u_prop_general_lng.htm">Language Mapping page</a>
+   </ul>
+<li>File Properties, C/C++ General category
+   <ul type="disc"> 
+   <li><a href="cdt_u_fileprop_lng.htm">Language Mapping page</a>
+   </ul>
+</ul>
+</p>
+
 <p><img src="../images/nokia2007Copyright.png" width="255" height="14"></p>
 </body>
 
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_general_lng.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_general_lng.htm
index c76e988671f..8a667592f73 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_general_lng.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_general_lng.htm
@@ -7,8 +7,8 @@
   <link rel="stylesheet" type="text/css" href="../help.css">
 </head>
 <body>
-<h1>C/C++ Project Properties, Language mapping</h1>
-<p>You can select which installed documentation to use for your project.</p>
+<h1>C/C++ Project Properties, Language mappings</h1>
+<p>Customize the use of C/C++ language associations in the <b>Language Mappings</b> preference panel for a project. </p>
 <p><img img="" src="../images/prop_lang.png"
  alt="C/C++ Project Properties, Language mapping"></p>
 <p></p>
@@ -28,56 +28,14 @@
  width="143" height="21"><br>
 
 <ul>
-<li><a href="cdt_u_prop_resource.htm">Project Properties, Resource page</a>
-<li><a href="cdt_u_prop_builders.htm">Project Properties, Builders page</a>
-<li><a href="cdt_u_prop_all.htm">Project Properties, common C/C++ Configurations handling</a>
-   <ul type="disc">
-   <li><a href="cdt_u_prop_manage_dialog.htm">Manage Configurations dialog</a>
-   <li><a href="cdt_u_prop_manage_newdialog.htm">Create Configuration dialog</a>
-   <li><a href="cdt_u_prop_manage_rendialog.htm">Rename Configuration dialog</a>
-   </ul>
-<li><a href="cdt_u_prop_build.htm">Project Properties, C/C++ Build category</a>
-   <ul type="disc">
-   <li><a href="cdt_u_prop_build_discovery.htm">Discovery options page</a>
-   <li><a href="cdt_u_prop_build_environment.htm">Environment page</a>
-   <li>Settings page
-       <ul> 
-       <li><a href="cdt_u_prop_build_settings_tool.htm">     Tool Settings tab</a>
-       <li><a href="cdt_u_prop_build_settings_steps.htm">    Build Steps tab</a>
-       <li><a href="cdt_u_prop_build_settings_artifact.htm"> Build Artifact tab</a>
-       <li><a href="cdt_u_prop_build_settings_binparser.htm">Binary Parsers tab</a>
-       <li><a href="cdt_u_prop_build_settings_errparser.htm">Error Parsers tab</a>
-       </ul> 
-   <li><a href="cdt_u_prop_build_toolchain.htm">Tool chain editor page</a>
-   <li><a href="cdt_u_prop_build_variables.htm">Variables page</a>
-   </ul>
-<li>Project Properties, C/C++ General category
+<li>C/C++ Preferences
    <ul type="disc"> 
-   <li><a href="cdt_u_prop_general_doc.htm">Documentation page</a>
-   <li><a href="cdt_u_prop_general_exp.htm">Export Settings page</a>
-       <!--ul>
-       <li><a href="cdt_u_prop_general_exp_inc.htm">Includes tab</a>
-       <li><a href="cdt_u_prop_general_exp_sym.htm">Symbols tab</a>
-       <li><a href="cdt_u_prop_general_exp_lib.htm">Libraries tab</a>
-       <li><a href="cdt_u_prop_general_exp_libpath.htm">Libraries path tab</a>
-       </ul-->
-   <li><a href="cdt_u_prop_general_typ.htm">File Types page</a>
-   <li><a href="cdt_u_prop_general_idx.htm">Indexer page</a>
-   <li><a href="cdt_u_prop_general_lng.htm">Language Mapping page</a>
-   <li>Paths and Symbols page
-       <ul>
-       <li><a href="cdt_u_prop_general_pns_inc.htm">Includes tab</a>
-       <li><a href="cdt_u_prop_general_pns_sym.htm">Symbols tab</a>
-       <li><a href="cdt_u_prop_general_pns_lib.htm">Libraries tab</a>
-       <li><a href="cdt_u_prop_general_pns_libpath.htm">Libraries path tab</a>
-       <li><a href="cdt_u_prop_general_pns_src.htm">Source Location tab</a>
-       <li><a href="cdt_u_prop_general_pns_out.htm">Output Location tab</a>
-       <li><a href="cdt_u_prop_general_pns_ref.htm">References tab</a>
-       <li><a href="cdt_u_prop_general_pns_hier.htm">Data Hierarchy tab</a>
-       </ul>
+   <li><a href="cdt_u_language_mapping_pref.htm">Language Mapping page</a>
+   </ul>
+<li>File Properties, C/C++ General category
+   <ul type="disc"> 
+   <li><a href="cdt_u_fileprop_lng.htm">Language Mapping page</a>
    </ul>
-<li><a href="cdt_u_prop_ref.htm">C/C++ Project Properties, Project References page</a>
-<li><a href="cdt_u_prop_rundebug.htm">C/C++ Project Properties, Run/Debug Settings page</a>
 </ul>
 </p>
 <p><img src="../images/intl_07.gif" ALT="Intel Copyright Statement" ></p>
