Index: /CKEditor/branches/features/aria/_source/plugins/a11yhelp/dialogs/a11yhelp.js
===================================================================
--- /CKEditor/branches/features/aria/_source/plugins/a11yhelp/dialogs/a11yhelp.js	(revision 5058)
+++ /CKEditor/branches/features/aria/_source/plugins/a11yhelp/dialogs/a11yhelp.js	(revision 5059)
@@ -12,6 +12,6 @@
 	{
 		var pageTpl = '<div class="cke_accessibility_legend" role="document" tabIndex="-1">%1</div>',
-			 sectionTpl = '<h1>%1</h1><dl>%2</dl>',
-			 itemTpl = '<dt>%1</dt><dd>%2</dd>';
+			sectionTpl = '<h1>%1</h1><dl>%2</dl>',
+			itemTpl = '<dt>%1</dt><dd>%2</dd>';
 
 		var pageHtml = [],
@@ -92,3 +92,3 @@
 		buttons : [ CKEDITOR.dialog.cancelButton ]
 	};
-} );
+});
Index: /CKEditor/branches/features/aria/_source/plugins/a11yhelp/plugin.js
===================================================================
--- /CKEditor/branches/features/aria/_source/plugins/a11yhelp/plugin.js	(revision 5058)
+++ /CKEditor/branches/features/aria/_source/plugins/a11yhelp/plugin.js	(revision 5059)
@@ -8,18 +8,14 @@
  */
 
-( function()
+CKEDITOR.plugins.add( 'a11yhelp',
 {
-	CKEDITOR.plugins.add( 'a11yhelp',
+	init : function( editor )
 	{
-		init : function( editor )
-		{
-			var command = new CKEDITOR.dialogCommand( 'a11yHelp' );
-			command.modes = { wysiwyg:1, source:1 };
-			command.canUndo = false;
+		var command = new CKEDITOR.dialogCommand( 'a11yHelp' );
+		command.modes = { wysiwyg:1, source:1 };
+		command.canUndo = false;
 
-			editor.addCommand( 'a11yHelp', command );
-			CKEDITOR.dialog.add( 'a11yHelp', this.path + 'dialogs/a11yhelp.js' );
-		}
-	});
-
-} )( );
+		editor.addCommand( 'a11yHelp', command );
+		CKEDITOR.dialog.add( 'a11yHelp', this.path + 'dialogs/a11yhelp.js' );
+	}
+});
Index: /CKEditor/branches/features/aria/_source/plugins/dialog/plugin.js
===================================================================
--- /CKEditor/branches/features/aria/_source/plugins/dialog/plugin.js	(revision 5058)
+++ /CKEditor/branches/features/aria/_source/plugins/dialog/plugin.js	(revision 5059)
@@ -140,13 +140,13 @@
 
 		dialogPart.setAttributes(
-		{
-			'role' : 'dialog',
-			'aria-labelledby' : titleId
-		} );
+			{
+				'role' : 'dialog',
+				'aria-labelledby' : titleId
+			});
 
 		CKEDITOR.tools.setTimeout( function()
-		{
-			editor.fire( 'ariaWidget', this.parts.contents );
-		}, 0, this );
+			{
+				editor.fire( 'ariaWidget', this.parts.contents );
+			}, 0, this );
 		
 		// Set the startup styles for the dialog, avoiding it enlarging the
@@ -161,4 +161,5 @@
 
 		this.parts.tabs.setAttribute( 'role', 'tablist' );
+
 		// Call the CKEDITOR.event constructor to initialize this instance.
 		CKEDITOR.event.call( this );
@@ -291,7 +292,9 @@
 			// Trigger the 'blur' event of  any input element before anything,
 			// since certain UI updates may depend on it.
-			try {
+			try
+			{
 				focusList[ current ].getInputElement().$.blur();
-			}catch( er ){}
+			}
+			catch( er ){}
 
 			var startIndex = ( current + offset + focusList.length ) % focusList.length,
@@ -364,5 +367,5 @@
 				this._.currentFocusIndex = -1;
 				changeFocus( true );
-				processed =1;
+				processed = 1;
 			}
 
@@ -878,5 +881,5 @@
 						env.gecko && env.version >= 10900 && !env.hc ? '' : ' href="javascript:void(0)"',
 						' tabIndex="-1"',
-						' hidefocus="true"' +
+						' hidefocus="true"',
 						' role="tab">',
 							contents.label,
