Merge pull request #2111 from codespell-project/peternewman-entrace Add entrace->entrance and friends