asciidoctor 2.0.16 → 2.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae8326d324111eddacde180bd2f207e1bc0bfd632695836e732a058165a0ac00
-  data.tar.gz: 27c06f4266e1e56a9c5c6ad1c86947361ee9c9cc8d32763af443329cebeea4be
+  metadata.gz: c33baadb7f5d28211bbb55b0b2b002159d57d483d35d17fe1b11d72dd4389e53
+  data.tar.gz: db81a673d28035c721612ab1c4f9d23e005a824384ac0ba1b1983e9e817d44e6
 SHA512:
-  metadata.gz: c42130c39f04726d9279edd8fe6bd9b93f55e02164161feb3cf84edfd74039e6e9fae94e4bed1f77612bc1c015f1dec90e015df4ded0f1bca11d7cf7eb8d1a6a
-  data.tar.gz: 676647258232f12d900507468935812f72faaa43fd78f68af0c03aa33e2d2abb81cb0607a9ddb84f7e5f5f3cf67882f1ffc6703aa3c016659cee2053113b061e
+  metadata.gz: a1fae45fddd3696607f9337f35222ecfad106aa295d2f328b54af5c21404ddb0c59baf6424b180bf46e4fed36fa28a6042f2d90310bb8acea01da4790a80ba3f
+  data.tar.gz: 0d65fb85055130df297d9ed12a63d68d03d5876c5b09f84d052396e793dada3a9406217969ac6574a3404b62113fb3afa7da235f6692ef2c1651904ecba00c71

data/CHANGELOG.adoc

@@ -11,11 +11,51 @@ endif::[]
 {uri-asciidoctor}[Asciidoctor] is a _fast_, open source text processor and publishing toolchain for converting {uri-asciidoc}[AsciiDoc] content into HTML 5, DocBook 5, and other formats.
 
 This document provides a high-level view of the changes introduced in Asciidoctor by release.
-For an even more detailed look at what has changed, refer to the {uri-repo}/commits/master[commit history] on GitHub.
+For an even more detailed look at what has changed, refer to the {uri-repo}/commits/[commit history] on GitHub.
 
 This project utilizes semantic versioning.
 
 // tag::compact[]
