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 c1e1f61ad6bcd9005630c23fd9c673116036412d..18966573919be4606323dc35f7aa0b84cb643a9d 100755 (executable)
--- 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 cf2b23d5ab739cb3abd9661ef79577ccbab4280e..2937c919233670a00c29dd889bacb5d16a2a6494 100755 (executable)
--- 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"