Index: /FCKeditor.Java/trunk/java-core/src/main/resources/net/fckeditor/handlers/default.properties
===================================================================
--- /FCKeditor.Java/trunk/java-core/src/main/resources/net/fckeditor/handlers/default.properties	(revision 2623)
+++ /FCKeditor.Java/trunk/java-core/src/main/resources/net/fckeditor/handlers/default.properties	(revision 2624)
@@ -61,4 +61,5 @@
 
 # default implementations
+connector.impl = net.fckeditor.connector.impl.ContextConnector
 connector.userActionImpl = net.fckeditor.requestcycle.impl.DisabledUserAction
 connector.userPathBuilderImpl = net.fckeditor.requestcycle.impl.ContextPathBuilder
Index: /FCKeditor.Java/trunk/java-demo/src/main/webapp/WEB-INF/web.xml
===================================================================
--- /FCKeditor.Java/trunk/java-demo/src/main/webapp/WEB-INF/web.xml	(revision 2623)
+++ /FCKeditor.Java/trunk/java-demo/src/main/webapp/WEB-INF/web.xml	(revision 2624)
@@ -8,5 +8,5 @@
 
 	<servlet>
-		<servlet-name>Connector</servlet-name>
+		<servlet-name>ConnectorServlet</servlet-name>
 		<servlet-class>
 			net.fckeditor.connector.ConnectorServlet
@@ -16,5 +16,5 @@
 
 	<servlet-mapping>
