documentation-only commit
fix minor errors in previous commit (missing const, missing semicolon)
Merge branch 'master' into psfex_hacking