/*\r
-Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.\r
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.\r
For licensing, see LICENSE.html or http://ckeditor.com/license\r
*/\r
\r
* a slash.\r
* @name CKEDITOR.config.smiley_path\r
* @type String\r
- * @default {@link CKEDITOR.basePath} + 'plugins/smiley/images/'\r
+ * @default <code><em>CKEDITOR.basePath</em> + 'plugins/smiley/images/'</code>\r
* @example\r
* config.smiley_path = 'http://www.example.com/images/smileys/';\r
* @example\r
'indecision', 'angry', 'angel', 'cool', 'devil', 'crying', 'enlightened', 'no',\r
'yes', 'heart', 'broken heart', 'kiss', 'mail'\r
];\r
+\r
+/**\r
+ * The number of columns to be generated by the smilies matrix.\r
+ * @name CKEDITOR.config.smiley_columns\r
+ * @type Number\r
+ * @default 8\r
+ * @since 3.3.2\r
+ * @example\r
+ * config.smiley_columns = 6;\r
+ */\r