Skip to content

Commit

Permalink
Geo Quick: integrated all proofing corrections from Dublin
Browse files Browse the repository at this point in the history
- additionally, applied one correction to ha_migration.xml
  • Loading branch information
taroth21 committed Nov 5, 2015
1 parent 01fd44f commit 8c5e84a
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 25 deletions.
4 changes: 2 additions & 2 deletions xml/geo_booth_i.xml
Original file line number Diff line number Diff line change
Expand Up @@ -370,10 +370,10 @@ ticket = "&ticket2;" <xref linkend="co.ha.geo.booth.config.ticket" xrefstyle="se
<!--taroth 2015-10-26:fate#319318: yast2 geo: configure booth authentification-->
<formalpara>
<title>Authentication</title>
<para>To make booth use authentication, click <guimenu>Authentication</guimenu> and in the
<para>To enable authentication for booth, click <guimenu>Authentication</guimenu> and in the
dialog that opens, activate <guimenu>Enable Security Auth</guimenu>. If you already have
an existing key, specify the path and file name in <guimenu>Authentication file</guimenu>.
To generate a key file for a new &geo; cluster or click <guimenu>Generate
To generate a key file for a new &geo; cluster, click <guimenu>Generate
Authentication Key File</guimenu>. The key will be created and written to the location specified in
<guimenu>Authentication file</guimenu>.</para>
</formalpara>
Expand Down
2 changes: 1 addition & 1 deletion xml/geo_drbd_i.xml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
<listitem>
<para>
On the site that should run the file system service, the upper layer
DRBD gets set <literal>primary</literal> mode by the
DRBD gets set to <literal>primary</literal> mode by the
<systemitem>ocf:linbit:drbd</systemitem> resource agent.
This means that the file system therein can be mounted and used by
applications.
Expand Down
2 changes: 1 addition & 1 deletion xml/geo_install_i.xml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<para>
Both patterns are only available if you have registered your system at
&scc; (or a local registration server) and have added the respective
product channels or installation media as extension. For information on how
product channels or installation media as an extension. For information on how
to install extensions, see the <citetitle>&sle; &productnumber;
&deploy;</citetitle>, available at <link xlink:href="http://www.suse.com/documentation/"/>. Refer to
chapter <citetitle>Installing Modules, Extensions, and Third Party Add-On Products</citetitle>.
Expand Down
5 changes: 1 addition & 4 deletions xml/geo_ip_i.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,7 @@
<listitem>
<para>
Your DNS server must be configured for dynamic DNS updates. For
information on how to do so with BIND/named, see the named documentation
<remark>taroth 2014-11: lmb, do you have a
pointer to a specific URL concerning named docs?</remark>
, or refer to
information on how to do so with BIND/named, see the <literal>named</literal> documentation, or refer to
<link xlink:href="http://www.semicomplete.com/articles/dynamic-dns-with-dhcp/"/>.
<remark>taroth 2014-11-21: lmb, would you consider the aforementioned link appropriate (WRT to
our customers and the kind of setup that is needed here)?</remark>
Expand Down
8 changes: 4 additions & 4 deletions xml/geo_manage_hawk2_i.xml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
</step>
<step>
<para>To specify further options like the update interval for &hawk;2, the port to connect
to or if to use HTTPS (default), click <guimenu>Advanced</guimenu> and enter the details.
to, or whether to use HTTPS (default), click <guimenu>Advanced</guimenu> and enter the details.
</para>
</step>
<step>
Expand Down Expand Up @@ -153,7 +153,7 @@
Tickets are visible in
&hawk;2 if they have been granted or revoked at least once <!--check!-->or if they are
referenced in a ticket dependency. </para>
<para>&hawk;2 displays the following ticket states:</para>
<para>&hawk;2 displays the following ticket statuses:</para>
<itemizedlist>
<listitem>
<para><guimenu>Granted</guimenu>: Tickets that are granted to the current site.</para>
Expand Down Expand Up @@ -201,7 +201,7 @@
</step>
<step>
<para> To show details for a certain ticket, click the <guimenu>Details</guimenu> icon next to
the ticket. A window shows if the ticket has been already granted, which <guimenu>Loss
the ticket. A window shows whether the ticket has been already granted, which <guimenu>Loss
Policy</guimenu> has been set (for the case that a ticket gets revoked from a site), and which
resources depend on the ticket.</para>
<figure>
Expand All @@ -218,7 +218,7 @@
</step>
<step>
<para> To revoke a granted ticket from the current site or to grant a ticket to the current
site, click the switch in the <guimenu>Granted</guimenu> column next to the ticket. On click,
site, click the switch in the <guimenu>Granted</guimenu> column next to the ticket. On clicking,
it shows the available action. Confirm your choice when &hawk;2 prompts for a confirmation. </para>
<para> If the ticket cannot be granted or revoked for any reason, &hawk;2 shows an error
message. If the ticket has been successfully granted or revoked, &hawk;2 will update the
Expand Down
2 changes: 1 addition & 1 deletion xml/geo_sync_i.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@

