Index: /FCKeditor.Java/branches/2.5-test/java-core/pom.xml
===================================================================
--- /FCKeditor.Java/branches/2.5-test/java-core/pom.xml	(revision 2506)
+++ /FCKeditor.Java/branches/2.5-test/java-core/pom.xml	(revision 2507)
Index: /FCKeditor.Java/branches/2.5-test/java-core/src/main/java/net/fckeditor/handlers/PropertiesLoader.java
===================================================================
--- /FCKeditor.Java/branches/2.5-test/java-core/src/main/java/net/fckeditor/handlers/PropertiesLoader.java	(revision 2506)
+++ /FCKeditor.Java/branches/2.5-test/java-core/src/main/java/net/fckeditor/handlers/PropertiesLoader.java	(revision 2507)
@@ -73,5 +73,5 @@
 		}
 
-		// 2. load user defaults
+		// 2. load user defaults if present
 		InputStream in2 = PropertiesLoader.class
 				.getResourceAsStream("/fckeditor.properties");
Index: /FCKeditor.Java/branches/2.5-test/java-demo/pom.xml
===================================================================
--- /FCKeditor.Java/branches/2.5-test/java-demo/pom.xml	(revision 2506)
+++ /FCKeditor.Java/branches/2.5-test/java-demo/pom.xml	(revision 2507)
Index: /FCKeditor.Java/branches/2.5-test/pom.xml
===================================================================
--- /FCKeditor.Java/branches/2.5-test/pom.xml	(revision 2506)
+++ /FCKeditor.Java/branches/2.5-test/pom.xml	(revision 2507)
@@ -1,5 +1,3 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>net.fckeditor</groupId>
@@ -12,12 +10,8 @@
 	</modules>
 	<properties>
-		<project.build.sourceEncoding>
-			UTF-8
-		</project.build.sourceEncoding>
-		<project.reporting.outputEncoding>
-			UTF-8
-		</project.reporting.outputEncoding>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<slf4j.version>1.5.2</slf4j.version>
-
+		
 		<!-- site plugin properties for Velocity -->
 		<slf4jVersion>${slf4j.version}</slf4jVersion>
@@ -39,8 +33,4 @@
 					</configuration>
 				</plugin>
-				<plugin>
-					<artifactId>maven-javadoc-plugin</artifactId>
-					<version>2.5</version>
-				</plugin>
 			</plugins>
 		</pluginManagement>
@@ -68,5 +58,5 @@
 			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
-				<version>2.2-beta-2</version>
+				<version>2.2-beta-1</version>
 				<configuration>
 					<descriptors>
@@ -79,4 +69,15 @@
 					</descriptors>
 				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>attach-javadocs</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
 			</plugin>
 			<plugin>
@@ -98,4 +99,5 @@
 				</configuration>
 			</plugin>
+		
 			<plugin>
 				<artifactId>maven-antrun-plugin</artifactId>
@@ -109,38 +111,24 @@
 						<configuration>
 							<tasks>
-								<copy overwrite="true" todir="src/site"
-									flatten="true">
+								<copy overwrite="true" todir="src/site" flatten="true">
 									<fileset dir="..">
-										<include
-											name="src/site/site.xml" />
+										<include name="src/site/site.xml" />
 									</fileset>
 								</copy>
-								<replace value="&lt;src&gt;../"
-									token="&lt;src&gt;/" dir="..">
-									<include
-										name="${pom.artifactId}/src/site/site.xml" />
-									<exclude
-										name="fckeditor-java/src/site/site.xml" />
+								<replace value="&lt;src&gt;../" token="&lt;src&gt;/" dir="..">
+									<include name="${pom.artifactId}/src/site/site.xml" />
+									<exclude name="fckeditor-java/src/site/site.xml" />
 								</replace>
-								<replace value="href=&quot;../"
-									token="href=&quot;/" dir="..">
-									<include
-										name="${pom.artifactId}/src/site/site.xml" />
-									<exclude
-										name="fckeditor-java/src/site/site.xml" />
+								<replace value="href=&quot;../" token="href=&quot;/" dir="..">
+									<include name="${pom.artifactId}/src/site/site.xml" />
+									<exclude name="fckeditor-java/src/site/site.xml" />
 								</replace>
