diff --git a/doc/admin-guide/source/networking-config-agents.rst b/doc/admin-guide/source/networking-config-agents.rst
index 74149e24bc..36d5abec27 100644
--- a/doc/admin-guide/source/networking-config-agents.rst
+++ b/doc/admin-guide/source/networking-config-agents.rst
@@ -337,7 +337,8 @@ The Neutron Metering agent resides beside neutron-l3-agent.
 Configure Load-Balancer-as-a-Service (LBaaS v2)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-For the back end, use either Octavia or Haproxy. This example uses Octavia.
+For the back end, use either :term:`Octavia` or :term:`HAProxy`.
+This example uses Octavia.
 
 **To configure LBaaS V2**
 
diff --git a/doc/common/glossary.rst b/doc/common/glossary.rst
index 96d47adf72..9eb83acfa5 100644
--- a/doc/common/glossary.rst
+++ b/doc/common/glossary.rst
@@ -1676,6 +1676,12 @@ H
       An object state in Object Storage where a new replica of the
       object is automatically created due to a drive failure.
 
+   HAProxy
+
+      Provides a high availability load balancer and proxy server for
+      TCP and HTTP-based applications that spreads requests across
+      multiple servers.
+
    hard reboot
 
       A type of reboot where a physical or virtual power button is
@@ -2665,6 +2671,10 @@ O
       design summit will take place in Barcelona, Spain. Ocata is
       a beach north of Barcelona.
 
+   Octavia
+
+      An operator-grade open source scalable load balancer.
+
    Oldie
 
       Term for an Object Storage process that runs for a long time.