From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 23 Dec 2012 04:35:34 +0000 (-0800)
Subject: Merge branch 'ta/doc-cleanup' into maint
X-Git-Tag: v1.8.0.3~17
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/66afe50b439e4d83679d12639dd084bcab0486f0?hp=-c

Merge branch 'ta/doc-cleanup' into maint

* ta/doc-cleanup:
Documentation: build html for all files in technical and howto
Documentation/howto: convert plain text files to asciidoc
Documentation/technical: convert plain text files to asciidoc
Change headline of technical/send-pack-pipeline.txt to not confuse its content with content from git-send-pack.txt
Shorten two over-long lines in git-bisect-lk2009.txt by abbreviating some sha1
Split over-long synopsis in git-fetch-pack.txt into several lines
---

66afe50b439e4d83679d12639dd084bcab0486f0
diff --combined Documentation/Makefile
index b81df682d9,361550422a..fe9a91d6a3
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@@ -24,8 -24,30 +24,30 @@@ SP_ARTICLES = user-manua
  SP_ARTICLES += howto/revert-branch-rebase
  SP_ARTICLES += howto/using-merge-subtree
  SP_ARTICLES += howto/using-signed-tag-in-pull-request
+ SP_ARTICLES += howto/use-git-daemon
+ SP_ARTICLES += howto/update-hook-example
+ SP_ARTICLES += howto/setup-git-server-over-http
+ SP_ARTICLES += howto/separating-topic-branches
+ SP_ARTICLES += howto/revert-a-faulty-merge
+ SP_ARTICLES += howto/recover-corrupted-blob-object
+ SP_ARTICLES += howto/rebuild-from-update-hook
+ SP_ARTICLES += howto/rebuild-from-update-hook
+ SP_ARTICLES += howto/rebase-from-internal-branch
+ SP_ARTICLES += howto/maintain-git
  API_DOCS = $(patsubst %.txt,%,$(filter-out technical/api-index-skel.txt technical/api-index.txt, $(wildcard technical/api-*.txt)))
  SP_ARTICLES += $(API_DOCS)
+ 
+ TECH_DOCS = technical/index-format
+ TECH_DOCS += technical/pack-format
+ TECH_DOCS += technical/pack-heuristics
+ TECH_DOCS += technical/pack-protocol
+ TECH_DOCS += technical/protocol-capabilities
+ TECH_DOCS += technical/protocol-common
+ TECH_DOCS += technical/racy-git
+ TECH_DOCS += technical/send-pack-pipeline
+ TECH_DOCS += technical/shallow
+ TECH_DOCS += technical/trivial-merge
+ SP_ARTICLES += $(TECH_DOCS)
  SP_ARTICLES += technical/api-index
  
  DOC_HTML += $(patsubst %,%.html,$(ARTICLES) $(SP_ARTICLES))
@@@ -231,7 -253,7 +253,7 @@@ clean
  	$(RM) *.texi *.texi+ *.texi++ git.info gitman.info
  	$(RM) *.pdf
  	$(RM) howto-index.txt howto/*.html doc.dep
- 	$(RM) technical/api-*.html technical/api-index.txt
+ 	$(RM) technical/*.html technical/api-index.txt
  	$(RM) $(cmds_txt) *.made
  	$(RM) manpage-base-url.xsl
  
@@@ -264,7 -286,7 +286,7 @@@ technical/api-index.txt: technical/api-
  	$(QUIET_GEN)cd technical && '$(SHELL_PATH_SQ)' ./api-index.sh
  
  technical/%.html: ASCIIDOC_EXTRA += -a git-relative-html-prefix=../
- $(patsubst %,%.html,$(API_DOCS) technical/api-index): %.html : %.txt
+ $(patsubst %,%.html,$(API_DOCS) technical/api-index $(TECH_DOCS)): %.html : %.txt
  	$(QUIET_ASCIIDOC)$(ASCIIDOC) -b xhtml11 -f asciidoc.conf \
  		$(ASCIIDOC_EXTRA) -agit_version=$(GIT_VERSION) $*.txt
  
@@@ -309,7 -331,7 +331,7 @@@ $(patsubst %.txt,%.texi,$(MAN_TXT)): %.
  
  howto-index.txt: howto-index.sh $(wildcard howto/*.txt)
  	$(QUIET_GEN)$(RM) $@+ $@ && \
 -	'$(SHELL_PATH_SQ)' ./howto-index.sh $(wildcard howto/*.txt) >$@+ && \
 +	'$(SHELL_PATH_SQ)' ./howto-index.sh $(sort $(wildcard howto/*.txt)) >$@+ && \
  	mv $@+ $@
  
  $(patsubst %,%.html,$(ARTICLES)) : %.html : %.txt