Index: /FCKeditor/trunk/_samples/html/sample12.html
===================================================================
--- /FCKeditor/trunk/_samples/html/sample12.html	(revision 728)
+++ /FCKeditor/trunk/_samples/html/sample12.html	(revision 729)
@@ -106,7 +106,4 @@
 oFCKeditor.Value	= 'This is some <strong>sample text</strong>. You are using <a href="http://www.fckeditor.net/">FCKeditor</a>.' ;
 
-// Enable the Enter Key Handler. This feature will not be available in the release version.
-oFCKeditor.Config["DisableEnterKeyHandler"]	= false ;
-
 // Set the configuration options for the Enter Key mode.
 oFCKeditor.Config["EnterMode"]		= sEnterMode ;
Index: /FCKeditor/trunk/editor/_source/internals/fck.js
===================================================================
--- /FCKeditor/trunk/editor/_source/internals/fck.js	(revision 728)
+++ /FCKeditor/trunk/editor/_source/internals/fck.js	(revision 729)
@@ -816,6 +816,5 @@
 
 	// Create the enter key handler
-	if ( !FCKConfig.DisableEnterKeyHandler )
-		FCK.EnterKeyHandler = new FCKEnterKey( FCK.EditorWindow, FCKConfig.EnterMode, FCKConfig.ShiftEnterMode, FCKConfig.TabSpaces ) ;
+	FCK.EnterKeyHandler = new FCKEnterKey( FCK.EditorWindow, FCKConfig.EnterMode, FCKConfig.ShiftEnterMode, FCKConfig.TabSpaces ) ;
 
 	// Listen for keystroke events.
Index: /FCKeditor/trunk/fckconfig.js
===================================================================
--- /FCKeditor/trunk/fckconfig.js	(revision 728)
+++ /FCKeditor/trunk/fckconfig.js	(revision 729)
@@ -25,7 +25,4 @@
  */
 
-// Disable the custom Enter Key Handler. This option will be removed in version 2.5.
-FCKConfig.DisableEnterKeyHandler = false ;
-
 FCKConfig.CustomConfigurationsPath = '' ;
 
@@ -43,5 +40,5 @@
 FCKConfig.StartupShowBlocks = false ;
 
-FCKConfig.Debug = false ;
+FCKConfig.Debug = true ;
 FCKConfig.AllowQueryStringDebug = true ;
 
Index: /FCKeditor/trunk/fckeditor.cfc
===================================================================
--- /FCKeditor/trunk/fckeditor.cfc	(revision 728)
+++ /FCKeditor/trunk/fckeditor.cfc	(revision 729)
@@ -209,5 +209,5 @@
 	 * changed 20041206 hk@lwd.de (improvements are welcome!)
 	 */
-	lConfigKeys = lConfigKeys & "DisableEnterKeyHandler,CustomConfigurationsPath,EditorAreaCSS,ToolbarComboPreviewCSS,DocType";
+	lConfigKeys = lConfigKeys & "CustomConfigurationsPath,EditorAreaCSS,ToolbarComboPreviewCSS,DocType";
 	lConfigKeys = lConfigKeys & ",BaseHref,FullPage,Debug,AllowQueryStringDebug,SkinPath";
 	lConfigKeys = lConfigKeys & ",PreloadImages,PluginsPath,AutoDetectLanguage,DefaultLanguage,ContentLangDirection";
Index: /FCKeditor/trunk/fckeditor.cfm
===================================================================
--- /FCKeditor/trunk/fckeditor.cfm	(revision 728)
+++ /FCKeditor/trunk/fckeditor.cfm	(revision 729)
@@ -118,5 +118,5 @@
 		 */
 		lConfigKeys = "";
-		lConfigKeys = lConfigKeys & "DisableEnterKeyHandler,CustomConfigurationsPath,EditorAreaCSS,ToolbarComboPreviewCSS,DocType";
+		lConfigKeys = lConfigKeys & "CustomConfigurationsPath,EditorAreaCSS,ToolbarComboPreviewCSS,DocType";
 		lConfigKeys = lConfigKeys & ",BaseHref,FullPage,Debug,AllowQueryStringDebug,SkinPath";
 		lConfigKeys = lConfigKeys & ",PreloadImages,PluginsPath,AutoDetectLanguage,DefaultLanguage,ContentLangDirection";