Index: /CKEditor.Java/ckeditor-java-core/trunk/src/main/java/com/ckeditor/EventHandler.java
===================================================================
--- /CKEditor.Java/ckeditor-java-core/trunk/src/main/java/com/ckeditor/EventHandler.java	(revision 6830)
+++ /CKEditor.Java/ckeditor-java-core/trunk/src/main/java/com/ckeditor/EventHandler.java	(revision 6831)
@@ -35,5 +35,5 @@
 	 * @param jsCode JavaScript anonymous function or a function name
 	 */
-	public void addEvent(final String event, final String jsCode) { 
+	public void addEventHandler(final String event, final String jsCode) {
 		if (events.get(event) == null) {
 			events.put(event, new LinkedHashSet<String>());
Index: /CKEditor.Java/ckeditor-java/trunk/src/main/webapp/_samples/advanced.jsp
===================================================================
--- /CKEditor.Java/ckeditor-java/trunk/src/main/webapp/_samples/advanced.jsp	(revision 6830)
+++ /CKEditor.Java/ckeditor-java/trunk/src/main/webapp/_samples/advanced.jsp	(revision 6831)
@@ -22,4 +22,31 @@
 		CKEditor Sample &mdash; Creating CKEditor Instances
 	</h1>
+	<div class="description">
+	<p>
+		This sample shows how to add event handlers to CKEditor with PHP.
+	</p>
+	<p>
+		A snippet of the configuration code can be seen below; check the source code of this page for
+		the full definition:
+	</p>
+	<pre class="samples">
+&lt;% 
+CKEditorConfig settings = new CKEditorConfig();
+settings.addConfigValue("skin", "office2003");
+EventHandler eventHandler = new EventHandler();
+eventHandler.addEventHandler("instanceReady", "function (ev) { alert(\"Loaded: \" + ev.editor.name); }");
+%&gt;
+
+&lt;ckeditor:editor basePath="/ckeditor/" config="&lt;%=settings %&gt;" editor="editor1" events="&lt;%=eventHandler %&gt;"/&gt;
+
+&lt;%
+settings.removeConfigValue("skin");
+settings.addConfigValue("uiColor", "#ADE82E");
+settings.addConfigValue("toolbar", "[['Format'],['Bold','Italic','Underline','Strike','-','Subscript','Superscript']]");
+%&gt;
+
+&lt;ckeditor:replace basePath="/ckeditor/" config="&lt;%=settings %&gt;" replace="editor2" /&gt;
+	</pre>
+	</div>
 	<!-- This <div> holds alert messages to be display in the sample page. -->
 	<div id="alerts">
@@ -41,11 +68,10 @@
 			<% 
 				String value = "My first CKEditor Java tag"; 
-				CKEditorConfig config2 = new CKEditorConfig();
-				config2.addConfigValue("width", "80%");
-				config2.addConfigValue("toolbar", "Basic");
+				CKEditorConfig settings = new CKEditorConfig();
+				settings.addConfigValue("skin", "office2003");
 				EventHandler eventHandler = new EventHandler();
-				eventHandler.addEvent("instanceReady", "function (ev) { alert(\"Loaded: \" + ev.editor.name); }");
+				eventHandler.addEventHandler("instanceReady", "function (ev) { alert(\"Loaded: \" + ev.editor.name); }");
 			%>
-			<ckeditor:editor basePath="../ckeditor/" config="<%=config2 %>"
+			<ckeditor:editor basePath="../ckeditor/" config="<%=settings %>"
 				 editor="editor1" value="<%= value %>"
 				 events="<%=eventHandler %>"/>
@@ -57,9 +83,9 @@
 		</p>
 		<%
-			config2.removeConfigValue("width");
-			config2.addConfigValue("toolbar", "[['Styles'],['Bold','Italic','Underline','Strike','-','Subscript','Superscript']]");
-			config2.addConfigValue("stylesSet", "[{name : 'Strong Emphasis', element : 'strong'}, {name : 'Emphasis', element : 'em'}, {name : 'Computer Code', element : 'code'}]");
+			settings.removeConfigValue("skin");
+			settings.addConfigValue("uiColor", "#ADE82E");
+			settings.addConfigValue("toolbar", "[['Format'],['Bold','Italic','Underline','Strike','-','Subscript','Superscript']]");
 		%>
-		<ckeditor:replace basePath="../ckeditor/" config="<%=config2 %>" replace="editor2" />
+		<ckeditor:replace basePath="../ckeditor/" config="<%=settings %>" replace="editor2" />
 		<input type="submit" value="Submit"/>
 	</form>
Index: /CKEditor.Java/ckeditor-java/trunk/src/main/webapp/_samples/index.jsp
===================================================================
--- /CKEditor.Java/ckeditor-java/trunk/src/main/webapp/_samples/index.jsp	(revision 6830)
+++ /CKEditor.Java/ckeditor-java/trunk/src/main/webapp/_samples/index.jsp	(revision 6831)
@@ -24,5 +24,10 @@
 		<li><a class="samples" href="standalone.jsp">Create CKEditor instances in Java</a><br />
 		Creating a CKEditor instance (no initial textarea element is required).</li>
-		<li><a class="samples" href="advanced.jsp">Create CKEditor instances in Java with eventHandler</a><br />
+	</ul>
+	<h2 class="samples">
+		Advanced Samples
+	</h2>
+	<ul>
+		<li><a class="samples" href="advanced.jsp">Create CKEditor instances in Java with event handler</a><br />
 		Creating a CKEditor instance (no initial textarea element is required) with advanced settings.</li>
 	</ul>
Index: /CKEditor.Java/ckeditor-java/trunk/src/main/webapp/_samples/replace.jsp
===================================================================
--- /CKEditor.Java/ckeditor-java/trunk/src/main/webapp/_samples/replace.jsp	(revision 6830)
+++ /CKEditor.Java/ckeditor-java/trunk/src/main/webapp/_samples/replace.jsp	(revision 6831)
@@ -22,4 +22,14 @@
 		This sample shows how to replace a selected <code>&lt;textarea&gt;</code> element
 		with a CKEditor instance by using Java code.
+	</p>
+	<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:
+	</p>
+	<pre class="samples">
+&lt;ckeditor:replace replace="textarea_id" basePath="/ckeditor/" /&gt;</pre>
+	<p>
+		Note that <code><em>textarea_id</em></code> in the code above is the <code>id</code> attribute of
+		the <code>&lt;textarea&gt;</code> element to be replaced.
 	</p>
 	</div>
Index: /CKEditor.Java/ckeditor-java/trunk/src/main/webapp/_samples/replaceAll.jsp
===================================================================
--- /CKEditor.Java/ckeditor-java/trunk/src/main/webapp/_samples/replaceAll.jsp	(revision 6830)
+++ /CKEditor.Java/ckeditor-java/trunk/src/main/webapp/_samples/replaceAll.jsp	(revision 6831)
@@ -25,4 +25,6 @@
 		after the last <code>&lt;textarea&gt;</code> element:
 	</p>	
+	<pre class="samples">
+&lt;ckeditor:replaceAll basePath="/ckeditor/" /&gt;</pre>
 	</div>
 	<!-- This <div> holds alert messages to be displayed in the sample page. -->
Index: /CKEditor.Java/ckeditor-java/trunk/src/main/webapp/_samples/standalone.jsp
===================================================================
--- /CKEditor.Java/ckeditor-java/trunk/src/main/webapp/_samples/standalone.jsp	(revision 6830)
+++ /CKEditor.Java/ckeditor-java/trunk/src/main/webapp/_samples/standalone.jsp	(revision 6831)
@@ -30,4 +30,23 @@
 			</p>
 		</noscript>
+	</div>
+	<div class="description">
+	<p>
+		This sample shows how to create a CKEditor instance with Java.
+	</p>
+	<pre class="samples">
+&lt;% 
+String value = "My first &lt;strong>CKEditor&lt;/strong&gt; Java tag";
+
+CKEditorConfig settings = new CKEditorConfig();
+settings.addConfigValue("width", "500");
+settings.addConfigValue("toolbar", "Basic");
+%&gt;
+
+&lt;ckeditor:editor basePath="/ckeditor/" config="&lt;%=settings %&gt;" editor="textarea_id" value="&lt;%= value %&gt;"/&gt;</pre>
+	<p>
+		Note that <code><em>textarea_id</em></code> in the code above is the <code>id</code> and <code>name</code> attribute of
+		the <code>&lt;textarea&gt;</code> element that will be created.
+	</p>
 	</div>
 	<!-- This <fieldset> holds the HTML code that you will usually find in your pages. -->
