Index: /FCKeditor.Java/trunk/java-core/src/main/javadoc/net/fckeditor/handlers/package.html =================================================================== --- /FCKeditor.Java/trunk/java-core/src/main/javadoc/net/fckeditor/handlers/package.html (revision 2152) +++ /FCKeditor.Java/trunk/java-core/src/main/javadoc/net/fckeditor/handlers/package.html (revision 2152) @@ -0,0 +1,96 @@ + + + + + + + +Different handlers for various purposes used in the entire system. + + + + + + + + + + + + +Different handlers for various purposes used in the entire system. + + + + + + + + + + + + +Different handlers for various purposes used in the entire system. + + + + + Index: /FCKeditor.Java/trunk/src/site/apt/velocity_freemarker.apt =================================================================== --- /FCKeditor.Java/trunk/src/site/apt/velocity_freemarker.apt (revision 2151) +++ /FCKeditor.Java/trunk/src/site/apt/velocity_freemarker.apt (revision 2152) @@ -19,5 +19,5 @@ ~~ @version $Id: connector.apt 2004 2008-05-16 14:48:17Z mosipov $ ------------------------------ - Velocity / Freemarker + Velocity/FreeMarker Integration ------------------------------ @@ -68,15 +68,3 @@ -<<<<<<< .mine -<<<<<<< .mine +------------------------------------------------------------------------------+ -======= -+------------------------------------------------------------------------------+ ->>>>>>> .theirs -======= -+------------------------------------------------------------------------------+ - - - - ->>>>>>> .theirs