Merge pull request #135 from SUSE/feature/jira-eco-1745-support-qdevi…

…ce-qnet

Fix jira#1745 (ECO) Add QDevice/QNetd

xml/art_sle_ha_install_quick.xml

@@ -256,6 +256,16 @@
       inside a &geo; cluster.</para>
     </listitem>
    </varlistentry>
+   <varlistentry>
+    <term>&qdevice;/&qnet;</term>
+    <listitem>
+     <para>
+      This setup is not covered here. If you want to use a &qnet; server,
+      you can set it up with the bootstrap script as described in
+      <xref linkend="cha-ha-qdevice"/>.
+     </para>
+    </listitem>
+   </varlistentry>
   </variablelist>
  </sect1>
 
@@ -641,7 +651,7 @@ softdog                16384  1</screen>
   </para>
   <para>
    The bootstrap scripts take care of changing the configuration specific to
-   a two-node cluster, for example, SBD and &corosync;.
+   a two-node cluster, for example, SBD, &corosync;.
   </para>
   <procedure xml:id="pro-ha-inst-quick-setup-ha-cluster-join">
    <title>Adding the Second Node (<systemitem class="server">&node2;</systemitem>) with
@@ -680,7 +690,7 @@ softdog                16384  1</screen>
     </para>
     <para>
      After logging in to the specified node, the script will copy the
-     &corosync; configuration, configure SSH and &csync;, and will
+     &corosync; configuration, configure SSH, &csync;, and will
      bring the current machine online as new cluster node. Apart from that,
      it will start the service needed for &hawk2;. <!--
      If you have configured shared storage with OCFS2, it will also

xml/book_sle_ha_guide.xml

@@ -60,6 +60,7 @@
   <xi:include href="ha_agents.xml"/>
   <xi:include href="ha_fencing.xml"/>
   <xi:include href="ha_storage_protection.xml"/>
+  <xi:include href="ha_qdevice-qnetd.xml"/>
   <xi:include href="ha_acl.xml"/>
   <xi:include href="ha_netbonding.xml"/>
   <xi:include href="ha_loadbalancing.xml"/>

xml/entity-decl.ent

@@ -133,6 +133,8 @@
 <!ENTITY ais            "OpenAIS">
 <!ENTITY corosync       "Corosync">
 <!ENTITY pace           "Pacemaker">
+<!ENTITY qdevice        "QDevice">
+<!ENTITY qnet           "QNetd">
 <!-- According to aspiers, there is an inconcistency. The systemd service is
 called pacemaker_remote, but the daemon pacemaker-remoted. :-(
 -->