Index: /CKEditor/trunk/_samples/ajax.html
===================================================================
--- /CKEditor/trunk/_samples/ajax.html	(revision 4850)
+++ /CKEditor/trunk/_samples/ajax.html	(revision 4851)
@@ -6,7 +6,14 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-	<title>Ajax - CKEditor Sample</title>
-	<script type="text/javascript" src="sample.js"></script>
-	<script id="headscript" type="text/javascript">
+	<title>Sample - CKEditor</title>
+	<meta content="text/html; charset=utf-8" http-equiv="content-type" />
+	<!-- CKReleaser %REMOVE_LINE%
+	<script type="text/javascript" src="../ckeditor.js"></script>
+	CKReleaser %REMOVE_START% -->
+	<script type="text/javascript" src="../ckeditor_source.js"></script>
+	<!-- CKReleaser %REMOVE_END% -->
+	<script src="sample.js" type="text/javascript"></script>
+	<link href="sample.css" rel="stylesheet" type="text/css" />
+	<script type="text/javascript">
 	//<![CDATA[
 
@@ -27,10 +34,10 @@
 	/*
 	if ( editor.setData )
-		editor.setData( html );
+	editor.setData( html );
 	else
-		CKEDITOR.on( 'loaded', function()
-			{
-				editor.setData( html );
-			});
+	CKEDITOR.on( 'loaded', function()
+	{
+	editor.setData( html );
+	});
 	*/
 }
@@ -55,18 +62,40 @@
 </head>
 <body>
-	<div id="html">
+	<h1>
+		CKEditor Sample
+	</h1>
+	<!-- This <div> holds alert messages to be display in the sample page. -->
+	<div id="alerts">
+		<noscript>
+			<p>
+				<strong>CKEditor requires JavaScript to run</strong>. In a browser with no JavaScript
+				support, like yours, you should still see the contents (HTML data) and you should
+				be able to edit it normally, without a rich editor interface.
+			</p>
+		</noscript>
+	</div>
+	<p>
+		<input onclick="createEditor();" type="button" value="Create Editor" />
+		<input onclick="removeEditor();" type="button" value="Remove Editor" />
+	</p>
+	<!-- This div will hold the editor. -->
+	<div id="editor">
+	</div>
+	<div id="contents" style="display: none">
 		<p>
-			<input type="button" value="Create Editor" onclick="createEditor();" />
-			<input type="button" value="Remove Editor" onclick="removeEditor();" />
-		</p>
-		<div id="editor">
-		</div>
-		<div id="contents" style="display: none">
-			<p>Edited Contents:</p>
-			<div id="editorcontents"></div>
+			Edited Contents:</p>
+		<!-- This div will be used to display the editor contents. -->
+		<div id="editorcontents">
 		</div>
 	</div>
-	<div id="code">
-		<pre></pre>
+	<div id="footer">
+		<hr />
+		<p>
+			CKEditor - The text editor for Internet - <a href="http://ckeditor.com/">http://ckeditor.com</a>
+		</p>
+		<p id="copy">
+			Copyright &copy; 2003-2009, <a href="http://cksource.com/">CKSource</a> - Frederico
+			Knabben. All rights reserved.
+		</p>
 	</div>
 </body>
Index: /CKEditor/trunk/_samples/api.html
===================================================================
--- /CKEditor/trunk/_samples/api.html	(revision 4850)
+++ /CKEditor/trunk/_samples/api.html	(revision 4851)
@@ -6,7 +6,14 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-	<title>API usage - CKEditor Sample</title>
-	<script type="text/javascript" src="sample.js"></script>
-	<script id="headscript" type="text/javascript">
+	<title>Sample - CKEditor</title>
+	<meta content="text/html; charset=utf-8" http-equiv="content-type" />
+	<!-- CKReleaser %REMOVE_LINE%
+	<script type="text/javascript" src="../ckeditor.js"></script>
+	CKReleaser %REMOVE_START% -->
+	<script type="text/javascript" src="../ckeditor_source.js"></script>
+	<!-- CKReleaser %REMOVE_END% -->
+	<script src="sample.js" type="text/javascript"></script>
+	<link href="sample.css" rel="stylesheet" type="text/css" />
+	<script type="text/javascript">
 	//<![CDATA[
 
@@ -14,26 +21,26 @@
 // its initialization.
 CKEDITOR.on( 'instanceReady', function( ev )
-	{
-		// Show the editor name and description in the browser status bar.
-		document.getElementById('eMessage').innerHTML = '<p>Instance "' + ev.editor.name + '" loaded.<\/p>' ;
+{
+	// Show the editor name and description in the browser status bar.
+	document.getElementById( 'eMessage' ).innerHTML = '<p>Instance "' + ev.editor.name + '" loaded.<\/p>';
 
-		// Show this sample buttons.
-		document.getElementById('eButtons').style.visibility = '' ;
-	});
+	// Show this sample buttons.
+	document.getElementById( 'eButtons' ).style.visibility = '';
+});
 
 function InsertHTML()
 {
 	// Get the editor instance that we want to interact with.
-	var oEditor = CKEDITOR.instances.editor1 ;
-	var value = document.getElementById( 'plainArea' ).value ;
+	var oEditor = CKEDITOR.instances.editor1;
+	var value = document.getElementById( 'plainArea' ).value;
 
 	// Check the active editing mode.
-	if (oEditor.mode == 'wysiwyg' )
+	if ( oEditor.mode == 'wysiwyg' )
 	{
 		// Insert the desired HTML.
-		oEditor.insertHtml( value ) ;
+		oEditor.insertHtml( value );
 	}
 	else
-		alert( 'You must be on WYSIWYG mode!' ) ;
+		alert( 'You must be on WYSIWYG mode!' );
 }
 
@@ -41,9 +48,9 @@
 {
 	// Get the editor instance that we want to interact with.
-	var oEditor = CKEDITOR.instances.editor1 ;
-	var value = document.getElementById( 'plainArea' ).value ;
+	var oEditor = CKEDITOR.instances.editor1;
+	var value = document.getElementById( 'plainArea' ).value;
 
 	// Set the editor contents (replace the actual one).
-	oEditor.setData( value ) ;
+	oEditor.setData( value );
 }
 
@@ -51,23 +58,23 @@
 {
 	// Get the editor instance that we want to interact with.
-	var oEditor = CKEDITOR.instances.editor1 ;
+	var oEditor = CKEDITOR.instances.editor1;
 
 	// Get the editor contents
-	alert( oEditor.getData() ) ;
+	alert( oEditor.getData() );
 }
 
-function ExecuteCommand( commandName )
+function ExecuteCommand(commandName)
 {
 	// Get the editor instance that we want to interact with.
-	var oEditor = CKEDITOR.instances.editor1 ;
+	var oEditor = CKEDITOR.instances.editor1;
 
 	// Check the active editing mode.
-	if (oEditor.mode == 'wysiwyg' )
+	if ( oEditor.mode == 'wysiwyg' )
 	{
 		// Execute the command.
-		oEditor.execCommand( commandName ) ;
+		oEditor.execCommand( commandName );
 	}
 	else
-		alert( 'You must be on WYSIWYG mode!' ) ;
+		alert( 'You must be on WYSIWYG mode!' );
 }
 
@@ -75,6 +82,6 @@
 {
 	// Get the editor instance that we want to interact with.
-	var oEditor = CKEDITOR.instances.editor1 ;
-	alert( oEditor.checkDirty() ) ;
+	var oEditor = CKEDITOR.instances.editor1;
+	alert( oEditor.checkDirty() );
 }
 
@@ -82,44 +89,67 @@
 {
 	// Get the editor instance that we want to interact with.
-	var oEditor = CKEDITOR.instances.editor1 ;
-	oEditor.resetDirty() ;
-	alert( 'The "IsDirty" status has been reset' ) ;
+	var oEditor = CKEDITOR.instances.editor1;
+	oEditor.resetDirty();
+	alert( 'The "IsDirty" status has been reset' );
 }
 
 	//]]>
 	</script>
+
 </head>
 <body>
-	<div id="html">
-		<form action="sample_posteddata.php" method="post">
+	<h1>
+		CKEditor Sample
+	</h1>
+	<!-- This <div> holds alert messages to be display in the sample page. -->
+	<div id="alerts">
+		<noscript>
+			<p>
+				<strong>CKEditor requires JavaScript to run</strong>. In a browser with no JavaScript
+				support, like yours, you should still see the contents (HTML data) and you should
+				be able to edit it normally, without a rich editor interface.
+			</p>
+		</noscript>
+	</div>
+	<form action="sample_posteddata.php" method="post">
 		<p>
-		This sample shows how to use the CKeditor JavaScript API to interact with the editor
-		at runtime.</p>
-		<textarea id="editor1" name="editor1" rows="10" cols="80">&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;</textarea>
+			This sample shows how to use the CKeditor JavaScript API to interact with the editor
+			at runtime.</p>
+		<textarea cols="80" id="editor1" name="editor1" rows="10">&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;</textarea>
+
 		<script type="text/javascript">
 		//<![CDATA[
 			// Replace the <textarea id="editor1"> with an CKEditor instance.
-			var editor = CKEDITOR.replace( 'editor1');
+			var editor = CKEDITOR.replace( 'editor1' );
 		//]]>
 		</script>
