Skip to content

Commit 1ad5417

Browse files
committed
Merge branch 'ta/doc-http-protocol-in-html'
* ta/doc-http-protocol-in-html: http-protocol.txt: don't use uppercase for variable names in "The Negotiation Algorithm" Documentation: make it easier to maintain enumerated documents create HTML for http-protocol.txt
2 parents 78dc48e + 9c96c7f commit 1ad5417

File tree

2 files changed

+121
-114
lines changed

2 files changed

+121
-114
lines changed

Documentation/Makefile

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
MAN1_TXT =
33
MAN5_TXT =
44
MAN7_TXT =
5+
TECH_DOCS =
6+
ARTICLES =
7+
SP_ARTICLES =
58

69
MAN1_TXT += $(filter-out \
710
$(addsuffix .txt, $(ARTICLES) $(SP_ARTICLES)), \
@@ -37,12 +40,12 @@ MAN_HTML = $(patsubst %.txt,%.html,$(MAN_TXT))
3740
OBSOLETE_HTML = git-remote-helpers.html
3841
DOC_HTML = $(MAN_HTML) $(OBSOLETE_HTML)
3942

40-
ARTICLES = howto-index
43+
ARTICLES += howto-index
4144
ARTICLES += everyday
4245
ARTICLES += git-tools
4346
ARTICLES += git-bisect-lk2009
4447
# with their own formatting rules.
45-
SP_ARTICLES = user-manual
48+
SP_ARTICLES += user-manual
4649
SP_ARTICLES += howto/new-command
4750
SP_ARTICLES += howto/revert-branch-rebase
4851
SP_ARTICLES += howto/using-merge-subtree
@@ -60,7 +63,8 @@ SP_ARTICLES += howto/maintain-git
6063
API_DOCS = $(patsubst %.txt,%,$(filter-out technical/api-index-skel.txt technical/api-index.txt, $(wildcard technical/api-*.txt)))
6164
SP_ARTICLES += $(API_DOCS)
6265

63-
TECH_DOCS = technical/index-format
66+
TECH_DOCS += technical/http-protocol
67+
TECH_DOCS += technical/index-format
6468
TECH_DOCS += technical/pack-format
6569
TECH_DOCS += technical/pack-heuristics
6670
TECH_DOCS += technical/pack-protocol

0 commit comments

Comments
 (0)