Merge branch 'jc/typo'

* jc/typo:
Typofixes outside documentation area

diff --cc diff.c
Simple merge

diff --cc path.c
Simple merge

diff --cc setup.c
Simple merge