From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 23 Dec 2012 04:40:07 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.8.1~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/86c3e6ed515d5e3bfca1d515c607db55ba032d71?ds=inline;hp=-c

Merge branch 'maint'
---

86c3e6ed515d5e3bfca1d515c607db55ba032d71
diff --combined Documentation/Makefile
index f3afcb620d,fe9a91d6a3..e53d333e5c
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@@ -21,7 -21,6 +21,7 @@@ ARTICLES += git-tool
  ARTICLES += git-bisect-lk2009
  # with their own formatting rules.
  SP_ARTICLES = user-manual
 +SP_ARTICLES += howto/new-command
  SP_ARTICLES += howto/revert-branch-rebase
  SP_ARTICLES += howto/using-merge-subtree
  SP_ARTICLES += howto/using-signed-tag-in-pull-request
@@@ -32,6 -31,7 +32,6 @@@ SP_ARTICLES += howto/separating-topic-b
  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)))
@@@ -331,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