Index: CKEditor/trunk/_dev/docs_build/template/publish.js
===================================================================
--- CKEditor/trunk/_dev/docs_build/template/publish.js	(revision 6348)
+++ CKEditor/trunk/_dev/docs_build/template/publish.js	(revision 6350)
@@ -1,3 +1,3 @@
-/** Called automatically by JsDoc Toolkit. */
+/** Called automatically by JsDoc Toolkit. */
 function publish(symbolSet) {
 	publish.conf = {  // trailing slash expected for dirs
Index: CKEditor/trunk/_samples/ajax.html
===================================================================
--- CKEditor/trunk/_samples/ajax.html	(revision 6348)
+++ CKEditor/trunk/_samples/ajax.html	(revision 6350)
@@ -64,5 +64,5 @@
 	</p>
 	</div>
-	
+
 	<!-- This <div> holds alert messages to be display in the sample page. -->
 	<div id="alerts">
Index: CKEditor/trunk/_samples/api.html
===================================================================
--- CKEditor/trunk/_samples/api.html	(revision 6348)
+++ CKEditor/trunk/_samples/api.html	(revision 6350)
@@ -104,5 +104,5 @@
 	// Get the editor instance that we want to interact with.
 	var oEditor = CKEDITOR.instances.editor1;
-	// Checks whether the current editor contents present changes when compared 
+	// Checks whether the current editor contents present changes when compared
 	// to the contents loaded into the editor at startup
 	// http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.editor.html#checkDirty
@@ -130,5 +130,5 @@
 	<div class="description">
 	<p>
-		This sample shows how to use the 
+		This sample shows how to use the
 		<a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.editor.html">CKEditor JavaScript API</a>
 		to interact with the editor at runtime.
Index: CKEditor/trunk/_samples/api_dialog.html
===================================================================
--- CKEditor/trunk/_samples/api_dialog.html	(revision 6348)
+++ CKEditor/trunk/_samples/api_dialog.html	(revision 6350)
@@ -112,5 +112,5 @@
 	<div class="description">
 	<p>
-		This sample shows how to use the 
+		This sample shows how to use the
 		<a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.dialog.html">CKEditor Dialog API</a>
 		to customize CKEditor dialog windows without changing the original editor code.
@@ -131,6 +131,6 @@
 	</p>
 	</div>
-	
-	
+
+
 	<!-- This <div> holds alert messages to be display in the sample page. -->
 	<div id="alerts">
Index: CKEditor/trunk/_samples/api_dialog/my_dialog.js
===================================================================
--- CKEditor/trunk/_samples/api_dialog/my_dialog.js	(revision 6348)
+++ CKEditor/trunk/_samples/api_dialog/my_dialog.js	(revision 6350)
@@ -1,3 +1,3 @@
-ï»?*
+/*
 Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
Index: CKEditor/trunk/_samples/autogrow.html
===================================================================
--- CKEditor/trunk/_samples/autogrow.html	(revision 6348)
+++ CKEditor/trunk/_samples/autogrow.html	(revision 6350)
@@ -22,5 +22,5 @@
 	<div class="description">
 	<p>
-		This sample shows how to configure CKEditor instances to use the 
+		This sample shows how to configure CKEditor instances to use the
 		<strong>autogrow</strong> plugin that lets the editor window expand and shrink
 		depending on the amount and size of content entered in the editing area.
@@ -32,10 +32,10 @@
 	<p>
 		It is also possible to set a maximum height for the editor window. Once CKEditor
-		editing area reaches the value in pixels specified in the <code>autoGrow_maxHeight</code> 
+		editing area reaches the value in pixels specified in the <code>autoGrow_maxHeight</code>
 		attribute, scrollbars will be added and the editor window will no longer expand.
-	</p>	
+	</p>
 	<p>
 		To add a CKEditor instance using the <strong>autogrow</strong> plugin and its
-		<code>autoGrow_maxHeight</code> attribute, insert the following JavaScript call to your code: 
+		<code>autoGrow_maxHeight</code> attribute, insert the following JavaScript call to your code:
 	</p>
 	<pre>CKEDITOR.replace( '<em>textarea_id</em>',
Index: CKEditor/trunk/_samples/divreplace.html
===================================================================
--- CKEditor/trunk/_samples/divreplace.html	(revision 6348)
+++ CKEditor/trunk/_samples/divreplace.html	(revision 6350)
@@ -76,5 +76,5 @@
 <body>
 	<h1>
-		CKEditor Sample &mdash; Replace DIV with CKEditor on the Fly 
+		CKEditor Sample &mdash; Replace DIV with CKEditor on the Fly
 	</h1>
 	<div class="description">
Index: CKEditor/trunk/_samples/enterkey.html
===================================================================
--- CKEditor/trunk/_samples/enterkey.html	(revision 6348)
+++ CKEditor/trunk/_samples/enterkey.html	(revision 6350)
@@ -45,7 +45,7 @@
 	<div class="description">
 	<p>
-		This sample shows how to configure the <em>Enter</em> and <em>Shift+Enter</em> keys 
-		to perform actions specified in the 
-		<a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.config.html#.enterMode"><code>enterMode</code></a> 
+		This sample shows how to configure the <em>Enter</em> and <em>Shift+Enter</em> keys
+		to perform actions specified in the
+		<a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.config.html#.enterMode"><code>enterMode</code></a>
 		and <a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.config.html#.shiftEnterMode"><code>shiftEnterMode</code></a>
 		parameters, respectively.
Index: CKEditor/trunk/_samples/fullpage.html
===================================================================
--- CKEditor/trunk/_samples/fullpage.html	(revision 6348)
+++ CKEditor/trunk/_samples/fullpage.html	(revision 6350)
@@ -25,6 +25,6 @@
 		<code>&lt;html&gt;</code> tag to the <code>&lt;/html&gt;</code> tag.
 	</p>
-	<p>	
-		CKEditor is inserted with a JavaScript call using the following code: 
+	<p>
+		CKEditor is inserted with a JavaScript call using the following code:
 	</p>
 	<pre>CKEDITOR.replace( '<em>textarea_id</em>',
@@ -37,5 +37,5 @@
 	</p>
 	</div>
-	
+
 	<!-- This <div> holds alert messages to be display in the sample page. -->
 	<div id="alerts">
Index: CKEditor/trunk/_samples/index.html
===================================================================
--- CKEditor/trunk/_samples/index.html	(revision 6348)
+++ CKEditor/trunk/_samples/index.html	(revision 6350)
@@ -51,8 +51,8 @@
 	<ul>
 		<li><a href="divreplace.html">Replace DIV elements on the fly</a><br />
-			Transforming a <code>div</code> element into an instance of CKEditor with a mouse click.	
+			Transforming a <code>div</code> element into an instance of CKEditor with a mouse click.
 		</li>
 		<li><a href="ajax.html">Create and destroy editor instances for Ajax applications</a><br />
-			Creating and destroying CKEditor instances on the fly and saving the contents entered into the editor window. 
+			Creating and destroying CKEditor instances on the fly and saving the contents entered into the editor window.
 		</li>
 		<li><a href="api.html">Basic usage of the API</a><br />
@@ -63,5 +63,5 @@
 		</li>
 		<li><a href="enterkey.html">Using the "Enter" key in CKEditor</a><br />
-			 Configuring the behavior of <em>Enter</em> and <em>Shift+Enter</em> keys. 
+			 Configuring the behavior of <em>Enter</em> and <em>Shift+Enter</em> keys.
 		</li>
 		<li><a href="sharedspaces.html">Shared toolbars</a><br />
@@ -78,5 +78,5 @@
 		</li>
 		<li><a href="output_for_flash.html">Output for Flash</a><br />
-			Configuring CKEditor to produce HTML code that can be used with Adobe Flash. 
+			Configuring CKEditor to produce HTML code that can be used with Adobe Flash.
 		</li>
 		<li><a href="placeholder.html">Placeholder plugin</a><br />
Index: CKEditor/trunk/_samples/jqueryadapter.html
===================================================================
--- CKEditor/trunk/_samples/jqueryadapter.html	(revision 6348)
+++ CKEditor/trunk/_samples/jqueryadapter.html	(revision 6350)
@@ -45,5 +45,5 @@
 	<div class="description">
 	<p>
-		This sample shows how to load CKEditor and configure it using the 
+		This sample shows how to load CKEditor and configure it using the
 		<a href="http://docs.cksource.com/CKEditor_3.x/Developers_Guide/jQuery_Adapter">jQuery adapter</a>.
 		In this case the jQuery adapter is responsible for transforming a <code>&lt;textarea&gt;</code>
@@ -51,6 +51,6 @@
 	</p>
 	<p>
-		CKEditor instance with custom configuration set in jQuery can be inserted with the   
-		following JavaScript code: 
+		CKEditor instance with custom configuration set in jQuery can be inserted with the
+		following JavaScript code:
 	</p>
 	<pre>$(function()
@@ -68,5 +68,5 @@
 	</p>
 	</div>
-		
+
 	<!-- This <div> holds alert messages to be display in the sample page. -->
 	<div id="alerts">
Index: CKEditor/trunk/_samples/output_for_flash.html
===================================================================
--- CKEditor/trunk/_samples/output_for_flash.html	(revision 6348)
+++ CKEditor/trunk/_samples/output_for_flash.html	(revision 6350)
@@ -38,5 +38,5 @@
 	<div class="description">
 	<p>
-		This sample shows how to configure CKEditor to output 
+		This sample shows how to configure CKEditor to output
 		HTML code that can be used with
 		<a href="http://www.adobe.com/livedocs/flash/9.0/main/wwhelp/wwhimpl/common/html/wwhelp.htm?context=LiveDocs_Parts&amp;file=00000922.html">
Index: CKEditor/trunk/_samples/output_html.html
===================================================================
--- CKEditor/trunk/_samples/output_html.html	(revision 6348)
+++ CKEditor/trunk/_samples/output_html.html	(revision 6350)
@@ -33,5 +33,5 @@
 	</p>
 	<p>
-		A snippet of the configuration code can be seen below; check the source of this page for 
+		A snippet of the configuration code can be seen below; check the source of this page for
 		full definition:
 	</p>
@@ -46,5 +46,5 @@
 				attributes	: { 'size' : '#(size)' }
 			}
-			
+
 		// More definitions follow.
 	});</pre>
Index: CKEditor/trunk/_samples/output_xhtml.html
===================================================================
--- CKEditor/trunk/_samples/output_xhtml.html	(revision 6348)
+++ CKEditor/trunk/_samples/output_xhtml.html	(revision 6350)
@@ -32,5 +32,5 @@
 	</p>
 	<p>
-		A snippet of the configuration code can be seen below; check the source of this page for 
+		A snippet of the configuration code can be seen below; check the source of this page for
 		full definition:
 	</p>
Index: CKEditor/trunk/_samples/php/events.php
===================================================================
--- CKEditor/trunk/_samples/php/events.php	(revision 6348)
+++ CKEditor/trunk/_samples/php/events.php	(revision 6350)
@@ -19,5 +19,5 @@
 	</p>
 	<p>
-		A snippet of the configuration code can be seen below; check the source code of this page for 
+		A snippet of the configuration code can be seen below; check the source code of this page for
 		the full definition:
 	</p>
Index: CKEditor/trunk/_samples/php/replace.php
===================================================================
--- CKEditor/trunk/_samples/php/replace.php	(revision 6348)
+++ CKEditor/trunk/_samples/php/replace.php	(revision 6350)
@@ -12,5 +12,5 @@
 <body>
 	<h1>
-		CKEditor Sample &mdash;  Replace Selected Textarea Elements Using PHP Code 
+		CKEditor Sample &mdash;  Replace Selected Textarea Elements Using PHP Code
 	</h1>
 	<div class="description">
@@ -21,5 +21,5 @@
 	<p>
 		To replace a <code>&lt;textarea&gt;</code> element, place the following call at any point
-		after the <code>&lt;textarea&gt;</code> element: 
+		after the <code>&lt;textarea&gt;</code> element:
 	</p>
 	<pre>
Index: CKEditor/trunk/_samples/php/replaceall.php
===================================================================
--- CKEditor/trunk/_samples/php/replaceall.php	(revision 6348)
+++ CKEditor/trunk/_samples/php/replaceall.php	(revision 6350)
@@ -21,5 +21,5 @@
 	<p>
 		To replace all <code>&lt;textarea&gt;</code> elements, place the following call at any point
-		after the last <code>&lt;textarea&gt;</code> element: 
+		after the last <code>&lt;textarea&gt;</code> element:
 	</p>
 	<pre>
Index: CKEditor/trunk/_samples/php/standalone.php
===================================================================
--- CKEditor/trunk/_samples/php/standalone.php	(revision 6348)
+++ CKEditor/trunk/_samples/php/standalone.php	(revision 6350)
@@ -19,5 +19,5 @@
 	</p>
 	<pre>
-&lt;?php 
+&lt;?php
 include_once "ckeditor/ckeditor.php";
 
Index: CKEditor/trunk/_samples/placeholder.html
===================================================================
--- CKEditor/trunk/_samples/placeholder.html	(revision 6348)
+++ CKEditor/trunk/_samples/placeholder.html	(revision 6350)
@@ -22,5 +22,5 @@
 	<div class="description">
 	<p>
-		This sample shows how to configure CKEditor instances to use the 
+		This sample shows how to configure CKEditor instances to use the
 		<strong>placeholder</strong> plugin that lets you insert read-only elements
 		into your content. To enter and modify read-only text, use the
@@ -30,5 +30,5 @@
 		To add a CKEditor instance that uses the <strong>placeholder</strong> plugin and a related
 		<strong>Create Placeholder</strong> toolbar button, insert the following JavaScript
-		call to your code: 
+		call to your code:
 	</p>
 	<pre>CKEDITOR.replace( '<em>textarea_id</em>',
Index: CKEditor/trunk/_samples/replacebyclass.html
===================================================================
--- CKEditor/trunk/_samples/replacebyclass.html	(revision 6348)
+++ CKEditor/trunk/_samples/replacebyclass.html	(revision 6350)
@@ -27,5 +27,5 @@
 	<p>
 		To replace a <code>&lt;textarea&gt;</code> element, simply assign it the <code>ckeditor</code>
-		class, as in the code below: 
+		class, as in the code below:
 	</p>
 	<pre>&lt;textarea <strong>class="ckeditor</strong>" name="editor1"&gt;&lt;/textarea&gt;</pre>
@@ -34,5 +34,5 @@
 	</p>
 	</div>
-	
+
 	<!-- This <div> holds alert messages to be display in the sample page. -->
 	<div id="alerts">
Index: CKEditor/trunk/_samples/replacebycode.html
===================================================================
--- CKEditor/trunk/_samples/replacebycode.html	(revision 6348)
+++ CKEditor/trunk/_samples/replacebycode.html	(revision 6350)
@@ -18,5 +18,5 @@
 <body>
 	<h1>
-		CKEditor Sample &mdash; Replace Textarea Elements Using JavaScript Code 
+		CKEditor Sample &mdash; Replace Textarea Elements Using JavaScript Code
 	</h1>
 	<div class="description">
@@ -28,5 +28,5 @@
 		To replace a <code>&lt;textarea&gt;</code> element, place the following call at any point
 		after the <code>&lt;textarea&gt;</code> element or inside a <code>&lt;script&gt;</code> element located
-		in the <code>&lt;head&gt;</code> section of the page, in a <code>window.onload</code> event handler: 
+		in the <code>&lt;head&gt;</code> section of the page, in a <code>window.onload</code> event handler:
 	</p>
 	<pre>CKEDITOR.replace( '<em>textarea_id</em>' );</pre>
@@ -36,5 +36,5 @@
 	</p>
 	</div>
-	
+
 	<!-- This <div> holds alert messages to be display in the sample page. -->
 	<div id="alerts">
Index: CKEditor/trunk/_samples/sample.css
===================================================================
--- CKEditor/trunk/_samples/sample.css	(revision 6348)
+++ CKEditor/trunk/_samples/sample.css	(revision 6350)
@@ -12,5 +12,5 @@
 
 body {
-	padding:10px 30px;	
+	padding:10px 30px;
 }
 
@@ -179,2 +179,7 @@
 }
 
+.cke_dialog label
+{
+	display: inline;
+	margin-bottom: auto;
+}
Index: CKEditor/trunk/_samples/sample.js
===================================================================
--- CKEditor/trunk/_samples/sample.js	(revision 6348)
+++ CKEditor/trunk/_samples/sample.js	(revision 6350)
@@ -1,3 +1,3 @@
-ï»?*
+/*
 Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
Index: CKEditor/trunk/_samples/sample_posteddata.php
===================================================================
--- CKEditor/trunk/_samples/sample_posteddata.php	(revision 6348)
+++ CKEditor/trunk/_samples/sample_posteddata.php	(revision 6350)
@@ -7,6 +7,6 @@
   We are sorry, but your Web server does not support the PHP language used in this script.
 
-  Please note that CKEditor can be used with any other server-side language than just PHP. 
-  To save the content created with CKEditor you need to read the POST data on the server 
+  Please note that CKEditor can be used with any other server-side language than just PHP.
+  To save the content created with CKEditor you need to read the POST data on the server
   side and write it to a file or a database.
 
Index: CKEditor/trunk/_samples/sharedspaces.html
===================================================================
--- CKEditor/trunk/_samples/sharedspaces.html	(revision 6348)
+++ CKEditor/trunk/_samples/sharedspaces.html	(revision 6350)
@@ -39,5 +39,5 @@
 	</p>
 	<p>
-		CKEditor instances with shared spaces can be inserted with a JavaScript call using the following code: 
+		CKEditor instances with shared spaces can be inserted with a JavaScript call using the following code:
 	</p>
 	<pre>CKEDITOR.replace( '<em>textarea_id</em>',
Index: CKEditor/trunk/_samples/skins.html
===================================================================
--- CKEditor/trunk/_samples/skins.html	(revision 6348)
+++ CKEditor/trunk/_samples/skins.html	(revision 6350)
@@ -26,5 +26,5 @@
 	</p>
 	<p>
-		CKEditor with a specified skin (in this case, the "Office 2003" skin) is inserted with a JavaScript call using the following code:  
+		CKEditor with a specified skin (in this case, the "Office 2003" skin) is inserted with a JavaScript call using the following code:
 	</p>
 	<pre>CKEDITOR.replace( '<em>textarea_id</em>',
@@ -37,5 +37,5 @@
 	</p>
 	</div>
-	
+
 	<!-- This <div> holds alert messages to be display in the sample page. -->
 	<div id="alerts">
Index: CKEditor/trunk/_samples/ui_color.html
===================================================================
--- CKEditor/trunk/_samples/ui_color.html	(revision 6348)
+++ CKEditor/trunk/_samples/ui_color.html	(revision 6350)
@@ -27,5 +27,5 @@
 	<h2>Setting the User Interface Color</h2>
 	<p>
-	To specify the color of the user interface, set the <code>uiColor</code> property:  
+	To specify the color of the user interface, set the <code>uiColor</code> property:
 	</p>
 	<pre>CKEDITOR.replace( '<em>textarea_id</em>',
@@ -41,9 +41,9 @@
 		If the <strong>uicolor</strong> plugin along with the dedicated <strong>UIColor</strong>
 		toolbar button is added to CKEditor, the user will also be able to pick the color of the
-		UI from the color palette available in the <strong>UI Color Picker</strong> dialog window.  
+		UI from the color palette available in the <strong>UI Color Picker</strong> dialog window.
 	</p>
 	<p>
 		To insert a CKEditor instance with the <strong>uicolor</strong> plugin enabled,
-		use the following JavaScript call: 
+		use the following JavaScript call:
 	</p>
 	<pre>CKEDITOR.replace( '<em>textarea_id</em>',
Index: CKEditor/trunk/_samples/ui_languages.html
===================================================================
--- CKEditor/trunk/_samples/ui_languages.html	(revision 6348)
+++ CKEditor/trunk/_samples/ui_languages.html	(revision 6350)
@@ -40,6 +40,6 @@
 	</p>
 	<p>
-	To specify the user interface language that will be used no matter what language is 
-	specified in user's browser or operating system, set the <code>language</code> property:  
+	To specify the user interface language that will be used no matter what language is
+	specified in user's browser or operating system, set the <code>language</code> property:
 	</p>
 	<pre>CKEDITOR.replace( '<em>textarea_id</em>',
Index: CKEditor/trunk/_source/core/htmlparser/element.js
===================================================================
--- CKEditor/trunk/_source/core/htmlparser/element.js	(revision 6348)
+++ CKEditor/trunk/_source/core/htmlparser/element.js	(revision 6350)
@@ -1,3 +1,3 @@
-/*
+/*
 Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
Index: CKEditor/trunk/_source/plugins/indent/plugin.js
===================================================================
--- CKEditor/trunk/_source/plugins/indent/plugin.js	(revision 6348)
+++ CKEditor/trunk/_source/plugins/indent/plugin.js	(revision 6350)
@@ -1,3 +1,3 @@
-/*
+/*
 Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
Index: CKEditor/trunk/_source/plugins/selection/plugin.js
===================================================================
--- CKEditor/trunk/_source/plugins/selection/plugin.js	(revision 6348)
+++ CKEditor/trunk/_source/plugins/selection/plugin.js	(revision 6350)
@@ -1,3 +1,3 @@
-/*
+/*
 Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
Index: CKEditor/trunk/ckeditor_basic_source.js
===================================================================
--- CKEditor/trunk/ckeditor_basic_source.js	(revision 6348)
+++ CKEditor/trunk/ckeditor_basic_source.js	(revision 6350)
@@ -1,3 +1,3 @@
-ï»?*
+/*
 Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
Index: CKEditor/trunk/ckeditor_source.js
===================================================================
--- CKEditor/trunk/ckeditor_source.js	(revision 6348)
+++ CKEditor/trunk/ckeditor_source.js	(revision 6350)
@@ -1,3 +1,3 @@
-ï»?*
+/*
 Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
Index: CKEditor/trunk/config.js
===================================================================
--- CKEditor/trunk/config.js	(revision 6348)
+++ CKEditor/trunk/config.js	(revision 6350)
@@ -7,9 +7,5 @@
 {
 	// Define changes to default configuration here. For example:
-//	config.language = 'he';
+	// config.language = 'fr';
 	// config.uiColor = '#AADC6E';
-//	config.extraPlugins ='bbcode';
-	config.enterMode = 2;
-//	config.entities = false;
-	config.fontSize_sizes = "30/30%;50/50%;100/100%;120/120%;150/150%;200/200%;300/300%";
 };