Squashing previous corrections into one commit along with a couple more
corrections to the docs, including changing the example seen in
fixtures.md
Merge pull request #2443 from dangerdan/doc_corrections

Documentation corrections