Index: /FCKeditor.Java/trunk/src/site/apt/connector.apt
===================================================================
--- /FCKeditor.Java/trunk/src/site/apt/connector.apt	(revision 2702)
+++ /FCKeditor.Java/trunk/src/site/apt/connector.apt	(revision 2703)
@@ -1,1 +1,82 @@
-The test goes here...
+~~ 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$
+				-------------------------
+					Connector
+				-------------------------
+
+Connector
+
+  The interation pack offers you the capability to localize any string responded
+  to the user on a global basis and on a per-locale basis dependending on the
+  deployed framework/system (Request, JSTL, Struts, Spring, and other).
+
+  Read on to see how you can refit the system to your needs:
+
+* The interface
+
+  The interface {{{java-core/apidocs/net/fckeditor/localization/LocaleResolver.html}<<<net.fckeditor.localization.LocaleResolver>>>}}
+  contains only one method:
+
+  * <<<Locale resolveLocale(final HttpServletRequest request)>>>: On every request
+    it will passed the current <<<HttpServletRequest>>> instance. It resolves the
+    user locale according to the underlying system or returns <<<null>>> if it 
+    can't resolve the locale.
+
+  []
+
+** Choosing an implemenation
+
+  You have to choose an inplemenation, either an existing or a custom one. If no
+  existing implemention suits your need, create your own. Implement the interface
+  and resolve the locale the way you want.
+
+  Existing, ready-to-go implementations:
+
+   * {{{java-core/apidocs/net/fckeditor/localization/impl/AcceptLanguageHeaderResolver.html}<<<net.fckeditor.localization.impl.AcceptLanguageHeaderResolver>>>}} (default):
+     It retrieves the first locale in the HTTP <<<Accept-Language>>> header if
+     availabe.
+
+   * {{{java-core/apidocs/net/fckeditor/localization/impl/JstlResolver.html}<<<net.fckeditor.localization.impl.JstlResolver>>>}}:
+     The user locale will be retrieved from the session set by JSTL's <<<fmt>>>
+     tag or similar.
+
+   []
+
+** Declaring an implementation
+
+   After your have chosen your desired implemenation, you have to declare it.
+   Put the fully-qualified class name of the implementation in your
+   <<<fckeditor.properies>>>:
+
++------------------------------------------------------------------------------+
+  localization.localeResolverImpl=<desired implementation>
++------------------------------------------------------------------------------+
+
+* The strings
+
+    [Hint:] The resolver system is fail-safe concerning localized string retrieval.
+            This means that if a localized string cannot be found, the default
+            string will be used.
+
+  Each responded string can be localized on a global basis and on a per-locale basis.
+  Put your globally localized strings in your <<<fckeditor.properties>>> and your
+  per-locale localized strings in a <<<fckeditor_\<locale\>.properties>>> file.
+  See the Localization chapter of the {{{properties.html}Configuration}} for a
+  string reference.
Index: /FCKeditor.Java/trunk/src/site/apt/upgrade_notes.apt.vm
===================================================================
--- /FCKeditor.Java/trunk/src/site/apt/upgrade_notes.apt.vm	(revision 2702)
+++ /FCKeditor.Java/trunk/src/site/apt/upgrade_notes.apt.vm	(revision 2703)
@@ -40,10 +40,10 @@
 |								| your classpath. The jar is bundled with the binary distribution. |
 *-------------------------------+----------------------------------------------+
-| {{{${ticketUrl}/2608}2608}}	| The FCKeditor value will now be passed as-is, whitespace won't be truncated anymore |
+| {{{${ticketUrl}/2608}2608}}	| The FCKeditor value will now be passed as-is, whitespace won't be truncated anymore. |
 *-------------------------------+----------------------------------------------+
 | {{{${ticketUrl}/2583}2583}}	| The ConnectorServlet will fail in some environments when the deployed war file won't be expanded. If this happens, the ConnectorServlet |
 |								| will emit an appropriate log message. Consider to switch to another {{{connector.html}Connector}}. |
 *-------------------------------+----------------------------------------------+
-| {{{${ticketUrl}/2582}2582}}	| Path handling has been aligned to other connector implementations. The FullUrl property is gone. the UserFilesPath has slightly changed |
+| {{{${ticketUrl}/2582}2582}}	| Path handling has been aligned to other connector implementations. The FullUrl property is gone ({{{faq.html#context-fullurl}FAQ}}). the UserFilesPath has slightly changed |
 |								| semantics and an UserFilesAbsolutePath property has beeen introduced. Please check the {{{properties.html}Configuration}} for more details. |
 *-------------------------------+----------------------------------------------+