-		<servlet-name>Connector</servlet-name>
+		<servlet-name>ConnectorServlet</servlet-name>
 		<!-- Do not wrap this line otherwise Glassfish will fail to load this file -->
 		<url-pattern>/fckeditor/editor/filemanager/connectors/*</url-pattern>
Index: /FCKeditor.Java/trunk/src/site/apt/connector.apt
===================================================================
--- /FCKeditor.Java/trunk/src/site/apt/connector.apt	(revision 2623)
+++ /FCKeditor.Java/trunk/src/site/apt/connector.apt	(revision 2624)
@@ -1,69 +1,1 @@
-~~ FCKeditor - The text editor for Internet - http://www.fckeditor.net
-~~ Copyright (C) 2003-2008 Frederico Caldeira Knabben
-~~
-~~ == BEGIN LICENSE ==
-~~
-~~ Licensed under the terms of any of the following licenses at your
-~~ choice:
-~~
-~~  - GNU General Public License Version 2 or later (the "GPL")
-~~    http://www.gnu.org/licenses/gpl.html
-~~
-~~  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
-~~    http://www.gnu.org/licenses/lgpl.html
-~~
-~~  - Mozilla Public License Version 1.1 or later (the "MPL")
-~~    http://www.mozilla.org/MPL/MPL-1.1.html
-~~
-~~ == END LICENSE ==
-~~ @version $Id$
-                        ------------------------------
-                           File Browser Connector
-                        ------------------------------
-
-Connector activation
-
-  The Connector is not mandatory. If you do <not> plan to provide file
-  interaction, you can skip this section.
-
-    [Hint:] The Connector by default is not present and disabled for security
-            reasons!
-
-  It takes two steps to enable it:
-
-  [[1]]  Declare the ConnectorServlet in your <<<web.xml>>>:
-
-+------------------------------------------------------------------------------+
-  <web-app version="2.4">
-    ...
-    <servlet>
-      <servlet-name>Connector</servlet-name>
-        <servlet-class>
-          net.fckeditor.connector.ConnectorServlet
-      </servlet-class>
-      <load-on-startup>1</load-on-startup>
-    </servlet>
-    ...
-    <servlet-mapping>
-      <servlet-name>Connector</servlet-name>
-      <url-pattern>
-        /fckeditor/editor/filemanager/connectors/*
-      </url-pattern>
-    </servlet-mapping>
-    ...
-  </web-app>
-+------------------------------------------------------------------------------+
-
-  Assuming you installed the editor in the <<</fckeditor>>> folder in your webapp.\
-  The Connector is now declared but <still> disabled. The response is going to
-  be a localized error message.
-
-  [[2]] Create a <<<fckeditor.properties>>> file in your classpath and add:
-
-+------------------------------------------------------------------------------+
-  connector.userActionImpl=net.fckeditor.requestcycle.impl.EnabledUserAction
-+------------------------------------------------------------------------------+
-
-  []
-
-  The Connector is now <<enabled>>.
+The test goes here...
Index: /FCKeditor.Java/trunk/src/site/apt/connector_servlet.apt
===================================================================
--- /FCKeditor.Java/trunk/src/site/apt/connector_servlet.apt	(revision 2624)
+++ /FCKeditor.Java/trunk/src/site/apt/connector_servlet.apt	(revision 2624)
@@ -0,0 +1,69 @@
+~~ FCKeditor - The text editor for Internet - http://www.fckeditor.net
+~~ Copyright (C) 2003-2008 Frederico Caldeira Knabben
+~~
+~~ == BEGIN LICENSE ==
+~~
+~~ Licensed under the terms of any of the following licenses at your
+~~ choice:
+~~
+~~  - GNU General Public License Version 2 or later (the "GPL")
+~~    http://www.gnu.org/licenses/gpl.html
+~~
+~~  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+~~    http://www.gnu.org/licenses/lgpl.html
+~~
+~~  - Mozilla Public License Version 1.1 or later (the "MPL")
+~~    http://www.mozilla.org/MPL/MPL-1.1.html
+~~
+~~ == END LICENSE ==
+~~ @version $Id$
+                        -----------------------------------
+                           File Browser Connector Servlet
+                        -----------------------------------
+
+Connector Servlet activation
+
+  The Connector Servlet is not mandatory. If you do <not> plan to provide file
+  interaction, you can skip this section.
+
+    [Hint:] The Connector Servlet has to be declared and will be disabled by default 
+	        for security reasons!
+
+  It takes two steps to enable it:
+
+  [[1]]  Declare the ConnectorServlet in your <<<web.xml>>>:
+
++------------------------------------------------------------------------------+
+  <web-app version="2.4">
+    ...
+    <servlet>
+      <servlet-name>ConnectorServlet</servlet-name>
+        <servlet-class>
+          net.fckeditor.connector.ConnectorServlet
+      </servlet-class>
+      <load-on-startup>1</load-on-startup>
+    </servlet>
+    ...
+    <servlet-mapping>
+      <servlet-name>ConnectorServlet</servlet-name>
+      <url-pattern>
+        /fckeditor/editor/filemanager/connectors/*
+      </url-pattern>
+    </servlet-mapping>
+    ...
+  </web-app>
++------------------------------------------------------------------------------+
+
+  Assuming you installed the editor in the <<</fckeditor>>> folder in your webapp.\
+  The Connector Servlet is now declared but <still> disabled. The response is 
+  going to be a localized error message.
+
+  [[2]] Create a <<<fckeditor.properties>>> file in your classpath and add:
+
++------------------------------------------------------------------------------+
+  connector.userActionImpl=net.fckeditor.requestcycle.impl.EnabledUserAction
++------------------------------------------------------------------------------+
+
+  []
+
+  The Connector Servlet is now <<enabled>>.
Index: /FCKeditor.Java/trunk/src/site/apt/ext_overview.apt
===================================================================
--- /FCKeditor.Java/trunk/src/site/apt/ext_overview.apt	(revision 2623)
+++ /FCKeditor.Java/trunk/src/site/apt/ext_overview.apt	(revision 2624)
@@ -30,4 +30,7 @@
   your needs:
 
+  * <<Connector>>: Gives you the ability to handle server-side connector requests
+    the way you want.
+
   * <<UserAction>>: Gives you full control over any action the user can do in the
     File Browser.
Index: /FCKeditor.Java/trunk/src/site/apt/index.apt
===================================================================
--- /FCKeditor.Java/trunk/src/site/apt/index.apt	(revision 2623)
+++ /FCKeditor.Java/trunk/src/site/apt/index.apt	(revision 2624)
@@ -41,5 +41,5 @@
   in your webapp, {{{download.html}download}} it, follow the {{{installation.html}Installation 
 Guide}}
-  and the {{{overview.html}Integration Overview}}.
+  and the {{{int_overview.html}Integration Overview}}.
 
 Call To Action
Index: /FCKeditor.Java/trunk/src/site/apt/int_overview.apt
===================================================================
--- /FCKeditor.Java/trunk/src/site/apt/int_overview.apt	(revision 2623)
+++ /FCKeditor.Java/trunk/src/site/apt/int_overview.apt	(revision 2624)
@@ -28,5 +28,5 @@
   * <<JSP tag library>>: Easy integration of the FCKeditor in your JSPs.
 
-  * <<Connector>>: A servlet to manage resources like images, documents, and other
+  * <<Connector Servlet>>: A servlet to manage resources like images, documents, and other
     files.
     
Index: /FCKeditor.Java/trunk/src/site/apt/properties.apt
===================================================================
--- /FCKeditor.Java/trunk/src/site/apt/properties.apt	(revision 2623)
+++ /FCKeditor.Java/trunk/src/site/apt/properties.apt	(revision 2624)
@@ -137,6 +137,10 @@
 |								|											|							| other renamed file type. (magic bytes check)		|
 *-------------------------------+-------------------------------------------+---------------------------+---------------------------------------------------+
+| connector.impl				| {{{java-core/apidocs/net/fckeditor/connector/impl/ContextConnector.html}<<<net.fckeditor.connector. | any fully-qualified class	| Provides a custom server-side connector for the	|
+|								| impl.ContextConnector>>>}}				| name of a valid {{{java-core/apidocs/net/fckeditor/connector/Connector.html}<<<Connector>>>}}  | File Browser. For more details see {{{connector.html}here}}. |
+|								|											| implementation			|													|
+*-------------------------------+-------------------------------------------+---------------------------+---------------------------------------------------+
 | connector.userActionImpl		| {{{java-core/apidocs/net/fckeditor/requestcycle/impl/DisabledUserAction.html}<<<net.fckeditor.requestcycle. | any fully-qualified class	| Provides custom security functions for the File	|
-|								| impl.DisabledUserAction>>>}}					| name of a valid {{{java-core/apidocs/net/fckeditor/requestcycle/UserAction.html}<<<UserAction>>>}}  | Browser Connector. For more details see {{{useraction.html}here}}. |
+|								| impl.DisabledUserAction>>>}}				| name of a valid {{{java-core/apidocs/net/fckeditor/requestcycle/UserAction.html}<<<UserAction>>>}}  | Browser Connector. For more details see {{{useraction.html}here}}. |
 |								|											| implementation			|													|
 *-------------------------------+-------------------------------------------+---------------------------+---------------------------------------------------+
Index: /FCKeditor.Java/trunk/src/site/site.xml
===================================================================
--- /FCKeditor.Java/trunk/src/site/site.xml	(revision 2623)
+++ /FCKeditor.Java/trunk/src/site/site.xml	(revision 2624)
@@ -19,5 +19,4 @@
 		<menu name="Introduction">
 			<item name="About" href="/index.html" />
-			<!--<item name="What's new" href="/whatsnew.html" />-->
 			<item name="Changes" href="/changes-report.html" />
 			<item name="Demo" href="/demo.html" />
@@ -30,9 +29,10 @@
 				href="/taglibrary.html"
 			/>
-			<item name="Connector" href="/connector.html" />
+			<item name="Connector Servlet" href="/connector_servlet.html" />
 			<item name="Velocity/FreeMarker" href="/velocity_freemarker.html"/>
 		</menu>
 		<menu name="Extending the Library">
-			<item name="Overview" href="/ext_overview.html"/>
+			<item name="Overview" href="/ext_overview.html" />
+			<item name="Connector" href="/connector.html" />
 			<item name="UserAction" href="/useraction.html" />
 			<item name="UserPathsBuilder" href="/userpathsbuilder.html" />
@@ -40,10 +40,6 @@
 		</menu>
 		<menu name="Reference">
-			<item name="Tag library"
-				href="/java-core/tagreference.html"
-			/>
-			<item name="Configuration"
-				href="/properties.html"
-			/>
+			<item name="Tag library" href="/java-core/tagreference.html" />
+			<item name="Configuration" href="/properties.html" />
 		</menu>
 		<!--<menu name="Developers">-->