Skip to content

Commit 88bc047

Browse files
committed
Meta/dodoc.sh: switch to asciidoctor
Also use asciidoctor for daily builds (Meta/Make) and releases (Meta/RelBuild).
1 parent 648e17b commit 88bc047

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

Make

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,9 +234,8 @@ then
234234
fi
235235

236236
set MAN_BASE_URL='"http://www.kernel.org/pub/software/scm/git/docs/"' \
237-
MAN_BOLD_LITERAL=YesPlease \
238237
$SHA1IMPLEMENTATION \
239-
GNU_ROFF=YesPlease \
238+
USE_ASCIIDOCTOR=YesPlease \
240239
USE_LIBPCRE=YesPlease \
241240
"$@"
242241

RelBuild

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ make clean &&
1111
make $j CFLAGS="-O2 -Wno-format-zero-length" \
1212
TAR_DIST_EXTRA_OPTS="$TAR_DIST_EXTRA_OPTS" dist &&
1313

14-
ASCIIDOC_NO_ROFF=YesPlease \
15-
ASCIIDOC8=YesPlease \
14+
USE_ASCIIDOCTOR=YesPlease \
1615
MAN_BASE_URL="git-htmldocs/" \
1716
make $j \
1817
TAR_DIST_EXTRA_OPTS="$TAR_DIST_EXTRA_OPTS" \

dodoc.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,7 @@ done
6464
dd='
6565
MAN_BASE_URL="git-htmldocs/"
6666
BLK_SHA1=YesPlease
67-
GNU_ROFF=YesPlease
68-
MAN_BOLD_LITERAL=YesPlease
67+
USE_ASCIIDOCTOR=YesPlease
6968
'
7069

7170
if test -z "$DOC_FROM_SCRATCH"

0 commit comments

Comments
 (0)