Merge changes from man.md into joe.1.in.
Authored by: Joseph Allen 2016-08-31
Parent: [af0a18]
Child: [d8d697]