Adjust assorted terminology and wording around product offerings. (#57242)

* Adjust assorted terminology and wording around product offerings.

* Update docs/docsite/rst/dev_guide/style_guide/trademarks.rst
* Update docs/docsite/rst/user_guide/modules_support.rst
* Update docs/docsite/rst/reference_appendices/tower.rst

5 files changed, 23 insertions, 21 deletions

diff --git a/docs/docsite/rst/community/communication.rst b/docs/docsite/rst/community/communication.rst
index 11ff52ff8c..b19c3ec02b 100644
--- a/docs/docsite/rst/community/communication.rst
+++ b/docs/docsite/rst/community/communication.rst
@@ -18,7 +18,7 @@ Mailing list information
 Ansible has several mailing lists.  Your first post to the mailing list will be moderated (to reduce spam), so please allow up to a day or so for your first post to appear.
 
 * `Ansible Announce list <https://groups.google.com/forum/#!forum/ansible-announce>`_ is a read-only list that shares information about new releases of Ansible, and also rare infrequent event information, such as announcements about an upcoming AnsibleFest, which is our official conference series. Worth subscribing to!
-* `Ansible AWX List <https://groups.google.com/forum/#!forum/awx-project>`_ is for `Ansible AWX <https://github.com/ansible/awx>`_ the upstream version of `Ansible Tower <https://www.ansible.com/products/tower>`_
+* `Ansible AWX List <https://groups.google.com/forum/#!forum/awx-project>`_ is for `Ansible AWX <https://github.com/ansible/awx>`_ the upstream version of `Red Hat Ansible Tower <https://www.ansible.com/products/tower>`_
 * `Ansible Container List <https://groups.google.com/forum/#!forum/ansible-container>`_ is for users and developers of the Ansible Container project.
 * `Ansible Development List <https://groups.google.com/forum/#!forum/ansible-devel>`_ is for learning how to develop on Ansible, asking about prospective feature design, or discussions about extending ansible or features in progress.
 * `Ansible Lockdown List <https://groups.google.com/forum/#!forum/ansible-lockdown>`_ is for all things related to Ansible Lockdown projects, including DISA STIG automation and CIS Benchmarks.
@@ -51,7 +51,7 @@ Many of our community `Working Groups <https://github.com/ansible/community/wiki
 
 - `Amazon (AWS) Working Group <https://github.com/ansible/community/wiki/AWS>`_ - ``#ansible-aws``
 - `Ansible Lockdown Working Group <https://github.com/ansible/community/wiki/Lockdown>`_ | `gh/ansible/ansible-lockdown <https://github.com/ansible/ansible-lockdown>`_ - ``#ansible-lockdown``- Security playbooks/roles
-- `AWX Working Group <https://github.com/ansible/awx>`_ - ``#ansible-awx`` - Upstream Ansible Tower
+- `AWX Working Group <https://github.com/ansible/awx>`_ - ``#ansible-awx`` - Upstream for Ansible Tower
 - `Azure Working Group <https://github.com/ansible/community/wiki/Azure>`_ - ``#ansible-azure``
 - `Community Working Group <https://github.com/ansible/community/wiki/Community>`_ - ``#ansible-community`` - Including Meetups
 - `Container Working Group <https://github.com/ansible/community/wiki/Container>`_ - ``#ansible-container``
@@ -85,9 +85,10 @@ IRC meetings
 The Ansible community holds regular IRC meetings on various topics, and anyone who is interested is invited to
 participate. For more information about Ansible meetings, consult the `meeting schedule and agenda page <https://github.com/ansible/community/blob/master/meetings/README.md>`_.
 
-Tower support questions
-========================
+Ansible Tower support questions
+===============================
 
-Ansible `Tower <https://www.ansible.com/products/tower>`_ is a UI, Server, and REST endpoint for Ansible.
+Red Hat Ansible `Tower <https://www.ansible.com/products/tower>`_ is a UI, Server, and REST endpoint for Ansible.
+The Red Hat Ansible Automation subscription contains support for Ansible, Ansible Tower, Ansible Automation for Networking, and more.
 
 If you have a question about Ansible Tower, visit `Red Hat support <https://access.redhat.com/products/ansible-tower-red-hat/>`_ rather than using the IRC channel or the general project mailing list.
diff --git a/docs/docsite/rst/community/other_tools_and_programs.rst b/docs/docsite/rst/community/other_tools_and_programs.rst
index 87f62786ef..50bbfa0413 100644
--- a/docs/docsite/rst/community/other_tools_and_programs.rst
+++ b/docs/docsite/rst/community/other_tools_and_programs.rst
@@ -107,7 +107,7 @@ Other Tools
 - `Ansigenome <https://github.com/nickjj/ansigenome>`_ - a command line tool designed to help you manage your Ansible roles.
 - `ARA <https://github.com/openstack/ara>`_ - records Ansible playbook runs and makes the recorded data available and intuitive for users and systems by integrating with Ansible as a callback plugin.
 - `Awesome Ansible <https://github.com/jdauphant/awesome-ansible>`_ - a collaboratively curated list of awesome Ansible resources.
-- `AWX <https://github.com/ansible/awx>`_ - provides a web-based user interface, REST API, and task engine built on top of Ansible. AWX is the upstream project for Tower, a commercial derivative of AWX.
+- `AWX <https://github.com/ansible/awx>`_ - provides a web-based user interface, REST API, and task engine built on top of Ansible. AWX is the upstream project for Red Hat Ansible Tower, part of the Red Hat Ansible Automation subscription.
 - `Mitogen for Ansible <https://mitogen.readthedocs.io/en/latest/ansible.html>`_ - uses the `Mitogen <https://github.com/dw/mitogen/>`_ library to execute Ansible playbooks in a more efficient way (decreases the execution time).
 - `OpsTools-ansible <https://github.com/centos-opstools/opstools-ansible>`_ - uses Ansible to configure an environment that provides the support of `OpsTools <https://wiki.centos.org/SpecialInterestGroup/OpsTools>`_, namely centralized logging and analysis, availability monitoring, and performance monitoring.
 - `TD4A <https://github.com/cidrblock/td4a>`_ - a template designer for automation. TD4A is a visual design aid for building and testing jinja2 templates. It will combine data in yaml format with a jinja2 template and render the output.
diff --git a/docs/docsite/rst/dev_guide/style_guide/trademarks.rst b/docs/docsite/rst/dev_guide/style_guide/trademarks.rst
index 44880feb33..266f16bd13 100644
--- a/docs/docsite/rst/dev_guide/style_guide/trademarks.rst
+++ b/docs/docsite/rst/dev_guide/style_guide/trademarks.rst
@@ -12,7 +12,7 @@ General Rules:
 
 Trademarks should be used on 1st references on a page or within a section.
 
-Use Ansible Tower® or Ansible®, on first reference when referring to products.
+Use Red Hat® Ansible Tower® or Ansible®, on first reference when referring to products.
  
 Use "Ansible" alone as the company name, as in "Ansible announced quarterly results," which is not marked.
 
@@ -20,13 +20,13 @@ Also add the trademark disclaimer.
 * When using Ansible trademarks in the body of written text, you should use the following credit line in a prominent place, usually a footnote.
 
     For Registered Trademarks:
-    - [Name of Trademark] is a registered trademark of Ansible, Inc. in the United States and other countries.
+    - [Name of Trademark] is a registered trademark of Red Hat, Inc. in the United States and other countries.
     
     For Unregistered Trademarks (TMs/SMs):
-    - [Name of Trademark] is a trademark of Ansible, Inc. in the United States and other countries.
+    - [Name of Trademark] is a trademark of Red Hat, Inc. in the United States and other countries.
 
     For registered and unregistered trademarks:
-    - [Name of Trademark] is a registered trademark and [Name of Trademark] is a trademark of Ansible, Inc. in the United States and other countries.
+    - [Name of Trademark] is a registered trademark and [Name of Trademark] is a trademark of Red Hat, Inc. in the United States and other countries.
 
 Guidelines for the proper use of trademarks:
 +++++++++++++++++++++++++++++++++++++++++++++
@@ -38,7 +38,7 @@ Always use proper trademark form and spelling.
 Never use a trademark as a noun. Always use a trademark as an adjective modifying the noun.
 
     Correct:
-    Ansible Tower® system performance is incredible.
+    Red Hat® Ansible Tower® system performance is incredible.
 
     Incorrect:
     Ansible's performance is incredible.
@@ -46,7 +46,7 @@ Never use a trademark as a noun. Always use a trademark as an adjective modifyin
 Never use a trademark as a verb. Trademarks are products or services, never actions.
 
     Correct:
-    "Orchestrate your entire network using Ansible Tower®."
+    "Orchestrate your entire network using Red Hat® Ansible Tower®."
     
     Incorrect:
     "Ansible your entire network."
@@ -54,7 +54,7 @@ Never use a trademark as a verb. Trademarks are products or services, never acti
 Never modify a trademark to a plural form. Instead, change the generic word from the singular to the plural.
 
     Correct:
-    "Corporate demand for Ansible Tower® configuration software is surging."
+    "Corporate demand for Red Hat® Ansible Tower® configuration software is surging."
 
     Incorrect:
     "Corporate demand for Ansible is surging."
diff --git a/docs/docsite/rst/reference_appendices/tower.rst b/docs/docsite/rst/reference_appendices/tower.rst
index 3c22e24682..151936dd21 100644
--- a/docs/docsite/rst/reference_appendices/tower.rst
+++ b/docs/docsite/rst/reference_appendices/tower.rst
@@ -1,12 +1,13 @@
 .. _ansible_tower:
 
-Ansible Tower
-=============
+Red Hat Ansible Tower
+=====================
 
-`Ansible Tower <https://www.ansible.com/products/tower>`_ (formerly 'AWX') is a web-based solution that makes Ansible even more easy to use for IT teams of all kinds.  It's designed to be the hub for all of your automation tasks.
+`Red Hat Ansible Tower <https://www.ansible.com/products/tower>` is a web console and REST API for operationalizing Ansible across your team, organization, and enterpise. It's designed to be the hub for all of your automation tasks.
 
-Tower allows you to control access to who can access what, even allowing sharing of SSH credentials without someone being able to transfer those credentials.  Inventory can be graphically managed or synced with a wide variety of cloud sources.  It logs all of your jobs, integrates well with LDAP, and has an amazing browsable REST API.  Command line tools are available for easy integration with Jenkins as well.  Provisioning callbacks provide great support for autoscaling topologies.
+Ansible Tower gives you role-based access control, including control over the use of securely stored credentials for SSH and other services. You can sync your Ansible Tower inventory with a wide variety of cloud sources, and powerful multi-playbook workflows allow you to model
+complex processes.
 
-Find out more about Tower features and how to download it on the `Ansible Tower webpage <https://www.ansible.com/products/tower>`_.  Tower
-is free for usage for up to 10 nodes, and comes bundled with amazing support from Ansible, Inc.  As you would expect, Tower is
-installed using Ansible playbooks!
+It logs all of your jobs, integrates well with LDAP, SAML, and other authentication sources, and has an amazing browsable REST API. Command line tools are available for easy integration with Jenkins as well.
+
+Find out more about Ansible Tower features and how to download it on the `Ansible Tower webpage <https://www.ansible.com/products/tower>`_. Ansible Tower is part of the Red Hat Ansible Automation subscription, and comes bundled with amazing support from Red Hat, Inc.
diff --git a/docs/docsite/rst/user_guide/modules_support.rst b/docs/docsite/rst/user_guide/modules_support.rst
index 376b3aed30..f5b711f1e0 100644
--- a/docs/docsite/rst/user_guide/modules_support.rst
+++ b/docs/docsite/rst/user_guide/modules_support.rst
@@ -46,7 +46,7 @@ For development-oriented topics, use the `ansible-devel Google group <https://gr
 
 The modules are hosted on GitHub in a subdirectory of the `Ansible <https://github.com/ansible/ansible/tree/devel/lib/ansible/modules>`_ repo.
 
-NOTE: If you have a Red Hat Ansible Engine product subscription, please follow the standard issue reporting process via the Red Hat Customer Portal.
+NOTE: If you have a Red Hat Ansible Automation product subscription, please follow the standard issue reporting process via the `Red Hat Customer Portal <https:///access.redhat.com/>`_.
 
 Support
 =======