asciidoctor 2.0.12 → 2.0.13

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 63300fdec712603ef3bcd94f0ffefcf409471851030c9ef4884939da23b60303
4
- data.tar.gz: b4fce4c962f9f62dd0ace6665ac53277529f00b17f49a5ec77c0fc1a01c4a6be
3
+ metadata.gz: a9e72633de0c6754af3817cb79f6dbb3837a14b6ed1dd4c9f2e22bb600460bff
4
+ data.tar.gz: ad8533870d76be07168b23cec5c8e53aa9e6128e30535650d827ffade7fad92d
5
5
  SHA512:
6
- metadata.gz: f8864b33f6bd1aa4e0e425050de59ab7e193aab248df31968b61bf014c72d2e64cae8b89c8cda074c5b25f7fe7fe8c0adb7a9c1b237f4ebef8eaca337f4773d5
7
- data.tar.gz: ef875df64d41583613ff6d333c1d8decf59ad7870768711e9405b4128505876d9a0a3dad904e559d03752d12cbc0665cd4aed40998ca95303af513bee55aaed5
6
+ metadata.gz: db1c156201c46129fea64fdfa08b40a7892ef655856ec679e81caad32fa5601da67de7bfd5e47f7a811813cf6efe78c3f958e4b294ac29fbf105ebb6725115d9
7
+ data.tar.gz: d6656dca3af8847229c556063bf0ed2ec5db03129a7af0d2bfaf65e400e5bb95fb571b9378c367ed2305b967fb33ce0c7085cc2e1740d653c360d079fff386f5
data/CHANGELOG.adoc CHANGED
@@ -13,7 +13,45 @@ endif::[]
13
13
  This document provides a high-level view of the changes introduced in Asciidoctor by release.
14
14
  For a detailed view of what has changed, refer to the {uri-repo}/commits/master[commit history] on GitHub.
15
15
 
