diff --git a/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml b/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml
index 929efb696d6..7a4ad50e444 100644
--- a/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml
+++ b/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml
@@ -87,6 +87,10 @@
    <topic href="reference/cdt_u_c_editor_hov.htm"
    	label="C/C++ Editor Hovers Preferences"/>
 </context>
+<context id ="scalability_preference_page_context">
+   <description>This page allows to configure editor scalability mode options.</description>
+   <topic href="reference/cdt_u_c_editor_save_actions.htm"
+   	label="C/C++ Editor Save Actions Preferences"/>
 <context id ="scalability_preference_page_context">
    <description>This page allows to configure editor scalability mode options. The scalability mode helps to deal with very large source files.</description>
    <topic href="reference/cdt_u_c_editor_scalability.htm"
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_gen.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_gen.htm
index 4bad98576b9..32c47b17f18 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_gen.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_gen.htm
@@ -33,10 +33,6 @@
 			<td><dt>Highlight inactive code</dt></td>
 			<td>Highlights inactive code when the cursor is positioned inside it.</td>
 		</tr>
-		<tr>
-			<td><dt>Ensure newline at end of file when saving</dt></td>
-			<td>Checkmark to ensure files always include a newline at the end.</td>
-		</tr>
 		<tr>
 			<td><dt>Appearance color options</dt></td>
 			<td>Lists the items for which you can specify a color.</td>
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_save_actions.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_save_actions.htm
new file mode 100644
index 00000000000..630011af777
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_save_actions.htm
@@ -0,0 +1,50 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//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>Editor preferences</title>
+	<link rel="stylesheet" type="text/css" href="../help.css">
+</head>
+<body>
+
+<h1>Save actions</h1>
+
+<p>Use the <b>Save Actions</b> preference panel to configure actions performed by C/C++ editor while saving
+a file. Click <b>Window &gt; Preferences &gt; C/C++ &gt; Editor &gt; Save Actions</b> to make changes.</p>
+
+<table width="600px" cellpadding="5" cellspacing="0" border="1" >
+	<caption><b>Editor Preference Options</b></caption>
+	<colgroup>
+		<col width="30%" valign="top" >
+		<col width="70%" valign="top" >
+	</colgroup>
+	<tbody>
+		<tr>
+			<td><dt>Remove trailing whitespace</dt></td>
+			<td>While saving a file, C/C++ editor will remove spaces and tab characters from the end of edited
+			  or all lines.</td>
+		</tr>
+		<tr>
+			<td><dt>Ensure newline at the end of file</dt></td>
+			<td>While saving a file, C/C++ editor will insert a newline at the end of the last line,
+			  if the last line does not have it already.</td>
+		</tr>
+	</tbody>
+</table>
+
+<p><img border="0" src="../images/ngconcepts.gif" ALT="Related concepts" width="143" height="21"> <br>
+<a href="../concepts/cdt_o_code_entry.htm">Coding aids</a></p>
+<p><img border="0" src="../images/ngtasks.gif" ALT="Related tasks" width="143" height="21">
+<br>
+<a href="../tasks/cdt_t_cust_cpp_editor.htm">Customizing the C/C++ editor</a></p>
+<p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21">
+<br>
+<a href="cdt_o_ceditor_pref.htm">C/C++ editor preferences</a></p>
+	<hr>
+<img src="../images/ng00_04a.gif" ALT="IBM Copyright Statement" >
+
+</body>
+
+</html>
\ No newline at end of file

Remove trailing whitespace	While saving a file, C/C++ editor will remove spaces and tab characters from the end of edited + or all lines.
Ensure newline at the end of file	While saving a file, C/C++ editor will insert a newline at the end of the last line, + if the last line does not have it already.