Merge branch '3' into 4

This commit is contained in:
Daniel Hensby 2018-03-14 14:15:51 +00:00
commit 069744bb21
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E

View File

@ -11,7 +11,7 @@ use SilverStripe\View\Parsers\HTMLValue;
/**
* A TinyMCE-powered WYSIWYG HTML editor field with image and link insertion and tracking capabilities. Editor fields
* are created from <textarea> tags, which are then converted with JavaScript.
* are created from &lt;textarea&gt; tags, which are then converted with JavaScript.
*
* Caution: The form field does not include any JavaScript or CSS when used outside of the CMS context,
* since the required frontend dependencies are included through CMS bundling.