Reordered two code blocks so that YML appears before XML, to match style used everywhere else in the docs except for translations (where XLIFF is the recommended format).
Minor typos and readability edits in wording around these blocks
Merge pull request #2329 from caponica/YML_before_XML

Reordered two code blocks so that YML appears before XML