+
 		<div id="eMessage">
-
 		</div>
 		<div id="eButtons" style="visibility: hidden">
-			<input type="button" value="Insert HTML" onclick="InsertHTML();" />
-			<input type="button" value="Set Editor Contents" onclick="SetContents();" />
-			<input type="button" value="Get Editor Contents (XHTML)" onclick="GetContents();" />
+			<input onclick="InsertHTML();" type="button" value="Insert HTML" />
+			<input onclick="SetContents();" type="button" value="Set Editor Contents" />
+			<input onclick="GetContents();" type="button" value="Get Editor Contents (XHTML)" />
 			<br />
-			<textarea id="plainArea" cols="80" rows="3">&lt;h2&gt;Test&lt;/h2&gt;&lt;p&gt;This is some &lt;a href="/Test1.html"&gt;sample&lt;/a&gt; HTML&lt;/p&gt;</textarea>
+			<textarea cols="80" id="plainArea" rows="3">&lt;h2&gt;Test&lt;/h2&gt;&lt;p&gt;This is some &lt;a href="/Test1.html"&gt;sample&lt;/a&gt; HTML&lt;/p&gt;</textarea>
 			<br />
 			<br />
-			<input type="button" value='Execute "bold" Command' onclick="ExecuteCommand('bold');" />
-			<input type="button" value='Execute "link" Command' onclick="ExecuteCommand('link');" />
-		<br />
-		<br />
-		<input type="button" value="checkDirty()" onclick="CheckDirty();" />
-		<input type="button" value="resetDirty()" onclick="ResetDirty();" />
+			<input onclick="ExecuteCommand('bold');" type="button" value="Execute &quot;bold&quot; Command" />
+			<input onclick="ExecuteCommand('link');" type="button" value="Execute &quot;link&quot; Command" />
+			<br />
+			<br />
+			<input onclick="CheckDirty();" type="button" value="checkDirty()" />
+			<input onclick="ResetDirty();" type="button" value="resetDirty()" />
 		</div>
-		</form>
+	</form>
+	<div id="footer">
+		<hr />
+		<p>
+			CKEditor - The text editor for Internet - <a href="http://ckeditor.com/">http://ckeditor.com</a>
+		</p>
+		<p id="copy">
+			Copyright &copy; 2003-2009, <a href="http://cksource.com/">CKSource</a> - Frederico
+			Knabben. All rights reserved.
+		</p>
 	</div>
 </body>
Index: /CKEditor/trunk/_samples/api_dialog.html
===================================================================
--- /CKEditor/trunk/_samples/api_dialog.html	(revision 4850)
+++ /CKEditor/trunk/_samples/api_dialog.html	(revision 4851)
@@ -6,20 +6,27 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-	<title>Replace Textarea by Code - CKEditor Sample</title>
-	<script type="text/javascript" src="sample.js"></script>
+	<title>Sample - CKEditor</title>
+	<meta content="text/html; charset=utf-8" http-equiv="content-type" />
+	<!-- CKReleaser %REMOVE_LINE%
+	<script type="text/javascript" src="../ckeditor.js"></script>
+	CKReleaser %REMOVE_START% -->
+	<script type="text/javascript" src="../ckeditor_source.js"></script>
+	<!-- CKReleaser %REMOVE_END% -->
+	<script src="sample.js" type="text/javascript"></script>
+	<link href="sample.css" rel="stylesheet" type="text/css" />
 	<style id="styles" type="text/css">
 
-.cke_button_myDialogCmd .cke_icon
-{
-	display : none !important;
-}
+		.cke_button_myDialogCmd .cke_icon
+		{
+			display: none !important;
+		}
 
-.cke_button_myDialogCmd .cke_label
-{
-	display : inline !important;
-}
+		.cke_button_myDialogCmd .cke_label
+		{
+			display: inline !important;
+		}
 
 	</style>
-	<script id="headscript" type="text/javascript">
+	<script type="text/javascript">
 	//<![CDATA[
 
@@ -90,21 +97,37 @@
 	//]]>
 	</script>
+
 </head>
 <body>
-	<div id="html">
-		<p>
-			This sample shows how to use the dialog API to customize dialogs whithout changing
-			the original editor code. The following customizations are being done::</p>
-		<ol>
-			<li><strong>Add dialog pages</strong> ("My Tab" in the Link dialog).</li>
-			<li><strong>Remove a dialog tab</strong> ("Target" tab from the Link dialog).</li>
-			<li><strong>Add dialog fields</strong> ("My Custom Field" into the Link dialog).</li>
-			<li><strong>Remove dialog fields</strong> ("Link Type" and "Browser Server" the Link dialog).</li>
-			<li><strong>Set default values for dialog fields</strong> (for the "URL" field in the
-				Link dialog). </li>
-			<li><strong>Create a custom dialog</strong> ("My Dialog" button).</li>
-		</ol>
-		<textarea id="editor1" name="editor1" rows="10" cols="80">&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;</textarea>
-		<script type="text/javascript">
+	<h1>
+		CKEditor Sample
+	</h1>
+	<!-- This <div> holds alert messages to be display in the sample page. -->
+	<div id="alerts">
+		<noscript>
+			<p>
+				<strong>CKEditor requires JavaScript to run</strong>. In a browser with no JavaScript
+				support, like yours, you should still see the contents (HTML data) and you should
+				be able to edit it normally, without a rich editor interface.
+			</p>
+		</noscript>
+	</div>
+	<!-- This <fieldset> holds the HTML that you will usually find in your
+	     pages. -->
+	<p>
+		This sample shows how to use the dialog API to customize dialogs whithout changing
+		the original editor code. The following customizations are being done::</p>
+	<ol>
+		<li><strong>Add dialog pages</strong> ("My Tab" in the Link dialog).</li>
+		<li><strong>Remove a dialog tab</strong> ("Target" tab from the Link dialog).</li>
+		<li><strong>Add dialog fields</strong> ("My Custom Field" into the Link dialog).</li>
+		<li><strong>Remove dialog fields</strong> ("Link Type" and "Browser Server" the Link
+			dialog).</li>
+		<li><strong>Set default values for dialog fields</strong> (for the "URL" field in the
+			Link dialog). </li>
+		<li><strong>Create a custom dialog</strong> ("My Dialog" button).</li>
+	</ol>
+	<textarea cols="80" id="editor1" name="editor1" rows="10">&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;</textarea>
+	<script type="text/javascript">
 		//<![CDATA[
 			// Replace the <textarea id="editor1"> with an CKEditor instance.
@@ -148,5 +171,14 @@
 				});
 		//]]>
-		</script>
+	</script>
+	<div id="footer">
+		<hr />
+		<p>
+			CKEditor - The text editor for Internet - <a href="http://ckeditor.com/">http://ckeditor.com</a>
+		</p>
+		<p id="copy">
+			Copyright &copy; 2003-2009, <a href="http://cksource.com/">CKSource</a> - Frederico
+			Knabben. All rights reserved.
+		</p>
 	</div>
 </body>
