From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 26 May 2016 21:31:46 +0000 (-0700)
Subject: Meta/Make, Meta/dodoc: enable BOLD_LITERAL
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af1e5c2a75de1d392afc47946d574193fba0f147;p=thirdparty%2Fgit.git

Meta/Make, Meta/dodoc: enable BOLD_LITERAL

While at it, retire use of old environment variables ASCIIDOC8 and
ASCIIDOC_NO_ROFF, which were retired at 79c461d5 (docs: default to
more modern toolset, 2010-11-19).
---

diff --git a/Make b/Make
index c1e1f61ad6..1896657391 100755
--- a/Make
+++ b/Make
@@ -231,8 +231,7 @@ then
 fi
 
 set	MAN_BASE_URL='"http://www.kernel.org/pub/software/scm/git/docs/"' \
-	ASCIIDOC_NO_ROFF=YesPlease \
-	ASCIIDOC8=YesPlease \
+	MAN_BOLD_LITERAL=YesPlease \
 	BLK_SHA1=YesPlease \
 	GNU_ROFF=YesPlease \
 	"$@"
diff --git a/dodoc.sh b/dodoc.sh
index cf2b23d5ab..2937c91923 100755
--- a/dodoc.sh
+++ b/dodoc.sh
@@ -62,11 +62,10 @@ done
 # The below used to contain this instead...
 # MAN_BASE_URL="http://www.kernel.org/pub/software/scm/git/docs/"
 dd='
-	ASCIIDOC_NO_ROFF=YesPlease
-	ASCIIDOC8=YesPlease
 	MAN_BASE_URL="git-htmldocs/"
 	BLK_SHA1=YesPlease
 	GNU_ROFF=YesPlease
+	MAN_BOLD_LITERAL=YesPlease
 '
 
 if test -z "$DOC_FROM_SCRATCH"