16
- == 2.0.12.rc.1 (2020-11-10) - @mojavelinux
16
+ // tag::compact[]
17
+ == 2.0.13 (2021-04-10) - @mojavelinux
18
+
19
+ Bug Fixes::
20
+
21
+ * Rollback change for #3470, which added logic to remove leading and trailing empty lines in an AsciiDoc include file; instead skip empty lines before processing document header (#3997)
22
+ * Don't allow `counter` and `counter2` attribute directives to override locked attributes (#3939) (*@mogztter*)
23
+ * Fix crash when resolving next value in sequence for counter with non-numeric value (#3940)
24
+ * Honor list of tags following negated wildcard on include directive (#3932)
25
+ * Update default stylesheet to remove dash in front of cite on nested quote block (#3847)
26
+ * Don't mangle formatting macros when uppercasing section titles in man page output (#3892)
27
+ * Don't escape hyphen in `manname` in man page output
28
+ * Remove extra `.sp` line before content of verse block in man page output
29
+ * Fix layout of footnotes in man page output (#3989)
30
+ * Fix formatting of footnote text with URL in man page output (#3988)
31
+ * Remove redundant trailing space on URL followed by non-adjacent text in man page output (#4004)
32
+ * Use `.bp` macro at location of page break in man page output (#3992)
33
+
34
+ Improvements::
35
+
36
+ * Extract method to create lexer and formatter in Rouge adapter (#3953) (*@Oblomov*)
37
+ * Add support for pygments.rb 2.x (#3969) (*@slonopotamus*)
38
+ * Allow `NullLogger` to be enabled by setting the `:logger` option to a falsy value (#3982)
39
+ * Substitute attributes in manpurpose part of NAME section in manpage doctype (#4000)
40
+ * Output all mannames in name section of HTML output for manpage doctype (#3757)
41
+
42
+ Build / Infrastructure::
43
+
44
+ * Enable running tests as root (PR #3874) (*@mikemckiernan*)
45
+ * Run tests against both pygments.rb 1.x and 2.x (#3969) (*@slonopotamus*)
46
+ * Speed up CI by using Bundler cache (PR #3901) (*@slonopotamus*)
47
+
48
+ Documentation::
49
+
50
+ * Import documentation for processor into this repository (#3861) (*@graphitefriction*)
51
+ * Add Belarusian translation of built-in attributes (PR #3928) (*@morganov*)
52
+
53
+ // end::compact[]
54
+ == 2.0.12 (2020-11-10) - @mojavelinux
17
55
 
18
56
  Bug Fixes::
19
57
 
data/LICENSE CHANGED
@@ -1,6 +1,6 @@
1
1
  MIT License
2
2
 
3
- Copyright (C) 2012-2020 Dan Allen, Sarah White, Ryan Waldron, and the
3
+ Copyright (C) 2012-2021 Dan Allen, Sarah White, Ryan Waldron, and the
4
4
  individual contributors to Asciidoctor.
5
5
 
6
6
  Permission is hereby granted, free of charge, to any person obtaining a copy
data/README-de.adoc CHANGED
@@ -1,6 +1,6 @@
1
1
  = Asciidoctor
2
2
  Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>; Ryan Waldron <https://github.com/erebor[@erebor]>
3
- v2.0.12, 2020-11-10
3
+ v2.0.13, 2021-04-10
4
4
  // settings:
5
5
  :idprefix:
6
6
  :idseparator: -
@@ -8,6 +8,7 @@ v2.0.12, 2020-11-10
8
8
  :language: {source-language}
9
9
  ifndef::env-github[:icons: font]
10
10
  ifdef::env-github[]
11
+ :status:
11
12
  :outfilesuffix: .adoc
12
13
  :caution-caption: :fire:
13
14
  :important-caption: :exclamation:
@@ -16,7 +17,7 @@ ifdef::env-github[]
16
17
  :warning-caption: :warning:
17
18
  endif::[]
18
19
  // Variables:
19
- :release-version: 2.0.12
20
+ :release-version: 2.0.13
20
21
  // URIs:
21
22
  :uri-org: https://github.com/asciidoctor
22
23
  :uri-repo: {uri-org}/asciidoctor
@@ -40,7 +41,7 @@ endif::[]
40
41
  :uri-license: {uri-rel-file-base}LICENSE
41
42
  :uri-tests: {uri-rel-tree-base}test
42
43
  :uri-discuss: https://discuss.asciidoctor.org
43
- :uri-irc: irc://irc.freenode.org/#asciidoctor
44
+ :uri-chat: https://asciidoctor.zulipchat.com
44
45
  :uri-rubygem: https://rubygems.org/gems/asciidoctor
45
46
  :uri-what-is-asciidoc: {uri-docs}/what-is-asciidoc
46
47
  :uri-user-manual: {uri-docs}/user-manual
@@ -83,6 +84,14 @@ endif::[]
83
84
  * {uri-docs}/user-manual[Asciidoctor Gebrauchshandbuch]
84
85
  * {uri-docs}/asciidoc-syntax-quick-reference[AsciiDoc Syntax-Referenz]
85
86
 
87
+ ifdef::status[]
88
+ image:https://img.shields.io/gem/v/asciidoctor.svg[Latest Release, link={uri-gem}]
89
+ image:https://img.shields.io/badge/rubydoc.info-{release-version}-blue.svg[library (API) docs,link=https://www.rubydoc.info/gems/asciidoctor/{release-version}]
90
+ image:https://github.com/asciidoctor/asciidoctor/workflows/CI/badge.svg[Build Status (GitHub Actions),link={uri-repo}/actions]
91
+ image:https://inch-ci.org/github/asciidoctor/asciidoctor.svg?branch=master[Inline docs,link=https://inch-ci.org/github/asciidoctor/asciidoctor]
92
+ image:https://img.shields.io/badge/zulip-join_chat-brightgreen.svg[project chat,link=https://asciidoctor.zulipchat.com/]
93
+ endif::[]
94
+
86
95
  == Sponsoren
87
96
 
88
97
  Wir möchten unseren großzügigen Sponsoren danken, ohne deren Unterstützung Asciidoctor nicht möglich wäre.
@@ -425,9 +434,9 @@ Asciidoctor wurde entwickelt, um Ihnen das Schreiben und Veröffentlichen Ihrer
425
434
  Aber wir können es nicht ohne ihr Feedback machen!
426
435
  Wir ermutigen Sie, Fragen zu stellen und alle Aspekte des Projekts auf der Diskussionsliste, auf Twitter oder im Chatroom zu diskutieren.
427
436
 
428
- Chat (Gitter):: image:https://badges.gitter.im/Join%20In.svg[Gitter, link=https://gitter.im/asciidoctor/asciidoctor]
437
+ Chat (Zulip):: {uri-chat}
429
438
  Discussionsliste (Nabble):: {uri-discuss}
430
- Twitter:: https://twitter.com/search?f=tweets&q=%23asciidoctor[#asciidoctor] hashtag or https://twitter.com/asciidoctor[@asciidoctor] mention
439
+ Twitter:: Follow https://twitter.com/asciidoctor[@asciidoctor] or search for the https://twitter.com/search?f=tweets&q=%23asciidoctor[#asciidoctor] hashtag
431
440
 
432
441
  ifdef::env-github[]
433
442
  Weitere Informationen und Dokumentation zu Asciidoctor finden Sie auf der Website des Projekts.
@@ -443,7 +452,7 @@ Asciidoctor Organization auf GitHub:: {uri-org}
443
452
 
444
453
  == Lizenz
445
454
 
446
- Copyright (C) 2012-2020 Dan Allen, Sarah White, Ryan Waldron, und die einzelnen Mitarbeiter von Asciidoctor.
455
+ Copyright (C) 2012-2021 Dan Allen, Sarah White, Ryan Waldron, und die einzelnen Mitarbeiter von Asciidoctor.
447
456
  Die Nutzung dieser Software wird unter den Bedingungen der MIT-Lizenz gewährt.
448
457
 
449
458
  Siehe die {uri-license}[LIZENZ] für den vollen Lizenztext.
data/README-fr.adoc CHANGED
@@ -1,6 +1,6 @@
1
1
  = Asciidoctor
2
2
  Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>; Ryan Waldron <https://github.com/erebor[@erebor]>
3
- v2.0.12, 2020-11-10
3
+ v2.0.13, 2021-04-10
4
4
  // settings:
5
5
  :idprefix:
6
6
  :idseparator: -
@@ -8,6 +8,7 @@ v2.0.12, 2020-11-10
8
8
  :language: {source-language}
9
9
  ifndef::env-github[:icons: font]
10
10
  ifdef::env-github[]
11
+ :status:
11
12
  :outfilesuffix: .adoc
12
13
  :caution-caption: :fire:
13
14
  :important-caption: :exclamation:
@@ -16,7 +17,7 @@ ifdef::env-github[]
16
17
  :warning-caption: :warning:
17
18
  endif::[]
18
19
  // Variables:
19
- :release-version: 2.0.12
20
+ :release-version: 2.0.13
20
21
  // URIs:
21
22
  :uri-org: https://github.com/asciidoctor
22
23
  :uri-repo: {uri-org}/asciidoctor
@@ -40,7 +41,7 @@ endif::[]
40
41
  :uri-license: {uri-rel-file-base}LICENSE
41
42
  :uri-tests: {uri-rel-tree-base}test
42
43
  :uri-discuss: https://discuss.asciidoctor.org
43
- :uri-irc: irc://irc.freenode.org/#asciidoctor
44
+ :uri-chat: https://asciidoctor.zulipchat.com
44
45
  :uri-rubygem: https://rubygems.org/gems/asciidoctor
45
46
  :uri-what-is-asciidoc: {uri-docs}/what-is-asciidoc
46
47
  :uri-user-manual: {uri-docs}/user-manual
@@ -80,6 +81,14 @@ endif::[]
80
81
  * {uri-docs}/asciidoc-syntax-quick-reference[Syntaxe de Référence AsciiDoc]
81
82
  * {uri-docs}/user-manual[Manuel Utilisateur Asciidoctor]
82
83
 
84
+ ifdef::status[]
85
+ image:https://img.shields.io/gem/v/asciidoctor.svg[Latest Release, link={uri-gem}]
86
+ image:https://img.shields.io/badge/rubydoc.info-{release-version}-blue.svg[library (API) docs,link=https://www.rubydoc.info/gems/asciidoctor/{release-version}]
87
+ image:https://github.com/asciidoctor/asciidoctor/workflows/CI/badge.svg[Build Status (GitHub Actions),link={uri-repo}/actions]
88
+ image:https://inch-ci.org/github/asciidoctor/asciidoctor.svg?branch=master[Inline docs,link=https://inch-ci.org/github/asciidoctor/asciidoctor]
89
+ image:https://img.shields.io/badge/zulip-join_chat-brightgreen.svg[project chat,link=https://asciidoctor.zulipchat.com/]
90
+ endif::[]
91
+
83
92
  == Sponsors
84
93
 
85
94
  Nous souhaitons exprimer toute notre reconnaissance à nos généreux sponsors, sans qui Asciidoctor ne pourrait pas exister.
@@ -391,12 +400,9 @@ Asciidoctor est développé dans le but de vous aider à écrire et publier du c
391
400
  Mais nous ne pouvons pas le faire sans vos avis !
392
401
  Nous vous encourageons à poser vos questions et à discuter de n'importe quels aspects du projet sur la liste de discussion, Twitter ou dans le salon de discussion.
393
402
 
394
- Chat (Gitter):: image:https://badges.gitter.im/Join%20In.svg[Gitter, link=https://gitter.im/asciidoctor/asciidoctor]
403
+ Chat (Zulip):: {uri-chat}
395
404
  Forum (Nabble):: {uri-discuss}
396
405
  Twitter:: hashtag https://twitter.com/search?f=tweets&q=%23asciidoctor[#asciidoctor] ou la mention https://twitter.com/asciidoctor[@asciidoctor]
397
- ////
398
- IRC (Chat):: {uri-irc}[#asciidoctor] sur FreeNode IRC
399
- ////
400
406
 
401
407
  ifdef::env-github[]
402
408
  De plus amples informations et documentations sur Asciidoctor peuvent être trouvées sur le site web du projet.
@@ -412,7 +418,7 @@ L'organisation Asciidoctor sur GitHub:: {uri-org}
412
418
 
413
419
  == Licence
414
420
 
415
- Copyright (C) 2012-2020 Dan Allen, Sarah White, Ryan Waldron, et les contributeurs individuels d'Asciidoctor.
421
+ Copyright (C) 2012-2021 Dan Allen, Sarah White, Ryan Waldron, et les contributeurs individuels d'Asciidoctor.
416
422
  Une utilisation libre de ce logiciel est autorisée sous les termes de la licence MIT.
417
423
 
418
424
  Consultez le fichier {uri-license}[LICENSE] pour plus de détails.
data/README-jp.adoc CHANGED
@@ -1,6 +1,6 @@
1
1
  = Asciidoctor
2
2
  Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>; Ryan Waldron <https://github.com/erebor[@erebor]>
3
- v2.0.12, 2020-11-10
3
+ v2.0.13, 2021-04-10
4
4
  // settings:
5
5
  :idprefix:
6
6
  :idseparator: -
@@ -8,6 +8,7 @@ v2.0.12, 2020-11-10
8
8
  :language: {source-language}
9
9
  ifndef::env-github[:icons: font]
10
10
  ifdef::env-github[]
11
+ :status:
11
12
  :outfilesuffix: .adoc
12
13
  :caution-caption: :fire:
13
14
  :important-caption: :exclamation:
@@ -16,7 +17,7 @@ ifdef::env-github[]
16
17
  :warning-caption: :warning:
17
18
  endif::[]
18
19
  // Variables:
19
- :release-version: 2.0.12
20
+ :release-version: 2.0.13
20
21
  // URIs:
21
22
  :uri-org: https://github.com/asciidoctor
22
23
  :uri-repo: {uri-org}/asciidoctor
@@ -44,7 +45,7 @@ endif::[]
44
45
  :uri-license: {uri-rel-file-base}LICENSE
45
46
  :uri-tests: {uri-rel-tree-base}test
46
47
  :uri-discuss: https://discuss.asciidoctor.org
47
- :uri-irc: irc://irc.freenode.org/#asciidoctor
48
+ :uri-chat: https://asciidoctor.zulipchat.com
48
49
  :uri-rubygem: https://rubygems.org/gems/asciidoctor
49
50
  :uri-what-is-asciidoc: {uri-docs}/what-is-asciidoc
50
51
  :uri-user-manual: {uri-docs}/user-manual
@@ -89,6 +90,14 @@ endif::[]
89
90
  * {uri-docs}/user-manual[Asciidoctor User Manual]
90
91
  * {uri-docs}/asciidoc-syntax-quick-reference[AsciiDoc Syntax Reference]
91
92
 
93
+ ifdef::status[]
94
+ image:https://img.shields.io/gem/v/asciidoctor.svg[Latest Release, link={uri-gem}]
95
+ image:https://img.shields.io/badge/rubydoc.info-{release-version}-blue.svg[library (API) docs,link=https://www.rubydoc.info/gems/asciidoctor/{release-version}]
96
+ image:https://github.com/asciidoctor/asciidoctor/workflows/CI/badge.svg[Build Status (GitHub Actions),link={uri-repo}/actions]
97
+ image:https://inch-ci.org/github/asciidoctor/asciidoctor.svg?branch=master[Inline docs,link=https://inch-ci.org/github/asciidoctor/asciidoctor]
98
+ image:https://img.shields.io/badge/zulip-join_chat-brightgreen.svg[project chat,link=https://asciidoctor.zulipchat.com/]
99
+ endif::[]
100
+
92
101
  == スポンサー
93
102
 
94
103
  {uri-project}/supporters[スポンサー] のみなさまが, このプロジェクトをサポートし, より良いテクニカルドキュメンテーションの実現にコミットメントをしてくださっていることに感謝します.
@@ -261,7 +270,7 @@ gem 'asciidoctor'
261
270
  $ bundle
262
271
 
263
272
  gemをアップグレードするには, Gemfileで新バージョンを指定し, `bundle` を再び実行してください.
264
- `bundle update` を(gemを指定せずに)行うことは推奨 *されません* . 他のgemもアップデートされて思わぬ結果になるかもしれないためです.
273
+ `bundle update` を(gemを指定せずに)行うことは推奨 *されません* . 他のgemもアップデートされて思わぬ結果になるかもしれないためです.
265
274
 
266
275
  == アップグレード
267
276
 
@@ -425,7 +434,7 @@ Asciidoctorは, コンテンツの執筆と公開を簡単にするために開
425
434
  しかしあなたからのフィードバックがなくてはAsciidoctorの開発は進みません!
426
435
  ディスカッションリスト, Twitter, チャットルームを使って, 質問をしたりプロジェクトのさまざまな側面について話し合ったりすることをお勧めします.
427
436
 
428
- チャット(Gitter):: image:https://badges.gitter.im/Join%20In.svg[Gitter, link=https://gitter.im/asciidoctor/asciidoctor]
437
+ チャット(Zulip):: {uri-chat}
429
438
  ディスカッションリスト(Nabble):: {uri-discuss}
430
439
  Twitter:: ハッシュタグ https://twitter.com/search?f=tweets&q=%23asciidoctor[#asciidoctor] またはメンション https://twitter.com/asciidoctor[@asciidoctor]
431
440
 
@@ -443,7 +452,7 @@ GitHub上のAsciidoctorのorganization:: {uri-org}
443
452
 
444
453
  == ライセンス
445
454
 
446
- Copyright (C) 2012-2020 Dan Allen, Sarah White, Ryan Waldron, and the individual contributors to Asciidoctor.
455
+ Copyright (C) 2012-2021 Dan Allen, Sarah White, Ryan Waldron, and the individual contributors to Asciidoctor.
447
456
  本ソフトウェアはMITライセンスのもとで使用できます.
448
457
 
449
458
  ライセンスの詳細については {uri-license}[LICENSE] ファイルを参照してください.
data/README-zh_CN.adoc CHANGED
@@ -1,6 +1,6 @@
1
1
  = Asciidoctor
2
2
  Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>; Ryan Waldron <https://github.com/erebor[@erebor]>
3
- v2.0.12, 2020-11-10
3
+ v2.0.13, 2021-04-10
4
4
  // settings:
5
5
  :page-layout: base
6
6
  :idprefix:
@@ -9,6 +9,7 @@ v2.0.12, 2020-11-10
9
9
  :language: {source-language}
10
10
  ifndef::env-github[:icons: font]
11
11
  ifdef::env-github[]
12
+ :status:
12
13
  :outfilesuffix: .adoc
13
14
  :caution-caption: :fire:
14
15
  :important-caption: :exclamation:
@@ -17,7 +18,7 @@ ifdef::env-github[]
17
18
  :warning-caption: :warning:
18
19
  endif::[]
19
20
  // Variables:
20
- :release-version: 2.0.12
21
+ :release-version: 2.0.13
21
22
  // URIs:
22
23
  :uri-org: https://github.com/asciidoctor
23
24
  :uri-repo: {uri-org}/asciidoctor
@@ -41,7 +42,7 @@ endif::[]
41
42
  :uri-license: {uri-rel-file-base}LICENSE
42
43
  :uri-tests: {uri-rel-tree-base}test
43
44
  :uri-discuss: https://discuss.asciidoctor.org
44
- :uri-irc: irc://irc.freenode.org/#asciidoctor
45
+ :uri-chat: https://asciidoctor.zulipchat.com
45
46
  :uri-rubygem: https://rubygems.org/gems/asciidoctor
46
47
  :uri-what-is-asciidoc: {uri-docs}/what-is-asciidoc
47
48
  :uri-user-manual: {uri-docs}/user-manual
@@ -77,6 +78,14 @@ Asciidoctor 是开源的,link:{uri-repo}[代码托管在 GitHub],遵从 {uri
77
78
  * {uri-docs}/asciidoc-syntax-quick-reference[AsciiDoc 语法快速参考]
78
79
  * {uri-docs}/user-manual[Asciidoctor 用户手册]
79
80
 
81
+ ifdef::status[]
82
+ image:https://img.shields.io/gem/v/asciidoctor.svg[Latest Release, link={uri-gem}]
83
+ image:https://img.shields.io/badge/rubydoc.info-{release-version}-blue.svg[library (API) docs,link=https://www.rubydoc.info/gems/asciidoctor/{release-version}]
84
+ image:https://github.com/asciidoctor/asciidoctor/workflows/CI/badge.svg[Build Status (GitHub Actions),link={uri-repo}/actions]
85
+ image:https://inch-ci.org/github/asciidoctor/asciidoctor.svg?branch=master[Inline docs,link=https://inch-ci.org/github/asciidoctor/asciidoctor]
86
+ image:https://img.shields.io/badge/zulip-join_chat-brightgreen.svg[project chat,link=https://asciidoctor.zulipchat.com/]
87
+ endif::[]
88
+
80
89
  .Ruby 所至, Asciidoctor 相随
81
90
  ****
82
91
  使用 JRuby 让 Asciidoctor 运行在 Java 虚拟机上。
@@ -383,9 +392,9 @@ Asciidoctor 支持自定义转化器,它可以操作从待处理文件到生
383
392
  但是,如果没有反馈,我们将寸步难行。
384
393
  我们鼓励你在讨论组、Twitter或聊天室里,提问为题,讨论项目的方方面面,
385
394
 
395
+ 聊天 (Zulip):: {uri-chat}
386
396
  讨论组 (Nabble):: {uri-discuss}
387
397
  Twitter:: https://twitter.com/search?f=tweets&q=%23asciidoctor[#asciidoctor] 来加入话题 或 https://twitter.com/asciidoctor[@asciidoctor] at并提醒我们
388
- 聊天 (Gitter):: image:https://badges.gitter.im/Join%20In.svg[Gitter, link=https://gitter.im/asciidoctor/asciidoctor]
389
398
 
390
399
  ifdef::env-github[]
391
400
  Further information and documentation about Asciidoctor can be found on the project's website.
@@ -402,7 +411,7 @@ Asciidoctor 组织在 GitHub 托管代码、议案跟踪和相关子项目。
402
411
  [#copyright-and-licensing]
403
412
  == 版权和协议
404
413
 
405
- Copyright (C) 2012-2020 Dan Allen, Sarah White, Ryan Waldron, and the individual contributors to Asciidoctor.
414
+ Copyright (C) 2012-2021 Dan Allen, Sarah White, Ryan Waldron, and the individual contributors to Asciidoctor.
406
415
  这个软件的免费使用是在MIT许可条款授予的。
407
416
 
408
417
  请看 {uri-license}[版权声明] 文件来获取更多详细信息。
data/README.adoc CHANGED
@@ -1,6 +1,6 @@
1
1
  = Asciidoctor
2
2
  Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>; Ryan Waldron <https://github.com/erebor[@erebor]>
3
- v2.0.12, 2020-11-10
3
+ v2.0.13, 2021-04-10
4
4
  // settings:
5
5
  :idprefix:
6
6
  :idseparator: -
@@ -17,134 +17,127 @@ ifdef::env-github[]
17
17
  :warning-caption: :warning:
18
18
  endif::[]
19
19
  // Variables:
20
- :release-version: 2.0.12
21
- // URIs:
22
- :uri-org: https://github.com/asciidoctor
23
- :uri-repo: {uri-org}/asciidoctor
24
- :uri-asciidoctorj: {uri-org}/asciidoctorj
25
- :uri-asciidoctorjs: {uri-org}/asciidoctor.js
26
- :uri-gradle-plugin: {uri-org}/asciidoctor-gradle-plugin
27
- :uri-maven-plugin: {uri-org}/asciidoctor-maven-plugin
28
- :uri-asciidoclet: {uri-org}/asciidoclet
29
- :uri-project: https://asciidoctor.org
30
- :uri-gem: https://rubygems.org/gems/asciidoctor
31
- ifdef::env-site[:uri-project: link:]
32
- :uri-docs: {uri-project}/docs
33
- :uri-news: {uri-project}/news
34
- :uri-manpage: {uri-project}/man/asciidoctor
35
- :uri-issues: {uri-repo}/issues
36
- :uri-contributors: {uri-repo}/graphs/contributors
37
- :uri-rel-file-base: link:
38
- :uri-rel-tree-base: link:
20
+ :release-version: 2.0.13
21
+ // URLs:
22
+ :url-org: https://github.com/asciidoctor
23
+ :url-repo: {url-org}/asciidoctor
24
+ :url-asciidoctorj: {url-org}/asciidoctorj
25
+ :url-asciidoctorjs: {url-org}/asciidoctor.js
26
+ :url-gradle-plugin: {url-org}/asciidoctor-gradle-plugin
27
+ :url-maven-plugin: {url-org}/asciidoctor-maven-plugin
28
+ :url-asciidoclet: {url-org}/asciidoclet
29
+ :url-project: https://asciidoctor.org
30
+ ifdef::env-site[:url-project: link:]
31
+ :url-docs: https://docs.asciidoctor.org
32
+ :url-news: {url-project}/news
33
+ :url-manpage: {url-project}/man/asciidoctor
34
+ :url-issues: {url-repo}/issues
35
+ :url-contributors: {url-repo}/graphs/contributors
36
+ :url-rel-file-base: link:
37
+ :url-rel-tree-base: link:
39
38
  ifdef::env-site,env-yard[]
40
- :uri-rel-file-base: {uri-repo}/blob/master/
41
- :uri-rel-tree-base: {uri-repo}/tree/master/
39
+ :url-rel-file-base: {url-repo}/blob/master/
40
+ :url-rel-tree-base: {url-repo}/tree/master/
42
41
  endif::[]
43
- :uri-changelog: {uri-rel-file-base}CHANGELOG.adoc
44
- :uri-contribute: {uri-rel-file-base}CONTRIBUTING.adoc
45
- :uri-license: {uri-rel-file-base}LICENSE
46
- :uri-tests: {uri-rel-tree-base}test
47
- :uri-discuss: https://discuss.asciidoctor.org
48
- :uri-irc: irc://irc.freenode.org/#asciidoctor
49
- :uri-rubygem: https://rubygems.org/gems/asciidoctor
50
- :uri-what-is-asciidoc: {uri-docs}/what-is-asciidoc
51
- :uri-user-manual: {uri-docs}/user-manual
52
- :uri-install-docker: https://github.com/asciidoctor/docker-asciidoctor
53
- //:uri-install-doc: {uri-docs}/install-toolchain
54
- :uri-install-macos-doc: {uri-docs}/install-asciidoctor-macos
55
- :uri-convert-doc: {uri-docs}/convert-documents
56
- :uri-themes-doc: {uri-docs}/produce-custom-themes-using-asciidoctor-stylesheet-factory
57
- :uri-gitscm-repo: https://github.com/git/git-scm.com
58
- :uri-prototype: {uri-gitscm-repo}/commits/master/lib/asciidoc.rb
59
- :uri-freesoftware: https://www.gnu.org/philosophy/free-sw.html
60
- :uri-foundation: https://foundation.zurb.com
61
- :uri-opal: https://opalrb.com
62
- :uri-tilt: https://github.com/rtomayko/tilt
63
- :uri-ruby: https://www.ruby-lang.org
42
+ :url-changelog: {url-rel-file-base}CHANGELOG.adoc
43
+ :url-contribute: {url-rel-file-base}CONTRIBUTING.adoc
44
+ :url-license: {url-rel-file-base}LICENSE
45
+ :url-tests: {url-rel-tree-base}test
46
+ :url-discuss: https://discuss.asciidoctor.org
47
+ :url-chat: https://asciidoctor.zulipchat.com
48
+ :url-rubygem: https://rubygems.org/gems/asciidoctor
49
+ :url-what-is-asciidoc: {url-docs}/asciidoctor/latest/#relationship-to-asciidoc
50
+ :url-install-docker: https://github.com/asciidoctor/docker-asciidoctor
51
+ :url-opal: https://opalrb.com
52
+ :url-tilt: https://github.com/rtomayko/tilt
53
+ :url-ruby: https://www.ruby-lang.org
54
+ //:url-prototype: https://github.com/git/git-scm.com/commits/master/lib/asciidoc.rb This page doesn't exist anymore.
64
55
  // images:
65
- :image-uri-screenshot: https://raw.githubusercontent.com/asciidoctor/asciidoctor/master/screenshot.png
56
+ :image-url-screenshot: https://raw.githubusercontent.com/asciidoctor/asciidoctor/master/screenshot.png
66
57
 
67
- {uri-project}[Asciidoctor] is a _fast_, {uri-license}[open source] text processor and publishing toolchain for converting {uri-what-is-asciidoc}[AsciiDoc] content to HTML5, DocBook, PDF, and other formats.
68
- Asciidoctor is written in Ruby and runs on all major operating systems.
69
- The Asciidoctor project is {uri-repo}[hosted on GitHub].
58
+ {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.
70
59
 
71
- To simplify installation, Asciidoctor is packaged and distributed as a RubyGem (aka gem) to {uri-rubygem}[RubyGems.org].
72
- It's also distributed as a package for popular Linux distributions and macOS.
73
- In addition to running on Ruby, Asciidoctor can be executed on a JVM using {uri-asciidoctorj}[AsciidoctorJ] or in any JavaScript environment (including the browser) using {uri-asciidoctorjs}[Asciidoctor.js].
60
+ Asciidoctor also has an ecosystem of extensions, converters, build plugins, and tools to help you author and publish content written in {url-what-is-asciidoc}[AsciiDoc].
61
+ You can find the documentation for these projects at {url-docs}.
62
+
63
+ In addition to running on Ruby, Asciidoctor can be executed on a JVM using {url-asciidoctorj}[AsciidoctorJ] or in any JavaScript environment using {url-asciidoctorjs}[Asciidoctor.js].
74
64
 
75
65
  ifndef::env-site,env-yard[]
76
66
  This document is also available in the following languages: +
77
- {uri-rel-file-base}README-zh_CN.adoc[汉语]
67
+ {url-rel-file-base}README-zh_CN.adoc[汉语]
78
68
  |
79
- {uri-rel-file-base}README-de.adoc[Deutsch]
69
+ {url-rel-file-base}README-de.adoc[Deutsch]
80
70
  |
81
- {uri-rel-file-base}README-fr.adoc[Français]
71
+ {url-rel-file-base}README-fr.adoc[Français]
82
72
  |
83
- {uri-rel-file-base}README-jp.adoc[日本語]
73
+ {url-rel-file-base}README-jp.adoc[日本語]
84
74
  endif::[]
85
75
 
86
76
  .Key documentation
87
77
  [.compact]
88
- * {uri-docs}/what-is-asciidoc[What is AsciiDoc?]
89
- * {uri-docs}/asciidoc-writers-guide[AsciiDoc Writer's Guide]
90
- * {uri-docs}/user-manual[Asciidoctor User Manual]
91
- * {uri-docs}/asciidoc-syntax-quick-reference[AsciiDoc Syntax Reference]
78
+ * {url-docs}/asciidoctor/latest/[Asciidoctor Documentation]
79
+ * {url-docs}/asciidoc/latest/[AsciiDoc Language Documentation]
80
+ * {url-docs}/asciidoc/latest/syntax-quick-reference/[AsciiDoc Syntax Quick Reference]
92
81
 
93
82
  ifdef::status[]
94
- //.*Project health*
95
- image:https://img.shields.io/gem/v/asciidoctor.svg[Latest Release, link={uri-gem}]
83
+ image:https://img.shields.io/gem/v/asciidoctor.svg[Latest Release, link={url-rubygem}]
96
84
  image:https://img.shields.io/badge/rubydoc.info-{release-version}-blue.svg[library (API) docs,link=https://www.rubydoc.info/gems/asciidoctor/{release-version}]
97
- image:https://github.com/asciidoctor/asciidoctor/workflows/CI/badge.svg[Build Status (GitHub Actions),link={uri-repo}/actions]
98
- //image:https://img.shields.io/coveralls/asciidoctor/asciidoctor/master.svg[Coverage Status,link=https://coveralls.io/r/asciidoctor/asciidoctor]
85
+ image:https://github.com/asciidoctor/asciidoctor/workflows/CI/badge.svg[Build Status (GitHub Actions),link={url-repo}/actions]
86
+ //image:https://img.shields.io/coveralls/asciidoctor/asciidoctor/master.svg[Code Coverage,link=https://coveralls.io/r/asciidoctor/asciidoctor]
99
87
  //image:https://codeclimate.com/github/asciidoctor/asciidoctor/badges/gpa.svg[Code Climate,link=https://codeclimate.com/github/asciidoctor/asciidoctor]
100
- image:https://inch-ci.org/github/asciidoctor/asciidoctor.svg?branch=master[Inline docs,link=https://inch-ci.org/github/asciidoctor/asciidoctor]
88
+ //image:https://inch-ci.org/github/asciidoctor/asciidoctor.svg?branch=master[Docs Coverage,link=https://inch-ci.org/github/asciidoctor/asciidoctor]
89
+ image:https://img.shields.io/badge/zulip-join_chat-brightgreen.svg[Project Chat (Zulip),link={url-chat}]
101
90
  endif::[]
102
91
 
103
92
  == Sponsors
104
93
 
105
- We want to recognize our {uri-project}/supporters[sponsors] for their commitment to improving the state of technical documentation by supporting this project.
94
+ We want to recognize our {url-project}/supporters[sponsors] for their commitment to improving the state of technical documentation by supporting this project.
106
95
  Thank you sponsors!
107
96
  Without your generous support, Asciidoctor would not be possible.
108
97
 
109
98
  You can support this project by becoming a sponsor through https://opencollective.com/asciidoctor[OpenCollective].
110
99
 
111
- == The Big Picture
100
+ == AsciiDoc Processing and Built-in Converters
112
101
 
113
- Asciidoctor reads content written in plain text, as shown in the panel on the left in the image below, and converts it to HTML5, as shown rendered in the right panel.
114
- Asciidoctor applies a default stylesheet to the HTML5 document to provide a pleasant out-of-the-box experience.
102
+ AsciiDoc is the language. +
103
+ Asciidoctor is the processor.
115
104
 
116
- image::{image-uri-screenshot}[Preview of AsciiDoc source and corresponding rendered HTML]
105
+ Asciidoctor reads the AsciiDoc source, as shown in the panel on the left in the image below, and converts it to publishable formats, such as HTML 5, as shown rendered in the panel on the right.
117
106
 
118
- == AsciiDoc Processing
107
+ image::{image-url-screenshot}[Preview of AsciiDoc source and corresponding rendered HTML]
119
108
 
120
- Asciidoctor reads and parses text written in the AsciiDoc syntax, then feeds the parse tree to a set of built-in converters to produce HTML5, DocBook 5, and man(ual) page output.
121
- You have the option of using your own converter or loading {uri-tilt}[Tilt]-supported templates to customize the generated output or produce additional formats.
109
+ Asciidoctor provides built-in {url-docs}/asciidoctor/latest/converters/[converters] for three output formats by default: {url-docs}/asciidoctor/latest/html-backend/[HTML 5], {url-docs}/asciidoctor/latest/docbook-backend/[DocBook 5], and {url-docs}/asciidoctor/latest/manpage-backend/[man page] (short for manual page).
110
+ Additional converters, such as PDF and EPUB 3, are provided by separate gems.
111
+ Asciidoctor also provides an out-of-the-box HTML experience complete with a {url-docs}/asciidoctor/latest/html-backend/default-stylesheet/[default stylesheet] and built-in integrations like Font Awesome (for icons), highlight.js, Rouge, and Pygments (for source highlighting), and MathJax (for STEM processing).
122
112
 
123
- Asciidoctor is a drop-in replacement for its predecessor, AsciiDoc Python (`asciidoc.py`).
124
- The Asciidoctor test suite has {uri-tests}[> 2,350 tests] to ensure compatibility with the AsciiDoc syntax.
113
+ == Asciidoctor Ecosystem
125
114
 
126
- In addition to the classic AsciiDoc syntax, Asciidoctor recognizes additional markup and formatting options, such as font-based icons (e.g., `+icon:fire[]+`) and UI elements (e.g., `+button:[Save]+`).
127
- Asciidoctor also offers a modern, responsive theme based on {uri-foundation}[Foundation] to style the HTML5 output.
115
+ Although Asciidoctor is written in Ruby, it does not mean you need Ruby to use it.
116
+ Asciidoctor can be executed on a JVM using {url-docs}/asciidoctorj/latest/[AsciidoctorJ] or in any JavaScript environment (including the browser) using {url-docs}/asciidoctor.js/latest/[Asciidoctor.js].
128
117
 
129
- == Where Ruby goes, Asciidoctor follows
118
+ Installing an Asciidoctor processor is just the beginning of your publishing experience.
119
+ Asciidoctor gives you access to a ecosystem of extensions and tools, ranging from add-on converters, to extended syntax, to build plugins, to integrated writing and preview environments:
130
120
 
131
- You can run Asciidoctor on the JVM using JRuby.
132
- To invoke the Asciidoctor API directly from Java and other JVM languages, use {uri-asciidoctorj}[AsciidoctorJ].
133
- There are plugins available for {uri-maven-plugin}[Apache Maven], {uri-gradle-plugin}[Gradle], and {uri-asciidoclet}[Javadoc], which allow you to integrate AsciiDoc processing directly into your build using AsciidoctorJ.
121
+ * {url-docs}/diagram-extension/latest/[Asciidoctor Diagram]
122
+ * {url-docs}/maven-tools/latest/[Maven plugin and site module]
123
+ * {url-gradle-plugin}[Gradle plugin]
124
+ * {url-docs}/asciidoclet/latest/[Asciidoclet]
125
+ * {url-docs}/reveal.js-converter/latest/[reveal.js converter]
126
+ * {url-docs}/epub3-converter/latest/[EPUB 3 converter]
127
+ * https://intellij-asciidoc-plugin.ahus1.de/docs[IntelliJ plugin]
128
+ * {url-docs}/asciidoctor/latest/tooling/#web-browser-add-ons-preview-only[web browser extensions]
129
+ * {url-org}[and more]
134
130
 
135
- Asciidoctor also runs in JavaScript.
136
- {uri-opal}[Opal] is used to transcompile the Ruby source to JavaScript to produce {uri-asciidoctorjs}[Asciidoctor.js].
137
- Asciidoctor.js is a fully-functional version of Asciidoctor that works in any JavaScript environment, such as a web browser or Node.js.
138
- It's used to power the AsciiDoc preview extensions for Chrome, Atom, Brackets and other web-based tooling.
131
+ Asciidoctor is the successor to AsciiDoc.py.
132
+ If you're using AsciiDoc.py, see {url-docs}/asciidoctor/latest/migrate/asciidoc-py/[Migrate from AsciiDoc.py] to learn how to upgrade to Asciidoctor.
139
133
 
140
134
  == Requirements
141
135
 
142
- Asciidoctor works on Linux, macOS and Windows and requires one of the following implementations of {uri-ruby}[Ruby]:
136
+ Asciidoctor works on Linux, macOS and Windows and requires one of the following implementations of {url-ruby}[Ruby]:
143
137
 
144
- * CRuby (aka MRI) 2.3 - 2.6
138
+ * CRuby (aka MRI) 2.3 - 3.0
145
139
  * JRuby 9.1 - 9.2
146
140
  * TruffleRuby (GraalVM)
147
- * Opal (JavaScript)
148
141
 
149
142
  [CAUTION]
150
143
  ====
@@ -160,11 +153,11 @@ Asciidoctor works best when you use UTF-8 everywhere.
160
153
 
161
154
  == Installation
162
155
 
163
- Asciidoctor can be installed using (a) package managers for popular Linux distributions, (b) Homebrew for macOS, (c) the `gem install` command (recommended for Windows users or if you'll be installing additional gems), (d) the Asciidoctor Docker image, or (e) Bundler.
164
-
165
- The benefit of using your operating system's package manager to install the gem is that it handles installing Ruby and the RubyGems library if those packages are not already installed on your machine.
156
+ Asciidoctor is packaged and distributed to RubyGems.org as a RubyGem (aka gem) named {url-rubygem}[asciidoctor^].
157
+ The asciidoctor gem can be installed on all major operating systems using Ruby packaging tools (gem or bundle).
158
+ Asciidoctor is also distributed as a Docker image, as a package for numerous Linux distributions, and as a package for macOS (via Homebrew).
166
159
 
167
- === (a) Linux package managers
160
+ === Linux package managers
168
161
 
169
162
  The version of Asciidoctor installed by the package manager may not match the latest release of Asciidoctor.
170
163
  Consult the package repository for your distribution to find out which version is packaged per distribution release.
@@ -176,7 +169,7 @@ Consult the package repository for your distribution to find out which version i
176
169
  * https://software.opensuse.org/package/rubygem-asciidoctor[OpenSUSE (rubygem-asciidoctor)]
177
170
  * https://packages.ubuntu.com/search?keywords=asciidoctor[Ubuntu (asciidoctor)]
178
171
 
179
- If you want to use a version of Asciidoctor that is newer than what is installed by the package manager, see the <<gem-install,gem installation instructions>>.
172
+ If you want to use a version of Asciidoctor that's newer than what is installed by the package manager, see the <<gem-install,gem installation instructions>>.
180
173
 
181
174
  ==== apk (Alpine Linux)
182
175
 
@@ -204,7 +197,7 @@ To install the package, open a terminal and type:
204
197
 
205
198
  $ sudo dnf install -y asciidoctor
206
199
 
207
- === (b) Homebrew (macOS)
200
+ === Homebrew (macOS)
208
201
 
209
202
  You can use Homebrew, the macOS package manager, to install Asciidoctor.
210
203
  If you don’t have Homebrew on your computer, complete the installation instructions at https://brew.sh/[brew.sh] first.
@@ -215,9 +208,9 @@ Open a terminal and type:
215
208
 
216
209
  Homebrew installs the `asciidoctor` gem into an exclusive prefix that's independent of system gems.
217
210
 
218
- === (c) Windows
211
+ === Windows
219
212
 
220
- To use Asciidoctor with Windows, you have two easy options.
213
+ To use Asciidoctor with Windows, you have two options.
221
214
 
222
215
  ==== Chocolatey
223
216
 
@@ -235,13 +228,14 @@ Then follow <<gem-install,gem installation instructions>>.
235
228
  Or you use the https://rubyinstaller.org/downloads/[Rubyinstaller], download the package for your Windows Version and after the installation go ahead with <<gem-install,gem installation instructions>>.
236
229
 
237
230
  [#gem-install]
238
- === (d) gem install
231
+ === gem install
239
232
 
240
- Before installing Asciidoctor using `gem install`, you should set up https://rvm.io[RVM] to install Ruby in your home directory (i.e., user space).
233
+ Before installing Asciidoctor using `gem install`, you should set up https://rvm.io[RVM] (or similar) to install Ruby in your home directory (i.e., user space).
241
234
  Then, you can safely use the `gem` command to install or update the Asciidoctor gem, or any other gem for that matter.
242
235
  When using RVM, gems are installed in a location isolated from the system.
236
+ (You should never use the gem command to install system-wide gems).
243
237
 
244
- Once you've installed Ruby using RVM, and you have activated it using `rvm use 2.6`, open a terminal and type:
238
+ Once you've installed Ruby using RVM, and you have activated it using `rvm use 3.0`, open a terminal and type:
245
239
 
246
240
  $ gem install asciidoctor
247
241
 
@@ -249,11 +243,11 @@ If you want to install a pre-release version (e.g., a release candidate), use:
249
243
 
250
244
  $ gem install asciidoctor --pre
251
245
 
252
- === (e) Docker
246
+ === Docker
253
247
 
254
- See {uri-install-docker}[Installing Asciidoctor using Docker].
248
+ See {url-install-docker}[Installing Asciidoctor using Docker].
255
249
 
256
- === (f) Bundler
250
+ === Bundler
257
251
 
258
252
  . Create a Gemfile in the root folder of your project (or the current directory)
259
253
  . Add the `asciidoctor` gem to your Gemfile as follows:
@@ -330,9 +324,6 @@ Asciidoctor {release-version} [https://asciidoctor.org]
330
324
  Runtime Environment (ruby 2.6.0p0 [x86_64-linux]) (lc:UTF-8 fs:UTF-8 in:- ex:UTF-8)
331
325
  ....
332
326
 
333
- Asciidoctor also provides an API.
334
- The API is intended for integration with other Ruby software, such as Rails, Sinatra and GitHub, and other languages, such as Java (via {uri-asciidoctorj}[AsciidoctorJ]) and JavaScript (via {uri-asciidoctorjs}[Asciidoctor.js]).
335
-
336
327
  === Command line interface (CLI)
337
328
 
338
329
  The `asciidoctor` command allows you to invoke Asciidoctor from the command line (i.e., a terminal).
@@ -350,15 +341,18 @@ For instance, to write the file to a different directory, use:
350
341
 
351
342
  $ asciidoctor -D output README.adoc
352
343
 
353
- The `asciidoctor` {uri-manpage}[man page] provides a complete reference of the command line interface.
344
+ The `asciidoctor` {url-manpage}[man page] provides a complete reference of the command line interface.
354
345
 
355
346
  Refer to the following resources to learn more about how to use the `asciidoctor` command.
356
347
 
357
- * {uri-convert-doc}[How do I convert a document?]
358
- * {uri-themes-doc}[How do I use the Asciidoctor stylesheet factory to produce custom themes?]
348
+ * {url-docs}/asciidoctor/latest/cli/[Process AsciiDoc using the CLI]
349
+ * {url-docs}/asciidoctor/latest/cli/options/[CLI options]
359
350
 
360
351
  === Ruby API
361
352
 
353
+ Asciidoctor also provides an API.
354
+ The API is intended for integration with other Ruby software, such as Rails, GitHub, and GitLab, as well as other languages, such as Java (via AsciidoctorJ) and JavaScript (via Asciidoctor.js).
355
+
362
356
  To use Asciidoctor in your application, you first need to require the gem:
363
357
 
364
358
  [source]
@@ -403,10 +397,14 @@ Keep in mind that if you don't like the output Asciidoctor produces, _you can ch
403
397
  Asciidoctor supports custom converters that can handle converting from the parsed document to the generated output.
404
398
 
405
399
  One easy way to customize the output piecemeal is by using the template converter.
406
- The template converter allows you to supply a {uri-tilt}[Tilt]-supported template file to handle converting any node in the document.
400
+ The template converter allows you to supply a {url-tilt}[Tilt]-supported template file to handle converting any node in the document.
407
401
 
408
402
  However you go about it, you _can_ have 100% control over the output.
409
- For more information about how to use the API or to customize the output, refer to the {uri-user-manual}[user manual].
403
+ For more information about how to use the API or to customize the output, see:
404
+
405
+ * {url-docs}/asciidoctor/latest/api/[Process AsciiDoc using the API]
406
+ * {url-docs}/asciidoctor/latest/api/options/[API options]
407
+ * {url-docs}/asciidoctor/latest/safe-modes/[Safe modes]
410
408
 
411
409
  == Contributing
412
410
 
@@ -425,10 +423,10 @@ Here are some ways *you* can contribute:
425
423
  ** clean up inconsistent whitespace
426
424
  ** write tests!
427
425
  * by refactoring code
428
- * by fixing {uri-issues}[issues]
426
+ * by fixing {url-issues}[issues]
429
427
  * by reviewing patches
430
428
 
431
- The {uri-contribute}[Contributing] guide provides information on how to create, style, and submit issues, feature requests, code, and documentation to the Asciidoctor Project.
429
+ The {url-contribute}[Contributing] guide provides information on how to create, style, and submit issues, feature requests, code, and documentation to Asciidoctor.
432
430
 
433
431
  == Getting Help
434
432
 
@@ -436,39 +434,45 @@ Asciidoctor is developed to help you easily write and publish your content.
436
434
  But we can't do it without your feedback!
437
435
  We encourage you to ask questions and discuss any aspects of the project on the discussion list, on Twitter or in the chat room.
438
436
 
439
- Chat (Gitter):: image:https://badges.gitter.im/Join%20In.svg[Gitter, link=https://gitter.im/asciidoctor/asciidoctor]
440
- Discussion list (Nabble):: {uri-discuss}
441
- Twitter:: https://twitter.com/search?f=tweets&q=%23asciidoctor[#asciidoctor] hashtag or https://twitter.com/asciidoctor[@asciidoctor] mention
437
+ Chat (Zulip):: {url-chat}
438
+ Discussion list (Nabble):: {url-discuss}
439
+ Twitter:: Follow https://twitter.com/asciidoctor[@asciidoctor] or search for the https://twitter.com/search?f=tweets&q=%23asciidoctor[#asciidoctor] hashtag
442
440
 
443
441
  ifdef::env-github[]
444
442
  Further information and documentation about Asciidoctor can be found on the project's website.
445
443
 
446
- {uri-project}[Home] | {uri-news}[News] | {uri-docs}[Docs]
444
+ {url-project}[Home] | {url-news}[News] | {url-docs}[Docs]
447
445
  endif::[]
448
446
 
449
447
  The Asciidoctor organization on GitHub hosts the project's source code, issue tracker, and sub-projects.
450
448
 
451
- Source repository (git):: {uri-repo}
452
- Issue tracker:: {uri-issues}
453
- Asciidoctor organization on GitHub:: {uri-org}
449
+ Source repository (git):: {url-repo}
450
+ Issue tracker:: {url-issues}
451
+ Asciidoctor organization on GitHub:: {url-org}
452
+
453
+ == Code of Conduct
454
+
455
+ 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.
456
+ By participating, you're agreeing to honor this code.
457
+ Let's work together to make this a welcoming, professional, inclusive, and safe environment for everyone.
454
458
 
455
459
  == Copyright and License
456
460
 
457
- Copyright (C) 2012-2020 Dan Allen, Sarah White, Ryan Waldron, and the individual contributors to Asciidoctor.
461
+ Copyright (C) 2012-present Dan Allen, Sarah White, Ryan Waldron, and the individual contributors to Asciidoctor.
458
462
  Use of this software is granted under the terms of the MIT License.
459
463
 
460
- See the {uri-license}[LICENSE] for the full license text.
464
+ See the {url-license}[LICENSE] for the full license text.
461
465
 
462
466
  == Authors
463
467
 
464
- *Asciidoctor* is led by https://github.com/mojavelinux[Dan Allen] and https://github.com/graphitefriction[Sarah White] and has received contributions from {uri-contributors}[many individuals] in Asciidoctor's awesome community.
465
- The project was initiated in 2012 by https://github.com/erebor[Ryan Waldron] and based on {uri-prototype}[a prototype] written by https://github.com/nickh[Nick Hengeveld].
468
+ *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.
469
+ 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.
466
470
 
467
- *AsciiDoc* was started and maintained by Stuart Rackham from https://github.com/asciidoc/asciidoc/blob/master/CHANGELOG.txt[2002 to 2013] and has received contributions from many individuals in the https://github.com/asciidoc/asciidoc/graphs/contributors[AsciiDoc community].
471
+ *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].
468
472
 
469
473
  == Trademarks
470
474
 
471
- AsciiDoc is a Trademark of the Eclipse Foundation, Inc.
475
+ AsciiDoc(R) and AsciiDoc Language(TM) are trademarks of the Eclipse Foundation, Inc.
472
476
 
473
477
  ifndef::env-site[]
474
478
  == Changelog
@@ -477,5 +481,5 @@ ifeval::[{safe-mode-level} < 20]
477
481
  include::CHANGELOG.adoc[tag=compact,leveloffset=+1]
478
482
  endif::[]
479
483
 
480
- Refer to the {uri-changelog}[CHANGELOG] for a complete list of changes in older releases.
484
+ Refer to the {url-changelog}[CHANGELOG] for a complete list of changes in older releases.
481
485
  endif::[]