Merge branch 'maint'
authorJunio C Hamano <junkio@cox.net>
Sun, 25 Mar 2007 22:08:11 +0000 (15:08 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 25 Mar 2007 22:08:11 +0000 (15:08 -0700)
* 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

1  2 
Documentation/user-manual.txt
Simple merge