fix typo
Merge branch 'restdoc-discussions' of https://github.com/sathomas/Hilary into restdocs
alphabetize parameters
Merge branch 'restdoc-preview-processor' of https://github.com/sathomas/Hilary into restdocs