Merge branch 'maint'
commit2603fa5fb358ee7834bc9e1a2e391f69d8fce815
authorJunio C Hamano <junkio@cox.net>
Sun, 25 Mar 2007 22:08:11 +0000 (25 15:08 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 25 Mar 2007 22:08:11 +0000 (25 15:08 -0700)
tree7b9351f89b043762b064ab90ed25da9afc10f23f
parentc5a07b3b4f9424ba9887a8a7e0b81164a228ed8e
parentfd2a75972e90d34bc8d4bebe1d669645557a2192
Merge branch 'maint'

* maint:
  user-manual: introduce "branch" and "branch head" differently
  glossary: clean up cross-references
  glossary: stop generating automatically
  user-manual: Use def_ instead of ref_ for glossary references.
  user-manual.txt: fix a tiny typo.
  user-manual: run xsltproc without --nonet option
Documentation/user-manual.txt