Need to switch to use CKEditor in the 3.0 distribution.

2 files changed, 3 insertions, 3 deletions

diff --git a/admin/admin_liberty_inc.php b/admin/admin_liberty_inc.php
index a76006f..bbc558e 100644
--- a/admin/admin_liberty_inc.php
+++ b/admin/admin_liberty_inc.php
@@ -20,7 +20,7 @@ $formLibertyFeatures = array(
 	// not entirely sure where this should go. liberty plugins? here? some other tab?
 	'liberty_use_span_wrapper' => array(
 		'label'  => 'Use a span wrapper',
-		'note' => 'Some plugins such as the attachment plugin wrap their output with a div. This might not work well when you are using a WYSYWIG such as TinyMCE or FCKeditor in combination with HTML Purifier. There are Pros and Cons to using either wrapper.',
+		'note' => 'Some plugins such as the attachment plugin wrap their output with a div. This might not work well when you are using a WYSYWIG such as TinyMCE or CKeditor in combination with HTML Purifier. There are Pros and Cons to using either wrapper.',
 		'default' => 'n'
 	),
 );
diff --git a/templates/admin_plugins.tpl b/templates/admin_plugins.tpl
index 6809e34..ef9eadb 100644
--- a/templates/admin_plugins.tpl
+++ b/templates/admin_plugins.tpl
@@ -86,7 +86,7 @@
 									{formlabel label="Allow HTML" for="allow_html"}
 									{forminput}
 										<input type="checkbox" name="content_allow_html" id="allow_html" value="y" {if $gBitSystem->isFeatureActive('content_allow_html')}checked="checked"{/if} />
-										This will render HTML in all content pages if it is present. This is a security risk to allow HTML entry by untrusted users, but is usually required for existing installations. For a more controlled environment, assign the <a href="{$smarty.const.USERS_PKG_URL}admin/edit_group.php">p_liberty_enter_html permission</a>.
+										This will render HTML in all content pages if it is present. This is a security risk to allow HTML entry by untrusted users, but is usually required for existing installations. For a more controlled environment, assign the <a href="{$smarty.const.USERS_PKG_URL}admin/edit_role.php">p_liberty_enter_html permission</a>.
 										{formhelp note="Allow the use of HTML in tikiwiki format content."}
 									{/forminput}
 								</div>
@@ -94,7 +94,7 @@
 									{formlabel label="Force Allow HTML" for="force_allow_html"}
 									{forminput}
 										<input type="checkbox" name="content_force_allow_html" id="force_allow_html" value="y" {if $gBitSystem->isFeatureActive('content_force_allow_html')}checked="checked"{/if} />
-										This will force HTML to be allowed for all users in tikiwiki format content. We require this on if you are using FCKEditor and recommended it with any other WYSIWYG editor.
+										This will force HTML to be allowed for all users in tikiwiki format content. We require this on if you are using CKEditor and recommended it with any other WYSIWYG editor.
 										{formhelp note="This will force the allowance of HTML in tikiwiki format content for all users."}
 									{/forminput}
 								</div>