Skip to content

Commit 3cdea38

Browse files
committed
Merge branch 'bc/submitting-patches-in-asciidoc' into maint
The SubmittingPatches document has been converted to produce an HTML version via AsciiDoc/Asciidoctor. * bc/submitting-patches-in-asciidoc: Documentation: convert SubmittingPatches to AsciiDoc Documentation: enable compat-mode for Asciidoctor
2 parents 02abc6b + 049e64a commit 3cdea38

File tree

3 files changed

+192
-161
lines changed

3 files changed

+192
-161
lines changed

Documentation/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ doc.dep
1111
cmds-*.txt
1212
mergetools-*.txt
1313
manpage-base-url.xsl
14+
SubmittingPatches.txt

Documentation/Makefile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ SP_ARTICLES += howto/maintain-git
6767
API_DOCS = $(patsubst %.txt,%,$(filter-out technical/api-index-skel.txt technical/api-index.txt, $(wildcard technical/api-*.txt)))
6868
SP_ARTICLES += $(API_DOCS)
6969

70+
TECH_DOCS += SubmittingPatches
7071
TECH_DOCS += technical/hash-function-transition
7172
TECH_DOCS += technical/http-protocol
7273
TECH_DOCS += technical/index-format
@@ -181,6 +182,7 @@ ASCIIDOC = asciidoctor
181182
ASCIIDOC_CONF =
182183
ASCIIDOC_HTML = xhtml5
183184
ASCIIDOC_DOCBOOK = docbook45
185+
ASCIIDOC_EXTRA += -acompat-mode
184186
ASCIIDOC_EXTRA += -I. -rasciidoctor-extensions
185187
ASCIIDOC_EXTRA += -alitdd='&\#x2d;&\#x2d;'
186188
DBLATEX_COMMON =
@@ -323,6 +325,7 @@ clean:
323325
$(RM) *.pdf
324326
$(RM) howto-index.txt howto/*.html doc.dep
325327
$(RM) technical/*.html technical/api-index.txt
328+
$(RM) SubmittingPatches.txt
326329
$(RM) $(cmds_txt) $(mergetools_txt) *.made
327330
$(RM) manpage-base-url.xsl
328331

@@ -361,6 +364,9 @@ technical/%.html: ASCIIDOC_EXTRA += -a git-relative-html-prefix=../
361364
$(patsubst %,%.html,$(API_DOCS) technical/api-index $(TECH_DOCS)): %.html : %.txt asciidoc.conf
362365
$(QUIET_ASCIIDOC)$(TXT_TO_HTML) $*.txt
363366

367+
SubmittingPatches.txt: SubmittingPatches
368+
$(QUIET_GEN) cp $< $@
369+
364370
XSLT = docbook.xsl
365371
XSLTOPTS = --xinclude --stringparam html.stylesheet docbook-xsl.css
366372

0 commit comments

Comments
 (0)