<para>
&csync; will contact other servers via a TCP port (by default
<literal>6556</literal>), and starts remote &csync;
<literal>6556</literal>), and start remote &csync;
instances. For detailed information about &csync;, refer to
<link xlink:href="http://oss.linbit.com/csync2/paper.pdf"/>
</para>
Expand Down
10 changes: 5 additions & 5 deletions xml/geo_upgrade_i.xml
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@
the Paxos algorithm. The booth version (v0.2) in &productname; 11 SP4 and
&productname; 12 and 12 SPx is loosely based on raft and is incompatible
with the one running v0.1. Therefore, a rolling upgrade from any system
running the old booth version to a one running the new booth version is not
running the old booth version to one running the new booth version is not
possible. Instead, all cluster nodes must be offline and the cluster needs to
be migrated as a whole as described in <xref
linkend="pro.ha.geo.upgrade.offline"/>.</para>
Expand All @@ -195,8 +195,8 @@
<para> If you use arbitrators outside of the cluster sites: </para>
<substeps performance="required">
<step>
<para> Upgrade each arbitrator to the desired &sls; version. Where to find
the details for the individual upgrade processes is listed in <xref
<para> Upgrade each arbitrator to the desired &sls; version. To find
the details for the individual upgrade processes, see <xref
linkend="table.ha.geo.upgrade.oview"/>. </para>
</step>
<step>
Expand Down Expand Up @@ -245,8 +245,8 @@
<para> If you use arbitrators outside of the cluster sites, proceed as
follows for each arbitrator:</para>
<step>
<para>Perform an upgrade to the desired target version of &sls;. Where
to find the details for the individual upgrade processes is listed in <xref
<para>Perform an upgrade to the desired target version of &sls;. To find
the details for the individual upgrade processes, see <xref
linkend="table.ha.geo.upgrade.oview"/>.</para>
</step>
<step>
Expand Down
8 changes: 4 additions & 4 deletions xml/ha_migration.xml
Original file line number Diff line number Diff line change
Expand Up @@ -410,8 +410,8 @@
For each cluster node, perform an upgrade to the desired target
version of &sls; and &productname;. If you have an existing &geo;
cluster setup and want to upgrade it, see the additional instructions
in the <citetitle>&hageo; &geoquick;</citetitle>. Where to find the
details for the individual upgrade processes is listed in
in the <citetitle>&hageo; &geoquick;</citetitle>. To find the
details for the individual upgrade processes, see
<xref linkend="sec.ha.migration.upgrade.oview"/>.
</para>
</step>
Expand Down Expand Up @@ -558,8 +558,8 @@
<step xml:id="step.ha.migration.upgrade.tolatest">
<para>
Perform an upgrade to the desired target version of &sls; and
&productname;. Where to find the details for the individual upgrade
processes is listed in
&productname;. To find the details for the individual upgrade
processes, see
<xref linkend="sec.ha.migration.upgrade.oview"/>.
</para>
</step>
Expand Down
6 changes: 3 additions & 3 deletions xml/phrases-decl.ent
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@
<itemizedlist xmlns='http://docbook.org/ns/docbook'>
<listitem >
<para>&hawk; version <literal>1.0.0</literal> (included in RPM
package: <systemitem class='resource'>hawk</systemitem>). For the
package <systemitem class='resource'>hawk</systemitem>). For the
documentation of this &hawk; version, see the manuals for
&productname; 12. They are available from
<link xmlns:xlink='http://www.w3.org/1999/xlink'
Expand All @@ -328,7 +328,7 @@
<para xmlns='http://docbook.org/ns/docbook'>
The packages <systemitem class='resource'>hawk</systemitem>
and <systemitem class='resource'>hawk2</systemitem> intentionally
conflict with each other to prevent that your installed version gets
accidentally replaced with another version.
conflict with each other to prevent your installed version
from getting accidentally replaced with another version.
</para>" >

0 comments on commit 8c5e84a

Please sign in to comment.