diff --git a/doc/common-rst/glossary.rst b/doc/common-rst/glossary.rst
index 65e20c6d..e08a95db 100644
--- a/doc/common-rst/glossary.rst
+++ b/doc/common-rst/glossary.rst
@@ -3,13 +3,13 @@ Glossary
 ========
 
 .. comments
-   This file file is automatically generated, edit the master   doc/glossary/glossary-terms.xml to update it.
+   This file is automatically generated, edit the master   doc/glossary/glossary-terms.xml to update it.
 
 This glossary offers a list of terms and definitions to define a
 vocabulary for OpenStack-related concepts.
 
 To add to OpenStack glossary, clone the `openstack/openstack-manuals repository <https://git.openstack.org/cgit/openstack/openstack-manuals>`__ and update the source file
-:file:`doc/glossary/glossary-terms.xml` through the
+``doc/glossary/glossary-terms.xml`` through the
 OpenStack contribution process.
 
 .. glossary::
@@ -31,7 +31,7 @@ OpenStack contribution process.
       which users or system processes have access to objects. It also
       defines which operations can be performed on specified objects. Each
       entry in a typical ACL specifies a subject and an operation. For
-      instance, the ACL entry `(Alice, delete)` for a file gives
+      instance, the ACL entry ``(Alice, delete)`` for a file gives
       Alice permission to delete the file.
 
    access key
@@ -209,7 +209,7 @@ OpenStack contribution process.
    API version
 
       In OpenStack, the API version for a project is part of the URL.
-      For example, :file:`example.com/nova/v1/foobar`.
+      For example, ``example.com/nova/v1/foobar``.
 
    applet
 
@@ -1064,7 +1064,7 @@ OpenStack contribution process.
    deprecated auth
 
       An option within Compute that enables administrators to create
-      and manage users through the `nova-manage` command as
+      and manage users through the ``nova-manage`` command as
       opposed to using the Identity service.
 
    Designate
@@ -2110,7 +2110,7 @@ OpenStack contribution process.
 
       The code name for the eleventh release of OpenStack. The
       design summit took place in Paris, France. Due to delays in the name
-      selection, the release was known only as K. Because `k` is the
+      selection, the release was known only as K. Because ``k`` is the
       unit symbol for kilo and the reference artifact is stored near Paris
       in the Pavillon de Breteuil in Sèvres, the community chose Kilo as
       the release name.
@@ -2355,7 +2355,7 @@ OpenStack contribution process.
    Monitor (LBaaS)
 
       LBaaS feature that provides availability monitoring using the
-      `ping` command, TCP, and HTTP/HTTPS GET.
+      ``ping`` command, TCP, and HTTP/HTTPS GET.
 
    Monitor (Mon)
 
@@ -2462,7 +2462,7 @@ OpenStack contribution process.
 
    network worker
 
-      The `nova-network` worker daemon; provides
+      The ``nova-network`` worker daemon; provides
       services such as giving an IP address to a booting nova
       instance.
 
@@ -2795,7 +2795,7 @@ OpenStack contribution process.
       interface. A private network interface can be a flat or VLAN network
       interface. A flat network interface is controlled by the
       flat_interface with flat managers. A VLAN network interface is
-      controlled by the `vlan_interface` option with VLAN
+      controlled by the ``vlan_interface`` option with VLAN
       managers.
 
    project
@@ -2867,7 +2867,7 @@ OpenStack contribution process.
       compute servers to interact with each other and with the public
       network. All machines must have a public and private network
       interface. The public network interface is controlled by the
-      `public_interface` option.
+      ``public_interface`` option.
 
    Puppet
 
@@ -3771,7 +3771,7 @@ OpenStack contribution process.
       compute servers to interact with each other and with the public
       network. All machines must have a public and private network
       interface. A VLAN network is a private network interface, which is
-      controlled by the `vlan_interface` option with VLAN
+      controlled by the ``vlan_interface`` option with VLAN
       managers.
 
    VM disk (VMDK)