vanilla ckeditor-3.0.1

[ckeditor.git] / _source / core / config.js

diff --git a/_source/core/config.js b/_source/core/config.js
index caa8d53..a51f938 100644 (file)
--- a/_source/core/config.js
+++ b/_source/core/config.js
@@ -63,13 +63,14 @@ CKEDITOR.config =
        baseHref : '',\r
 \r
        /**\r
-        * The CSS file to be used to apply style to the contents. It should\r
+        * The CSS file(s) to be used to apply style to the contents. It should\r
         * reflect the CSS used in the final pages where the contents are to be\r
         * used.\r
-        * @type String\r
+        * @type String|Array\r
         * @default '<CKEditor folder>/contents.css'\r
         * @example\r
         * config.contentsCss = '/css/mysitestyles.css';\r
+        * config.contentsCss = ['/css/mysitestyles.css', '/css/anotherfile.css'];\r
         */\r
        contentsCss : CKEDITOR.basePath + 'contents.css',\r
 \r
@@ -178,13 +179,14 @@ CKEDITOR.config =
        fullPage : false,\r
 \r
        /**\r
-        * The editor height, in CSS size format or pixel integer.\r
+        * The height of editing area( content ), in relative or absolute, e.g. 30px, 5em.\r
+        * Note: Percentage unit is not supported yet. e.g. 30%.\r
         * @type Number|String\r
         * @default '200'\r
         * @example\r
         * config.height = 500;\r
-        * @example\r
         * config.height = '25em';\r
+        * config.height = '300px';\r
         */\r
        height : 200,\r
 \r
@@ -196,7 +198,7 @@ CKEDITOR.config =
         * @type String\r
         * @example\r
         */\r
-       plugins : 'about,basicstyles,blockquote,button,clipboard,colorbutton,contextmenu,elementspath,enterkey,entities,filebrowser,find,flash,font,format,forms,horizontalrule,htmldataprocessor,image,indent,justify,keystrokes,link,list,maximize,newpage,pagebreak,pastefromword,pastetext,popup,preview,print,removeformat,resize,save,scayt,smiley,showblocks,sourcearea,stylescombo,table,tabletools,specialchar,tab,templates,toolbar,undo,wysiwygarea,wsc',\r
+       plugins : 'about,basicstyles,blockquote,button,clipboard,colorbutton,colordialog,contextmenu,elementspath,enterkey,entities,filebrowser,find,flash,font,format,forms,horizontalrule,htmldataprocessor,image,indent,justify,keystrokes,link,list,maximize,newpage,pagebreak,pastefromword,pastetext,popup,preview,print,removeformat,resize,save,scayt,smiley,showblocks,sourcearea,stylescombo,table,tabletools,specialchar,tab,templates,toolbar,undo,wysiwygarea,wsc',\r
 \r
        /**\r
         * List of additional plugins to be loaded. This is a tool setting which\r