Index: /CKEditor.Java/ckeditor-java-core/trunk/pom.xml
===================================================================
--- /CKEditor.Java/ckeditor-java-core/trunk/pom.xml	(revision 6802)
+++ /CKEditor.Java/ckeditor-java-core/trunk/pom.xml	(revision 6803)
@@ -26,4 +26,8 @@
 		</license>
 	</licenses>
+	<organization>
+		<name>CKSource - Frederico Knabben</name>
+		<url>http://cksource.com</url>
+	</organization>
 	<scm>
 		<url>http://svn.ckeditor.com/CKEditor.Java/ckeditor-java-core/trunk</url>
Index: /CKEditor.Java/ckeditor-java-core/trunk/src/main/java/com/ckeditor/CKEditorConfig.java
===================================================================
--- /CKEditor.Java/ckeditor-java-core/trunk/src/main/java/com/ckeditor/CKEditorConfig.java	(revision 6802)
+++ /CKEditor.Java/ckeditor-java-core/trunk/src/main/java/com/ckeditor/CKEditorConfig.java	(revision 6803)
@@ -11,5 +11,5 @@
 
 /**
- * CKEditor tag for the Java configuration class.
+ * CKEditor configuration class.
  */
 public class CKEditorConfig implements Cloneable {
@@ -40,5 +40,5 @@
 	 * <b>Usage:</b>
 	 * <pre>config.addConfigValue("baseHref", "http://www.example.com/path/");</pre>
-	 * <pre>config.addConfigValue("toolbar", [[ 'Source', '-', 'Bold', 'Italic' ]]);</pre>
+	 * <pre>config.addConfigValue("toolbar", "[[ 'Source', '-', 'Bold', 'Italic' ]]");</pre>
 	 * @param key configuration parameter key
 	 * @param value configuration parameter value.
@@ -51,5 +51,5 @@
 	 * Adds a Map parameter to the configuration.
 	 * <b>Usage:</b>
-	 * <pre>Map<String, Object> map = new HashMap<String, Object>();</pre>
+	 * <pre>Map&lt;String, Object&gt; map = new HashMap&lt;String, Object&gt;();</pre>
 	 * <pre>map.put("element", "span");</pre>
 	 * <pre>map.put("styles", "{'background-color' : '#(color)'}");</pre>
@@ -67,6 +67,6 @@
 	 * <b>Usage:</b>
 	 * <pre> 
-		List<List<String>> list = new ArrayList<List<String>>();
-		List<String> subList = new ArrayList<String>();
+		List&lt;List&lt;String&gt;&gt; list = new ArrayList&lt;List&lt;String&gt;&gt;();
+		List&lt;String&gt; subList = new ArrayList&lt;String&gt;();
 		subList.add("Source");
 		subList.add("-");
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 6802)
+++ /CKEditor.Java/ckeditor-java-core/trunk/src/main/java/com/ckeditor/CKEditorInsertTag.java	(revision 6803)
@@ -16,5 +16,5 @@
  * &lt;ckeditor:editor&gt; tag code.
  * <b>Usage:</b>
- * <pre>&lt;ckeditor:editor basePath="../../ckeditor/" editor="editor1" /&gt;</pre>
+ * <pre>&lt;ckeditor:editor basePath="/ckeditor/" editor="editor1" /&gt;</pre>
  */
 public class CKEditorInsertTag extends CKEditorTag {
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 6802)
+++ /CKEditor.Java/ckeditor-java-core/trunk/src/main/java/com/ckeditor/CKEditorReplaceAllTag.java	(revision 6803)
@@ -8,5 +8,5 @@
  * &lt;ckeditor:replaceAll&gt; tag code.
  * <b>Usage:</b>
- * <pre>&lt;ckeditor:replaceAll basePath="../../ckeditor/" /&gt;</pre>
+ * <pre>&lt;ckeditor:replaceAll basePath="/ckeditor/" /&gt;</pre>
  */
 public class CKEditorReplaceAllTag extends CKEditorTag {
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 6802)
+++ /CKEditor.Java/ckeditor-java-core/trunk/src/main/java/com/ckeditor/CKEditorReplaceTag.java	(revision 6803)
@@ -9,5 +9,5 @@
  * &lt;ckeditor:replace&gt; tag code.
  * <b>Usage:</b>
- * <pre>&lt;ckeditor:replace replace="editor1" basePath="../../ckeditor/" /&gt;</pre>
+ * <pre>&lt;ckeditor:replace replace="editor1" basePath="/ckeditor/" /&gt;</pre>
  */
 public class CKEditorReplaceTag extends CKEditorTag {
Index: /CKEditor.Java/ckeditor-java-core/trunk/src/main/java/com/ckeditor/TagHelper.java
===================================================================
--- /CKEditor.Java/ckeditor-java-core/trunk/src/main/java/com/ckeditor/TagHelper.java	(revision 6802)
+++ /CKEditor.Java/ckeditor-java-core/trunk/src/main/java/com/ckeditor/TagHelper.java	(revision 6803)
@@ -15,5 +15,5 @@
 	
 	private static final String[] CHARS_FROM 
-					= {"\\", "/", "\n", "\t", "\r", "\0c", "\0c", "\""};
+					= {"\\", "/", "\n", "\t", "\r", "\b", "\f", "\""};
 	private static final String[] CHARS_TO 
 					= {"\\\\", "\\/", "\\\n", "\\\t", "\\\r", "\\\b", "\\\f", "\\\""};
@@ -36,5 +36,5 @@
 	 * Creates JavaScript code for including ckeditor.js.
 	 * @param basePath CKEditor base path
-	 * @param args script agruments
+	 * @param args script arguments
 	 * @return JavaScript code
 	 */
Index: /CKEditor.Java/ckeditor-java/trunk/pom.xml
===================================================================
--- /CKEditor.Java/ckeditor-java/trunk/pom.xml	(revision 6802)
+++ /CKEditor.Java/ckeditor-java/trunk/pom.xml	(revision 6803)
@@ -26,4 +26,8 @@
 		</license>
 	</licenses>
+	<organization>
+		<name>CKSource - Frederico Knabben</name>
+		<url>http://cksource.com</url>
+	</organization>
 	<packaging>war</packaging>
 	<build>