More info added to Content formatting page
Merge pull request #1068 from cfarquharson/master

More info added to Content formatting page
Removed div from rule
Merge remote-tracking branch 'upstream/master' into rtl-fixes-ie7
Cleaned up extra whitespace