Index: FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/handlers/ConnectorHandler.java
===================================================================
--- FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/handlers/ConnectorHandler.java	(revision 2738)
+++ FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/handlers/ConnectorHandler.java	(revision 2739)
@@ -30,5 +30,5 @@
  * Handler for Connector-related properties.<br />
  * Wraps to the {@link PropertiesLoader}.<br />
- * <em>Deprecated methods will be removed in 2.5</em>
+ * <em>Deprecated methods will be removed in FCKeditor.Java 2.6.</em>
  * 
  * @version $Id$
Index: FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/handlers/ExtensionsHandler.java
===================================================================
--- FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/handlers/ExtensionsHandler.java	(revision 2738)
+++ FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/handlers/ExtensionsHandler.java	(revision 2739)
@@ -37,8 +37,8 @@
  * versa.
  * </p>
- * <em>Class will be removed in 2.6.</em>
+ * <em>Class will be removed in FCKeditor.Java 2.6.</em>
  * 
  * @version $Id$
- * @deprecated Functionality merged with {@link ResourceType}.
+ * @deprecated Functionality merged into {@link ResourceType}.
  */
 @Deprecated
Index: FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/localization/LocaleResolver.java
===================================================================
--- FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/localization/LocaleResolver.java	(revision 2738)
+++ FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/localization/LocaleResolver.java	(revision 2739)
@@ -26,5 +26,5 @@
 
 /**
- * An interface which provides the ability to resolve the current user's locale
+ * An interface which provides the ability to resolve the current user locale
  * independently from any framework or direct implementation.
  * 
@@ -37,7 +37,7 @@
 	 * 
 	 * @param request
-	 *            The current request instance
+	 *            The current request instance.
 	 * @return The locale of the user or <code>null</code> if the locale
-	 *         cannot be resolved
+	 *         cannot be resolved.
 	 */
 	public Locale resolveLocale(final HttpServletRequest request);
Index: FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/requestcycle/impl/ServerRootPathBuilder.java
===================================================================
--- FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/requestcycle/impl/ServerRootPathBuilder.java	(revision 2738)
+++ FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/requestcycle/impl/ServerRootPathBuilder.java	(revision 2739)
@@ -3,5 +3,5 @@
 import javax.servlet.http.HttpServletRequest;
 
-import net.fckeditor.handlers.ConnectorHandler;
+import net.fckeditor.handlers.PropertiesLoader;
 import net.fckeditor.requestcycle.UserPathBuilder;
 
@@ -22,6 +22,6 @@
 	 * .servlet.http.HttpServletRequest)
 	 */
-	public String getUserFilesAbsolutePath(HttpServletRequest request) {
-		return ConnectorHandler.getUserFilesAbsolutePath();
+	public String getUserFilesAbsolutePath(final HttpServletRequest request) {
+		return PropertiesLoader.getUserFilesAbsolutePath();
 	}
 
@@ -33,6 +33,6 @@
 	 * .http.HttpServletRequest)
 	 */
-	public String getUserFilesPath(HttpServletRequest request) {
-		return ConnectorHandler.getUserFilesPath();
+	public String getUserFilesPath(final HttpServletRequest request) {
+		return PropertiesLoader.getUserFilesPath();
 	}
 
Index: FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/requestcycle/impl/UserActionImpl.java
===================================================================
--- FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/requestcycle/impl/UserActionImpl.java	(revision 2738)
+++ FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/requestcycle/impl/UserActionImpl.java	(revision 2739)
@@ -31,5 +31,5 @@
  * <em>Deprecated: The name does not describe its functionality, class has been
  * replaced with <code>EnabledUserAction</code> which does the same but has a more
- * proper name. This class may removed in future versions.</em>
+ * proper name. This class may be removed in future versions.</em>
  * 
  * @see EnabledUserAction
Index: FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/tool/UtilsFile.java
===================================================================
--- FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/tool/UtilsFile.java	(revision 2738)
+++ FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/tool/UtilsFile.java	(revision 2739)
@@ -24,5 +24,5 @@
 import java.io.InputStream;
 
-import net.fckeditor.handlers.ConnectorHandler;
+import net.fckeditor.handlers.PropertiesLoader;
 
 import org.apache.commons.io.FilenameUtils;
@@ -53,6 +53,6 @@
     		return "";
     
-    	String name = (ConnectorHandler.isForceSingleExtension()) ? UtilsFile.forceSingleExtension(fileName)
-    	        : fileName;
+    	String name = (PropertiesLoader.isForceSingleExtension()) ? UtilsFile
+				.forceSingleExtension(fileName) : fileName;
     
     	// Remove \ / | : ? * " < > with _