Add site and location to glossary (#354)

* Clarify location terminology where appropriate

* Remove duplicate geo cluster entry from glossary

* Add site and location to glossary

jsc#DOCTEAM-108

* Geographic -> geographical to match the other uses in the guide

xml/art_sle_ha_geo_quick.xml

@@ -116,17 +116,18 @@
     <listitem>
      <para>
       You have at least two existing clusters that you want to combine into a
-      &geo; cluster. (If you need to set up two clusters first, follow the
-      instructions in the <xref linkend="art-ha-install-quick"/>.
-     </para>
+      &geo; cluster (if you need to set up two clusters first, follow the
+      instructions in the <xref linkend="art-ha-install-quick"/>).
+      </para>
     </listitem>
    </varlistentry>
    <varlistentry>
     <term>Meaningful Cluster Names</term>
     <listitem>
      <para>
-      Each cluster has a meaningful cluster name defined in &corosync.conf;
-      that reflects its location.
+      Each cluster has a meaningful name that reflects its location,
+      for example: <literal>amsterdam</literal> and <literal>berlin</literal>.
+      Cluster names are defined in &corosync.conf;.
      </para>
    </listitem>
    </varlistentry>

xml/ha_config_basics.xml

@@ -84,8 +84,7 @@
        <title>Usage scenario:</title>
        <para>Classic stretched clusters, focus on high availability of services
         and local data redundancy. For databases and enterprise
-        resource planning. One of the most popular setups during the last few
-        years.
+        resource planning. One of the most popular setups.
        </para>
       </formalpara>
      </listitem>

xml/ha_glossary.xml

@@ -103,7 +103,7 @@ performance will be met during a contractual measurement period.</para>
    </para>
   </glossdef>
  </glossentry>
- <glossentry><glossterm>booth</glossterm>
+ <glossentry xml:id="glos-booth"><glossterm>booth</glossterm>
   <glossdef>
    <para>
     The instance that manages the failover process between the sites of a
@@ -171,6 +171,15 @@ performance will be met during a contractual measurement period.</para>
    </para>
   </glossdef>
  </glossentry>
+ <glossentry>
+  <glossterm>cluster site</glossterm>
+  <glossdef>
+   <para>
+    In &geo; clustering, a cluster site (or just <quote>site</quote>) is a group of
+    nodes in the same physical location, managed by <xref linkend="glos-booth"/>.
+   </para>
+  </glossdef>
+ </glossentry>
  <glossentry><glossterm>concurrency violation</glossterm>
   <glossdef>
    <para>
@@ -314,16 +323,19 @@ performance will be met during a contractual measurement period.</para>
     be shut down or reset to prevent it from causing trouble. This way,
     resources are locked out of a node whose status is uncertain.
 <!--Fencing is distinguished between node and resource fencing.-->
-    <remark>fabian: TODO emap: Since the difference is not explained, better 
+    <remark>fabian: TODO emap: Since the difference is not explained, better
     drop it.</remark>
    </para>
   </glossdef>
  </glossentry>
- <glossentry><glossterm>geo cluster (geographically dispersed cluster)</glossterm>
+  <glossentry><glossterm>&geo; cluster (geographically dispersed cluster)</glossterm>
   <glossdef>
    <para>
-    See <xref linkend="glos-geo"/>.
-    <remark>toms 2014-02-12: (from Phil): refer to new, common chapter</remark>
+    Consists of multiple, &geo.dispersed; sites with a local cluster
+    each. The sites communicate via IP. Failover across the sites is
+    coordinated by a higher-level entity, the booth. &geo; clusters need
+    to cope with limited network bandwidth and high latency. Storage is
+    replicated asynchronously.
    </para>
   </glossdef>
  </glossentry>
@@ -362,6 +374,14 @@ performance will be met during a contractual measurement period.</para>
    </para>
   </glossdef>
  </glossentry>
+ <glossentry><glossterm>location</glossterm>
+  <glossdef>
+   <para>
+    In the context of a <emphasis>location constraint</emphasis>, <quote>location</quote>
+    refers to the nodes on which a resource can or cannot run.
+   </para>
+  </glossdef>
+ </glossentry>
  <glossentry><glossterm>LRM (local resource manager)</glossterm>
   <glossdef>
    <para>
@@ -384,7 +404,7 @@ performance will be met during a contractual measurement period.</para>
    <para>
     <remark>toms 2014-02-12: (From Phil):
      Is heartbeat (v3) still an option and should it be listed here?
-     
+
      Definition
      heartbeat: A CCM, in version 3 an alternative to Corosync. Supports more than two
      communication paths, but no cluster filesystem.
@@ -411,17 +431,6 @@ performance will be met during a contractual measurement period.</para>
    </para>
   </glossdef>
  </glossentry>
- <glossentry xml:id="glos-geo"><glossterm>&geo; cluster</glossterm>
-  <glossdef>
-   <para>
-    Consists of multiple, &geo.dispersed; sites with a local cluster
-    each. The sites communicate via IP. Failover across the sites is
-    coordinated by a higher-level entity, the booth. &geo; clusters need
-    to cope with limited network bandwidth and high latency. Storage is
-    replicated asynchronously.
-   </para>
-  </glossdef>
- </glossentry>
  <glossentry><glossterm>node</glossterm>
   <glossdef>
    <para>
@@ -580,4 +589,4 @@ performance will be met during a contractual measurement period.</para>
    </para>
   </glossdef>
  </glossentry>
-</glossary>
+</glossary>

xml/ha_loadbalancing.xml

@@ -6,7 +6,7 @@
 ]>
 
 <!--taroth 2011-11-25: maintainer of ipvsadmin: marius tomaschewski-->
-<!-- 
+<!--
 toms 2014-05-27:
 * Restructured file to make it easier to describe both LVS and HAProxy
 * Let Darix/Lars proofread that file.
@@ -110,7 +110,7 @@ toms 2014-05-27:
    </listitem>
    <listitem>
     <formalpara>
-     <title>Balance number of connections per server</title>
+     <title>Balancing the number of connections per server</title>
      <para>
       A load balancer between users and servers can divide the number of
       users across multiple servers.
@@ -119,7 +119,7 @@ toms 2014-05-27:
    </listitem>
    <listitem>
     <formalpara>
-     <title>Geo Location</title>
+     <title>Geographical location</title>
      <para>
       It is possible to direct clients to a server nearby.
      </para>
@@ -228,4 +228,4 @@ toms 2014-05-27:
     </listitem>
   </itemizedlist>
  </sect1>
-</chapter>
+</chapter>