Git fork

Merge branch 'js/doc-markup-updates-fix'

Work around asciidoctor's css that renders `monospace` material
in the SYNOPSIS section of manual pages as block elements.

* js/doc-markup-updates-fix:
Doc: fix Asciidoctor css workaround
asciidoctor: fix `synopsis` rendering

+11
+6
Documentation/Makefile
··· 204 204 ASCIIDOC_EXTRA += -acompat-mode -atabsize=8 205 205 ASCIIDOC_EXTRA += -I. -rasciidoctor-extensions 206 206 ASCIIDOC_EXTRA += -alitdd='&\#x2d;&\#x2d;' 207 + ASCIIDOC_EXTRA += -adocinfo=shared 207 208 ASCIIDOC_DEPS = asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS 208 209 DBLATEX_COMMON = 209 210 XMLTO_EXTRA += --skip-validation 210 211 XMLTO_EXTRA += -x manpage.xsl 211 212 endif 213 + 214 + ASCIIDOC_DEPS += docinfo.html 212 215 213 216 SHELL_PATH ?= $(SHELL) 214 217 # Shell quote; ··· 337 340 $(RM) SubmittingPatches.txt 338 341 $(RM) $(cmds_txt) $(mergetools_txt) *.made 339 342 $(RM) GIT-ASCIIDOCFLAGS 343 + 344 + docinfo.html: docinfo-html.in 345 + $(QUIET_GEN)$(RM) $@ && cat $< >$@ 340 346 341 347 $(MAN_HTML): %.html : %.txt $(ASCIIDOC_DEPS) 342 348 $(QUIET_ASCIIDOC)$(TXT_TO_HTML) -d manpage -o $@ $<
+5
Documentation/docinfo-html.in
··· 1 + <style> 2 + pre>code { 3 + display: inline; 4 + } 5 + </style>