openstack/openstack-manuals
Code Issues Proposed changes

Merge "[glossary] Unify the deplicated definitions"

Browse Source
This commit is contained in:
Jenkins 2015-12-25 12:28:17 +00:00 committed by Gerrit Code Review
commit 1c02148509
1 changed files with 19 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
doc/glossary/glossary-terms.xml
View File

@ -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>