From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 16 Jun 2007 08:22:35 +0000 (-0700)
Subject: Merge branch 'lh/submodule'
X-Git-Tag: v1.5.3-rc0~91
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ad2a2f6f0b40ba7c3dea8ec8ddcbc3f65f083998?ds=inline;hp=-c

Merge branch 'lh/submodule'

* lh/submodule:
gitmodules(5): remove leading period from synopsis
Add gitmodules(5)
git-submodule: give submodules proper names
Rename sections from "module" to "submodule" in .gitmodules
git-submodule: remember to checkout after clone
t7400: barf if git-submodule removes or replaces a file
---

ad2a2f6f0b40ba7c3dea8ec8ddcbc3f65f083998
diff --combined Documentation/Makefile
index 4edf788c3a,2ad18e0ac3..cc563247a9
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@@ -2,7 -2,7 +2,7 @@@ MAN1_TXT= 
  	$(filter-out $(addsuffix .txt, $(ARTICLES) $(SP_ARTICLES)), \
  		$(wildcard git-*.txt)) \
  	gitk.txt
- MAN5_TXT=gitattributes.txt gitignore.txt
+ MAN5_TXT=gitattributes.txt gitignore.txt gitmodules.txt
  MAN7_TXT=git.txt
  
  DOC_HTML=$(patsubst %.txt,%.html,$(MAN1_TXT) $(MAN5_TXT) $(MAN7_TXT))
@@@ -37,9 -37,6 +37,9 @@@ man7dir=$(mandir)/man
  
  ASCIIDOC=asciidoc
  ASCIIDOC_EXTRA =
 +ifdef ASCIIDOC8
 +ASCIIDOC_EXTRA += -a asciidoc7compatible
 +endif
  INSTALL?=install
  DOC_REF = origin/man