From aaa73edf8cdde760034e9e37c6dbab0d95a3a6e9 Mon Sep 17 00:00:00 2001
From: KATO Tomoyuki <kato.tomoyuki@jp.fujitsu.com>
Date: Thu, 24 Dec 2015 11:12:03 +0900
Subject: [PATCH] [glossary] Unify the deplicated definitions

* "Domain Name Service" and "Domain Name System" to "Domain Name System"
  - mainly use the word "service".
* "ESX" and "ESXi" to "ESX"
  - VMware has recently provided ESXi only.
* "HTTP" and "Hypertext Transfer Protocol (HTTP)" to "HTTP"
* "HTTPS" and "Hypertext Transfer Protocol Secure (HTTPS)" to "HTTPS"

Change-Id: Ibdfd4c0989dbda535465e14209dc22cd43c60efa
---
 doc/glossary/glossary-terms.xml | 82 ++++++++-------------------------
 1 file changed, 19 insertions(+), 63 deletions(-)

diff --git a/doc/glossary/glossary-terms.xml b/doc/glossary/glossary-terms.xml
index 8c7d562dec..3bb5fc93aa 100644
--- a/doc/glossary/glossary-terms.xml
+++ b/doc/glossary/glossary-terms.xml
@@ -2776,13 +2776,13 @@
     <glossentry>
       <glossterm>DNS</glossterm>
       <indexterm class="singular">
-          <primary>DNS (Domain Name Server, Service or System)</primary>
+          <primary>DNS (Domain Name System, Server or Service)</primary>
 
           <secondary>definitions of</secondary>
         </indexterm>
 
       <glossdef>
-        <para>Domain Name Server. A hierarchical and distributed naming system
+        <para>Domain Name System. A hierarchical and distributed naming system
         for computers, services, and resources connected to the Internet or a
         private network. Associates a human-friendly names to IP
         addresses.</para>
@@ -2851,16 +2851,6 @@
       </glossdef>
     </glossentry>
 
-    <glossentry>
-      <glossterm>Domain Name Service (DNS)</glossterm>
-
-      <glossdef>
-        <para>In Compute, the support that enables associating DNS entries
-        with floating IP addresses, nodes, or cells so that hostnames are
-        consistent across reboots.</para>
-      </glossdef>
-    </glossentry>
-
     <glossentry>
       <glossterm>Domain Name System (DNS)</glossterm>
 
@@ -2878,6 +2868,10 @@
         invokes the slave. DNS servers might also be clustered or replicated
         such that changes made to one DNS server are automatically propagated
         to other active servers.</para>
+
+        <para>In Compute, the support that enables associating DNS entries
+        with floating IP addresses, nodes, or cells so that hostnames are
+        consistent across reboots.</para>
       </glossdef>
     </glossentry>
 
@@ -3191,17 +3185,6 @@
       </glossdef>
     </glossentry>
 
-    <glossentry>
-      <glossterm>ESX</glossterm>
-      <indexterm class="singular">
-          <primary>ESX hypervisor</primary>
-        </indexterm>
-
-      <glossdef>
-        <para>An OpenStack-supported hypervisor.</para>
-      </glossdef>
-    </glossentry>
-
     <glossentry>
       <glossterm>ESXi</glossterm>
       <indexterm class="singular">
@@ -4067,41 +4050,6 @@
       </glossdef>
     </glossentry>
 
-    <glossentry>
-      <glossterm>HTTP</glossterm>
-      <indexterm class="singular">
-          <primary>HTTP (Hypertext Transfer Protocol)</primary>
-
-          <secondary>basics of</secondary>
-        </indexterm>
-
-      <glossdef>
-        <para>Hypertext Transfer Protocol. HTTP is an application protocol for
-        distributed, collaborative, hypermedia information systems. It is the
-        foundation of data communication for the World Wide Web. Hypertext is
-        structured text that uses logical links (hyperlinks) between nodes
-        containing text. HTTP is the protocol to exchange or transfer
-        hypertext.</para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry>
-      <glossterm>HTTPS</glossterm>
-      <indexterm class="singular">
-          <primary>HTTPS (Hypertext Transfer Protocol Secure)</primary>
-        </indexterm>
-
-      <glossdef>
-        <para>Hypertext Transfer Protocol Secure (HTTPS) is a communications
-        protocol for secure communication over a computer network, with
-        especially wide deployment on the Internet. Technically, it is not a
-        protocol in and of itself; rather, it is the result of simply layering
-        the Hypertext Transfer Protocol (HTTP) on top of the SSL/TLS protocol,
-        thus adding the security capabilities of SSL/TLS to standard HTTP
-        communications.</para>
-      </glossdef>
-    </glossentry>
-
     <glossentry>
       <glossterm>hybrid cloud</glossterm>
       <indexterm class="singular">
@@ -4148,8 +4096,11 @@
       <glossterm>Hypertext Transfer Protocol (HTTP)</glossterm>
 
       <glossdef>
-        <para>The protocol that tells browsers where to go to find
-        information.</para>
+        <para>An application protocol for distributed, collaborative,
+        hypermedia information systems. It is the foundation of data
+        communication for the World Wide Web. Hypertext is structured
+        text that uses logical links (hyperlinks) between nodes containing
+        text. HTTP is the protocol to exchange or transfer hypertext.</para>
       </glossdef>
     </glossentry>
 
@@ -4157,9 +4108,14 @@
       <glossterm>Hypertext Transfer Protocol Secure (HTTPS)</glossterm>
 
       <glossdef>
-        <para>Encrypted HTTP communications using SSL or TLS; most OpenStack
-        API endpoints and many inter-component communications support HTTPS
-        communication.</para>
+        <para>An encrypted communications protocol for secure communication
+        over a computer network, with especially wide deployment on the
+        Internet. Technically, it is not a protocol in and of itself;
+        rather, it is the result of simply layering the Hypertext Transfer
+        Protocol (HTTP) on top of the TLS or SSL protocol, thus adding the
+        security capabilities of TLS or SSL to standard HTTP communications.
+        most OpenStack API endpoints and many inter-component communications
+        support HTTPS communication.</para>
       </glossdef>
     </glossentry>