Index: /CKEditor.Java/ckeditor-java-core/trunk/src/main/java/com/ckeditor/CKEditorInsertTag.java
===================================================================
--- /CKEditor.Java/ckeditor-java-core/trunk/src/main/java/com/ckeditor/CKEditorInsertTag.java	(revision 6838)
+++ /CKEditor.Java/ckeditor-java-core/trunk/src/main/java/com/ckeditor/CKEditorInsertTag.java	(revision 6839)
@@ -14,5 +14,6 @@
 
 /**
- * <ckeditor:editor> tag code.
+ * <code>&lt;ckeditor:editor&gt;</code> tag code.
+ * 
  * <b>Usage:</b>
  * <pre>&lt;ckeditor:editor basePath="/ckeditor/" editor="editor1" /&gt;</pre>
Index: /CKEditor.Java/ckeditor-java-core/trunk/src/main/java/com/ckeditor/CKEditorReplaceAllTag.java
===================================================================
--- /CKEditor.Java/ckeditor-java-core/trunk/src/main/java/com/ckeditor/CKEditorReplaceAllTag.java	(revision 6838)
+++ /CKEditor.Java/ckeditor-java-core/trunk/src/main/java/com/ckeditor/CKEditorReplaceAllTag.java	(revision 6839)
@@ -6,5 +6,5 @@
 
 /**
- * &lt;ckeditor:replaceAll&gt; tag code.
+ * <code>&lt;ckeditor:replaceAll&gt;</code> tag code.
  * <b>Usage:</b>
  * <pre>&lt;ckeditor:replaceAll basePath="/ckeditor/" /&gt;</pre>
Index: /CKEditor.Java/ckeditor-java-core/trunk/src/main/java/com/ckeditor/CKEditorReplaceTag.java
===================================================================
--- /CKEditor.Java/ckeditor-java-core/trunk/src/main/java/com/ckeditor/CKEditorReplaceTag.java	(revision 6838)
+++ /CKEditor.Java/ckeditor-java-core/trunk/src/main/java/com/ckeditor/CKEditorReplaceTag.java	(revision 6839)
@@ -7,5 +7,5 @@
 
 /**
- * &lt;ckeditor:replace&gt; tag code.
+ * <code>&lt;ckeditor:replace&gt;</code> tag code.
  * <b>Usage:</b>
  * <pre>&lt;ckeditor:replace replace="editor1" basePath="/ckeditor/" /&gt;</pre>
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 6838)
+++ /CKEditor.Java/ckeditor-java-core/trunk/src/main/java/com/ckeditor/EventHandler.java	(revision 6839)
@@ -15,5 +15,5 @@
  * <pre>
   		EventHandler eventHandler = new EventHandler();
-		eventHandler.addEvent("instanceReady","function (ev) {
+		eventHandler.addEventHandler("instanceReady","function (ev) {
 			alert(\"Loaded: \" + ev.editor.name); }");
   </pre>
Index: /CKEditor.Java/ckeditor-java-core/trunk/src/main/java/com/ckeditor/GlobalEventHandler.java
===================================================================
--- /CKEditor.Java/ckeditor-java-core/trunk/src/main/java/com/ckeditor/GlobalEventHandler.java	(revision 6838)
+++ /CKEditor.Java/ckeditor-java-core/trunk/src/main/java/com/ckeditor/GlobalEventHandler.java	(revision 6839)
@@ -15,5 +15,5 @@
  * <pre>
  	GlobalEventHandler globalEventHandler = new GlobalEventHandler();
-	globalEventHandler.addEvent("dialogDefinition","function (ev) {  
+	globalEventHandler.addEventHandler("dialogDefinition","function (ev) {
 							alert(\"Loading dialog window: \" + ev.data.name); }");
 	</pre>
Index: /CKEditor.Java/ckeditor-java-core/trunk/src/main/java/com/ckeditor/package-info.java
===================================================================
--- /CKEditor.Java/ckeditor-java-core/trunk/src/main/java/com/ckeditor/package-info.java	(revision 6838)
+++ /CKEditor.Java/ckeditor-java-core/trunk/src/main/java/com/ckeditor/package-info.java	(revision 6839)
@@ -4,5 +4,5 @@
 */
 /**
- * 
+ * CKEditor for Java - the server side integration for CKEditor.
  */
 package com.ckeditor;
Index: /CKEditor.Java/ckeditor-java-core/trunk/src/main/resources/META-INF/ckeditor.tld
===================================================================
--- /CKEditor.Java/ckeditor-java-core/trunk/src/main/resources/META-INF/ckeditor.tld	(revision 6838)
+++ /CKEditor.Java/ckeditor-java-core/trunk/src/main/resources/META-INF/ckeditor.tld	(revision 6839)
@@ -80,5 +80,5 @@
 				<![CDATA[
 				EventHandler eventHandler = new EventHandler();
-				eventHandler.addEvent("instanceReady","function (ev) {      
+				eventHandler.addEventHandler("instanceReady","function (ev) {
 						          alert(\"Loaded: \" + ev.editor.name); }");
 				]]>
@@ -93,5 +93,5 @@
 			<description>CKEditor global events. Example:
 				<![CDATA[GlobalEventHandler globalEventHandler = new GlobalEventHandler();
-				globalEventHandler.addEvent("dialogDefinition","function (ev) {  alert(\"Loading dialog window: \" + ev.data.name); }");
+				globalEventHandler.addEventHandler("dialogDefinition","function (ev) {  alert(\"Loading dialog window: \" + ev.data.name); }");
 				]]>
 			</description>
@@ -179,5 +179,5 @@
 				<![CDATA[
 				EventHandler eventHandler = new EventHandler();
-				eventHandler.addEvent("instanceReady","function (ev) {      
+				eventHandler.addEventHandler("instanceReady","function (ev) {
 						          alert(\"Loaded: \" + ev.editor.name); }");
 				]]>
@@ -192,5 +192,5 @@
 			<description>CKEditor global events. Example:
 				<![CDATA[GlobalEventHandler globalEventHandler = new GlobalEventHandler();
-				globalEventHandler.addEvent("dialogDefinition","function (ev) {  alert(\"Loading dialog window: \" + ev.data.name); }");
+				globalEventHandler.addEventHandler("dialogDefinition","function (ev) {  alert(\"Loading dialog window: \" + ev.data.name); }");
 				]]>
 			</description>
@@ -255,5 +255,5 @@
 				<![CDATA[
 				EventHandler eventHandler = new EventHandler();
-				eventHandler.addEvent("instanceReady","function (ev) {      
+				eventHandler.addEventHandler("instanceReady","function (ev) {
 						          alert(\"Loaded: \" + ev.editor.name); }");
 				]]>
@@ -268,5 +268,5 @@
 			<description>CKEditor global events. Example:
 				<![CDATA[GlobalEventHandler globalEventHandler = new GlobalEventHandler();
-				globalEventHandler.addEvent("dialogDefinition","function (ev) {  alert(\"Loading dialog window: \" + ev.data.name); }");
+				globalEventHandler.addEventHandler("dialogDefinition","function (ev) {  alert(\"Loading dialog window: \" + ev.data.name); }");
 				]]>
 			</description>