From 039f86251c4322ee7f691ef694ce4ca70af0e1d4 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Steenis Date: Mon, 11 Jun 2018 14:50:08 +0200 Subject: [PATCH] Typos --- content/rancher/v2.x/en/faq/_index.md | 10 +++++----- content/rancher/v2.x/en/faq/contributing/_index.md | 2 +- .../v2.x/en/installation/ha-server-install/_index.md | 2 +- .../clusters/adding-a-pod-security-policy/_index.md | 2 +- .../authentication/github/_index.md | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/content/rancher/v2.x/en/faq/_index.md b/content/rancher/v2.x/en/faq/_index.md index 0c441bd58ac..4a4b0bd6cbf 100644 --- a/content/rancher/v2.x/en/faq/_index.md +++ b/content/rancher/v2.x/en/faq/_index.md @@ -29,11 +29,11 @@ No. Unfortunately, the differences were enough such that we cannot support Ranc ### How does Rancher v2.0 affect Cattle? -Cattle will not supported in v2.0 as Rancher has been re-architected to be based on Kubernetes. You can, however, expect majority of Cattle features you use will exist and function similarly on Kubernetes. We will develop migration tools in Rancher v2.1 to help you transform your existing Rancher Compose files into Kubernetes yaml files. +Cattle will not supported in v2.0 as Rancher has been re-architected to be based on Kubernetes. You can, however, expect majority of Cattle features you use will exist and function similarly on Kubernetes. We will develop migration tools in Rancher v2.1 to help you transform your existing Rancher Compose files into Kubernetes YAML files. #### Can I migrate existing Cattle workloads into Kubernetes? -Yes. In the upcoming Rancher v2.1 release we will provide a tool to help translate existing Cattle workloads in Compose format to kubernetes yaml format. You will then be able to deploy those workloads on the v2.0 platform. +Yes. In the upcoming Rancher v2.1 release we will provide a tool to help translate existing Cattle workloads in Compose format to Kubernetes YAML format. You will then be able to deploy those workloads on the v2.0 platform. ### Environments & Clusters @@ -49,7 +49,7 @@ Yes. We still provide you with the same way of executing our Rancher agents dire #### How would the migration from v1.x to v2.0 work? -Due to the technical difficulty in transforming a Docker container into a pod running Kubernetes, upgrading will require users to “replay” those workloads from v1.x into new v2.0 environments. We plan to ship with a tool in v2.1 to translate existing Rancher Compose files into Kubernetes yaml files. You will then be able to deploy those workloads on the v2.0 platform. +Due to the technical difficulty in transforming a Docker container into a pod running Kubernetes, upgrading will require users to "replay" those workloads from v1.x into new v2.0 environments. We plan to ship with a tool in v2.1 to translate existing Rancher Compose files into Kubernetes YAML files. You will then be able to deploy those workloads on the v2.0 platform. #### Is it possible to upgrade from Rancher v1.0 to v2.0 without any disruption to Cattle and Kubernetes clusters? @@ -108,9 +108,9 @@ Yes. Longhorn was on a bit of a hiatus while we were working on v2.0. We plan to #### Are there changes to default roles available now or going forward? Will the Kubernetes alignment impact plans for roles/RBAC? -The default roles will be expanded to accomodate the new Rancher 2.0 features, and will also take advantage of the Kubernetes RBAC (Role-Based Access Control) capabilities to give you more flexibility. +The default roles will be expanded to accommodate the new Rancher 2.0 features, and will also take advantage of the Kubernetes RBAC (Role-Based Access Control) capabilities to give you more flexibility. -#### Will there be any functions like network policies to separate a front-end contrainer from a back-end container through some kind of firewall in v2.0? +#### Will there be any functions like network policies to separate a front-end container from a back-end container through some kind of firewall in v2.0? Yes. You can do so by leveraging Kubernetes' network policies. diff --git a/content/rancher/v2.x/en/faq/contributing/_index.md b/content/rancher/v2.x/en/faq/contributing/_index.md index 9c1d9afd892..32dcec70bea 100644 --- a/content/rancher/v2.x/en/faq/contributing/_index.md +++ b/content/rancher/v2.x/en/faq/contributing/_index.md @@ -22,7 +22,7 @@ If you find any bugs or are having any trouble, please contact us by filing an i ### Docs -If you have any updates to our documentation, please make any PRs to our docs repo. +If you have any updates to our documentation, please make any pull request to our docs repo. - [Rancher 2.x Docs Repo](https://github.com/rancher/docs): This repo is where all the docs for Rancher 2.x are located. They are located in the `content` folder in the repo. diff --git a/content/rancher/v2.x/en/installation/ha-server-install/_index.md b/content/rancher/v2.x/en/installation/ha-server-install/_index.md index fc5d202f526..f7a61957a1c 100644 --- a/content/rancher/v2.x/en/installation/ha-server-install/_index.md +++ b/content/rancher/v2.x/en/installation/ha-server-install/_index.md @@ -448,7 +448,7 @@ By default, Rancher automatically generates self-signed certificates for itself You have a couple of options: - Create a backup of your Rancher Server in case of a disaster scenario: [High Availablility Back Up and Restoration]({{< baseurl >}}/rancher/v2.x/en/installation/backups-and-restoration/ha-backup-and-restoration). -- Create a Kubernettes cluster: [Creating a Cluster]({{ }}/rancher/v2.x/en/tasks/clusters/creating-a-cluster/). +- Create a Kubernetes cluster: [Creating a Cluster]({{ }}/rancher/v2.x/en/tasks/clusters/creating-a-cluster/).
diff --git a/content/rancher/v2.x/en/tasks/clusters/adding-a-pod-security-policy/_index.md b/content/rancher/v2.x/en/tasks/clusters/adding-a-pod-security-policy/_index.md index 1fab4c86788..2d2ee026279 100644 --- a/content/rancher/v2.x/en/tasks/clusters/adding-a-pod-security-policy/_index.md +++ b/content/rancher/v2.x/en/tasks/clusters/adding-a-pod-security-policy/_index.md @@ -23,7 +23,7 @@ When you create a new cluster, you can configure it to apply a PSP immediately. >**Prerequisite:** >Create a Pod Security Policy within Rancher. Before you can assign a default PSP to a new cluster, you must have a PSP available for assignment. For instruction, see [Creating Pod Security Policies]({{< baseurl >}}/rancher/v2.x/en/tasks/global-configuration/pod-security-policies/). >**Note:** ->For security purposes, we recommend assiging a PSP as you create your clusters. +>For security purposes, we recommend assigning a PSP as you create your clusters. To enable a default Pod Security Policy, set the **Pod Security Policy Support** option to **Enabled**, and then make a selection from the **Default Pod Security Policy** drop-down. diff --git a/content/rancher/v2.x/en/tasks/global-configuration/authentication/github/_index.md b/content/rancher/v2.x/en/tasks/global-configuration/authentication/github/_index.md index 860ee14968e..9e7876bd3e4 100644 --- a/content/rancher/v2.x/en/tasks/global-configuration/authentication/github/_index.md +++ b/content/rancher/v2.x/en/tasks/global-configuration/authentication/github/_index.md @@ -5,7 +5,7 @@ weight: 3075 In environments using GitHub, you can configure Rancher to allow sign on using GitHub credentials. ->**Prerequisties:** Read [External Authentication Configuration and Principal Users]({{< baseurl >}}/rancher/v2.x/en/concepts/global-configuration/authentication/#external-authentication-configuration-and-principal-users). +>**Prerequisites:** Read [External Authentication Configuration and Principal Users]({{< baseurl >}}/rancher/v2.x/en/concepts/global-configuration/authentication/#external-authentication-configuration-and-principal-users). 1. Sign into Rancher using a local user assigned the `administrator` role (i.e., the _local principal_).