Index: /FCKeditor.Java/trunk/pom.xml
===================================================================
--- /FCKeditor.Java/trunk/pom.xml	(revision 2699)
+++ /FCKeditor.Java/trunk/pom.xml	(revision 2700)
@@ -25,4 +25,5 @@
 		<currentVersion>${version}</currentVersion>
 		<FCKeditorVersion>2.6.3</FCKeditorVersion>
+		<ticketUrl>${issueManagement.url}ticket</ticketUrl>
 	</properties>
 	<build>
Index: /FCKeditor.Java/trunk/src/changes/changes.xml
===================================================================
--- /FCKeditor.Java/trunk/src/changes/changes.xml	(revision 2699)
+++ /FCKeditor.Java/trunk/src/changes/changes.xml	(revision 2700)
@@ -7,23 +7,24 @@
 	<body>
 		<release version="2.5-SNAPSHOT" date="in SVN" description="Decoupling of the server-side storage, localization of user responses and other minor enhancements.">
+			<!-- <action type="update" issue="2581">Rename UserPathBuilder interface to something more appropriate</action> -->
+			<!-- <action type="add" issue="2592">Add more logging statements</action> -->
+			
+			<action dev="mosipov" type="remove" issue="2618">Extract ImageInfo from java-core.jar</action>
+			<action dev="mosipov" type="fix" issue="2608">Removing carriage return invalidate Javascript</action>
+			<action dev="mosipov" type="update" issue="2605">Move escapeXml method to a StringBuffer</action>
+			<action dev="mosipov" type="update" issue="2583">ConnectorServlet#init fails on some application servers</action>
+			<action dev="mosipov" type="update" issue="2582">Rework *Path and fullUrl properties</action>
+			<action dev="mosipov" type="remove" issue="2580">Deprecate UserActionImpl in favor of EnabledUserAction</action>
+			<action dev="mosipov" type="add" issue="2383">set defaults in default.properties for all interfaces</action>
+			<action dev="mosipov" type="add" issue="2382">add method isEnabledForFolderCreation to UserAction interface</action>
+			<action dev="mosipov" type="add" issue="2361">Provide interface for locale resolution</action>
 			<!-- <action dev="th-schwarz" type="add" issue="28">Implement Interface for File Browser Connector and Quick Uploader</action> -->
-			<!-- <action dev="mosipov" type="add" issue="2361">Provide interface for locale resolution</action>  -->
-			<action dev="mosipov" type="add" issue="2382">add method isEnabledForFolderCreation to UserAction interface</action>
-			<action dev="mosipov" type="add" issue="2383">set defaults in default.properties for all interfaces</action>
-			<action dev="mosipov" type="remove" issue="2580">Deprecate UserActionImpl in favor of EnabledUserAction</action>
-			<!-- <action type="update" issue="2581">Rename UserPathBuilder interface to something more appropriate</action> -->
-			<!-- <action dev="mosipov" type="update" issue="2582">Rework *Path and fullUrl properties</action> -->
-			<!-- <action type="update" issue="2583">ConnectorServlet#init fails on some application servers</action> -->
-			<!-- <action type="add" issue="2592">Add more logging statements</action> -->
-			<action dev="mosipov" type="update" issue="2605">Move escapeXml method to a StringBuffer</action>
-			<action dev="mosipov" type="fix" issue="2608">Removing carriage return invalidate Javascript</action>
-			<action dev="mosipov" type="remove" issue="2618">Extract ImageInfo from java-core.jar</action>
 		</release>
 		<release version="2.4.1" date="2008-10-12"
 			description="Minor bugfixes and enhancements.">
+			<action dev="mosipov" type="fix" issue="2372">Empty/non-set FCK:editor value causes NullPointerException</action>
+			<action dev="mosipov" type="fix" issue="2359">fckeditor-java-demo fails in Glassfish</action>
+			<action dev="mosipov" type="fix" issue="2357">PropertiesLoader Exception when undeploying a webapp using FCKeditor.Java Integration</action>
 			<action dev="mosipov" type="fix" issue="2355">FCK:editor output is not XHTML 1.0 compliant</action>
-			<action dev="mosipov" type="fix" issue="2357">PropertiesLoader Exception when undeploying a webapp using FCKeditor.Java Integration</action>
-			<action dev="mosipov" type="fix" issue="2359">fckeditor-java-demo fails in Glassfish</action>
-			<action dev="mosipov" type="fix" issue="2372">Empty/non-set FCK:editor value causes NullPointerException</action>
 		</release>
 	</body>
Index: /FCKeditor.Java/trunk/src/site/apt/properties.apt
===================================================================
--- /FCKeditor.Java/trunk/src/site/apt/properties.apt	(revision 2699)
+++ /FCKeditor.Java/trunk/src/site/apt/properties.apt	(revision 2700)
@@ -71,5 +71,4 @@
 *------------------------------------+--------------------------------+-----------------------------+-----------------------------------+
 || Property                          || Default                       || Valid Values               || Description                     ||
-||                                   ||                               ||                            ||                                 ||
 *------------------------------------+--------------------------------+-----------------------------+-----------------------------------+
 | fckeditor.toolbarSet \ \ \ \ \ \ 	 | Default                		  | any string \ \ \ \ \ \      | Indicates the toolbar set you want to load. If you provide a name which does not exist, the editor will fail to load. |
Index: /FCKeditor.Java/trunk/src/site/apt/upgrade_notes.apt.vm
===================================================================
--- /FCKeditor.Java/trunk/src/site/apt/upgrade_notes.apt.vm	(revision 2699)
+++ /FCKeditor.Java/trunk/src/site/apt/upgrade_notes.apt.vm	(revision 2700)
@@ -32,15 +32,7 @@
 * Upgrading from 2.4.x
 
-*------------------------------------+--------------------------------+-----------------------------+-----------------------------------+
-|| Ticket                          || Default                       || Valid Values               || Description                     ||
-||                                   ||                               ||                            ||                                 ||
-*------------------------------------+--------------------------------+-----------------------------+-----------------------------------+
-| {{{${imUrl}/ticket/6969}6969}} 	 | Default                		  | any string \ \ \ \ \ \      | Indicates the toolbar set you want to load. If you provide a name which does not exist, the editor will fail to load. |
-*------------------------------------+--------------------------------+-----------------------------+-----------------------------------+
-| fckeditor.width	                 | 200	                          | any string					| Indicates the editor width. 		|
-*------------------------------------+--------------------------------+-----------------------------+-----------------------------------+
-| fckeditor.height	                 | 100%						      | any string                  | Indicates the editor height. 		|
-*------------------------------------+--------------------------------+-----------------------------+-----------------------------------+
-| fckeditor.basePath		         | /fckeditor \ \ \ \ \ \         | any path                    | The default path of the editor installation resides within your webapp. |
-|                                    | 							      |                             | Change this value only if you install the editor under a different name or maintain several editor installations. |
-*------------------------------------+--------------------------------+-----------------------------+-----------------------------------+
+*-------------------------------+----------------------------------------------+
+|| Ticket						|| Advice									  ||
+*-------------------------------+----------------------------------------------+
+| {{{${ticketUrl}/6969}6969}}	| Default									   |
+*---------------- --------------+----------------------------------------------+