Index: /CKEditor/trunk/_samples/api_dialog/my_dialog.js
===================================================================
--- /CKEditor/trunk/_samples/api_dialog/my_dialog.js	(revision 4850)
+++ /CKEditor/trunk/_samples/api_dialog/my_dialog.js	(revision 4851)
@@ -1,3 +1,3 @@
-/*
+﻿/*
 Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/trunk/_samples/divreplace.html
===================================================================
--- /CKEditor/trunk/_samples/divreplace.html	(revision 4850)
+++ /CKEditor/trunk/_samples/divreplace.html	(revision 4851)
@@ -6,5 +6,13 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-	<title>Replace DIV - CKEditor Sample</title>
+	<title>Sample - CKEditor</title>
+	<meta content="text/html; charset=utf-8" http-equiv="content-type" />
+	<!-- CKReleaser %REMOVE_LINE%
+	<script type="text/javascript" src="../ckeditor.js"></script>
+	CKReleaser %REMOVE_START% -->
+	<script type="text/javascript" src="../ckeditor_source.js"></script>
+	<!-- CKReleaser %REMOVE_END% -->
+	<script src="sample.js" type="text/javascript"></script>
+	<link href="sample.css" rel="stylesheet" type="text/css" />
 	<style id="styles" type="text/css">
 
@@ -22,6 +30,5 @@
 
 	</style>
-	<script type="text/javascript" src="sample.js"></script>
-	<script id="headscript" type="text/javascript">
+	<script type="text/javascript">
 	//<![CDATA[
 
@@ -65,50 +72,69 @@
 	//]]>
 	</script>
+
 </head>
 <body>
-	<div id="html">
+	<h1>
+		CKEditor Sample
+	</h1>
+	<!-- This <div> holds alert messages to be display in the sample page. -->
+	<div id="alerts">
+		<noscript>
+			<p>
+				<strong>CKEditor requires JavaScript to run</strong>. In a browser with no JavaScript
+				support, like yours, you should still see the contents (HTML data) and you should
+				be able to edit it normally, without a rich editor interface.
+			</p>
+		</noscript>
+	</div>
+	<p>
+		Double-click on any of the following DIVs to transform them into editor instances.</p>
+	<div class="editable">
+		<h3>
+			Part 1</h3>
 		<p>
-			Double-click on any of the following DIVs to transform them into editor instances.</p>
-		<div class='editable'>
-			<h3>
-				Part 1</h3>
-			<p>
-				Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Cras et ipsum quis mi
-				semper accumsan. Integer pretium dui id massa. Suspendisse in nisl sit amet urna
-				rutrum imperdiet. Nulla eu tellus. Donec ante nisi, ullamcorper quis, fringilla
-				nec, sagittis eleifend, pede. Nulla commodo interdum massa. Donec id metus. Fusce
-				eu ipsum. Suspendisse auctor. Phasellus fermentum porttitor risus.
-			</p>
-		</div>
-		<div class='editable'>
-			<h3>
-				Part 2</h3>
-			<p>
-				Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Cras et ipsum quis mi
-				semper accumsan. Integer pretium dui id massa. Suspendisse in nisl sit amet urna
-				rutrum imperdiet. Nulla eu tellus. Donec ante nisi, ullamcorper quis, fringilla
-				nec, sagittis eleifend, pede. Nulla commodo interdum massa. Donec id metus. Fusce
-				eu ipsum. Suspendisse auctor. Phasellus fermentum porttitor risus.
-			</p>
-			<p>
-				Donec velit. Mauris massa. Vestibulum non nulla. Nam suscipit arcu nec elit. Phasellus
-				sollicitudin iaculis ante. Ut non mauris et sapien tincidunt adipiscing. Vestibulum
-				vitae leo. Suspendisse nec mi tristique nulla laoreet vulputate.
-			</p>
-		</div>
-		<div class='editable'>
-			<h3>
-				Part 3</h3>
-			<p>
-				Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Cras et ipsum quis mi
-				semper accumsan. Integer pretium dui id massa. Suspendisse in nisl sit amet urna
-				rutrum imperdiet. Nulla eu tellus. Donec ante nisi, ullamcorper quis, fringilla
-				nec, sagittis eleifend, pede. Nulla commodo interdum massa. Donec id metus. Fusce
-				eu ipsum. Suspendisse auctor. Phasellus fermentum porttitor risus.
-			</p>
-		</div>
+			Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Cras et ipsum quis mi
+			semper accumsan. Integer pretium dui id massa. Suspendisse in nisl sit amet urna
+			rutrum imperdiet. Nulla eu tellus. Donec ante nisi, ullamcorper quis, fringilla
+			nec, sagittis eleifend, pede. Nulla commodo interdum massa. Donec id metus. Fusce
+			eu ipsum. Suspendisse auctor. Phasellus fermentum porttitor risus.
+		</p>
 	</div>
-	<div id="code">
-		<pre></pre>
+	<div class="editable">
+		<h3>
+			Part 2</h3>
+		<p>
+			Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Cras et ipsum quis mi
+			semper accumsan. Integer pretium dui id massa. Suspendisse in nisl sit amet urna
+			rutrum imperdiet. Nulla eu tellus. Donec ante nisi, ullamcorper quis, fringilla
+			nec, sagittis eleifend, pede. Nulla commodo interdum massa. Donec id metus. Fusce
+			eu ipsum. Suspendisse auctor. Phasellus fermentum porttitor risus.
+		</p>
+		<p>
+			Donec velit. Mauris massa. Vestibulum non nulla. Nam suscipit arcu nec elit. Phasellus
+			sollicitudin iaculis ante. Ut non mauris et sapien tincidunt adipiscing. Vestibulum
+			vitae leo. Suspendisse nec mi tristique nulla laoreet vulputate.
+		</p>
+	</div>
+	<div class="editable">
+		<h3>
+			Part 3</h3>
+		<p>
+			Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Cras et ipsum quis mi
+			semper accumsan. Integer pretium dui id massa. Suspendisse in nisl sit amet urna
+			rutrum imperdiet. Nulla eu tellus. Donec ante nisi, ullamcorper quis, fringilla
+			nec, sagittis eleifend, pede. Nulla commodo interdum massa. Donec id metus. Fusce
+			eu ipsum. Suspendisse auctor. Phasellus fermentum porttitor risus.
+		</p>
+	</div>
+	<div id="footer">
+		<hr />
+		<p>
+			CKEditor - The text editor for Internet - <a href="http://ckeditor.com/">http://ckeditor.com</a>
+		</p>
+		<p id="copy">
+			Copyright &copy; 2003-2009, <a href="http://cksource.com/">CKSource</a> - Frederico
+			Knabben. All rights reserved.
+		</p>
 	</div>
 </body>
Index: /CKEditor/trunk/_samples/enterkey.html
===================================================================
--- /CKEditor/trunk/_samples/enterkey.html	(revision 4850)
+++ /CKEditor/trunk/_samples/enterkey.html	(revision 4851)
@@ -6,7 +6,14 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-	<title>ENTER Key Configuration - CKEditor Sample</title>
-	<script type="text/javascript" src="sample.js"></script>
-	<script id="headscript" type="text/javascript">
+	<title>Sample - CKEditor</title>
+	<meta content="text/html; charset=utf-8" http-equiv="content-type" />
+	<!-- CKReleaser %REMOVE_LINE%
+	<script type="text/javascript" src="../ckeditor.js"></script>
+	CKReleaser %REMOVE_START% -->
+	<script type="text/javascript" src="../ckeditor_source.js"></script>
+	<!-- CKReleaser %REMOVE_END% -->
+	<script src="sample.js" type="text/javascript"></script>
+	<link href="sample.css" rel="stylesheet" type="text/css" />
+	<script type="text/javascript">
 	//<![CDATA[
 
@@ -33,43 +40,52 @@
 </head>
 <body>
-	<!--
-		The values in the select boxes represent the contants taht can be used
-		to configure the enter key. You can use the constants directly instead
-		of their numeric values:
-			- CKEDITOR.ENTER_P		= 1;
-			- CKEDITOR.ENTER_BR		= 2;
-			- CKEDITOR.ENTER_DIV	= 3;
-	-->
-	<div id="html">
-		<div style="float: left; margin-right: 20px">
-			When ENTER is pressed:<br />
-			<select id="xEnter" onchange="changeEnter();">
-				<option value="1" selected="selected">Create new &lt;P&gt; (recommended)</option>
-				<option value="3">Create new &lt;DIV&gt;</option>
-				<option value="2">Break the line with a &lt;BR&gt;</option>
-			</select>
-		</div>
-		<div style="float: left">
-			When SHIFT + ENTER is pressed:<br />
-			<select id="xShiftEnter" onchange="changeEnter();">
-				<option value="1">Create new &lt;P&gt;</option>
-				<option value="3">Create new &lt;DIV&gt;</option>
-				<option value="2" selected="selected">Break the line with a &lt;BR&gt; (recommended)</option>
-			</select>
-		</div>
-		<br style="clear: both" />
-
-		<form action="sample_posteddata.php" method="post">
+	<h1>
+		CKEditor Sample
+	</h1>
+	<!-- This <div> holds alert messages to be display in the sample page. -->
+	<div id="alerts">
+		<noscript>
 			<p>
-				<br />
-				<textarea id="editor1" name="editor1" rows="10" cols="80">This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.</textarea>
+				<strong>CKEditor requires JavaScript to run</strong>. In a browser with no JavaScript
+				support, like yours, you should still see the contents (HTML data) and you should
+				be able to edit it normally, without a rich editor interface.
 			</p>
-			<p>
-				<input type="submit" value="Submit" />
-			</p>
-		</form>
+		</noscript>
 	</div>
-	<div id="code">
-		<pre></pre>
+	<div style="float: left; margin-right: 20px">
+		When ENTER is pressed:<br />
+		<select id="xEnter" onchange="changeEnter();">
+			<option selected="selected" value="1">Create new &lt;P&gt; (recommended)</option>
+			<option value="3">Create new &lt;DIV&gt;</option>
+			<option value="2">Break the line with a &lt;BR&gt;</option>
+		</select>
+	</div>
+	<div style="float: left">
+		When SHIFT + ENTER is pressed:<br />
+		<select id="xShiftEnter" onchange="changeEnter();">
+			<option value="1">Create new &lt;P&gt;</option>
+			<option value="3">Create new &lt;DIV&gt;</option>
+			<option selected="selected" value="2">Break the line with a &lt;BR&gt; (recommended)</option>
+		</select>
+	</div>
+	<br style="clear: both" />
+	<form action="sample_posteddata.php" method="post">
+		<p>
+			<br />
+			<textarea cols="80" id="editor1" name="editor1" rows="10">This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.</textarea>
+		</p>
+		<p>
+			<input type="submit" value="Submit" />
+		</p>
+	</form>
+	<div id="footer">
+		<hr />
+		<p>
+			CKEditor - The text editor for Internet - <a href="http://ckeditor.com/">http://ckeditor.com</a>
+		</p>
+		<p id="copy">
+			Copyright &copy; 2003-2009, <a href="http://cksource.com/">CKSource</a> - Frederico
+			Knabben. All rights reserved.
+		</p>
 	</div>
 </body>
Index: /CKEditor/trunk/_samples/fullpage.html
===================================================================
--- /CKEditor/trunk/_samples/fullpage.html	(revision 4850)
+++ /CKEditor/trunk/_samples/fullpage.html	(revision 4851)
@@ -6,35 +6,60 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-	<title>Full Page Editing - CKEditor Sample</title>
-	<script type="text/javascript" src="sample.js"></script>
+	<title>Sample - CKEditor</title>
+	<meta content="text/html; charset=utf-8" http-equiv="content-type" />
+	<!-- CKReleaser %REMOVE_LINE%
+	<script type="text/javascript" src="../ckeditor.js"></script>
+	CKReleaser %REMOVE_START% -->
+	<script type="text/javascript" src="../ckeditor_source.js"></script>
+	<!-- CKReleaser %REMOVE_END% -->
+	<script src="sample.js" type="text/javascript"></script>
+	<link href="sample.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-	<div id="html">
-		<form action="sample_posteddata.php" method="post">
+	<h1>
+		CKEditor Sample
+	</h1>
+	<!-- This <div> holds alert messages to be display in the sample page. -->
+	<div id="alerts">
+		<noscript>
 			<p>
-				In this sample the editor is configured to edit entire HTML pages, from the
-				&lt;html&gt; tag to &lt;/html&gt;.</p>
-			<p>
-				<label for="editor1">
-					Editor 1:</label><br />
-				<textarea id="editor1" name="editor1" rows="10" cols="80">&lt;html&gt;&lt;head&gt;&lt;title&gt;CKEditor Sample&lt;/title&gt;&lt;/head&gt;&lt;body&gt;&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</textarea>
-				<script type="text/javascript">
-				//<![CDATA[
+				<strong>CKEditor requires JavaScript to run</strong>. In a browser with no JavaScript
+				support, like yours, you should still see the contents (HTML data) and you should
+				be able to edit it normally, without a rich editor interface.
+			</p>
+		</noscript>
+	</div>
+	<form action="sample_posteddata.php" method="post">
+		<p>
+			In this sample the editor is configured to edit entire HTML pages, from the &lt;html&gt;
+			tag to &lt;/html&gt;.</p>
+		<p>
+			<label for="editor1">
+				Editor 1:</label><br />
+			<textarea cols="80" id="editor1" name="editor1" rows="10">&lt;html&gt;&lt;head&gt;&lt;title&gt;CKEditor Sample&lt;/title&gt;&lt;/head&gt;&lt;body&gt;&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</textarea>
+			<script type="text/javascript">
+			//<![CDATA[
 
-					CKEDITOR.replace( 'editor1',
-						{
-							fullPage : true
-						});
+				CKEDITOR.replace( 'editor1',
+					{
+						fullPage : true
+					});
 
-				//]]>
-				</script>
-			</p>
-			<p>
-				<input type="submit" value="Submit" />
-			</p>
-		</form>
-	</div>
-	<div id="code">
-		<pre></pre>
+			//]]>
+			</script>
+		</p>
+		<p>
+			<input type="submit" value="Submit" />
+		</p>
+	</form>
+	<div id="footer">
+		<hr />
+		<p>
+			CKEditor - The text editor for Internet - <a href="http://ckeditor.com/">http://ckeditor.com</a>
+		</p>
+		<p id="copy">
+			Copyright &copy; 2003-2009, <a href="http://cksource.com/">CKSource</a> - Frederico
+			Knabben. All rights reserved.
+		</p>
 	</div>
 </body>
Index: /CKEditor/trunk/_samples/jqueryadapter.html
===================================================================
--- /CKEditor/trunk/_samples/jqueryadapter.html	(revision 4850)
+++ /CKEditor/trunk/_samples/jqueryadapter.html	(revision 4851)
@@ -6,62 +6,72 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-	<title>jQuery adapter - CKEditor Sample</title>
+	<title>Sample - CKEditor</title>
+	<meta content="text/html; charset=utf-8" http-equiv="content-type" />
 	<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1/jquery.js"></script>
-<!-- CKReleaser %REMOVE_LINE%
+	<!-- CKReleaser %REMOVE_LINE%
 	<script type="text/javascript" src="../ckeditor.js"></script>
 	<script type="text/javascript" src="../adapters/jquery.js"></script>
-CKReleaser %REMOVE_START% -->
+	CKReleaser %REMOVE_START% -->
 	<script type="text/javascript" src="../ckeditor_source.js"></script>
 	<script type="text/javascript" src="../_source/adapters/jquery.js"></script>
-<!-- CKReleaser %REMOVE_END% -->
+	<!-- CKReleaser %REMOVE_END% -->
+	<script src="sample.js" type="text/javascript"></script>
+	<link href="sample.css" rel="stylesheet" type="text/css" />
 	<script type="text/javascript">
-		$( function()
-		{
-			var config = {
-				toolbar :
-				[
-					[ 'Bold', 'Italic', '-', 'NumberedList', 'BulletedList', '-', 'Link', 'Unlink' ],
-					[ 'UIColor' ]
-				]
-			};
+	//<![CDATA[
 
-			// Initialize the editor.
-			// Callback function can be passed and executed after full instance creation.
-			$( '.jquery_ckeditor' ).ckeditor( config );
-		} );
+$(function()
+{
+	var config = {
+		toolbar:
+		[
+			['Bold', 'Italic', '-', 'NumberedList', 'BulletedList', '-', 'Link', 'Unlink'],
+			['UIColor']
+		]
+	};
+
+	// Initialize the editor.
+	// Callback function can be passed and executed after full instance creation.
+	$('.jquery_ckeditor').ckeditor(config);
+});
+
+	//]]>
 	</script>
 </head>
 <body>
-	<div id="html">
-		<form action="sample_posteddata.php" method="post">
+	<h1>
+		CKEditor Sample
+	</h1>
+	<!-- This <div> holds alert messages to be display in the sample page. -->
+	<div id="alerts">
+		<noscript>
 			<p>
-				<label for="editor1">
-					Editor 1:</label><br />
-				<textarea id="editor1" name="editor1" class="jquery_ckeditor" rows="10" cols="80">&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://www.fckeditor.net/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;</textarea>
+				<strong>CKEditor requires JavaScript to run</strong>. In a browser with no JavaScript
+				support, like yours, you should still see the contents (HTML data) and you should
+				be able to edit it normally, without a rich editor interface.
 			</p>
-			<p>
-				<input type="submit" value="Submit" />
-			</p>
-		</form>
+		</noscript>
 	</div>
-	<div id="code">
-		<pre>
-&lt;script type=&quot;text/javascript&quot;&gt;
-	$( function()
-	{
-		$( '.jquery_ckeditor' ).<b>ckeditor()</b>;
-	} );
-&lt;/script&gt;
-		</pre>
-		<pre>
-&lt;form action=""&gt;
-  &lt;p&gt;
-    &lt;label for="editor1"&gt;
-      Editor 1:&lt;/label&gt;&lt;br /&gt;
-    &lt;textarea id="editor1" name="editor1" <b>class="jquery_ckeditor"</b> rows="10" cols="80"&gt;&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://www.fckeditor.net/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;&lt;/textarea&gt;
-  &lt;/p&gt;
-  &lt;p&gt;
-&lt;/form&gt;
-</pre>
+	<!-- This <fieldset> holds the HTML that you will usually find in your
+	     pages. -->
+	<form action="sample_posteddata.php" method="post">
+	<p>
+		<label for="editor1">
+			Editor 1:</label><br />
+		<textarea class="jquery_ckeditor" cols="80" id="editor1" name="editor1" rows="10">&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;</textarea>
+	</p>
+	<p>
+		<input type="submit" value="Submit" />
+	</p>
+	</form>
+	<div id="footer">
+		<hr />
+		<p>
+			CKEditor - The text editor for Internet - <a href="http://ckeditor.com/">http://ckeditor.com</a>
+		</p>
+		<p id="copy">
+			Copyright &copy; 2003-2009, <a href="http://cksource.com/">CKSource</a> - Frederico
+			Knabben. All rights reserved.
+		</p>
 	</div>
 </body>
Index: /CKEditor/trunk/_samples/replacebyclass.html
===================================================================
--- /CKEditor/trunk/_samples/replacebyclass.html	(revision 4850)
+++ /CKEditor/trunk/_samples/replacebyclass.html	(revision 4851)
@@ -1,3 +1,3 @@
-﻿<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--
 Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
@@ -6,38 +6,47 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-	<title>Replace Textareas by Class Name - CKEditor Sample</title>
-	<script type="text/javascript" src="sample.js"></script>
+	<title>Sample - CKEditor</title>
+	<meta content="text/html; charset=utf-8" http-equiv="content-type" />
+	<!-- CKReleaser %REMOVE_LINE%
+	<script type="text/javascript" src="../ckeditor.js"></script>
+	CKReleaser %REMOVE_START% -->
+	<script type="text/javascript" src="../ckeditor_source.js"></script>
+	<!-- CKReleaser %REMOVE_END% -->
+	<script src="sample.js" type="text/javascript"></script>
+	<link href="sample.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-	<div id="html">
-		<form action="sample_posteddata.php" method="post">
+	<h1>
+		CKEditor Sample
+	</h1>
+	<!-- This <div> holds alert messages to be display in the sample page. -->
+	<div id="alerts">
+		<noscript>
 			<p>
-				<label for="editor1">
-					Editor 1:</label><br />
-				<textarea id="editor1" name="editor1" class="ckeditor" rows="10" cols="80">&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;</textarea>
+				<strong>CKEditor requires JavaScript to run</strong>. In a browser with no JavaScript
+				support, like yours, you should still see the contents (HTML data) and you should
+				be able to edit it normally, without a rich editor interface.
 			</p>
-			<p>
-				<input type="submit" value="Submit" />
-			</p>
-		</form>
+		</noscript>
 	</div>
-	<div id="code">
-		<pre>
-&lt;form action=""&gt;
-  &lt;p&gt;
-    &lt;label for="editor1"&gt;
-      Editor 1:&lt;/label&gt;&lt;br /&gt;
-    &lt;textarea id="editor1" name="editor1" <b>class="ckeditor"</b> rows="10" cols="80"&gt;&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;&lt;/textarea&gt;
-  &lt;/p&gt;
-  &lt;p&gt;
-    &lt;label for="editor2"&gt;
-      Editor 2:&lt;/label&gt;&lt;br /&gt;
-    &lt;textarea id="editor2" name="editor2" <b>class="ckeditor"</b> rows="10" cols="80"&gt;&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;&lt;/textarea&gt;
-  &lt;/p&gt;
-  &lt;p&gt;
-    &lt;input type="submit" value="Submit" /&gt;
-  &lt;/p&gt;
-&lt;/form&gt;
-</pre>
+	<form action="sample_posteddata.php" method="post">
+		<p>
+			<label for="editor1">
+				Editor 1:</label><br />
+			<textarea class="ckeditor" cols="80" id="editor1" name="editor1" rows="10">&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;</textarea>
+		</p>
+		<p>
+			<input type="submit" value="Submit" />
+		</p>
+	</form>
+	<div id="footer">
+		<hr />
+		<p>
+			CKEditor - The text editor for Internet - <a href="http://ckeditor.com/">http://ckeditor.com</a>
+		</p>
+		<p id="copy">
+			Copyright &copy; 2003-2009, <a href="http://cksource.com/">CKSource</a> - Frederico
+			Knabben. All rights reserved.
+		</p>
 	</div>
 </body>
Index: /CKEditor/trunk/_samples/replacebycode.html
===================================================================
--- /CKEditor/trunk/_samples/replacebycode.html	(revision 4850)
+++ /CKEditor/trunk/_samples/replacebycode.html	(revision 4851)
@@ -6,71 +6,78 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-	<title>Replace Textarea by Code - CKEditor Sample</title>
-	<script type="text/javascript" src="sample.js"></script>
+	<title>Sample - CKEditor</title>
+	<meta content="text/html; charset=utf-8" http-equiv="content-type" />
+	<!-- CKReleaser %REMOVE_LINE%
+	<script type="text/javascript" src="../ckeditor.js"></script>
+	CKReleaser %REMOVE_START% -->
+	<script type="text/javascript" src="../ckeditor_source.js"></script>
+	<!-- CKReleaser %REMOVE_END% -->
+	<script src="sample.js" type="text/javascript"></script>
+	<link href="sample.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-	<div id="html">
-		<form action="sample_posteddata.php" method="post">
+	<h1>
+		CKEditor Sample
+	</h1>
+	<!-- This <div> holds alert messages to be display in the sample page. -->
+	<div id="alerts">
+		<noscript>
 			<p>
-				<label for="editor1">
-					Editor 1:</label><br />
-				<textarea id="editor1" name="editor1" rows="10" cols="80">&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;</textarea>
-				<script type="text/javascript">
-				//<![CDATA[
+				<strong>CKEditor requires JavaScript to run</strong>. In a browser with no JavaScript
+				support, like yours, you should still see the contents (HTML data) and you should
+				be able to edit it normally, without a rich editor interface.
+			</p>
+		</noscript>
+	</div>
+	<form action="sample_posteddata.php" method="post">
+		<p>
+			<label for="editor1">
+				Editor 1:</label><br />
+			<textarea cols="80" id="editor1" name="editor1" rows="10">&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;</textarea>
+			<script type="text/javascript">
+			//<![CDATA[
 
-					// This call can be placed at any point after the
-					// <textarea>, or inside a <head><script> in a
-					// window.onload event handler.
+				// This call can be placed at any point after the
+				// <textarea>, or inside a <head><script> in a
+				// window.onload event handler.
 
-					// Replace the <textarea id="editor"> with an CKEditor
-					// instance, using default configurations.
-					CKEDITOR.replace( 'editor1' );
+				// Replace the <textarea id="editor"> with an CKEditor
+				// instance, using default configurations.
+				CKEDITOR.replace( 'editor1' );
 
-				//]]>
-				</script>
-			</p>
-			<p>
-				<label for="editor2">
-					Editor 2:</label><br />
-				<textarea id="editor2" name="editor2" rows="10" cols="80">&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;</textarea>
-				<script type="text/javascript">
-				//<![CDATA[
+			//]]>
+			</script>
+		</p>
+		<p>
+			<label for="editor2">
+				Editor 2:</label><br />
+			<textarea cols="80" id="editor2" name="editor2" rows="10">&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;</textarea>
+			<script type="text/javascript">
+			//<![CDATA[
 
-					// This call can be placed at any point after the
-					// <textarea>, or inside a <head><script> in a
-					// window.onload event handler.
+				// This call can be placed at any point after the
+				// <textarea>, or inside a <head><script> in a
+				// window.onload event handler.
 
-					// Replace the <textarea id="editor"> with an CKEditor
-					// instance, using default configurations.
-					CKEDITOR.replace( 'editor2' );
+				// Replace the <textarea id="editor"> with an CKEditor
+				// instance, using default configurations.
+				CKEDITOR.replace( 'editor2' );
 
-				//]]>
-				</script>
-			</p>
-			<p>
-				<input type="submit" value="Submit" />
-			</p>
-		</form>
-	</div>
-	<div id="code">
-		<pre>
-&lt;form action=""&gt;
-  &lt;p&gt;
-    &lt;label for="editor1"&gt;
-      Editor 1:&lt;/label&gt;&lt;br /&gt;
-    &lt;textarea <b>name="editor1"</b> rows="10" cols="80"&gt;&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;&lt;/textarea&gt;
-    &lt;script type="text/javascript"&gt;
-    //&lt;![CDATA[
-
-      <b>CKEDITOR.replace( 'editor1' );</b>
-
-    //]]&gt;
-    &lt;/script&gt;
-  &lt;/p&gt;
-  &lt;p&gt;
-    &lt;input type="submit" value="Submit" /&gt;
-  &lt;/p&gt;
-&lt;/form&gt;
-</pre>
+			//]]>
+			</script>
+		</p>
+		<p>
+			<input type="submit" value="Submit" />
+		</p>
+	</form>
+	<div id="footer">
+		<hr />
+		<p>
+			CKEditor - The text editor for Internet - <a href="http://ckeditor.com/">http://ckeditor.com</a>
+		</p>
+		<p id="copy">
+			Copyright &copy; 2003-2009, <a href="http://cksource.com/">CKSource</a> - Frederico
+			Knabben. All rights reserved.
+		</p>
 	</div>
 </body>
Index: /CKEditor/trunk/_samples/sample.css
===================================================================
--- /CKEditor/trunk/_samples/sample.css	(revision 4850)
+++ /CKEditor/trunk/_samples/sample.css	(revision 4851)
@@ -1,3 +1,3 @@
-﻿/*
+/*
 Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
Index: Editor/trunk/_samples/sample.html
===================================================================
--- /CKEditor/trunk/_samples/sample.html	(revision 4850)
+++ 	(revision )
@@ -1,82 +1,0 @@
-﻿<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!--
-Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.html or http://ckeditor.com/license
--->
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>Sample - CKEditor</title>
-	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<!-- CKReleaser %REMOVE_LINE%
-	<script type="text/javascript" src="../ckeditor.js"></script>
-CKReleaser %REMOVE_START% -->
-	<script type="text/javascript" src="../ckeditor_source.js"></script>
-	<script type="text/javascript">
-	//<![CDATA[
-
-// Loaded dependencies of sample.js.
-CKEDITOR.loader.load( 'core/ajax' );
-CKEDITOR.loader.load( 'core/env' );
-
-	//]]>
-	</script>
-<!--
-	## Uncomment this if loading the "basic" version.
-
-	<script type="text/javascript" src="../_source/core/loader.js"></script>
-	<script type="text/javascript">
-	//<![CDATA[
-
-// Loaded dependencies of sample.js.
-CKEDITOR.loader.load( 'core/ajax' );
-CKEDITOR.loader.load( 'core/env' );
-
-	//]]>
-	</script>
--->
-<!-- CKReleaser %REMOVE_END% -->
-	<script type="text/javascript" src="sample.js"></script>
-	<link type="text/css" rel="stylesheet" href="sample.css" />
-	<script id="styles" type="text/javascript">
-	//<![CDATA[
-		document.write( CKEDITOR.samples.styles );
-	//]]>
-	</script>
-	<script id="headscript" type="text/javascript">
-	//<![CDATA[
-		document.write( CKEDITOR.samples.headScript );
-	//]]>
-	</script>
-</head>
-<body>
-	<h1>
-		CKEditor Sample
-	</h1>
-	<!-- This <div> holds alert messages to be display in the sample page. -->
-	<div id="alerts">
-		<noscript>
-			<p>
-				<strong>CKEditor requires JavaScript to run</strong>. In a browser with no JavaScript
-				support, like yours, you should still see the contents (HTML data) and you should
-				be able to edit it normally, without a rich editor interface.
-			</p>
-		</noscript>
-	</div>
-	<!-- This <fieldset> holds the HTML that you will usually find in your
-	     pages. -->
-	<script id="html" type="text/javascript">
-	//<![CDATA[
-		document.write( CKEDITOR.samples.htmlData );
-	//]]>
-	</script>
-	<div id="footer">
-		<hr />
-		<p>
-			CKEditor - The text editor for Internet - <a href="http://ckeditor.com/">http://ckeditor.com</a>
-		</p>
-		<p id="copy">
-			Copyright &copy; 2003-2009, <a href="http://cksource.com/">CKSource</a> - Frederico Knabben. All rights reserved.
-		</p>
-	</div>
-</body>
-</html>
Index: /CKEditor/trunk/_samples/sample.js
===================================================================
--- /CKEditor/trunk/_samples/sample.js	(revision 4850)
+++ /CKEditor/trunk/_samples/sample.js	(revision 4851)
@@ -7,76 +7,7 @@
 // It is just a helper file that displays a red message about browser compatibility
 // at the top of the samples (if incompatible browser is detected).
-// %REMOVE_START%
-// In the SVN version of CKEditor, it does some more magic, for example it
-// redirects all samples to the sample.html file. It still can be ignored anyway.
-// %REMOVE_END%
-
-// Firebug has been presented some bugs with console. It must be "initialized"
-// before the page load to work.
-// FIXME: Remove the following in the future, if Firebug gets fixed.
-if ( typeof console != 'undefined' )
-	console.log();
-
-// %REMOVE_START%
-(function()
-{
-	// The sample##.html files also include this script. We don't want them to
-	// run, so we redirect to the samples.html page, passing the correct
-	// querystring parameter to load the desired page.
-
-	var sampleMatch = window.location.pathname.match( /[\/\\]([^\/\\]+).html/ );
-	if ( sampleMatch && sampleMatch[1] != 'sample' )
-		window.location = 'sample.html?sample=' + sampleMatch[1] + ( location.search.length > 1 ? '&' + location.search.substr(1) : '' );
-})();
-// %REMOVE_END%
 
 if ( window.CKEDITOR )
 {
-// %REMOVE_START%
-	CKEDITOR.samples = (function()
-	{
-		var ajax = CKEDITOR.ajax;
-
-		// Default values for the CKEDITOR.samples properties.
-		var samples =
-		{
-			htmlData : '<p>No HTML data available.</p>',
-			codeData : '<p>No code data available.</p>'
-		};
-
-		if ( /[?&]sample=[^&]+/.test( document.location.search ) )
-		{
-			var currentSample = document.location.search.match( /[?&]sample=([^&]+)/ )[1];
-			var sampleData = ajax.loadXml( CKEDITOR.getUrl( '_samples/' + currentSample + '.html' ) );
-
-			if ( sampleData )
-			{
-				var getNodeHtml = function ( id )
-				{
-					return sampleData.getInnerXml( '//*[@id="' + id + '"]' );
-				};
-
-				samples.headScript	= getNodeHtml( 'headscript' ) || '';
-				samples.styles		= getNodeHtml( 'styles' ) || '';
-				samples.htmlData	= getNodeHtml( 'html' ) || '';
-				samples.codeData	= getNodeHtml( 'code' ) || '';
-
-				if ( samples.headScript )
-					samples.headScript = '<script id="headscript" type="text/javascript">' + samples.headScript + '</script>';
-
-				if ( samples.styles )
-					samples.styles = '<style id="styles" type="text/css">' + samples.styles + '</style>';
-
-				// The '//*/*/*' XPath is the only way to make it work with
-				// xmlns="http://www.w3.org/1999/xhtml" without workarounds. It
-				// means that we must always have <html><head><title> in this
-				// precise order.
-				document.title = sampleData.getInnerXml( '//*/*/*' );
-			}
-		}
-
-		return samples;
-	})();
-// %REMOVE_END%
 	(function()
 	{
@@ -114,5 +45,6 @@
 			html += '</p><p>With non compatible browsers, you should still be able to see and edit the contents (HTML) in a plain text field.</p>';
 
-			document.getElementById( 'alerts' ).innerHTML = html;
+			var alertsEl = document.getElementById( 'alerts' );
+			alertsEl && ( alertsEl.innerHTML = html );
 		};
 
Index: /CKEditor/trunk/_samples/sharedspaces.html
===================================================================
--- /CKEditor/trunk/_samples/sharedspaces.html	(revision 4850)
+++ /CKEditor/trunk/_samples/sharedspaces.html	(revision 4851)
@@ -6,109 +6,134 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-	<title>Replace Textarea by Code - CKEditor Sample</title>
-	<script type="text/javascript" src="sample.js"></script>
+	<title>Sample - CKEditor</title>
+	<meta content="text/html; charset=utf-8" http-equiv="content-type" />
+	<!-- CKReleaser %REMOVE_LINE%
+	<script type="text/javascript" src="../ckeditor.js"></script>
+	CKReleaser %REMOVE_START% -->
+	<script type="text/javascript" src="../ckeditor_source.js"></script>
+	<!-- CKReleaser %REMOVE_END% -->
+	<script src="sample.js" type="text/javascript"></script>
+	<link href="sample.css" rel="stylesheet" type="text/css" />
 	<style id="styles" type="text/css">
 
-#editorsForm
-{
-	height: 400px;
-	overflow: auto;
-	border: solid 1px #555;
-	margin: 10px 0;
-	padding: 0 10px;
-}
+		#editorsForm
+		{
+			height: 400px;
+			overflow: auto;
+			border: solid 1px #555;
+			margin: 10px 0;
+			padding: 0 10px;
+		}
 
 	</style>
 </head>
 <body>
-	<div id="html">
-		<div id="topSpace">
-		</div>
-		<form id="editorsForm" action="sample_posteddata.php" method="post">
+	<h1>
+		CKEditor Sample
+	</h1>
+	<!-- This <div> holds alert messages to be display in the sample page. -->
+	<div id="alerts">
+		<noscript>
 			<p>
-				<label for="editor1">
-					Editor 1 (uses the shared toolbar and element path):</label><br />
-				<textarea id="editor1" name="editor1" rows="10" cols="80">&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;</textarea>
-				<script type="text/javascript">
-				//<![CDATA[
-					CKEDITOR.replace( 'editor1',
+				<strong>CKEditor requires JavaScript to run</strong>. In a browser with no JavaScript
+				support, like yours, you should still see the contents (HTML data) and you should
+				be able to edit it normally, without a rich editor interface.
+			</p>
+		</noscript>
+	</div>
+	<div id="topSpace">
+	</div>
+	<form action="sample_posteddata.php" id="editorsForm" method="post">
+		<p>
+			<label for="editor1">
+				Editor 1 (uses the shared toolbar and element path):</label><br />
+			<textarea cols="80" id="editor1" name="editor1" rows="10">&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;</textarea>
+			<script type="text/javascript">
+			//<![CDATA[
+				CKEDITOR.replace( 'editor1',
+					{
+						sharedSpaces :
 						{
-							sharedSpaces :
-							{
-								top : 'topSpace',
-								bottom : 'bottomSpace'
-							},
+							top : 'topSpace',
+							bottom : 'bottomSpace'
+						},
 
-							// Removes the maximize plugin as it's not usable
-							// in a shared toolbar.
-							// Removes the resizer as it's not usable in a
-							// shared elements path.
-							removePlugins : 'maximize,resize'
-						} );
-				//]]>
-				</script>
-			</p>
-			<p>
-				<label for="editor2">
-					Editor 2 (uses the shared toolbar and element path):</label><br />
-				<textarea id="editor2" name="editor2" rows="10" cols="80">&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;</textarea>
-				<script type="text/javascript">
-				//<![CDATA[
-					CKEDITOR.replace( 'editor2',
+						// Removes the maximize plugin as it's not usable
+						// in a shared toolbar.
+						// Removes the resizer as it's not usable in a
+						// shared elements path.
+						removePlugins : 'maximize,resize'
+					} );
+			//]]>
+			</script>
+		</p>
+		<p>
+			<label for="editor2">
+				Editor 2 (uses the shared toolbar and element path):</label><br />
+			<textarea cols="80" id="editor2" name="editor2" rows="10">&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;</textarea>
+			<script type="text/javascript">
+			//<![CDATA[
+				CKEDITOR.replace( 'editor2',
+					{
+						sharedSpaces :
 						{
-							sharedSpaces :
-							{
-								top : 'topSpace',
-								bottom : 'bottomSpace'
-							},
+							top : 'topSpace',
+							bottom : 'bottomSpace'
+						},
 
-							// Removes the maximize plugin as it's not usable
-							// in a shared toolbar.
-							// Removes the resizer as it's not usable in a
-							// shared elements path.
-							removePlugins : 'maximize,resize'
-						} );
-				//]]>
-				</script>
-			</p>
-			<p>
-				<label for="editor3">
-					Editor 3 (uses the shared toolbar only):</label><br />
-				<textarea id="editor3" name="editor3" rows="10" cols="80">&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;</textarea>
-				<script type="text/javascript">
-				//<![CDATA[
-					CKEDITOR.replace( 'editor3',
+						// Removes the maximize plugin as it's not usable
+						// in a shared toolbar.
+						// Removes the resizer as it's not usable in a
+						// shared elements path.
+						removePlugins : 'maximize,resize'
+					} );
+			//]]>
+			</script>
+		</p>
+		<p>
+			<label for="editor3">
+				Editor 3 (uses the shared toolbar only):</label><br />
+			<textarea cols="80" id="editor3" name="editor3" rows="10">&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;</textarea>
+			<script type="text/javascript">
+			//<![CDATA[
+				CKEDITOR.replace( 'editor3',
+					{
+						sharedSpaces :
 						{
-							sharedSpaces :
-							{
-								top : 'topSpace'
-							},
+							top : 'topSpace'
+						},
 
-							// Removes the maximize plugin as it's not usable
-							// in a shared toolbar.
-							removePlugins : 'maximize'
-						} );
-				//]]>
-				</script>
-			</p>
-			<p>
-				<label for="editor4">
-					Editor 4 (no shared spaces):</label><br />
-				<textarea id="editor4" name="editor4" rows="10" cols="80">&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;</textarea>
-				<script type="text/javascript">
-				//<![CDATA[
-					CKEDITOR.replace( 'editor4' );
-				//]]>
-				</script>
-			</p>
-			<p>
-				<input type="submit" value="Submit" />
-			</p>
-		</form>
-		<div id="bottomSpace">
-		</div>
+						// Removes the maximize plugin as it's not usable
+						// in a shared toolbar.
+						removePlugins : 'maximize'
+					} );
+			//]]>
+			</script>
+		</p>
+		<p>
+			<label for="editor4">
+				Editor 4 (no shared spaces):</label><br />
+			<textarea cols="80" id="editor4" name="editor4" rows="10">&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;</textarea>
+			<script type="text/javascript">
+			//<![CDATA[
+				CKEDITOR.replace( 'editor4' );
+			//]]>
+			</script>
+		</p>
+		<p>
+			<input type="submit" value="Submit" />
+		</p>
+	</form>
+	<div id="bottomSpace">
 	</div>
-	<div id="code">
-		<pre></pre>
+	<div id="footer">
+		<hr />
+		<p>
+			CKEditor - The text editor for Internet - <a href="http://ckeditor.com/">http://ckeditor.com</a>
+		</p>
+		<p id="copy">
+			Copyright &copy; 2003-2009, <a href="http://cksource.com/">CKSource</a> - Frederico
+			Knabben. All rights reserved.
+		</p>
 	</div>
 </body>
Index: /CKEditor/trunk/_samples/skins.html
===================================================================
--- /CKEditor/trunk/_samples/skins.html	(revision 4850)
+++ /CKEditor/trunk/_samples/skins.html	(revision 4851)
@@ -1,3 +1,3 @@
-﻿<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--
 Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
@@ -6,56 +6,81 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-	<title>Skins - CKEditor Sample</title>
-	<script type="text/javascript" src="sample.js"></script>
+	<title>Sample - CKEditor</title>
+	<meta content="text/html; charset=utf-8" http-equiv="content-type" />
+	<!-- CKReleaser %REMOVE_LINE%
+	<script type="text/javascript" src="../ckeditor.js"></script>
+	CKReleaser %REMOVE_START% -->
+	<script type="text/javascript" src="../ckeditor_source.js"></script>
+	<!-- CKReleaser %REMOVE_END% -->
+	<script src="sample.js" type="text/javascript"></script>
+	<link href="sample.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-	<div id="html">
-		<form action="sample_posteddata.php" method="post">
+	<h1>
+		CKEditor Sample
+	</h1>
+	<!-- This <div> holds alert messages to be display in the sample page. -->
+	<div id="alerts">
+		<noscript>
 			<p>
-				"Kama" skin:<br />
-				<textarea id="editor_kama" name="editor_kama" rows="10" cols="80">&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;</textarea>
-				<script type="text/javascript">
-				//<![CDATA[
+				<strong>CKEditor requires JavaScript to run</strong>. In a browser with no JavaScript
+				support, like yours, you should still see the contents (HTML data) and you should
+				be able to edit it normally, without a rich editor interface.
+			</p>
+		</noscript>
+	</div>
+	<form action="sample_posteddata.php" method="post">
+		<p>
+			"Kama" skin:<br />
+			<textarea cols="80" id="editor_kama" name="editor_kama" rows="10">&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;</textarea>
+			<script type="text/javascript">
+			//<![CDATA[
 
-					CKEDITOR.replace( 'editor_kama',
-						{
-							skin : 'kama'
-						});
+				CKEDITOR.replace( 'editor_kama',
+					{
+						skin : 'kama'
+					});
 
-				//]]>
-				</script>
-			</p>
-			<p>
-				"Office 2003" skin:<br />
-				<textarea id="editor_office2003" name="editor_office2003" rows="10" cols="80">&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;</textarea>
-				<script type="text/javascript">
-				//<![CDATA[
+			//]]>
+			</script>
+		</p>
+		<p>
+			"Office 2003" skin:<br />
+			<textarea cols="80" id="editor_office2003" name="editor_office2003" rows="10">&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;</textarea>
+			<script type="text/javascript">
+			//<![CDATA[
 
-					CKEDITOR.replace( 'editor_office2003',
-						{
-							skin : 'office2003'
-						});
+				CKEDITOR.replace( 'editor_office2003',
+					{
+						skin : 'office2003'
+					});
 
-				//]]>
-				</script>
-			</p>
-			<p>
-				"V2" skin:<br />
-				<textarea id="editor_v2" name="editor_v2" rows="10" cols="80">&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;</textarea>
-				<script type="text/javascript">
-				//<![CDATA[
+			//]]>
+			</script>
+		</p>
+		<p>
+			"V2" skin:<br />
+			<textarea cols="80" id="editor_v2" name="editor_v2" rows="10">&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;</textarea>
+			<script type="text/javascript">
+			//<![CDATA[
 
-					CKEDITOR.replace( 'editor_v2',
-						{
-							skin : 'v2'
-						});
+				CKEDITOR.replace( 'editor_v2',
+					{
+						skin : 'v2'
+					});
 
-				//]]>
-				</script>
-			</p>
-		</form>
-	</div>
-	<div id="code">
-		<pre></pre>
+			//]]>
+			</script>
+		</p>
+	</form>
+	<div id="footer">
+		<hr />
+		<p>
+			CKEditor - The text editor for Internet - <a href="http://ckeditor.com/">http://ckeditor.com</a>
+		</p>
+		<p id="copy">
+			Copyright &copy; 2003-2009, <a href="http://cksource.com/">CKSource</a> - Frederico
+			Knabben. All rights reserved.
+		</p>
 	</div>
 </body>
Index: /CKEditor/trunk/_samples/ui_color.html
===================================================================
--- /CKEditor/trunk/_samples/ui_color.html	(revision 4850)
+++ /CKEditor/trunk/_samples/ui_color.html	(revision 4851)
@@ -6,77 +6,85 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-	<title>UI Color Setting Tool - CKEditor Sample</title>
-	<script type="text/javascript" src="sample.js"></script>
+	<title>Sample - CKEditor</title>
+	<meta content="text/html; charset=utf-8" http-equiv="content-type" />
+	<!-- CKReleaser %REMOVE_LINE%
+	<script type="text/javascript" src="../ckeditor.js"></script>
+	CKReleaser %REMOVE_START% -->
+	<script type="text/javascript" src="../ckeditor_source.js"></script>
+	<!-- CKReleaser %REMOVE_END% -->
+	<script src="sample.js" type="text/javascript"></script>
+	<link href="sample.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-	<div id="html">
-		<p>Click the UI Color Picker button to test your color preferences at runtime.</p>
-		<form action="sample_posteddata.php" method="post">
+	<h1>
+		CKEditor Sample
+	</h1>
+	<!-- This <div> holds alert messages to be display in the sample page. -->
+	<div id="alerts">
+		<noscript>
 			<p>
-				<textarea id="editor1" name="editor1" rows="10" cols="80">&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;</textarea>
-				<script type="text/javascript">
-				//<![CDATA[
+				<strong>CKEditor requires JavaScript to run</strong>. In a browser with no JavaScript
+				support, like yours, you should still see the contents (HTML data) and you should
+				be able to edit it normally, without a rich editor interface.
+			</p>
+		</noscript>
+	</div>
+	<p>
+		Click the UI Color Picker button to test your color preferences at runtime.</p>
+	<form action="sample_posteddata.php" method="post">
+	<p>
+		<textarea cols="80" id="editor1" name="editor1" rows="10">&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;</textarea>
+		<script type="text/javascript">
+		//<![CDATA[
 
-					// Replace the <textarea id="editor"> with an CKEditor
-					// instance, using default configurations.
-					CKEDITOR.replace( 'editor1',
-						{
-							extraPlugins : 'uicolor',
-							toolbar :
-							[
-								[ 'Bold', 'Italic', '-', 'NumberedList', 'BulletedList', '-', 'Link', 'Unlink' ],
-								[ 'UIColor' ]
-							]
-						});
+			// Replace the <textarea id="editor"> with an CKEditor
+			// instance, using default configurations.
+			CKEDITOR.replace( 'editor1',
+				{
+					extraPlugins : 'uicolor',
+					toolbar :
+					[
+						[ 'Bold', 'Italic', '-', 'NumberedList', 'BulletedList', '-', 'Link', 'Unlink' ],
+						[ 'UIColor' ]
+					]
+				});
 
-				//]]>
-				</script>
-			</p>
-			<p>
-				<textarea id="editor2" name="editor2" rows="10" cols="80">&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;</textarea>
-				<script type="text/javascript">
-				//<![CDATA[
+		//]]>
+		</script>
+	</p>
+	<p>
+		<textarea cols="80" id="editor2" name="editor2" rows="10">&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;</textarea>
+		<script type="text/javascript">
+		//<![CDATA[
 
-					// Replace the <textarea id="editor"> with an CKEditor
-					// instance, using default configurations.
-					CKEDITOR.replace( 'editor2',
-						{
-							extraPlugins : 'uicolor',
-							uiColor: '#14B8C4',
-							toolbar :
-							[
-								[ 'Bold', 'Italic', '-', 'NumberedList', 'BulletedList', '-', 'Link', 'Unlink' ],
-								[ 'UIColor' ]
-							]
-						} );
+			// Replace the <textarea id="editor"> with an CKEditor
+			// instance, using default configurations.
+			CKEDITOR.replace( 'editor2',
+				{
+					extraPlugins : 'uicolor',
+					uiColor: '#14B8C4',
+					toolbar :
+					[
+						[ 'Bold', 'Italic', '-', 'NumberedList', 'BulletedList', '-', 'Link', 'Unlink' ],
+						[ 'UIColor' ]
+					]
+				} );
 
-				//]]>
-				</script>
-			</p>
-			<p>
-				<input type="submit" value="Submit" />
-			</p>
-		</form>
-	</div>
-	<div id="code">
-		<pre>
-&lt;form action=""&gt;
-  &lt;p&gt;
-    &lt;label for="editor1"&gt;
-      Editor 1:&lt;/label&gt;&lt;br /&gt;
-    &lt;textarea <b>name="editor1"</b> rows="10" cols="80"&gt;&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;&lt;/textarea&gt;
-    &lt;script type="text/javascript"&gt;
-    //&lt;![CDATA[
-
-      <b>CKEDITOR.replace( 'editor1' );</b>
-
-    //]]&gt;
-    &lt;/script&gt;
-  &lt;/p&gt;
-  &lt;p&gt;
-    &lt;input type="submit" value="Submit" /&gt;
-  &lt;/p&gt;
-&lt;/form&gt;
-</pre>
+		//]]>
+		</script>
+	</p>
+	<p>
+		<input type="submit" value="Submit" />
+	</p>
+	</form>
+	<div id="footer">
+		<hr />
+		<p>
+			CKEditor - The text editor for Internet - <a href="http://ckeditor.com/">http://ckeditor.com</a>
+		</p>
+		<p id="copy">
+			Copyright &copy; 2003-2009, <a href="http://cksource.com/">CKSource</a> - Frederico
+			Knabben. All rights reserved.
+		</p>
 	</div>
 </body>
Index: /CKEditor/trunk/_samples/ui_languages.html
===================================================================
--- /CKEditor/trunk/_samples/ui_languages.html	(revision 4850)
+++ /CKEditor/trunk/_samples/ui_languages.html	(revision 4851)
@@ -1,3 +1,3 @@
-﻿<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--
 Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
@@ -6,88 +6,105 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-	<title>User Interface Globalization - CKEditor Sample</title>
-	<script type="text/javascript" src="sample.js"></script>
-	<script id="headscript" type="text/javascript">
-	//<![CDATA[
-
-	document.write( '<script type="text/javascript" src="../' +
-		'_source/' + 	// %REMOVE_LINE%
-		'lang/_languages.js"><\/script>' );
-
-	//]]>
-	</script>
+	<title>Sample - CKEditor</title>
+	<meta content="text/html; charset=utf-8" http-equiv="content-type" />
+	<!-- CKReleaser %REMOVE_LINE%
+	<script type="text/javascript" src="../ckeditor.js"></script>
+	<script type="text/javascript" src="../lang/_languages.js"></script>
+	CKReleaser %REMOVE_START% -->
+	<script type="text/javascript" src="../ckeditor_source.js"></script>
+	<script type="text/javascript" src="../_source/lang/_languages.js"></script>
+	<!-- CKReleaser %REMOVE_END% -->
+	<script src="sample.js" type="text/javascript"></script>
+	<link href="sample.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-	<div id="html">
-		<form action="sample_posteddata.php" method="post">
+	<h1>
+		CKEditor Sample
+	</h1>
+	<!-- This <div> holds alert messages to be display in the sample page. -->
+	<div id="alerts">
+		<noscript>
 			<p>
-				<label for="editor1">
-					Available languages (<span id="count">&nbsp;</span>
-					languages!):</label><br />
-				<select id="languages" onchange="createEditor( this.value );" disabled="disabled">
-					<script type="text/javascript">
-					//<![CDATA[
-
-						// Get the language list from the _languages.js file.
-						for ( var i = 0 ; i < window.CKEDITOR_LANGS.length ; i++ )
-						{
-							document.write(
-								'<option value="' + window.CKEDITOR_LANGS[i].code + '">' +
-									window.CKEDITOR_LANGS[i].name +
-								'</option>' );
-						}
-
-					//]]>
-					</script>
-				</select>
-				<br />
-				<span style="color: #888888">(You may see strange characters if your system doesn't
-					support the selected language)</span>
+				<strong>CKEditor requires JavaScript to run</strong>. In a browser with no JavaScript
+				support, like yours, you should still see the contents (HTML data) and you should
+				be able to edit it normally, without a rich editor interface.
 			</p>
-			<p>
-				<textarea id="editor1" name="editor1" rows="10" cols="80">&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;</textarea>
+		</noscript>
+	</div>
+	<form action="sample_posteddata.php" method="post">
+		<p>
+			<label for="editor1">
+				Available languages (<span id="count"> </span>languages!):</label><br />
+			<select disabled="disabled" id="languages" onchange="createEditor( this.value );">
 				<script type="text/javascript">
 				//<![CDATA[
 
-					// Set the number of languages.
-					document.getElementById( 'count' ).innerHTML = window.CKEDITOR_LANGS.length;
-
-					var editor;
-
-					function createEditor( languageCode )
+					// Get the language list from the _languages.js file.
+					for ( var i = 0 ; i < window.CKEDITOR_LANGS.length ; i++ )
 					{
-						if ( editor )
-							editor.destroy();
-
-						// Replace the <textarea id="editor"> with an CKEditor
-						// instance, using default configurations.
-						editor = CKEDITOR.replace( 'editor1',
-							{
-								language : languageCode,
-
-								on :
-								{
-									instanceReady : function()
-									{
-										// Wait for the editor to be ready to set
-										// the language combo.
-										var languages = document.getElementById( 'languages' );
-										languages.value = this.langCode;
-										languages.disabled = false;
-									}
-								}
-							} );
+						document.write(
+							'<option value="' + window.CKEDITOR_LANGS[i].code + '">' +
+								window.CKEDITOR_LANGS[i].name +
+							'</option>' );
 					}
-
-					// At page startup, load the default language:
-					createEditor( '' );
 
 				//]]>
 				</script>
-			</p>
-		</form>
-	</div>
-	<div id="code">
-		<pre></pre>
+			</select>
+			<br />
+			<span style="color: #888888">(You may see strange characters if your system doesn't
+				support the selected language)</span>
+		</p>
+		<p>
+			<textarea cols="80" id="editor1" name="editor1" rows="10">&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;</textarea>
+			<script type="text/javascript">
+			//<![CDATA[
+
+				// Set the number of languages.
+				document.getElementById( 'count' ).innerHTML = window.CKEDITOR_LANGS.length;
+
+				var editor;
+
+				function createEditor( languageCode )
+				{
+					if ( editor )
+						editor.destroy();
+
+					// Replace the <textarea id="editor"> with an CKEditor
+					// instance, using default configurations.
+					editor = CKEDITOR.replace( 'editor1',
+						{
+							language : languageCode,
+
+							on :
+							{
+								instanceReady : function()
+								{
+									// Wait for the editor to be ready to set
+									// the language combo.
+									var languages = document.getElementById( 'languages' );
+									languages.value = this.langCode;
+									languages.disabled = false;
+								}
+							}
+						} );
+				}
+
+				// At page startup, load the default language:
+				createEditor( '' );
+
+			//]]>
+			</script>
+		</p>
+	</form>
+	<div id="footer">
+		<hr />
+		<p>
+			CKEditor - The text editor for Internet - <a href="http://ckeditor.com/">http://ckeditor.com</a>
+		</p>
+		<p id="copy">
+			Copyright &copy; 2003-2009, <a href="http://cksource.com/">CKSource</a> - Frederico
+			Knabben. All rights reserved.
+		</p>
 	</div>
 </body>
