Merge branch 'jc/config-mak-document-darwin-vs-macosx'