Index: /FCKeditor.Java/branches/2.4/src/site/apt/installation.apt =================================================================== --- /FCKeditor.Java/branches/2.4/src/site/apt/installation.apt (revision 1930) +++ /FCKeditor.Java/branches/2.4/src/site/apt/installation.apt (revision 1931) @@ -24,5 +24,5 @@ Installation Guide -* Using Maven +* Using Maven 2 [Attention:] The integration pack will be available on the central repo @@ -30,6 +30,6 @@ location will be obsolete! - If you use Maven 2 for your projects all you need to do is include a reference - to the library in the dependencies section of your POM: + Include a dependency reference to the library in the dependencies section of + your POM: +-------------------------------------------------------+ @@ -61,6 +61,7 @@ * Manual installation - The distribution comes in three flavors, pick one that best fits your - environment from the {{{http://www.fckeditor.net/download}download area}}. + The distribution comes in three flavors, pick one from the + {{{http://www.fckeditor.net/download}download area}} which fits best in your + environment. * <<>> @@ -72,14 +73,15 @@ If you are starting from scratch, this distribution fits best. This package - comes with a pre-built jar and all dependencies. + comes with pre-built jars, all dependencies, the entire documentation for + offline usage and the license file. - Those distribution files are: + The pre-built jars are: *--------------------------------------------+----------------------------------+ || File || Description || *--------------------------------------------+----------------------------------+ -| fckeditor-java-2.4-core-beta-1.jar | main jar | +| fckeditor-java-core-2.4-beta-1.jar | main jar | *--------------------------------------------+----------------------------------+ -| fckeditor-java-2.4-core-beta-1-javadoc.jar | optional javadoc for IDE integration | +| fckeditor-java-core-2.4-beta-1-javadoc.jar | optional javadoc for IDE integration | *--------------------------------------------+----------------------------------+ @@ -93,5 +95,5 @@ | commons-io-1.3.2.jar | Apache Commons IO library | *--------------------------------------------+----------------------------------+ -| slf4j-api-1.5.0.jar | simple logging facade api | +| slf4j-api-1.5.0.jar | Simple logging facade library | *--------------------------------------------+----------------------------------+ @@ -101,6 +103,6 @@ * <<>> - If you want to check out the pack's core, refit the code to your needs - (obeying the license terms) or compile it yourself, this is the perfect + If you want to check out the integration's source code, refit to your needs + (obeying the license terms) or compile yourself, this is the perfect distribution for you. @@ -109,8 +111,8 @@ A word on Logging - [Attention:] Do skip this section otherwise your application will <> + [Attention:] Do skip this section otherwise your application will <>! We use the state-of-the-art logging facade <<>>. To make slf4j work at runtime, - you have to add <> binding and the appropriate backend (may be optional) onto + you have to add <> binding and the appropriate backend (may be optional) into your classpath.\ Please check the {{{http://slf4j.org}slf4j website}} for more information on bindings Index: /FCKeditor.Java/branches/2.4/src/site/apt/integration/connector.apt =================================================================== --- /FCKeditor.Java/branches/2.4/src/site/apt/integration/connector.apt (revision 1930) +++ /FCKeditor.Java/branches/2.4/src/site/apt/integration/connector.apt (revision 1931) @@ -81,9 +81,9 @@ The fully-qualified class name of the implemented classes can now be set as described in - {{{fckeditor-properties.html}Configuration settings}}. + {{{../properties.html}Configuration settings}}. At the moment, the integration pack provides two interfaces to extend the connector: - [[1]] {{{java-core/apidocs/net/fckeditor/requestcycle/UserPathBuilder.html}<<>>}} + [[1]] {{{../java-core/apidocs/net/fckeditor/requestcycle/UserPathBuilder.html}<<>>}} In this interface there is only one method <<>>, @@ -91,5 +91,5 @@ the path for all resource files. - [[2]] {{{java-core/apidocs/net/fckeditor/requestcycle/UserAction.html}<<>>}} + [[2]] {{{../java-core/apidocs/net/fckeditor/requestcycle/UserAction.html}<<>>}} There are two methods to authorize users to do file based actions: @@ -102,3 +102,3 @@ For those who wants to enable all users for browsing and uploading files, there is an implementation - of <<>> you can use: {{{java-core/apidocs/net/fckeditor/requestcycle/impl/UserActionImp.html}UserActionImpl}} + of <<>> you can use: {{{../java-core/apidocs/net/fckeditor/requestcycle/impl/UserActionImpl.html}UserActionImpl}} Index: /FCKeditor.Java/branches/2.4/src/site/apt/integration/taglibrary.apt =================================================================== --- /FCKeditor.Java/branches/2.4/src/site/apt/integration/taglibrary.apt (revision 1930) +++ /FCKeditor.Java/branches/2.4/src/site/apt/integration/taglibrary.apt (revision 1931) @@ -24,6 +24,6 @@ Tag library - Define the tag extension in each JSP page that uses the FCKeditor.Java taglib. - The uri directives must match the URI defined in the tld in the jar file. + Declare the tag extension in each JSP page that uses the FCKeditor.Java taglib. + The uri directive must match the uri defined in the {{{../java-core/tagreference.html}tag reference}}. The prefix identifies the tags in the tag library within the JSP page. @@ -39,5 +39,5 @@ +--------------------------------------------------------------------+ - Now you are set to use the taglib. A brief usage would be: + Now you are set to use the taglib. A brief declaration would be: +--------------------------------------------------------------------+ Index: /FCKeditor.Java/branches/2.4/src/site/apt/properties.apt =================================================================== --- /FCKeditor.Java/branches/2.4/src/site/apt/properties.apt (revision 1930) +++ /FCKeditor.Java/branches/2.4/src/site/apt/properties.apt (revision 1931) @@ -72,5 +72,5 @@ || || || || || *------------------------------------+--------------------------------+-----------------------------+-----------------------------------+ -| 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. | +| 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. | *------------------------------------+--------------------------------+-----------------------------+-----------------------------------+ | fckeditor.width | 200 | any string | Indicates the editor width. | @@ -84,5 +84,5 @@ * Connector - The integration pack supports file, flash, image, and media resource types. + The integration library supports file, flash, image, and media resource types. Replace in the property name with "file", "flash", "image", or "media". @@ -131,13 +131,13 @@ *-------------------------------+--------------------------------+-----------------------------+----------------------------------------------------+ | connector.secureImageUploads |true | true, false (boolean) | Checks uploaded images for validity. | -| | | | I.e. the uploaded file is a real image not any | +| | | | I.e. the uploaded file is a real image and not any | | | | | other renamed file type. | *-------------------------------+--------------------------------+-----------------------------+----------------------------------------------------+ | connector.userActionImpl | | any class implementing the | Providing custom security functions for the File | | | | {{{java-core/apidocs/net/fckeditor/requestcycle/UserAction.html}<<>>}} | Browser Connector. For more details see | -| | | interface | {{{integration/connector.html#Extending_the_Connector}Extending the Connector}}. | +| | | interface | {{{integration/connector.html#Extending_the_Connector}here}}. | *-------------------------------+--------------------------------+-----------------------------+----------------------------------------------------+ -| connector.userPathBuilderImpl | | any class implementing the | Providing a custom function to construct an user depended 'BaseDir' for the | -| | | {{{java-core/apidocs/net/fckeditor/requestcycle/UserPathBuilder.html}<<>>}} | Browser Connector. For more details see | -| | | interface | {{{integration/connector.html#Extending_the_Connector}Extending the Connector}}. | +| connector.userPathBuilderImpl | | any class implementing the | Providing a custom function to construct a user-dependent 'UserFilesPath' for the | +| | | {{{java-core/apidocs/net/fckeditor/requestcycle/UserPathBuilder.html}<<>>}} | File Browser Connector. For more details see | +| | | interface | {{{integration/connector.html#Extending_the_Connector}here}}. | *-------------------------------+--------------------------------+-----------------------------+----------------------------------------------------+