From 53050130a69cb43df386743fe33f18b151177d71 Mon Sep 17 00:00:00 2001 From: June Yi Date: Tue, 21 May 2019 17:12:41 +0900 Subject: [PATCH] setup page replaces picking the right solutions page Describe language specific style guide in l10n guide (#14437) removed references to Table of solutions moved [Nutanix Karbon] under the right column --- content/en/docs/contribute/localization.md | 4 ++++ .../getting-started-guides/fedora/fedora_manual_config.md | 7 ++----- content/en/docs/setup/_index.md | 4 ++-- content/en/docs/setup/on-premises-vm/cloudstack.md | 4 +--- content/en/docs/setup/on-premises-vm/ovirt.md | 2 -- content/en/docs/setup/turnkey/aws.md | 2 -- content/en/docs/setup/turnkey/gce.md | 2 -- 7 files changed, 9 insertions(+), 16 deletions(-) diff --git a/content/en/docs/contribute/localization.md b/content/en/docs/contribute/localization.md index 301e84a0829c6..859b342827ddd 100644 --- a/content/en/docs/contribute/localization.md +++ b/content/en/docs/contribute/localization.md @@ -228,6 +228,10 @@ other = "ICH BIN..." Localizing site strings lets you customize site-wide text and features: for example, the legal copyright text in the footer on each page. +### Language specific style guide and glossary + +Some language teams have their own language-specific style guide and glossary. For example, see the [Korean Localization Guide](/ko/docs/contribute/localization_ko/). + ## Branching strategy Because localization projects are highly collaborative efforts, we encourage teams to work in shared development branches. diff --git a/content/en/docs/getting-started-guides/fedora/fedora_manual_config.md b/content/en/docs/getting-started-guides/fedora/fedora_manual_config.md index 385ecc190ab69..887f3627982a4 100644 --- a/content/en/docs/getting-started-guides/fedora/fedora_manual_config.md +++ b/content/en/docs/getting-started-guides/fedora/fedora_manual_config.md @@ -143,9 +143,9 @@ current-context: kubelet-context * Start the appropriate services on the node (fed-node). ```shell -for SERVICES in kube-proxy kubelet docker; do +for SERVICES in kube-proxy kubelet docker; do systemctl enable --now $SERVICES - systemctl status $SERVICES + systemctl status $SERVICES done ``` @@ -175,6 +175,3 @@ kubectl delete -f ./node.json IaaS Provider | Config. Mgmt | OS | Networking | Docs | Conforms | Support Level -------------------- | ------------ | ------ | ---------- | --------------------------------------------- | ---------| ---------------------------- Bare-metal | custom | Fedora | _none_ | [docs](/docs/getting-started-guides/fedora/fedora_manual_config) | | Project - -For support level information on all solutions, see the [Table of solutions](/docs/getting-started-guides/#table-of-solutions) chart. - diff --git a/content/en/docs/setup/_index.md b/content/en/docs/setup/_index.md index 6ba9f644a3687..d94021e834922 100644 --- a/content/en/docs/setup/_index.md +++ b/content/en/docs/setup/_index.md @@ -22,7 +22,7 @@ card: This section covers different options to set up and run Kubernetes. -Different Kubernetes solutions meet different requirements: ease of maintenance, security, control, available resources, and expertise required to operate and manage a cluster. +Different Kubernetes solutions meet different requirements: ease of maintenance, security, control, available resources, and expertise required to operate and manage a cluster. You can deploy a Kubernetes cluster on a local machine, cloud, on-prem datacenter; or choose a managed Kubernetes cluster. You can also create custom solutions across a wide range of cloud providers, or bare metal environments. @@ -92,7 +92,7 @@ The following production environment solutions table lists the providers and the | [Microsoft Azure](https://azure.microsoft.com) | [Azure Kubernetes Service (AKS)](https://azure.microsoft.com/en-us/services/kubernetes-service/) | | | | | | [Mirantis Cloud Platform](https://www.mirantis.com/software/kubernetes/) | | | ✔ | | | | [Nirmata](https://www.nirmata.com/) | | ✔ | ✔ | | | -| [Nutanix](https://www.nutanix.com/en) | [Nutanix Karbon](https://www.nutanix.com/products/karbon) | | [Nutanix Karbon](https://www.nutanix.com/products/karbon) | | [Nutanix AHV](https://www.nutanix.com/products/acropolis/virtualization) | +| [Nutanix](https://www.nutanix.com/en) | [Nutanix Karbon](https://www.nutanix.com/products/karbon) | | [Nutanix Karbon](https://www.nutanix.com/products/karbon) | | [Nutanix AHV](https://www.nutanix.com/products/acropolis/virtualization) | | [OpenShift](https://www.openshift.com) |[OpenShift Dedicated](https://www.openshift.com/products/dedicated/) and [OpenShift Online](https://www.openshift.com/products/online/) | | [OpenShift Container Platform](https://www.openshift.com/products/container-platform/) | | [OpenShift Container Platform](https://www.openshift.com/products/container-platform/) |[OpenShift Container Platform](https://www.openshift.com/products/container-platform/) | [Oracle Cloud Infrastructure Container Engine for Kubernetes (OKE)](https://docs.cloud.oracle.com/iaas/Content/ContEng/Concepts/contengoverview.htm) | ✔ | ✔ | | | | | [oVirt](https://www.ovirt.org/) | | | | | ✔ | diff --git a/content/en/docs/setup/on-premises-vm/cloudstack.md b/content/en/docs/setup/on-premises-vm/cloudstack.md index 41169656307c0..605d9e0e8c0fb 100644 --- a/content/en/docs/setup/on-premises-vm/cloudstack.md +++ b/content/en/docs/setup/on-premises-vm/cloudstack.md @@ -28,7 +28,7 @@ sudo apt-add-repository ppa:ansible/ansible sudo apt-get update sudo apt-get install ansible ``` - + On CloudStack server you also have to install libselinux-python : ```shell @@ -117,6 +117,4 @@ IaaS Provider | Config. Mgmt | OS | Networking | Docs -------------------- | ------------ | ------ | ---------- | --------------------------------------------- | ---------| ---------------------------- CloudStack | Ansible | CoreOS | flannel | [docs](/docs/setup/on-premises-vm/cloudstack/) | | Community ([@Guiques](https://github.com/ltupin/)) -For support level information on all solutions, see the [Table of solutions](/docs/setup/pick-right-solution/#table-of-solutions) chart. - {{% /capture %}} diff --git a/content/en/docs/setup/on-premises-vm/ovirt.md b/content/en/docs/setup/on-premises-vm/ovirt.md index 0c030f45c5cf7..faf2510d77be2 100644 --- a/content/en/docs/setup/on-premises-vm/ovirt.md +++ b/content/en/docs/setup/on-premises-vm/ovirt.md @@ -68,6 +68,4 @@ IaaS Provider | Config. Mgmt | OS | Networking | Docs -------------------- | ------------ | ------ | ---------- | --------------------------------------------- | ---------| ---------------------------- oVirt | | | | [docs](/docs/setup/on-premises-vm/ovirt/) | | Community ([@simon3z](https://github.com/simon3z)) -For support level information on all solutions, see the [Table of solutions](/docs/setup/pick-right-solution/#table-of-solutions) chart. - {{% /capture %}} diff --git a/content/en/docs/setup/turnkey/aws.md b/content/en/docs/setup/turnkey/aws.md index 9b0b4503ce1c9..88fb338846fc6 100644 --- a/content/en/docs/setup/turnkey/aws.md +++ b/content/en/docs/setup/turnkey/aws.md @@ -82,8 +82,6 @@ AWS | kops | Debian | k8s (VPC) | [docs](https AWS | CoreOS | CoreOS | flannel | [docs](/docs/getting-started-guides/aws) | | Community AWS | Juju | Ubuntu | flannel, calico, canal | [docs](/docs/getting-started-guides/ubuntu) | 100% | Commercial, Community -For support level information on all solutions, see the [Table of solutions](/docs/getting-started-guides/#table-of-solutions) chart. - ## Further reading Please see the [Kubernetes docs](/docs/) for more details on administering diff --git a/content/en/docs/setup/turnkey/gce.md b/content/en/docs/setup/turnkey/gce.md index 1ed6551a60c51..3b3daf3ce052d 100644 --- a/content/en/docs/setup/turnkey/gce.md +++ b/content/en/docs/setup/turnkey/gce.md @@ -219,8 +219,6 @@ IaaS Provider | Config. Mgmt | OS | Networking | Docs -------------------- | ------------ | ------ | ---------- | --------------------------------------------- | ---------| ---------------------------- GCE | Saltstack | Debian | GCE | [docs](/docs/setup/turnkey/gce/) | | Project -For support level information on all solutions, see the [Table of solutions](/docs/getting-started-guides/#table-of-solutions) chart. - ## Further reading Please see the [Kubernetes docs](/docs/) for more details on administering