rename asciidoc-python.adoc to asciidoc-py and use AsciiDoc.py to refer to original processor

7 files changed, 11 insertions, 12 deletions

diff --git a/docs/modules/ROOT/pages/converters.adoc b/docs/modules/ROOT/pages/converters.adoc
index 31c54489..d46e8a7d 100644
--- a/docs/modules/ROOT/pages/converters.adoc
+++ b/docs/modules/ROOT/pages/converters.adoc
@@ -88,7 +88,7 @@ The tool provides built-in theming via a YAML configuration file, which is docum
 TIP: Asciidoctor PDF is the preferred tool for converting to PDF and is fully supported by the Asciidoctor community.
 
 a2x::
-A DocBook toolchain frontend provided by that AsciiDoc Python project.
+A DocBook toolchain frontend provided by that AsciiDoc.py project.
 +
 To use this tool, you should first convert to DocBook using Asciidoctor, then convert the DocBook to PDF using a2x.
 a2x accepts a DocBook file as input and can convert it to a PDF using either Apache FOP or dblatex.
diff --git a/docs/modules/ROOT/pages/index.adoc b/docs/modules/ROOT/pages/index.adoc
index 0644b608..d74c563f 100644
--- a/docs/modules/ROOT/pages/index.adoc
+++ b/docs/modules/ROOT/pages/index.adoc
@@ -18,8 +18,8 @@ Asciidoctor is also distributed as a package for numerous Linux distributions as
 
 Asciidoctor is open source software that is available under the terms of the MIT license and {url-org}[hosted on GitHub^].
 
-Asciidoctor is the successor to AsciiDoc Python (AsciiDoc.py).
-If you're using AsciiDoc.py, follow xref:migrate:asciidoc-python.adoc[] to learn how to upgrade to Asciidoctor.
+Asciidoctor is the successor to AsciiDoc.py (aka AsciiDoc Python).
+If you're using AsciiDoc.py, follow xref:migrate:asciidoc-py.adoc[] to learn how to upgrade to Asciidoctor.
 
 == Basic usage
 
diff --git a/docs/modules/ROOT/pages/localization-support.adoc b/docs/modules/ROOT/pages/localization-support.adoc
index 5a357f33..cf2d0bc0 100644
--- a/docs/modules/ROOT/pages/localization-support.adoc
+++ b/docs/modules/ROOT/pages/localization-support.adoc
@@ -18,7 +18,7 @@ See {url-org}/asciidoctor/issues/1601[issue #1601^] for details.
 In the interim, you can leverage the DocBook toolchain to get right-to-left support.
 * Attributes that store dates and times (e.g., `docdatetime`) are always formatted like `2019-01-04 19:26:06 GMT+0000`.
 * Message (aka logging) strings are always in English.
-* Asciidoctor does not support the language conf files used by AsciiDoc Python.
+* Asciidoctor does not support the language conf files used by AsciiDoc.py.
 However, Asciidoctor does provide {url-lang-attributes}[a translation file^] that can be used for a similar purpose.
 
 [#customizing-labels]
diff --git a/docs/modules/ROOT/pages/whats-new.adoc b/docs/modules/ROOT/pages/whats-new.adoc
index 7c7b2305..7a0c6384 100644
--- a/docs/modules/ROOT/pages/whats-new.adoc
+++ b/docs/modules/ROOT/pages/whats-new.adoc
@@ -389,7 +389,7 @@ _**Release date:** 2019.03.22_
 == Build and infrastructure
 
 * clear SOURCE_DATE_EPOCH env var when testing timezones (PR #2969) (*@aerostitch*)
-* remove compat folder (removes the AsciiDoc Python config file that provides pseudo-compliance with Asciidoctor and a stylesheet for an old Font Awesome migration)
+* remove compat folder (removes the AsciiDoc.py config file that provides pseudo-compliance with Asciidoctor and a stylesheet for an old Font Awesome migration)
 * add Ruby 2.6.0 to build matrix
 * stop running CI job on unsupported versions of Ruby
 * exclude test suite, build script, and Gemfile from gem (#3044)
diff --git a/docs/modules/migrate/nav.adoc b/docs/modules/migrate/nav.adoc
index 6df6ade3..2c35826a 100644
--- a/docs/modules/migrate/nav.adoc
+++ b/docs/modules/migrate/nav.adoc
@@ -1,6 +1,6 @@
 * Migration Guides
 ** xref:upgrade.adoc[]
-** xref:asciidoc-python.adoc[]
+** xref:asciidoc-py.adoc[]
 ** xref:docbook-xml.adoc[]
 ** xref:markdown.adoc[]
 ** xref:confluence-xhtml.adoc[]
diff --git a/docs/modules/migrate/pages/asciidoc-python.adoc b/docs/modules/migrate/pages/asciidoc-py.adoc
index 3a1728dc..a5f1cac8 100644
--- a/docs/modules/migrate/pages/asciidoc-python.adoc
+++ b/docs/modules/migrate/pages/asciidoc-py.adoc
@@ -1,17 +1,16 @@
-= Migrate from AsciiDoc.py to Asciidoctor
-:navtitle: Migrate from AsciiDoc.py
+= Migrate from AsciiDoc.py
 :url-diagram: {url-org}/asciidoctor-diagram
 :url-tests: {url-org}/asciidoctor/tree/master/test
 :url-doctest: {url-org}/asciidoctor-doctest
 :url-manpage: {url-project}/man/asciidoctor
 //:uri-diffs: {uri-home}/docs/asciidoc-asciidoctor-diffs/
-// um anchor: migrating-from-asciidoc-python
 
-If you're currently using AsciiDoc.py (aka AsciiDoc Python) to convert your AsciiDoc documents and want to switch to Asciidoctor, you'll need to migrate your legacy AsciiDoc content to the official AsciiDoc syntax defined and supported by Asciidoctor.
+AsciiDoc.py (aka AsciiDoc Python) is the original AsciiDoc processor, which has now been superseded by Asciidoctor.
+If you're currently using AsciiDoc.py to convert your AsciiDoc documents and are ready to switch to Asciidoctor, you'll need to migrate your legacy AsciiDoc content to the official AsciiDoc syntax defined and supported by Asciidoctor.
 In doing so, you'll also benefit from the enhancements that have been added to the AsciiDoc language since Asciidoctor took over development of the language.
 This page covers those differences and how to migrate.
 
-NOTE: This documentation specifically covers migration from AsciiDoc.py 8 to the latest stable version of Asciidoctor.
+NOTE: This documentation specifically covers migration from AsciiDoc.py 8.6.
 
 == Processor call
 
diff --git a/docs/modules/migrate/pages/upgrade.adoc b/docs/modules/migrate/pages/upgrade.adoc
index 7fae3f9b..6a270979 100644
--- a/docs/modules/migrate/pages/upgrade.adoc
+++ b/docs/modules/migrate/pages/upgrade.adoc
@@ -1,7 +1,7 @@
 = Upgrade from Asciidoctor 1.5.x to 2.0
 
 IMPORTANT: This page if for users upgrading from a previous version of Asciidoctor to the latest stable version of Asciidoctor.
-If your migrating from AsciiDoc Python, see xref:asciidoc-python.adoc[].
+If your migrating from AsciiDoc.py, see xref:asciidoc-py.adoc[].
 
 When you upgrade Asciidoctor you may also need to update some of the syntax and attributes in your AsciiDoc documents.
 Major version releases can include new AsciiDoc syntax capabilities as well as syntax changes that make it more consistent.