@@ -2087,6 +2090,5 @@
 				if ( this.keyboardFocusable )
 				{
-					this.tabIndex = elementDefinition.tabIndex == null ?
-						0 : elementDefinition.tabIndex;
+					this.tabIndex = elementDefinition.tabIndex || 0;
 
 					this.focusIndex = dialog._.focusList.push( this ) - 1;
Index: /CKEditor/branches/features/aria/_source/plugins/dialogui/plugin.js
===================================================================
--- /CKEditor/branches/features/aria/_source/plugins/dialogui/plugin.js	(revision 5058)
+++ /CKEditor/branches/features/aria/_source/plugins/dialogui/plugin.js	(revision 5059)
@@ -148,5 +148,5 @@
 					var html = [];
 					if ( elementDefinition.labelLayout != 'horizontal' )
-						html.push( '<label class="cke_dialog_ui_labeled_label" ' +
+						html.push( '<label class="cke_dialog_ui_labeled_label" ',
 								' id="'+  _.labelId + '"',
 								' for="' + _.inputId + '"',
@@ -1392,5 +1392,5 @@
 	CKEDITOR.ui.dialog.fileButton.prototype = new CKEDITOR.ui.dialog.button;
 
-	CKEDITOR.ui.dialog.fieldset.prototype = CKEDITOR.tools.extend( {}, CKEDITOR.ui.dialog.hbox.prototype );
+	CKEDITOR.ui.dialog.fieldset.prototype = CKEDITOR.tools.clone( CKEDITOR.ui.dialog.hbox.prototype );
 
 	CKEDITOR.dialog.addUIElement( 'text', textBuilder );
Index: /CKEditor/branches/features/aria/_source/plugins/flash/dialogs/flash.js
===================================================================
--- /CKEditor/branches/features/aria/_source/plugins/flash/dialogs/flash.js	(revision 5058)
+++ /CKEditor/branches/features/aria/_source/plugins/flash/dialogs/flash.js	(revision 5059)
@@ -346,4 +346,5 @@
 											hidden : true,
 											// v-align with the 'src' field.
+											// TODO: We need something better than a fixed size here.
 											style : 'display:inline-block;margin-top:10px;',
 											label : editor.lang.common.browseServer
Index: /CKEditor/branches/features/aria/_source/plugins/floatpanel/plugin.js
===================================================================
--- /CKEditor/branches/features/aria/_source/plugins/floatpanel/plugin.js	(revision 5058)
+++ /CKEditor/branches/features/aria/_source/plugins/floatpanel/plugin.js	(revision 5059)
@@ -239,5 +239,6 @@
 								} );
 
-							// Give focus to the panel block with a delay. (to help screen-readers to speak out the widget)
+							// Give focus to the panel block with a delay,
+							// to help screen-readers to speak out the widget.
 							setTimeout( function() { block.element.focus(); }, 500 );
 						} , this );
Index: /CKEditor/branches/features/aria/_source/plugins/image/dialogs/image.js
===================================================================
--- /CKEditor/branches/features/aria/_source/plugins/image/dialogs/image.js	(revision 5058)
+++ /CKEditor/branches/features/aria/_source/plugins/image/dialogs/image.js	(revision 5059)
@@ -547,4 +547,5 @@
 											id : 'browse',
 											// v-align with the 'txtUrl' field.
+											// TODO: We need something better than a fixed size here.
 											style : 'display:inline-block;margin-top:10px;',
 											align : 'center',
Index: /CKEditor/branches/features/aria/_source/plugins/link/dialogs/link.js
===================================================================
--- /CKEditor/branches/features/aria/_source/plugins/link/dialogs/link.js	(revision 5058)
+++ /CKEditor/branches/features/aria/_source/plugins/link/dialogs/link.js	(revision 5059)
@@ -476,5 +476,5 @@
 											this.allowOnChange = true;
 
-											// Araise the tab order of this field to top in case of URL.
+											// Raise  the tab order of this field to top in case of URL.
 											var linkType = this.getDialog().getContentElement( 'info', 'linkType' );
 											if ( linkType && linkType.getValue() == 'url' )
Index: /CKEditor/branches/features/aria/_source/plugins/smiley/plugin.js
===================================================================
--- /CKEditor/branches/features/aria/_source/plugins/smiley/plugin.js	(revision 5058)
+++ /CKEditor/branches/features/aria/_source/plugins/smiley/plugin.js	(revision 5059)
@@ -62,9 +62,19 @@
  * @default  The textual descriptions of smiley.
  * @example
