Remove the lie stating that curlies cannot be used when closing and then reopening php tags
Fix use of incorrect closing control structure in part about colon-style control structures
Merging 'master' into 'gh-pages'