From: Felipe Contreras Date: Thu, 13 Apr 2023 11:57:38 GMT Subject: [RFC PATCH 05/12] doc: fix support for multiple docbook backends Message-ID: <20230413115745.116063-6-felipe.contreras@gmail.com> In-Reply-To: <20230413115745.116063-1-felipe.contreras@gmail.com> docbook isn't a backend, but a famliy of backends. Signed-off-by: Felipe Contreras --- Documentation/asciidoc.conf | 12 ++++++------ t/t0600-doc-tools.sh | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf index 303d45dc34..356b131870 100644 --- a/Documentation/asciidoc.conf +++ b/Documentation/asciidoc.conf @@ -22,15 +22,15 @@ apostrophe=' backtick=` litdd=-- -ifdef::backend-docbook[] +ifdef::basebackend-docbook[] [linkgit-inlinemacro] {0%{target}} {0#} {0#{target}{0}} {0#} -endif::backend-docbook[] +endif::basebackend-docbook[] -ifdef::backend-docbook[] +ifdef::basebackend-docbook[] ifdef::doctype-manpage[] # The following two small workarounds insert a simple paragraph after screen [listingblock] @@ -49,10 +49,10 @@ ifdef::doctype-manpage[] {title#} {title%} endif::doctype-manpage[] -endif::backend-docbook[] +endif::basebackend-docbook[] ifdef::doctype-manpage[] -ifdef::backend-docbook[] +ifdef::basebackend-docbook[] [header] template::[header-declarations] @@ -70,7 +70,7 @@ template::[docinfo] {manname} {manpurpose} -endif::backend-docbook[] +endif::basebackend-docbook[] endif::doctype-manpage[] ifdef::backend-xhtml11[] diff --git a/t/t0600-doc-tools.sh b/t/t0600-doc-tools.sh index e4388a54c6..2552b0d376 100755 --- a/t/t0600-doc-tools.sh +++ b/t/t0600-doc-tools.sh @@ -84,7 +84,7 @@ test_expect_success ASCIIDOC 'legacy asciidoc.py' ' check_manpage "git-foo" ' -test_expect_failure ASCIIDOC 'legacy asciidoc.py (docbook5)' ' +test_expect_success ASCIIDOC 'legacy asciidoc.py (docbook5)' ' build_asciidoc_py "git-foo" docbook5 && check_manpage "git-foo" ' -- 2.40.0+fc1