Merge branch '3' into 4

src/Forms/FormAction.php

@@ -5,7 +5,7 @@ namespace SilverStripe\Forms;
 use SilverStripe\ORM\FieldType\DBHTMLText;
 
 /**
- * The action buttons are <input type="submit"> as well as <button> tags.
+ * The action buttons are `<input type="submit">` as well as <button> tags.
  *
  * Upon clicking the button below will redirect the user to doAction under the current controller.
  *
@@ -49,7 +49,7 @@ class FormAction extends FormField
     protected $schemaComponent = 'FormAction';
 
     /**
-     * Enables the use of <button> instead of <input>
+     * Enables the use of `<button>` instead of `<input>`
      * in {@link Field()} - for more customisable styling.
      *
      * @var boolean
@@ -252,7 +252,7 @@ class FormAction extends FormField
     }
 
     /**
-     * Get whether this action can be performed without vaidating the data
+     * Get whether this action can be performed without validating the data
      *
      * @return bool
      */

src/Forms/HTMLEditor/HTMLEditorField.php

@@ -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 `<textarea>` 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.