Merge pull request #7126 from terminalmage/docs

Two docs commits
Fix broken link in FAQ

The link to "state.hightstate" in the 3rd bullet point was not properly
formed, so the hyperlink failed to create.

Also massaged the paragraphs explaining the difference between the
cmd.run and cmd.wait states.