Fix issue #1842; fix some typos.#1903

ceri wants to merge 2 commits intofreebsd:mainfreebsd/pkg:mainfrom

ceri:masterceri/pkg:masterCopy head branch name to clipboard