- * // Use the emoticons as descriptions..
- * config.smiley_descriptions = [
- *	':)', ':(', ';)', ':D', ':/', ':P', ':*)', ':-o',
- *	':|', '>:(', 'o:)', '8-)', '>:-)', ';(', '', '', '',
- *	'', '', ':-*', '' ];
+ * // Default settings.
+ * config.smiley_descriptions =
+ *     [
+ *         'smiley', 'sad', 'wink', 'laugh', 'frown', 'cheeky', 'blush', 'surprise',
+ *         'indecision', 'angry', 'angle', 'cool', 'devil', 'crying', 'enlightened', 'no',
+ *         'yes', 'heart', 'broken heart', 'kiss', 'mail'
+ *     ];
+ * @example
+ * // Use textual emoticons as description.
+ * config.smiley_descriptions =
+ *     [
+ *         ':)', ':(', ';)', ':D', ':/', ':P', ':*)', ':-o',
+ *         ':|', '>:(', 'o:)', '8-)', '>:-)', ';(', '', '', '',
+ *         '', '', ':-*', ''
+ *     ];
  */
 CKEDITOR.config.smiley_descriptions =
Index: /CKEditor/branches/features/aria/_source/plugins/specialchar/dialogs/specialchar.js
===================================================================
--- /CKEditor/branches/features/aria/_source/plugins/specialchar/dialogs/specialchar.js	(revision 5058)
+++ /CKEditor/branches/features/aria/_source/plugins/specialchar/dialogs/specialchar.js	(revision 5059)
@@ -11,5 +11,5 @@
 	 */
 	var dialog,
-			lang = editor.lang.specialChar;
+		lang = editor.lang.specialChar;
 	var onChoice = function( evt )
 	{
Index: /CKEditor/branches/features/aria/_source/plugins/templates/dialogs/templates.js
===================================================================
--- /CKEditor/branches/features/aria/_source/plugins/templates/dialogs/templates.js	(revision 5058)
+++ /CKEditor/branches/features/aria/_source/plugins/templates/dialogs/templates.js	(revision 5059)
@@ -44,10 +44,10 @@
 				var html = '<table style="width:350px;" class="cke_tpl_preview"><tr>';
 
-				if( template.image && imagesPath )
+				if ( template.image && imagesPath )
 					html += '<td class="cke_tpl_preview_img"><img src="' + CKEDITOR.getUrl( imagesPath + template.image ) + '"></td>';
 
 				html += '<td style="white-space:normal;"><span class="cke_tpl_title">' + template.title + '</span><br/>';
 
-				if( template.description )
+				if ( template.description )
 					html += '<span>' + template.description + '</span>';
 
@@ -70,5 +70,5 @@
 					isInsert = dialog.getValueOf( 'selectTpl', 'chkInsertOpt' );
 
-				if( isInsert )
+				if ( isInsert )
 				{
 					// Everything should happen after the document is loaded (#4073).
@@ -95,5 +95,5 @@
 			{
 				var target = evt.data.getTarget(),
-						position = listContainer.getPosition( target );
+					position = listContainer.getPosition( target );
 
 				// Keyboard navigation for template list.
@@ -101,8 +101,8 @@
 				{
 					var keystroke = evt.data.getKeystroke(),
-							items = listContainer.getElementsByTag( 'a' ),
-							focusItem;
-
-					if( items )
+						items = listContainer.getElementsByTag( 'a' ),
+						focusItem;
+
+					if ( items )
 					{
 						switch ( keystroke )
@@ -208,7 +208,7 @@
 							{
 								listContainer.setHtml(
-										'<div class="cke_tpl_empty">' +
+									'<div class="cke_tpl_empty">' +
 										'<span>' + editor.lang.templates.emptyListMsg + '</span>' +
-										'</div>' );
+									'</div>' );
 							}
 						});
Index: /CKEditor/branches/features/aria/_source/plugins/wysiwygarea/plugin.js
===================================================================
--- /CKEditor/branches/features/aria/_source/plugins/wysiwygarea/plugin.js	(revision 5058)
+++ /CKEditor/branches/features/aria/_source/plugins/wysiwygarea/plugin.js	(revision 5059)
@@ -716,6 +716,6 @@
 				{
 					ieFocusGrabber = editor.container.append( CKEDITOR.dom.element.createFromHtml(
-					'<span tabindex="-1" style="position:absolute; left:-10000"></span>' ) );
-
+						'<span tabindex="-1" style="position:absolute; left:-10000"></span>' ) );
+					
 					ieFocusGrabber.on( 'focus', function()
 						{