-								<replace value="href=&quot;"
-									token="href=&quot;../${pom.artifactId}/" dir="..">
-									<include
-										name="${pom.artifactId}/src/site/site.xml" />
-									<exclude
-										name="fckeditor-java/src/site/site.xml" />
+								<replace value="href=&quot;" token="href=&quot;../${pom.artifactId}/" dir="..">
+									<include name="${pom.artifactId}/src/site/site.xml" />
+									<exclude name="fckeditor-java/src/site/site.xml" />
 								</replace>
-								<replace value="href=&quot;../images"
-									token="href=&quot;images" dir="..">
-									<include
-										name="${pom.artifactId}/src/site/site.xml" />
-									<exclude
-										name="fckeditor-java/src/site/site.xml" />
+								<replace value="href=&quot;../images" token="href=&quot;images" dir="..">
+									<include name="${pom.artifactId}/src/site/site.xml" />
+									<exclude name="fckeditor-java/src/site/site.xml" />
 								</replace>
 							</tasks>
@@ -168,5 +156,4 @@
 				</artifactId>
 				<version>2.1</version>
-				<inherited>false</inherited>
 				<reportSets>
 					<reportSet>
@@ -198,4 +185,10 @@
 					</reportSet>
 				</reportSets>
+			</plugin>
+			<plugin>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<configuration>
+					<quiet>true</quiet>
+				</configuration>
 			</plugin>
 		</plugins>
@@ -306,10 +299,6 @@
 	</mailingLists>
 	<scm>
-		<connection>
-			scm:svn:http://svn.fckeditor.net/FCKeditor.Java/trunk
-		</connection>
-		<developerConnection>
-			scm:svn:https://svn.fckeditor.net/FCKeditor.Java/trunk
-		</developerConnection>
+		<connection>scm:svn:http://svn.fckeditor.net/FCKeditor.Java/trunk</connection>
+		<developerConnection>scm:svn:https://svn.fckeditor.net/FCKeditor.Java/trunk</developerConnection>
 		<url>http://dev.fckeditor.net/browser/FCKeditor.Java/trunk</url>
 	</scm>
@@ -320,13 +309,19 @@
 		<repository>
 			<id>local</id>
-			<url>file:///home/mosipov/public_html/m2repo</url>
+			<url>
+				file:///home/mosipov/public_html/m2repo
+			</url>
 		</repository>
 		<snapshotRepository>
 			<id>local</id>
-			<url>file:///home/mosipov/public_html/m2repo-snapshots</url>
+			<url>
+				file:///home/mosipov/public_html/m2repo-snapshots
+			</url>
 		</snapshotRepository>
 		<site>
 			<id>local</id>
-			<url>file:///home/mosipov/public_html/docs</url>
+			<url>
+				file:///home/mosipov/public_html/docs
+			</url>
 		</site>
 	</distributionManagement>
Index: /FCKeditor.Java/branches/2.5-test/src/main/assembly/bin.xml
===================================================================
--- /FCKeditor.Java/branches/2.5-test/src/main/assembly/bin.xml	(revision 2506)
+++ /FCKeditor.Java/branches/2.5-test/src/main/assembly/bin.xml	(revision 2507)
@@ -19,5 +19,5 @@
 				</dependencySets>
 				<outputFileNameMapping>
-					fckeditor-${module.artifactId}-${module.version}.${module.extension}
+					${module.build.finalName}.${module.extension}
 				</outputFileNameMapping>
 				<unpack>false</unpack>
@@ -32,5 +32,5 @@
 				<includeDependencies>false</includeDependencies>
 				<outputFileNameMapping>
-					fckeditor-${module.artifactId}-${module.version}-${module.classifier}.${module.extension}
+					${module.build.finalName}${dashClassifier?}.${module.extension}
 				</outputFileNameMapping>
 				<unpack>false</unpack>
Index: /FCKeditor.Java/branches/2.5-test/src/site/apt/demo.apt.vm
===================================================================
--- /FCKeditor.Java/branches/2.5-test/src/site/apt/demo.apt.vm	(revision 2506)
+++ /FCKeditor.Java/branches/2.5-test/src/site/apt/demo.apt.vm	(revision 2507)
@@ -28,5 +28,5 @@
 
   The demo is intended for novices, beginners, and for everyone who wants to see
