Index: /CKEditor/trunk/_source/core/config.js =================================================================== --- /CKEditor/trunk/_source/core/config.js (revision 4894) +++ /CKEditor/trunk/_source/core/config.js (revision 4895) @@ -168,5 +168,7 @@ /** - * Sets the 'id' attribute to be used on body if it doesn't have one. + * Sets the "id" attribute to be used on the body element of the editing + * area. + * @since 3.1 * @type String * @default '' @@ -175,5 +177,7 @@ /** - * Sets the 'class' attribute to be used on body if it doesn't have one. + * Sets the "class" attribute to be used on the body element of the editing + * area. + * @since 3.1 * @type String * @default '' @@ -186,4 +190,5 @@ * <body> tags. The final output will also reflect this setting, * including the <body> contents only if this setting is disabled. + * @since 3.1 * @type Boolean * @default false Index: /CKEditor/trunk/_source/core/editor.js =================================================================== --- /CKEditor/trunk/_source/core/editor.js (revision 4894) +++ /CKEditor/trunk/_source/core/editor.js (revision 4895) @@ -686,4 +686,5 @@ * Whether escape HTML when editor update original input element. * @name CKEDITOR.config.htmlEncodeOutput + * @since 3.1 * @type {Boolean} * @default false Index: /CKEditor/trunk/_source/plugins/link/dialogs/link.js =================================================================== --- /CKEditor/trunk/_source/plugins/link/dialogs/link.js (revision 4894) +++ /CKEditor/trunk/_source/plugins/link/dialogs/link.js (revision 4895) @@ -1360,20 +1360,26 @@ /** - * The e-mail address anti-spam protection option. + *

The e-mail address anti-spam protection option. The protection will be + * applied when creating or modifying e-mail links through the editor interface.

+ *

Two methods of protection can be choosed:

+ *
  1. The e-mail parts (name, domain and any other query string) are + * assembled into a function call pattern. Such function must be + * provided by the developer in the pages that will use the contents. + *
  2. Only the e-mail address is obfuscated into a special string that + * has no meaning for humans or spam bots, but which is properly + * rendered and accepted by the browser.
+ *

Both approaches require JavaScript to be enabled.

* @name CKEDITOR.config.emailProtection + * @since 3.1 * @type {String} - * Two forms of protection could be choosed from : - * 1. The whole address parts ( name, domain with any other query string ) are assembled into a - * function call pattern which invoke you own provided function, with the specified arguments. - * 2. Only the e-mail address is obfuscated into unicode code point sequences, replacement are - * done by a String.fromCharCode() call. - * Note: Both approaches require JavaScript to be enabled. - * @default '' + * @default '' (empty string = disabled) * @example - * config.emailProtection = ''; - * // href="mailto:tester@ckeditor.com?subject=subject&body=body" - * config.emailProtection = 'encode'; - * // href="e-mail" - * config.emailProtection = 'mt(NAME,DOMAIN,SUBJECT,BODY)'; - * // href="javascript:mt('tester','ckeditor.com','subject','body')" + * // href="mailto:tester@ckeditor.com?subject=subject&body=body" + * config.emailProtection = ''; + * @example + * // href="e-mail" + * config.emailProtection = 'encode'; + * @example + * // href="javascript:mt('tester','ckeditor.com','subject','body')" + * config.emailProtection = 'mt(NAME,DOMAIN,SUBJECT,BODY)'; */ Index: /CKEditor/trunk/_source/plugins/pastefromword/filter/default.js =================================================================== --- /CKEditor/trunk/_source/plugins/pastefromword/filter/default.js (revision 4894) +++ /CKEditor/trunk/_source/plugins/pastefromword/filter/default.js (revision 4895) @@ -1145,9 +1145,10 @@ /** - * Whether the ignore all font-related format styles, including: - * - font size; - * - font family; - * - font fore/background color; + * Whether to ignore all font related formatting styles, including: + * * @name CKEDITOR.config.pasteFromWordRemoveFontStyles + * @since 3.1 * @type Boolean * @default true @@ -1157,6 +1158,7 @@ /** - * Whether transform MS-Word Outline Numbered Heading into html list. + * Whether to transform MS Word outline numbered headings into lists. * @name CKEDITOR.config.pasteFromWordNumberedHeadingToList + * @since 3.1 * @type Boolean * @default false @@ -1166,8 +1168,9 @@ /** - * Whether remove element styles that can't be managed with editor, note that this - * this doesn't handle the font-specific styles, which depends on - * how {@link CKEDITOR.config.pasteFromWordRemoveFontStyles} is configured. + * Whether to remove element styles that can't be managed with the editor. Note + * that this doesn't handle the font specific styles, which depends on the + * {@link CKEDITOR.config.pasteFromWordRemoveFontStyles} setting instead. * @name CKEDITOR.config.pasteFromWordRemoveStyles + * @since 3.1 * @type Boolean * @default true Index: /CKEditor/trunk/_source/plugins/pastefromword/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/pastefromword/plugin.js (revision 4894) +++ /CKEditor/trunk/_source/plugins/pastefromword/plugin.js (revision 4895) @@ -97,6 +97,8 @@ /** - * Whether prompt the user about the clean-up of content from MS-Word. + * Whether to prompt the user about the clean up of content being pasted from + * MS Word. * @name CKEDITOR.config.pasteFromWordPromptCleanup + * @since 3.1 * @type Boolean * @default undefined @@ -106,7 +108,9 @@ /** - * The file that provides the MS-Word Filtering rules. - * Note: It's a global configuration which are shared by all editor instances. + * The file that provides the MS Word cleanup function for pasting operations. + * Note: This is a global configuration shared by all editor instances present + * in the page. * @name CKEDITOR.config.pasteFromWordCleanupFile + * @since 3.1 * @type String * @default 'default'