Merge branch 'jm/doc-wording-tweaks' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 22 Jul 2014 17:26:17 +0000 (10:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 22 Jul 2014 17:26:17 +0000 (10:26 -0700)
* jm/doc-wording-tweaks:
Documentation: wording fixes in the user manual and glossary

Trivial merge