Skip to content

Commit

Permalink
Remove doubling of SUSE because of &caasp; including the &suse; entit…
Browse files Browse the repository at this point in the history
…y already.
  • Loading branch information
KucharczykL authored and btat committed Nov 22, 2019
1 parent dd02b89 commit ae8d29a
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion xml/app_psps.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<para>
&productname; 1.3.1 introduces built-in support for Pod Security Policies
(PSPs), which are provided via &helm; charts and are set up automatically,
unlike older releases which require manual PSP setup. &suse; &caasp; and
unlike older releases which require manual PSP setup. &caasp; and
&aks; both require PSPs for &cap; to operate correctly. This section
provides instructions for configuring and applying the appropriate PSPs to
older &cap; releases.
Expand Down
2 changes: 1 addition & 1 deletion xml/cap_depl_admin_notes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<literal>example.com</literal> as the example domain. Your DNS management is
platform-dependent, for example &aks; assigns IP addresses to your
services, which you will map to A records. &eks; assigns host names,
which you will use to create CNAMEs. &suse; &caasp; provides the flexibility
which you will use to create CNAMEs. &caasp; provides the flexibility
to manage your name services in nearly any way you wish. The chapters for
each platform in this guide provide the relevant DNS instructions.
</para>
Expand Down
12 changes: 6 additions & 6 deletions xml/cap_depl_install_caasp.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:xlink="http://www.w3.org/1999/xlink">
<info>
<title>Deploying &productname; on &suse; &caasp;</title>
<title>Deploying &productname; on &caasp;</title>
<dm:docmanager xmlns:dm="urn:x-suse:ns:docmanager">
<dm:bugtracker></dm:bugtracker>
<dm:translation>yes</dm:translation>
Expand Down Expand Up @@ -119,10 +119,10 @@
</listitem>
</varlistentry>
<varlistentry>
<term>Install &suse; &caasp;</term>
<term>Install &caasp;</term>
<listitem>
<para>
&productname; is supported on &suse; &caasp; 3.x.
&productname; is supported on &caasp; 3.x.
</para>
<!-- para -->
&kernel-prereq;
Expand Down Expand Up @@ -286,7 +286,7 @@ Happy Helming!</screen>
<title>Pod Security Policy</title>

<para>
&suse; &caasp; 3 includes Pod Security Policy (PSP) support. This change
&caasp; 3 includes Pod Security Policy (PSP) support. This change
adds two new PSPs to &caasp; 3:
</para>

Expand All @@ -311,7 +311,7 @@ Happy Helming!</screen>

<para>
&productname; &productnumber; includes the necessary PSP configurations in
the &helm; charts to run on &suse; &caasp;, and are set up automatically
the &helm; charts to run on &caasp;, and are set up automatically
without requiring manual configuration. See <xref linkend="app-psps"/> for
instructions on applying the necessary PSPs manually on older &cap;
releases.
Expand Down Expand Up @@ -480,7 +480,7 @@ persistentvolume "pvc-c464ed6a-3852-11e8-bd10-90b8d0c59f1c" deleted
<title>Load Balancers</title>
<para>
Production deployments usually include some kind of load balancer.
Running &productname; on &suse; &caasp; provides the flexibility to
Running &productname; on &caasp; provides the flexibility to
structure your network nearly any way you need to. This guide does not
describe how to set up a load balancer or name services, as these depend
on your requirements and existing network architecture.
Expand Down
2 changes: 1 addition & 1 deletion xml/cap_kube_requirements.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:xlink="http://www.w3.org/1999/xlink">
<info>
<title>Running &productname; on non-&suse; &caasp; &kube; Systems</title>
<title>Running &productname; on non-&caasp; &kube; Systems</title>
<dm:docmanager xmlns:dm="urn:x-suse:ns:docmanager">
<dm:bugtracker></dm:bugtracker>
<dm:translation>yes</dm:translation>
Expand Down
18 changes: 9 additions & 9 deletions xml/cap_overview.xml
Original file line number Diff line number Diff line change
Expand Up @@ -215,9 +215,9 @@
<title>Minimum Requirements</title>

<para>
This guide details the steps for deploying &scf; on &suse; &caasp;, and on
This guide details the steps for deploying &scf; on &caasp;, and on
supported &kube; environments such as &aks-full;, &gke-full;, and &eks-full;.
&suse; &caasp; is a specialized application development and hosting platform built
&caasp; is a specialized application development and hosting platform built
on the &susemicros; container host operating system, container orchestration
with &kube;, and &salt; for automating installation and configuration.
</para>
Expand All @@ -226,7 +226,7 @@
<title>Required Knowledge</title>
<para>
Installing and administering &productname; requires knowledge of Linux,
&docker;, &kube;, and your &kube; platform (for example &suse; &caasp;,
&docker;, &kube;, and your &kube; platform (for example &caasp;,
AKS, EKS, OpenStack). You must plan resource allocation and network
architecture by taking into account the requirements of your &kube;
platform in addition to &scf; requirements. &scf; is a discrete component
Expand All @@ -238,7 +238,7 @@
<para>
You may create a minimal deployment on four &kube; nodes for testing.
However, this is insufficient for a production deployment. A supported
deployment includes &scf; installed on &suse; &caasp;, &eks;, &gke;, or &aks;.
deployment includes &scf; installed on &caasp;, &eks;, &gke;, or &aks;.
You also need a storage back-end such as &ses; or NFS, a DNS/DHCP
server, and an Internet connection to download additional packages during
installation and ~10 GB of &docker; images on each &kube; worker after
Expand All @@ -247,10 +247,10 @@

<para>
A production deployment requires considerable resources. &productname;
includes an entitlement of &suse; &caasp; and &ses;. &ses; alone has
includes an entitlement of &caasp; and &ses;. &ses; alone has
substantial requirements; see the
<link xlink:href="https://www.suse.com/products/suse-enterprise-storage/">Tech
Specs</link> for details. &suse; &caasp; requires a minimum of four hosts:
Specs</link> for details. &caasp; requires a minimum of four hosts:
one admin and three &kube; nodes. &scf; is then deployed on the &kube;
nodes. Four &caasp; nodes are not sufficient for a production deployment.
<xref linkend="fig-cap-min-prod-arch"/> describes a minimal production
Expand Down Expand Up @@ -318,7 +318,7 @@
</itemizedlist>

<para>
&suse; &caasp; is a Container as a Service platform, and &productname; is a
&caasp; is a Container as a Service platform, and &productname; is a
PaaS.
</para>

Expand All @@ -337,7 +337,7 @@
</figure>

<para>
<xref linkend="fig-cap-containerized"/> illustrates how &suse; &caasp; and
<xref linkend="fig-cap-containerized"/> illustrates how &caasp; and
&productname; containerize the platform itself.
</para>

Expand All @@ -350,7 +350,7 @@
<imageobject role="html">
<imagedata fileref="cap-containerized.png"/>
</imageobject>
<textobject role="description"><phrase>&suse; &caasp; and &productname; containerize the
<textobject role="description"><phrase>&caasp; and &productname; containerize the
platform itself.</phrase>
</textobject>
</mediaobject>
Expand Down

0 comments on commit ae8d29a

Please sign in to comment.