Merge pull request #894 from r8k/master

fix typos & reword faq.rst