diff --git a/doc/source/user/messaging/messaging.rst b/doc/source/user/messaging/messaging.rst
index e91601a303..cedcdb88ca 100644
--- a/doc/source/user/messaging/messaging.rst
+++ b/doc/source/user/messaging/messaging.rst
@@ -71,22 +71,22 @@ support.
    +----------------+-----------+-----------+-----+--------+-----------+
 
 
-Standard deployment of rabbitmq server
+Standard deployment of RabbitMQ server
 --------------------------------------
 
-A single rabbitmq server backend (e.g. server or cluster) is the
-default deployment for OSA. This broker messaging backend
+A single RabbitMQ server backend (e.g. server or cluster) is the
+default deployment for OpenStack-Ansible (OSA). This broker messaging backend
 provides the queue services for both RPC and Notification
 communications through its integration with the oslo.messaging rabbit
 driver. The `oslo-messaging.yml`_ file provides the default
 configuration to associate the oslo.messaging RPC and Notify services
-to the rabbitmq server backend.
+to the RabbitMQ server backend.
 
 .. literalinclude:: ../../../../inventory/group_vars/all/oslo-messaging.yml
    :language: yaml
    :start-after: under the License.
 
-.. _oslo-messaging.yml: https://github.com/openstack/openstack-ansible/blob/master/inventory/group_vars/all/oslo-messaging.yml
+.. _oslo-messaging.yml: https://opendev.org/openstack/openstack-ansible/src/branch/master/inventory/group_vars/all/oslo-messaging.yml
 
 
 Managing RabbitMQ stream policy
@@ -101,7 +101,7 @@ only comes into effect ones a stream has accumulated enough messages to fill a
 segment, which has a default size of 500MB.
 
 If you would like to reduce disk usage, an additional policy can be applied via
-OpenStack Ansible as shown below:
+OpenStack-Ansible as shown below:
 
 .. literalinclude:: ../../../../inventory/group_vars/all/infra.yml
    :language: yaml
diff --git a/doc/source/user/prod/haproxy_in_lxc.rst b/doc/source/user/prod/haproxy_in_lxc.rst
index 16f15a66bc..524432e029 100644
--- a/doc/source/user/prod/haproxy_in_lxc.rst
+++ b/doc/source/user/prod/haproxy_in_lxc.rst
@@ -149,7 +149,7 @@ For that we need to do the following series of changes in the
 
 
 #. In ``provider_networks`` you need to define a new container network and
-   assign it to HAproxy group.
+   assign it to HAProxy group.
 
     .. code:: yaml
 
diff --git a/doc/source/user/prod/provnet_groups.rst b/doc/source/user/prod/provnet_groups.rst
index 835de66bac..6edbadce64 100644
--- a/doc/source/user/prod/provnet_groups.rst
+++ b/doc/source/user/prod/provnet_groups.rst
@@ -8,7 +8,7 @@ Many network configuration examples assume a homogenous environment,
 where each server is configured identically and consistent network
 interfaces and interface names can be assumed across all hosts.
 
-Recent changes to OSA enables deployers to define provider networks
+Recent changes to OpenStack-Ansible (OSA) enables deployers to define provider networks
 that apply to particular inventory groups and allows for a heterogeneous
 network configuration within a cloud environment. New groups can be created
 or existing inventory groups, such as ``network_hosts`` or
@@ -17,7 +17,7 @@ only to hosts that meet the given parameters.
 
 Before reading this document, please review the following scenario:
 
-* :dev_docs:`Production environment  <user/prod/example.html>`
+* :dev_docs:`Production environment <user/prod/example.html>`
 
 This example environment has the following characteristics:
 
diff --git a/doc/source/user/security/ssl-certificates.rst b/doc/source/user/security/ssl-certificates.rst
index 727ffa132a..f6879d342c 100644
--- a/doc/source/user/security/ssl-certificates.rst
+++ b/doc/source/user/security/ssl-certificates.rst
@@ -236,7 +236,7 @@ it is required that the public endpoint is accessible directly by the
 Certificate Authority.
 
 Deployment of certificates using Let's Encrypt has been validated for
-openstack-ansible using Ubuntu 22.04 (Jammy Jellyfish). Other distributions should work
+OpenStack-Ansible using Ubuntu 22.04 (Jammy Jellyfish). Other distributions should work
 but are not tested.
 
 To deploy certificates with certbot, add the following to