Index: /CKEditor/branches/versions/3.1.x/_source/core/config.js
===================================================================
--- /CKEditor/branches/versions/3.1.x/_source/core/config.js	(revision 4586)
+++ /CKEditor/branches/versions/3.1.x/_source/core/config.js	(revision 4587)
@@ -283,15 +283,5 @@
 	 * config.baseFloatZIndex = 2000
 	 */
-	baseFloatZIndex : 10000,
-
-	/**
-	 * Whether escape HTML when editor update original input element.
-	 * @type {Boolean}
-	 * @default false
-	 * @example
-	 * config.htmlEncodeOutput = true;
-	 */
-	htmlEncodeOutput : false
-
+	baseFloatZIndex : 10000
 };
 
Index: /CKEditor/branches/versions/3.1.x/_source/core/editor.js
===================================================================
--- /CKEditor/branches/versions/3.1.x/_source/core/editor.js	(revision 4586)
+++ /CKEditor/branches/versions/3.1.x/_source/core/editor.js	(revision 4587)
@@ -676,2 +676,12 @@
 		}
 	});
+
+/**
+ * Whether escape HTML when editor update original input element.
+ * @name CKEDITOR.config.htmlEncodeOutput
+ * @type {Boolean}
+ * @default false
+ * @example
+ * config.htmlEncodeOutput = true;
+ */
+