-  the FCKeditor (version 2.6.2) in action right out of the box. It's also a good
+  the FCKeditor (version 2.6.4) in action right out of the box. It's also a good
   reference for you to see how all integral parts work together.
 
Index: /FCKeditor.Java/branches/2.5-test/src/site/apt/download.apt.vm
===================================================================
--- /FCKeditor.Java/branches/2.5-test/src/site/apt/download.apt.vm	(revision 2506)
+++ /FCKeditor.Java/branches/2.5-test/src/site/apt/download.apt.vm	(revision 2507)
@@ -103,4 +103,4 @@
   We use the state-of-the-art logging facade <<<SLF4J>>>. To make SFL4J work at
   runtime, you have to add <<one>> binding and the corresponding backend (may
-  be optional) into your classpath. Please check the {{{http://slf4j.org}SLF4J website}}
+  be optional) in your classpath. Please check the {{{http://slf4j.org}SLF4J website}}
   for more information on bindings and the API itself.
Index: /FCKeditor.Java/branches/2.5-test/src/site/apt/index.apt
===================================================================
--- /FCKeditor.Java/branches/2.5-test/src/site/apt/index.apt	(revision 2506)
+++ /FCKeditor.Java/branches/2.5-test/src/site/apt/index.apt	(revision 2507)
@@ -37,7 +37,8 @@
   
   This documentation is straight forward to use!\
-  Read the {{{changes-report.html}changes}} compared to the last release. Go over
+  Read the {{{changes-report.html}Changes}} in this release. Go over
   and checkout the {{{demo.html}Demo}} and if you are ready to deploy the FCKeditor
-  in your webapp, {{{download.html}download}} it, follow the {{{installation.html}Installation Guide}}
+  in your webapp, {{{download.html}download}} it, follow the {{{installation.html}Installation 
+Guide}}
   and the {{{overview.html}Integration Overview}}.
 
Index: /FCKeditor.Java/branches/2.5-test/src/site/apt/installation.apt
===================================================================
--- /FCKeditor.Java/branches/2.5-test/src/site/apt/installation.apt	(revision 2506)
+++ /FCKeditor.Java/branches/2.5-test/src/site/apt/installation.apt	(revision 2507)
@@ -29,17 +29,17 @@
 * Integration pack installation
 
-  Installing the integration pack, it's dependencies, and a required SLF4J binding.
+  Installing the integration pack, its dependencies, and a preferred SLF4J binding.
 
 ** Using Maven 2
 
    If you have already declared the dependency reference as described in the
-   {{{download.html}download guide}}, Maven has already installed everything for
-   you. Declare the chosen SFL4J binding and corresponding backend (may be optional)
-   in the dependencies section of your POM within the <runtime> scope.
+   {{{download.html}Download Guide}}, Maven has already installed everything for
+   you. You just need to declare the chosen SFL4J binding and corresponding backend
+   (may be optional) in the dependencies section of your POM within the <runtime> scope.
 
 ** Manual installation
 
-   Simply put the downloaded core jar, it's dependencies and your favorite SFL4J
-   binding together with the corresponding backend (may be optional) in to your
+   Simply put the downloaded core jar, its dependencies and your favorite SFL4J
+   binding together with the corresponding backend (may be optional) in your
    classpath (usually <<<WEB-INF/lib>>>) and you are ready to go.
 
@@ -48,6 +48,6 @@
   Although the public distribution is fine, it still contains a lot of superfluous
   files for a Java environment. Use the following <<<Ant>>> target on the FCKeditor
-  2.6.2 zip file (1,26 MiB) to create a cleaner and smaller distribution zip file
-  (996 KiB). After the reduction you can unzip the smaller distribution zip
+  2.6.4 zip file (? MiB) to create a cleaner and smaller distribution zip file
+  (? KiB). After the reduction you can unzip the smaller distribution zip
   file into your webapp.
 
@@ -56,5 +56,5 @@
   <!-- Adapt these properties to your needs -->
   <property name="fckeditor-tmp" location="fckeditor-tmp" />
-  <property name="fckeditor-basename" value="FCKeditor_2.6.2" />
+  <property name="fckeditor-basename" value="FCKeditor_2.6.4" />
   <property name="fckeditor-destfile" value="${fckeditor-basename}_clean.zip" />