Minor edits
Minor edits
Minor edits

I can't remember what came of the 'apt' capitalisation discussion, so have left it lowercase.
Minor edits
Minor edits
Minor edits
Minor edits
Minor edits
Minor edits
Minor edits
Minor edits
Missing hyphen
Minor edits
Resolve merge conflict