Index: openacs-4/packages/acs-bootstrap-installer/installer/www/blank-master.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/installer/www/blank-master.tcl,v diff -u -N -r1.2 -r1.2.2.1 --- openacs-4/packages/acs-bootstrap-installer/installer/www/blank-master.tcl 10 Jun 2015 19:14:01 -0000 1.2 +++ openacs-4/packages/acs-bootstrap-installer/installer/www/blank-master.tcl 14 Aug 2015 11:41:28 -0000 1.2.2.1 @@ -212,6 +212,10 @@ " -order tinymceZ } +if { [info exists ::acs_blank_master(ckeditor4)] } { + template::head::add_javascript -src "//cdn.ckeditor.com/4.5.2/standard/ckeditor.js" +} + if {![info exists doc(title)]} { set doc(title) "[ad_conn instance_name]" ns_log warning "[ad_conn url] has no doc(title) set." Index: openacs-4/packages/acs-templating/tcl/richtext-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/richtext-procs.tcl,v diff -u -N -r1.52 -r1.52.2.1 --- openacs-4/packages/acs-templating/tcl/richtext-procs.tcl 27 Oct 2014 16:40:12 -0000 1.52 +++ openacs-4/packages/acs-templating/tcl/richtext-procs.tcl 14 Aug 2015 11:41:28 -0000 1.52.2.1 @@ -295,8 +295,9 @@

Implements the richtext widget, which offers rich text editing options. - This version supports the xinha and tinymce - editors. + This version integrates support for the xinha and + tinymce editors out of the box, but other richtext editors + can be used including and configuring them in your custom template. If the acs-templating.UseHtmlAreaForRichtextP parameter is set to true (1), this will use the WYSIWYG editor widget set in the acs-templating.RichTextEditor @@ -318,9 +319,9 @@ You can also parameterize the richtext widget with a 'htmlarea_p' attribute, which can be true or false, and which will override the parameter setting.

- The available editors in wysigwig mode are xinha and tinymce. In order to - use xinha, one has to use 'editor xinha' in the options of the form field. - The following options for xinha may be specified: + The available integrated editors in wysigwig mode are xinha and tinymce. In + order to use xinha, one has to use 'editor xinha' in the options of the form + field. The following options for xinha may be specified: