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)
commit79e9dba0d4a60ef56237a5686848c6ba6572b696
treee3fd48dc81a090b200e776103405cdc165e6d011
parentaf3e5d1b2af6322621f26791abf8d619771f04e2
parent3c735e0776e11951631c6b7a181c655f5742011b
Merge branch 'jm/doc-wording-tweaks' into maint

* jm/doc-wording-tweaks:
  Documentation: wording fixes in the user manual and glossary