Fixed default parameter value for WYSIWYG field type
Fixed default parameter value for WYSIWYG field type (other page)
Merge branch '2.2' of https://github.com/jchamberlain/pyrocms-docs into jchamberlain-2.2

Conflicts:
	content/field-types/wysiwyg.md