+== 2.0.17 (2022-01-05) - @mojavelinux
+
+Bug Fixes::
+
+  * Don't crash if process method for custom block returns an abstract block with context `:compound` that isn't of type `Block` (e.g., a list)
+  * Ignore return value of process method for custom block or block macro if value matches parent argument
+  * Remove unnamespaced selectors in Pygments stylesheet
+  * Normalize output from Pygments to use `linenos` class for inline line numbering and trim space after number; update default stylesheet accordingly
+  * Change `AbstractBlock#sections?` to return false when called on block that isn't a Section or Document (PR #3591) *@mogztter*
+  * Hide built-in marker on HTML summary element in Safari when using default stylesheet (#4162)
+  * Hide outline around HTML summary when activated in Safari (#4162)
+  * Include primary video in value of `playlist` attribute when embeddding YouTube video (#4156)
+  * Honor stripes=none on nested table (#4165)
+  * Update default stylesheet to fix spacing around empty list item (#4184)
+  * Honor `:header_only` option when parsing document with manpage doctype (#4192)
+  * Use numeric character reference for closing square bracket around alt text of icon
+  * Process author or authors document attribute in document header when implicit doctitle is absent (#4206)
+  * Patch open-uri-cached gem to work with Ruby 3.1 (update: drop patch now that open-uri-cached has been fixed) (#4227)
+
+Improvements::
+
+  * Prevent line numbers on source blocks in HTML output from being selected (applies to pygments and coderay) (#4128)
+  * Allow hash to be specified for Vimeo video either in video ID or using `hash` attribute (#4176)
+  * Remove unnecessary specificity in default stylesheet for styling p element inside list item
+  * Remove obsolete gist embed styles from default stylesheet
+  * Allow `--failure-level` to be set to default value, `FATAL`
+  * Sort levels in help for `--failure-level` option in ascending order
+  * Invert FR translations for caution & warning admonition labels (#4212) (*cyChop*)
+  * Add tests for open-uri-cached integration that is activated by the `cache-uri` attribute
+  * Don't warn if negated tag is not found in include file (#4230)
+
+Documentation::
+
+  * Document how to extend an existing converter or create a new converter (#4136)
+  * Document the syntax topic of the `--help` CLI option (#4175)
+  * Document how to uninstall the Asciidoctor gem (#4154)
+  * Document how to enable and use the sourcemap (the `:sourcemap` option)
+  * Document how to catalog additional assets (the `:catalog_assets` option)
+
+// end::compact[]
 == 2.0.16 (2021-08-03) - @mojavelinux
 
 Bug Fixes::
@@ -26,7 +66,7 @@ Bug Fixes::
   * Don't crash if `:to_file` option is passed to `load` or `load_file` and value is not a string (#4055)
   * Use automatic link text if ID in shorthand xref is followed by dangling comma (e.g., `+<<idname,>>+`)
   * Update default stylesheet to indent blocks attached to list item in checklist (#2550)
-  * Update default stylesheet to reenable styling of implicit lead role on first paragraph of preamble inside AsciiDoc table cell
+  * Update default stylesheet to re-enable styling of implicit lead role on first paragraph of preamble inside AsciiDoc table cell
   * Update default stylesheet to fix conflict between text decoration and bottom border on abbr[title] element
   * Change invalid font family "sans" in default stylesheet to "sans-serif"
   * Fix missing automatic reftext for internal xrefs in manpage output (#4110)
@@ -52,7 +92,6 @@ Build / Infrastructure::
   * Import source of default stylesheet into this repository; use PostCSS with cssnano to minify (#4062)
   * Use autoprefixer to manage browser prefixes in default stylesheet (#4118)
 
-// end::compact[]
 == 2.0.15 (2021-04-27) - @mojavelinux
 
 Bug Fixes::
@@ -137,7 +176,7 @@ Bug Fixes::
 
   * Set type and target property on unresolved footnote reference and unset id property (fixes regression) (#3825)
   * Fix crash when inlining an SVG if the explicit width or height value on the image node is not a string (#3829)
-  * Reset word wrap behavior to normal on tables, then reenable again for admonition content, horizontal dlist description, and AsciiDoc table cells (#3833)
+  * Reset word wrap behavior to normal on tables, then re-enable again for admonition content, horizontal dlist description, and AsciiDoc table cells (#3833)
 
 Improvements::
 
@@ -686,7 +725,7 @@ Enhancements::
   * register document in catalog if id is set; assign reftext to document attributes if specified in a block attribute line (#2301, PR #2428)
   * allow automatic width to be applied to individual columns in a table using the special value `~` (#1844)
   * use the quote element in DocBook converter to represent smart quotes (#2272, PR #2356) (@bk2204)
-  * parse and pass all manpage names to output document master (i.e., shadow man pages) (#1811, #2543, PR #2414)
+  * parse and pass all manpage names to output (i.e., shadow man pages) (#1811, #2543, PR #2414)
   * parse credit line of shorthand quote block as block attributes; apply normal subs to credit line in shorthand quote blocks (#1667, PR #2452)
   * populate copyright element in DocBook output from value of copyright attribute (#2728)
   * preserve directories if source dir and destination dir are set (#1394, PR #2421)
@@ -1016,7 +1055,7 @@ Compliance::
 
   * retain block content in items of callout list when converting to HTML and man page (#1478)
   * only substitute specialchars for content in literal table cells (#1912)
-  * fix operator logic for ifndef directive with multiple attributes (#1983)
+  * fix operator logic for ifndef directive with multiple attributes to align with behavior of AsciiDoc.py; when attributes are separated by commas, content is only included if none of the attributes listed are set; when attributes are separated by pluses, content is included if at least one of the attributes is not set (#1983)
   * only recognize uniform underline for setext section title (#2083)
   * don't match headings with mixed leading characters (#2074)
   * fix layout break from matching lines it shouldn't
@@ -1139,7 +1178,7 @@ https://github.com/asciidoctor/asciidoctor/compare/v1.5.5\...v1.5.6[full diff]
 Enhancements::
 
   * Add preference to limit the maximum size of an attribute value (#1861)
-  * Honor SOURCE_DATE_EPOCH environment variable to accomodate reproducible builds (#1721) (*@JojoBoulix*)
+  * Honor SOURCE_DATE_EPOCH environment variable to accommodate reproducible builds (#1721) (*@JojoBoulix*)
   * Add reversed attribute to ordered list if reversed option is enabled (#1830)
   * Add support for additional docinfo locations (e.g., :header)
   * Configure default stylesheet to break monospace word if exceeds length of line using `word-wrap: break-word`; add `nobreak` and `nowrap` roles to prevent breaks (#1814)
@@ -1171,7 +1210,7 @@ Improvements::
 
 Compliance::
 
-  * Support 6-digit decimal char refs, 5-digit hexidecimal char refs (#1824)
+  * Support 6-digit decimal char refs, 5-digit hexadecimal char refs (#1824)
   * Compatibility fixes for Opal
   * Check for number using Integer instead of Fixnum class for compatibility with Ruby 2.4
 
@@ -1188,7 +1227,7 @@ Bug Fixes::
 
 Infrastructure::
 
-  * Build gem properly in the absense of a git workspace, make compatible with JRuby (#1779)
+  * Build gem properly in the absence of a git workspace, make compatible with JRuby (#1779)
   * Run tests in CI using latest versions of Ruby, including Ruby 2.3 (*@ferdinandrosario*)
 
 Distribution Packages::
@@ -1631,7 +1670,7 @@ Bug Fixes::
 Infrastructure::
 
   * add Ruby 2.1 to list of supported platforms
-  * reenable rbx in Travis build
+  * re-enable rbx in Travis build
   * switch tests to minitest (*@ktdreyer*)
   * update RPM for Fedora Rawhide (*@ktdreyer*)
   * refactor unit tests so they work in RubyMine (*@cmoulliard*)
@@ -1937,7 +1976,7 @@ Compliance::
   * support limited value comparison functionality of ifeval (#83)
   * added support for multiple attributes in ifdef and ifndef directives
   * don't attempt to embed image with uri reference when data-uri is set (#157)
-  * accomodate trailing dot in author name (#156)
+  * accommodate trailing dot in author name (#156)
   * don't hardcode language attribute in html backend (#185)
   * removed language from DocBook root node (#188)
   * fixed revinfo line swallowing attribute entry

data/README-de.adoc

@@ -1,6 +1,6 @@
 = Asciidoctor
-Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>; Ryan Waldron <https://github.com/erebor[@erebor]>
-v2.0.16, 2021-08-03
+Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>
+v2.0.17, 2022-01-05
 // settings:
 :idprefix:
 :idseparator: -
@@ -9,7 +9,6 @@ v2.0.16, 2021-08-03
 ifndef::env-github[:icons: font]
 ifdef::env-github[]
 :status:
-:outfilesuffix: .adoc
 :caution-caption: :fire:
 :important-caption: :exclamation:
 :note-caption: :paperclip:
@@ -17,7 +16,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.16
+:release-version: 2.0.17
 // URIs:
 :uri-org: https://github.com/asciidoctor
 :uri-repo: {uri-org}/asciidoctor
@@ -33,8 +32,8 @@ ifdef::env-site[:uri-project: link:]
 :uri-rel-file-base: link:
 :uri-rel-tree-base: link:
 ifdef::env-site[]
-:uri-rel-file-base: {uri-repo}/blob/master/
-:uri-rel-tree-base: {uri-repo}/tree/master/
+:uri-rel-file-base: {uri-repo}/blob/HEAD/
+:uri-rel-tree-base: {uri-repo}/tree/HEAD/
 endif::[]
 :uri-changelog: {uri-rel-file-base}CHANGELOG.adoc
 :uri-contribute: {uri-rel-file-base}CONTRIBUTING.adoc
@@ -51,14 +50,13 @@ endif::[]
 :uri-render-doc: {uri-docs}/render-documents
 :uri-themes-doc: {uri-docs}/produce-custom-themes-using-asciidoctor-stylesheet-factory
 :uri-gitscm-repo: https://github.com/git/git-scm.com
-:uri-prototype: {uri-gitscm-repo}/commits/master/lib/asciidoc.rb
 :uri-freesoftware: https://www.gnu.org/philosophy/free-sw.html
 :uri-foundation: https://foundation.zurb.com
 :uri-opal: https://opalrb.com
 :uri-tilt: https://github.com/rtomayko/tilt
 :uri-ruby: https://ruby-lang.org
 // images:
-:image-uri-screenshot: https://raw.githubusercontent.com/asciidoctor/asciidoctor/master/screenshot.png
+:image-uri-screenshot: https://cdn.jsdelivr.net/gh/asciidoctor/asciidoctor/screenshot.png
 
 {uri-project}[Asciidoctor] ist ein _schneller_, {uri-license}[Open Source] Textverarbeitungs- und Publishing-Toolchain für die Konvertierung von {uri-what-is-asciidoc}[AsciiDoc]-Inhalten in HTML 5, DocBook 5, PDF und andere Formate.
 Asciidoctor ist in Ruby geschrieben und läuft auf allen gängigen Betriebsystemen.
@@ -88,8 +86,7 @@ ifdef::status[]
 image:https://img.shields.io/gem/v/asciidoctor.svg[Latest Release, link={uri-gem}]
 image:https://img.shields.io/badge/rubydoc.info-{release-version}-blue.svg[library (API) docs,link=https://www.rubydoc.info/gems/asciidoctor/{release-version}]
 image:https://github.com/asciidoctor/asciidoctor/workflows/CI/badge.svg[Build Status (GitHub Actions),link={uri-repo}/actions]
-image:https://inch-ci.org/github/asciidoctor/asciidoctor.svg?branch=master[Inline docs,link=https://inch-ci.org/github/asciidoctor/asciidoctor]
-image:https://img.shields.io/badge/zulip-join_chat-brightgreen.svg[project chat,link=https://asciidoctor.zulipchat.com/]
+image:https://img.shields.io/badge/zulip-join_chat-brightgreen.svg[Project Chat (Zulip),link={uri-chat}]
 endif::[]
 
 == Sponsoren
@@ -460,7 +457,7 @@ Siehe die {uri-license}[LIZENZ] für den vollen Lizenztext.
 == Authoren
 
 *Asciidoctor* wird von https://github.com/mojavelinux[Dan Allen] und https://github.com/graphitefriction[Sarah White] geleitet und hat Beiträge von {uri-contributors}[vielen Personen] in Asciidoctors großartiger Gemeinschaft erhalten.
-Das Projekt wurde 2012 von https://github.com/erebor[Ryan Waldron] initiiert und basiert auf einem {uri-prototype}[Prototyp] von https://github.com/nickh[Nick Hengeveld].
+Das Projekt wurde 2012 von https://github.com/erebor[Ryan Waldron] initiiert und basiert auf einem prototyp von https://github.com/nickh[Nick Hengeveld].
 
 *AsciiDoc* wurde von Stuart Rackham gegründet und hat Beiträge von vielen Personen aus der AsciiDoc-Community erhalten.
 

data/README-fr.adoc

@@ -1,6 +1,6 @@
 = Asciidoctor
-Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>; Ryan Waldron <https://github.com/erebor[@erebor]>
-v2.0.16, 2021-08-03
+Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>
+v2.0.17, 2022-01-05
 // settings:
 :idprefix:
 :idseparator: -
@@ -9,7 +9,6 @@ v2.0.16, 2021-08-03
 ifndef::env-github[:icons: font]
 ifdef::env-github[]
 :status:
-:outfilesuffix: .adoc
 :caution-caption: :fire:
 :important-caption: :exclamation:
 :note-caption: :paperclip:
@@ -17,7 +16,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.16
+:release-version: 2.0.17
 // URIs:
 :uri-org: https://github.com/asciidoctor
 :uri-repo: {uri-org}/asciidoctor
@@ -33,8 +32,8 @@ ifdef::env-site[:uri-project: link:]
 :uri-rel-file-base: link:
 :uri-rel-tree-base: link:
 ifdef::env-site[]
-:uri-rel-file-base: {uri-repo}/blob/master/
-:uri-rel-tree-base: {uri-repo}/tree/master/
+:uri-rel-file-base: {uri-repo}/blob/HEAD/
+:uri-rel-tree-base: {uri-repo}/tree/HEAD/
 endif::[]
 :uri-changelog: {uri-rel-file-base}CHANGELOG.adoc
 :uri-contribute: {uri-rel-file-base}CONTRIBUTING.adoc
@@ -51,13 +50,12 @@ endif::[]
 :uri-render-doc: {uri-docs}/render-documents
 :uri-themes-doc: {uri-docs}/produce-custom-themes-using-asciidoctor-stylesheet-factory
 :uri-gitscm-repo: https://github.com/git/git-scm.com
-:uri-prototype: {uri-gitscm-repo}/commits/master/lib/asciidoc.rb
 :uri-freesoftware: https://www.gnu.org/philosophy/free-sw.html
 :uri-foundation: https://foundation.zurb.com
 :uri-tilt: https://github.com/rtomayko/tilt
 :uri-ruby: https://ruby-lang.org
 // images:
-:image-uri-screenshot: https://raw.githubusercontent.com/asciidoctor/asciidoctor/master/screenshot.png
+:image-uri-screenshot: https://cdn.jsdelivr.net/gh/asciidoctor/asciidoctor/screenshot.png
 
 {uri-project}/[Asciidoctor] est un processeur de texte et une chaîne de publication _rapide_ et {uri-license}[open source] permettant de convertir du contenu {uri-what-is-asciidoc}[AsciiDoc] en HTML 5, DocBook 5, PDF et d'autres formats.
 Asciidoctor est écrit en Ruby et fonctionne sur les principaux systèmes d'exploitation.
@@ -85,8 +83,7 @@ ifdef::status[]
 image:https://img.shields.io/gem/v/asciidoctor.svg[Latest Release, link={uri-gem}]
 image:https://img.shields.io/badge/rubydoc.info-{release-version}-blue.svg[library (API) docs,link=https://www.rubydoc.info/gems/asciidoctor/{release-version}]
 image:https://github.com/asciidoctor/asciidoctor/workflows/CI/badge.svg[Build Status (GitHub Actions),link={uri-repo}/actions]
-image:https://inch-ci.org/github/asciidoctor/asciidoctor.svg?branch=master[Inline docs,link=https://inch-ci.org/github/asciidoctor/asciidoctor]
-image:https://img.shields.io/badge/zulip-join_chat-brightgreen.svg[project chat,link=https://asciidoctor.zulipchat.com/]
+image:https://img.shields.io/badge/zulip-join_chat-brightgreen.svg[Project Chat,link={uri-chat}]
 endif::[]
 
 == Sponsors
@@ -426,7 +423,7 @@ Consultez le fichier {uri-license}[LICENSE] pour plus de détails.
 == Auteurs
 
 *Asciidoctor* est mené par https://github.com/mojavelinux[Dan Allen] et https://github.com/graphitefriction[Sarah White] et reçoit de nombreuses contributions de la part de la {uri-contributors}[géniale communauté] Asciidoctor.
-Le projet a été initié en 2012 par https://github.com/erebor[Ryan Waldron] et est basé sur {uri-prototype}[un prototype] écrit par https://github.com/nickh[Nick Hengeveld].
+Le projet a été initié en 2012 par https://github.com/erebor[Ryan Waldron] et est basé sur un prototype écrit par https://github.com/nickh[Nick Hengeveld].
 
 *AsciiDoc* a été démarré par Stuart Rackham et a reçu de nombreuses contributions de la part de la communauté AsciiDoc.
 

data/README-jp.adoc

@@ -1,6 +1,6 @@
 = Asciidoctor
-Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>; Ryan Waldron <https://github.com/erebor[@erebor]>
-v2.0.16, 2021-08-03
+Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>
+v2.0.17, 2022-01-05
 // settings:
 :idprefix:
 :idseparator: -
@@ -9,7 +9,6 @@ v2.0.16, 2021-08-03
 ifndef::env-github[:icons: font]
 ifdef::env-github[]
 :status:
-:outfilesuffix: .adoc
 :caution-caption: :fire:
 :important-caption: :exclamation:
 :note-caption: :paperclip:
@@ -17,7 +16,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.16
+:release-version: 2.0.17
 // URIs:
 :uri-org: https://github.com/asciidoctor
 :uri-repo: {uri-org}/asciidoctor
@@ -37,8 +36,8 @@ ifdef::env-site[:uri-project: link:]
 :uri-rel-file-base: link:
 :uri-rel-tree-base: link:
 ifdef::env-site,env-yard[]
-:uri-rel-file-base: {uri-repo}/blob/master/
-:uri-rel-tree-base: {uri-repo}/tree/master/
+:uri-rel-file-base: {uri-repo}/blob/HEAD/
+:uri-rel-tree-base: {uri-repo}/tree/HEAD/
 endif::[]
 :uri-changelog: {uri-rel-file-base}CHANGELOG.adoc
 :uri-contribute: {uri-rel-file-base}CONTRIBUTING.adoc
@@ -55,14 +54,13 @@ endif::[]
 :uri-convert-doc: {uri-docs}/convert-documents
 :uri-themes-doc: {uri-docs}/produce-custom-themes-using-asciidoctor-stylesheet-factory
 :uri-gitscm-repo: https://github.com/git/git-scm.com
-:uri-prototype: {uri-gitscm-repo}/commits/master/lib/asciidoc.rb
 :uri-freesoftware: https://www.gnu.org/philosophy/free-sw.html
 :uri-foundation: https://foundation.zurb.com
 :uri-opal: https://opalrb.com
 :uri-tilt: https://github.com/rtomayko/tilt
 :uri-ruby: https://www.ruby-lang.org
 // images:
-:image-uri-screenshot: https://raw.githubusercontent.com/asciidoctor/asciidoctor/master/screenshot.png
+:image-uri-screenshot: https://cdn.jsdelivr.net/gh/asciidoctor/asciidoctor/screenshot.png
 
 {uri-project}[Asciidoctor]は, {uri-what-is-asciidoc}[AsciiDoc] で書かれたコンテンツをHTML5, DocBook, PDFなどのフォーマットに変換する, _高速で_ {uri-license}[オープンソース] のテキストプロセッサおよびパブリッシングツールチェインです.
 AsciidoctorはRubyで書かれており, すべての主要オペレーティングシステムで動作します.
@@ -70,7 +68,7 @@ Asciidoctorプロジェクトは {uri-repo}[GitHubにホスティング] され
 
 インストールをシンプルにするため, AsciidoctorはRubyGem（gem）パッケージとして, {uri-rubygem}[RubyGems.org] で配布されています.
 さらに, Asciidoctorは主要なLinuxディストリビューション用およびmacOS用パッケージとしても配布されています.
-AsciidctorはRubyで動作するだけでなく, {uri-asciidoctorj}[AsciidoctorJ]としてJVM上でも動作します. また, {uri-asciidoctorjs}[Asciidoctor.js]としてどのようなJavaScript環境（ブラウザを含む）でも実行できます.
+AsciidoctorはRubyで動作するだけでなく, {uri-asciidoctorj}[AsciidoctorJ]としてJVM上でも動作します. また, {uri-asciidoctorjs}[Asciidoctor.js]としてどのようなJavaScript環境（ブラウザを含む）でも実行できます.
 
 ifndef::env-site,env-yard[]
 このドキュメントには以下の言語版が存在します: +
@@ -94,8 +92,7 @@ ifdef::status[]
 image:https://img.shields.io/gem/v/asciidoctor.svg[Latest Release, link={uri-gem}]
 image:https://img.shields.io/badge/rubydoc.info-{release-version}-blue.svg[library (API) docs,link=https://www.rubydoc.info/gems/asciidoctor/{release-version}]
 image:https://github.com/asciidoctor/asciidoctor/workflows/CI/badge.svg[Build Status (GitHub Actions),link={uri-repo}/actions]
-image:https://inch-ci.org/github/asciidoctor/asciidoctor.svg?branch=master[Inline docs,link=https://inch-ci.org/github/asciidoctor/asciidoctor]
-image:https://img.shields.io/badge/zulip-join_chat-brightgreen.svg[project chat,link=https://asciidoctor.zulipchat.com/]
+image:https://img.shields.io/badge/zulip-join_chat-brightgreen.svg[Project Chat,link={uri-chat}]
 endif::[]
 
 == スポンサー
@@ -460,7 +457,7 @@ Copyright (C) 2012-present Dan Allen, Sarah White, Ryan Waldron, and the individ
 == 作者
 
 *Asciidoctor* は https://github.com/mojavelinux[Dan Allen] と https://github.com/graphitefriction[Sarah White] がリードし, Asciidoctorの素晴らしきコミュニティの {uri-contributors}[数多くのメンバ] からコントリビューションを受けてきました．
-このプロジェクトは https://github.com/nickh[Nick Hengeveld] の {uri-prototype}[プロトタイプ] をベースに https://github.com/erebor[Ryan Waldron] により2012年から創始されました.
+このプロジェクトは https://github.com/nickh[Nick Hengeveld] のプロトタイプをベースに https://github.com/erebor[Ryan Waldron] により2012年から創始されました.
 
 *AsciiDoc* は Stuart Rackham により創始され, AsciiDocコミュニティの数多くのメンバからコントリビューションを受けてきました.
 

data/README-zh_CN.adoc

@@ -1,6 +1,6 @@
 = Asciidoctor
-Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>; Ryan Waldron <https://github.com/erebor[@erebor]>
-v2.0.16, 2021-08-03
+Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>
+v2.0.17, 2022-01-05
 // settings:
 :page-layout: base
 :idprefix:
@@ -10,7 +10,6 @@ v2.0.16, 2021-08-03
 ifndef::env-github[:icons: font]
 ifdef::env-github[]
 :status:
-:outfilesuffix: .adoc
 :caution-caption: :fire:
 :important-caption: :exclamation:
 :note-caption: :paperclip:
@@ -18,7 +17,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.16
+:release-version: 2.0.17
 // URIs:
 :uri-org: https://github.com/asciidoctor
 :uri-repo: {uri-org}/asciidoctor
@@ -34,8 +33,8 @@ ifdef::env-site[:uri-project: link:]
 :uri-rel-file-base: link:
 :uri-rel-tree-base: link:
 ifdef::env-site[]
-:uri-rel-file-base: {uri-repo}/blob/master/
-:uri-rel-tree-base: {uri-repo}/tree/master/
+:uri-rel-file-base: {uri-repo}/blob/HEAD/
+:uri-rel-tree-base: {uri-repo}/tree/HEAD/
 endif::[]
 :uri-changelog: {uri-rel-file-base}CHANGELOG.adoc
 :uri-contribute: {uri-rel-file-base}CONTRIBUTING.adoc
@@ -52,13 +51,12 @@ endif::[]
 :uri-render-doc: {uri-docs}/render-documents
 :uri-themes-doc: {uri-docs}/produce-custom-themes-using-asciidoctor-stylesheet-factory
 :uri-gitscm-repo: https://github.com/git/git-scm.com
-:uri-prototype: {uri-gitscm-repo}/commits/master/lib/asciidoc.rb
 :uri-freesoftware: https://www.gnu.org/philosophy/free-sw.html
 :uri-foundation: https://foundation.zurb.com
 :uri-tilt: https://github.com/rtomayko/tilt
 :uri-ruby: https://ruby-lang.org
 // images:
-:image-uri-screenshot: https://raw.githubusercontent.com/asciidoctor/asciidoctor/master/screenshot.png
+:image-uri-screenshot: https://cdn.jsdelivr.net/gh/asciidoctor/asciidoctor/screenshot.png
 
 {uri-project}/[Asciidoctor] 是一个 _快速_ 文本处理器和发布工具链，它可以将 {uri-what-is-asciidoc}[AsciiDoc] 文档转化成 HTML 5、 DocBook 5 以及其他格式。
 Asciidoctor 由 Ruby 编写，打包成 RubyGem，然后发布到 {uri-rubygem}[RubyGems.org] 上。
@@ -82,8 +80,7 @@ ifdef::status[]
 image:https://img.shields.io/gem/v/asciidoctor.svg[Latest Release, link={uri-gem}]
 image:https://img.shields.io/badge/rubydoc.info-{release-version}-blue.svg[library (API) docs,link=https://www.rubydoc.info/gems/asciidoctor/{release-version}]
 image:https://github.com/asciidoctor/asciidoctor/workflows/CI/badge.svg[Build Status (GitHub Actions),link={uri-repo}/actions]
-image:https://inch-ci.org/github/asciidoctor/asciidoctor.svg?branch=master[Inline docs,link=https://inch-ci.org/github/asciidoctor/asciidoctor]
-image:https://img.shields.io/badge/zulip-join_chat-brightgreen.svg[project chat,link=https://asciidoctor.zulipchat.com/]
+image:https://img.shields.io/badge/zulip-join_chat-brightgreen.svg[Project Chat,link={uri-chat}]
 endif::[]
 
 .Ruby 所至， Asciidoctor 相随
@@ -420,7 +417,7 @@ Copyright (C) 2012-present Dan Allen, Sarah White, Ryan Waldron, and the individ
 == 作者
 
 *Asciidoctor* 由 https://github.com/mojavelinux[Dan Allen] 和 https://github.com/graphitefriction[Sarah White] 领导，并从 Asciidoctor 社区的 {uri-contributors}[很多其他独立开发者] 上收到了很多贡献。
-项目最初由 https://github.com/erebor[Ryan Waldron] 于 2012年基于 https://github.com/nickh[Nick Hengeveld] 的 {uri-prototype}[原型] 创建。
+项目最初由 https://github.com/erebor[Ryan Waldron] 于 2012年基于 https://github.com/nickh[Nick Hengeveld] 的原型创建。
 
 *AsciiDoc* 由 Stuart Rackham 启动，并从 AsciiDoc 社区的其他独立开发者上收到很多贡献。
 

data/README.adoc

@@ -1,6 +1,6 @@
 = Asciidoctor
-Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>; Ryan Waldron <https://github.com/erebor[@erebor]>
-v2.0.16, 2021-08-03
+Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>
+v2.0.17, 2022-01-05
 // settings:
 :idprefix:
 :idseparator: -
@@ -9,7 +9,6 @@ v2.0.16, 2021-08-03
 ifndef::env-github[:icons: font]
 ifdef::env-github[]
 :status:
-:outfilesuffix: .adoc
 :caution-caption: :fire:
 :important-caption: :exclamation:
 :note-caption: :paperclip:
@@ -17,7 +16,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.16
+:release-version: 2.0.17
 // URLs:
 :url-org: https://github.com/asciidoctor
 :url-repo: {url-org}/asciidoctor
@@ -36,8 +35,8 @@ ifdef::env-site[:url-project: link:]
 :url-rel-file-base: link:
 :url-rel-tree-base: link:
 ifdef::env-site,env-yard[]
-:url-rel-file-base: {url-repo}/blob/master/
-:url-rel-tree-base: {url-repo}/tree/master/
+:url-rel-file-base: {url-repo}/blob/HEAD/
+:url-rel-tree-base: {url-repo}/tree/HEAD/
 endif::[]
 :url-changelog: {url-rel-file-base}CHANGELOG.adoc
 :url-contribute: {url-rel-file-base}CONTRIBUTING.adoc
@@ -51,9 +50,8 @@ endif::[]
 :url-opal: https://opalrb.com
 :url-tilt: https://github.com/rtomayko/tilt
 :url-ruby: https://www.ruby-lang.org
-//:url-prototype: https://github.com/git/git-scm.com/commits/master/lib/asciidoc.rb This page doesn't exist anymore.
 // images:
-:image-url-screenshot: https://raw.githubusercontent.com/asciidoctor/asciidoctor/master/screenshot.png
+:image-url-screenshot: https://cdn.jsdelivr.net/gh/asciidoctor/asciidoctor/screenshot.png
 
 {url-project}[Asciidoctor] is a fast, open source, Ruby-based text processor for parsing AsciiDoc(R) into a document model and converting it to output formats such as HTML 5, DocBook 5, manual pages, PDF, EPUB 3, and other formats.
 
@@ -83,9 +81,6 @@ ifdef::status[]
 image:https://img.shields.io/gem/v/asciidoctor.svg[Latest Release, link={url-rubygem}]
 image:https://img.shields.io/badge/rubydoc.info-{release-version}-blue.svg[library (API) docs,link=https://www.rubydoc.info/gems/asciidoctor/{release-version}]
 image:https://github.com/asciidoctor/asciidoctor/workflows/CI/badge.svg[Build Status (GitHub Actions),link={url-repo}/actions]
-//image:https://img.shields.io/coveralls/asciidoctor/asciidoctor/master.svg[Code Coverage,link=https://coveralls.io/r/asciidoctor/asciidoctor]
-//image:https://codeclimate.com/github/asciidoctor/asciidoctor/badges/gpa.svg[Code Climate,link=https://codeclimate.com/github/asciidoctor/asciidoctor]
-//image:https://inch-ci.org/github/asciidoctor/asciidoctor.svg?branch=master[Docs Coverage,link=https://inch-ci.org/github/asciidoctor/asciidoctor]
 image:https://img.shields.io/badge/zulip-join_chat-brightgreen.svg[Project Chat (Zulip),link={url-chat}]
 endif::[]
 
@@ -155,7 +150,7 @@ Asciidoctor works best when you use UTF-8 everywhere.
 
 Asciidoctor is packaged and distributed to RubyGems.org as a RubyGem (aka gem) named {url-rubygem}[asciidoctor^].
 The asciidoctor gem can be installed on all major operating systems using Ruby packaging tools (gem or bundle).
-Asciidoctor is also distributed as a Docker image, as a package for numerous Linux distributions, and as a package for macOS (via Homebrew).
+Asciidoctor is also distributed as a Docker image, as a package for numerous Linux distributions, and as a package for macOS (via Homebrew and MacPorts).
 
 === Linux package managers
 
@@ -197,17 +192,30 @@ To install the package, open a terminal and type:
 
  $ sudo dnf install -y asciidoctor
 
-=== Homebrew (macOS)
+=== macOS
+
+==== Homebrew
+
+You can use https://brew.sh[Homebrew], the macOS package manager, to install Asciidoctor.
+If you don't have Homebrew on your computer, complete the https://brew.sh[installation instructions] first.
 
-You can use Homebrew, the macOS package manager, to install Asciidoctor.
-If you don’t have Homebrew on your computer, complete the installation instructions at https://brew.sh/[brew.sh] first.
-Once Homebrew is installed, you’re ready to install the `asciidoctor` gem.
+Once Homebrew is installed, you're ready to install the `asciidoctor` gem.
 Open a terminal and type:
 
  $ brew install asciidoctor
 
 Homebrew installs the `asciidoctor` gem into an exclusive prefix that's independent of system gems.
 
+==== MacPorts
+
+You can also use https://www.macports.org[MacPorts], another package manager for macOS, to install Asciidoctor.
+If you don't have MacPorts on your computer, complete the https://www.macports.org/install.php[installation instructions] first.
+
+Once MacPorts is installed, you're ready to install the `asciidoctor` gem via the https://ports.macports.org/port/asciidoctor/[Asciidoctor port].
+Open a terminal and type:
+
+ $ sudo port install asciidoctor
+
 === Windows
 
 To use Asciidoctor with Windows, you have two options.
@@ -297,6 +305,13 @@ To upgrade the gem, use:
  $ brew update
  $ brew upgrade asciidoctor
 
+=== MacPorts (macOS)
+
+To upgrade the gem, use:
+
+ $ sudo port selfupdate
+ $ sudo port upgrade asciidoctor
+
 === gem install
 
 If you previously installed Asciidoctor using the `gem` command, you'll need to manually upgrade Asciidoctor when a new version is released.
@@ -452,7 +467,7 @@ Asciidoctor organization on GitHub:: {url-org}
 
 == Code of Conduct
 
-The core Asciidoctor project is governed by the https://github.com/asciidoctor/.github/blob/main/CODE-OF-CONDUCT.md[Code of Conduct] for the Asciidoctor community of projects.
+The core Asciidoctor project is governed by the https://github.com/asciidoctor/.github/blob/HEAD/CODE-OF-CONDUCT.md[Code of Conduct] for the Asciidoctor community of projects.
 By participating, you're agreeing to honor this code.
 Let's work together to make this a welcoming, professional, inclusive, and safe environment for everyone.
 
@@ -474,7 +489,7 @@ See the {url-license}[LICENSE] for the full license text.
 *Asciidoctor* is led by https://github.com/mojavelinux[Dan Allen] and https://github.com/graphitefriction[Sarah White] and has received contributions from {url-contributors}[many individuals] in Asciidoctor's awesome community.
 The project was initiated in 2012 by https://github.com/erebor[Ryan Waldron] based on a prototype written by https://github.com/nickh[Nick Hengeveld] for the Git website.
 
-*AsciiDoc.py* was started and maintained by Stuart Rackham from https://github.com/asciidoc-py/asciidoc-py2/blob/master/CHANGELOG.txt[2002 to 2013] and has received contributions from many individuals in the https://github.com/asciidoc-py/asciidoc-py2/graphs/contributors[AsciiDoc.py community].
+*AsciiDoc.py* was started and maintained by Stuart Rackham from https://github.com/asciidoc-py/asciidoc-py2/blob/HEAD/CHANGELOG.txt[2002 to 2013] and has received contributions from many individuals in the https://github.com/asciidoc-py/asciidoc-py2/graphs/contributors[AsciiDoc.py community].
 
 == Trademarks
 

data/asciidoctor.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   #s.required_ruby_version = '>= 2.3.0'
   s.metadata = {
     'bug_tracker_uri' => 'https://github.com/asciidoctor/asciidoctor/issues',
-    'changelog_uri' => 'https://github.com/asciidoctor/asciidoctor/blob/master/CHANGELOG.adoc',
+    'changelog_uri' => 'https://github.com/asciidoctor/asciidoctor/blob/HEAD/CHANGELOG.adoc',
     'mailing_list_uri' => 'http://discuss.asciidoctor.org',
     'source_code_uri' => 'https://github.com/asciidoctor/asciidoctor'
   }

data/data/locale/attributes-fr.adoc

@@ -1,7 +1,7 @@
 // French translation, courtesy of Nicolas Comet <nicolas.comet@gmail.com> with updates from Maheva Bagard Laursen <mblaursen@gbif.org>
 :appendix-caption: Annexe
 :appendix-refsig: {appendix-caption}
-:caution-caption: Avertissement
+:caution-caption: Attention
 :chapter-signifier: Chapitre
 :chapter-refsig: {chapter-signifier}
 :example-caption: Exemple
@@ -20,4 +20,4 @@ ifdef::preface-title[:preface-title: Préface]
 :toc-title: Table des matières
 :untitled-label: Sans titre
 :version-label: Version
-:warning-caption: Attention
+:warning-caption: Avertissement