Meta/dodoc.sh: switch to asciidoctor

Also use asciidoctor for daily builds (Meta/Make) and releases
(Meta/RelBuild).

diff --git a/Make b/Make
index e635b104e766fff7ff858221cd122a56f7ba7af6..7d6907b1452837d259c271c168fea739d2b1b024 100755 (executable)
--- a/Make
+++ b/Make
@@ -234,9 +234,8 @@ then
 fi
 
 set    MAN_BASE_URL='"http://www.kernel.org/pub/software/scm/git/docs/"' \
-       MAN_BOLD_LITERAL=YesPlease \
        $SHA1IMPLEMENTATION \
-       GNU_ROFF=YesPlease \
+       USE_ASCIIDOCTOR=YesPlease \
        USE_LIBPCRE=YesPlease \
        "$@"
 

diff --git a/RelBuild b/RelBuild
index ab49d53f9f1f3ecea6295ca33f4b9093fc421afc..45045b67e4309ea98bd594a699c9fcf561879025 100755 (executable)
--- a/RelBuild
+++ b/RelBuild
@@ -11,8 +11,7 @@ make clean &&
 make $j CFLAGS="-O2 -Wno-format-zero-length" \
        TAR_DIST_EXTRA_OPTS="$TAR_DIST_EXTRA_OPTS" dist &&
 
-ASCIIDOC_NO_ROFF=YesPlease \
-ASCIIDOC8=YesPlease \
+USE_ASCIIDOCTOR=YesPlease \
 MAN_BASE_URL="git-htmldocs/" \
 make $j \
        TAR_DIST_EXTRA_OPTS="$TAR_DIST_EXTRA_OPTS" \

diff --git a/dodoc.sh b/dodoc.sh
index 719203f482e5e04839df2bf84748c5ff771ee383..2a72b654f922f4cf5c522f979ccbe3fd14f206fb 100755 (executable)
--- a/dodoc.sh
+++ b/dodoc.sh
@@ -64,8 +64,7 @@ done
 dd='
        MAN_BASE_URL="git-htmldocs/"
        BLK_SHA1=YesPlease
-       GNU_ROFF=YesPlease
-       MAN_BOLD_LITERAL=YesPlease
+       USE_ASCIIDOCTOR=YesPlease
 '
 
 if test -z "$DOC_FROM_SCRATCH"