From: Felipe Contreras Date: Thu, 13 Apr 2023 11:57:36 GMT Subject: [RFC PATCH 03/12] doc: remove unnecessary hack for asciidoctor Message-ID: <20230413115745.116063-4-felipe.contreras@gmail.com> In-Reply-To: <20230413115745.116063-1-felipe.contreras@gmail.com> It was added in f6461b82b9 (Documentation: fix build with Asciidoctor 2, 2019-09-15) to avoid newlines, but they don't matter. Signed-off-by: Felipe Contreras --- Documentation/Makefile | 1 - Documentation/manpage.xsl | 3 --- t/t0600-doc-tools.sh | 4 ++-- 3 files changed, 2 insertions(+), 6 deletions(-) delete mode 100644 Documentation/manpage.xsl diff --git a/Documentation/Makefile b/Documentation/Makefile index 5cd35df61c..3fab7ce9cd 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -202,7 +202,6 @@ ASCIIDOC_EXTRA += -alitdd='&\#x2d;&\#x2d;' ASCIIDOC_DEPS = asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS DBLATEX_COMMON = XMLTO_EXTRA += --skip-validation -XMLTO_EXTRA += -x manpage.xsl endif SHELL_PATH ?= $(SHELL) diff --git a/Documentation/manpage.xsl b/Documentation/manpage.xsl deleted file mode 100644 index ef64bab17a..0000000000 --- a/Documentation/manpage.xsl +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/t/t0600-doc-tools.sh b/t/t0600-doc-tools.sh index db77db72e5..a80cd32cd6 100755 --- a/t/t0600-doc-tools.sh +++ b/t/t0600-doc-tools.sh @@ -70,7 +70,7 @@ build_asciidoctor() { asciidoctor -acompat-mode -atabsize=8 -I "$doc_dir" -rasciidoctor-extensions -alitdd='--' \ -amanmanual='Git Manual' -amansource='Git 1.0.0' -arevdate='2005-01-01' -b docbook5 -d manpage \ -o "$1.xml" "$1.txt" && - xmltoman "$1" -x "$doc_dir"/manpage.xsl + xmltoman "$1" } check_manpage() { @@ -83,7 +83,7 @@ test_expect_success ASCIIDOC 'legacy asciidoc.py' ' check_manpage "git-foo" ' -test_expect_failure ASCIIDOCTOR 'modern asciidoctor (docbook5)' ' +test_expect_success ASCIIDOCTOR 'modern asciidoctor (docbook5)' ' build_asciidoctor "git-foo" && check_manpage "git-foo" ' -- 2.40.0+fc1