From 770e092131c433801ad38a32aa4b82b9a68e95c3 Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Thu, 3 May 2018 18:11:10 -0700 Subject: [PATCH] grammar fixes --- .../rancher/v2.x/en/installation/_index.md | 2 +- .../config-nginx/_index.md | 12 ++++---- .../v2.x/en/installation/ssl-config/_index.md | 2 +- .../v2.x/en/quick-start-guide/_index.md | 28 +++++++++--------- .../img/rancher/container-port-field.png | Bin .../img/rancher/listening-port-field.png | Bin .../img/rancher/nodeport-dropdown.png | Bin 7 files changed, 22 insertions(+), 22 deletions(-) rename content/rancher/v2.x/en/quick-start-guide/images/publish_the_container_port_80.png => src/img/rancher/container-port-field.png (100%) rename content/rancher/v2.x/en/quick-start-guide/images/on_listening_port_random.png => src/img/rancher/listening-port-field.png (100%) rename content/rancher/v2.x/en/quick-start-guide/images/as_a_nodeport.png => src/img/rancher/nodeport-dropdown.png (100%) diff --git a/content/rancher/v2.x/en/installation/_index.md b/content/rancher/v2.x/en/installation/_index.md index 114e9756fde..f7eb0386e5a 100644 --- a/content/rancher/v2.x/en/installation/_index.md +++ b/content/rancher/v2.x/en/installation/_index.md @@ -22,6 +22,6 @@ This section contains instructions for installing Rancher in development and pro b. [Amazon Network Load Balancer]({{< baseurl >}}/rancher/v2.x/en/installation/load-balancing-config/config-amazon-nlb/) - c. [Nginx]({{< baseurl >}}/rancher/v2.x/en/installation/load-balancing-config/config-nginx/) + c. [Nginx]({{< baseurl >}}/rancher/v2.x/en/installation/load-balancing-config/config-Nginx/) 3. Configure SSL communication. Set up SSL by installing certificates on your Kubernetes nodes. You have a variety of options for [SSL Configuration]({{< baseurl >}}/rancher/v2.x/en/installation/ssl-config/). diff --git a/content/rancher/v2.x/en/installation/load-balancing-config/config-nginx/_index.md b/content/rancher/v2.x/en/installation/load-balancing-config/config-nginx/_index.md index bb397eb43f3..1d0659d442f 100644 --- a/content/rancher/v2.x/en/installation/load-balancing-config/config-nginx/_index.md +++ b/content/rancher/v2.x/en/installation/load-balancing-config/config-nginx/_index.md @@ -1,16 +1,16 @@ --- -title: Configure NGINX +title: Configure Nginx weight: 315 --- -# Configure NGINX +# Configure Nginx -NGINX is a popular application platform that can be used as a load balancer. Rancher supports use of NGINX with ngx_http_v2_module enabled, which isn't enabled by default. Use the following parameter when setting up NGINX to enable the module: `--with-http_v2_module`. +Nginx is a popular application platform that can be used as a load balancer. Rancher supports use of Nginx with ngx_http_v2_module enabled, which isn't enabled by default. Use the following parameter when setting up Nginx to enable the module: `--with-http_v2_module`. >**Note:** ->- NGINX is not supported if you are using SSL passthrough. +>- Nginx is not supported if you are using SSL passthrough. >- If you are using self-signed certificates, the certificate and key must be signed by same certificate authority as `cattle-keys-server`. -After the server is running, use the code sample below as a template when setting up your NGINX config file. Replace the variables with host names or IP addresses from your environment. +After the server is running, use the code sample below as a template when setting up your Nginx config file. Replace the variables with host names or IP addresses from your environment. ``` upstream rancher { @@ -45,7 +45,7 @@ server { proxy_set_header Connection $connection_upgrade; # mitigate HTTPoxy Vulnerability - # https://www.nginx.com/blog/mitigating-the-httpoxy-vulnerability-with-nginx/ + # https://www.nginx.com/blog/mitigating-the-httpoxy-vulnerability-with-Nginx/ proxy_set_header Proxy ""; proxy_http_version 1.1; diff --git a/content/rancher/v2.x/en/installation/ssl-config/_index.md b/content/rancher/v2.x/en/installation/ssl-config/_index.md index 380884a19cd..4415fd1236d 100644 --- a/content/rancher/v2.x/en/installation/ssl-config/_index.md +++ b/content/rancher/v2.x/en/installation/ssl-config/_index.md @@ -129,7 +129,7 @@ The loadbalancer or proxy has to be configured to support the following: Example configs: -- nginx 1.12 / 1.13 +- Nginx 1.12 / 1.13 ``` upstream rancher { diff --git a/content/rancher/v2.x/en/quick-start-guide/_index.md b/content/rancher/v2.x/en/quick-start-guide/_index.md index 39ad6807422..cbb0f137fab 100644 --- a/content/rancher/v2.x/en/quick-start-guide/_index.md +++ b/content/rancher/v2.x/en/quick-start-guide/_index.md @@ -11,7 +11,7 @@ Howdy Partner! This tutorial walks you through: - Installation of {{< product >}} {{< version >}} - Creation of your first cluster -- Deployment of an application, NGINX +- Deployment of an application, Nginx ## Objectives @@ -30,13 +30,13 @@ This Quick Start Guide is divided into different tasks for easier consumption. Use the versatile **Custom** option to clone your Linux host into a new Kubernetes cluster. 5. [Deploy a Workload](#deploy-a-workload)
- Create a workload so that Kubernetes can distribute NGINX among your cluster nodes. + Create a workload so that Kubernetes can distribute Nginx among your cluster nodes. 6. [View Your Application](#view-your-application)
- When your workload finishes deployment, browse to your node IP to make sure NGINX is running. + When your workload finishes deployment, browse to your node IP to make sure Nginx is running. 7. [What's Next?](#whats-next)
- Now that you've created a cluster and deployed NGINX, find out what else you can do with Rancher v2.0. + Now that you've created a cluster and deployed Nginx, find out what else you can do with Rancher v2.0. ## Provision a Linux Host @@ -132,7 +132,7 @@ In this task, use the versatile **Custom** option. This option lets you convert You're ready to create your first _workload_. A workload is an object that includes pods along with other files and info needed to deploy your application. -For this workload, you'll be deploying the application NGINX. +For this workload, you'll be deploying the application Nginx. 1. From the **Clusters** page, open the cluster that you just created. @@ -146,12 +146,12 @@ For this workload, you'll be deploying the application NGINX. 5. Enter a **Name** for your workload. -6. From the **Docker Image** field, enter `nginx`. +6. From the **Docker Image** field, enter `Nginx`. 7. From **Port Mapping**, click **Add Port**. 8. From the **As a** drop-down, make sure that **NodePort (On every node)** is selected. -![As a dropdown, NodePort (On every node selected)](images/as_a_nodeport.png) +![As a dropdown, NodePort (On every node selected)]({{< baseurl >}}/src/img/nodeport-dropdown.png) 9. From the **On Listening Port** field, leave the **Random** value in place. ![On Listening Port, Random selected](images/on_listening_port_random.png) @@ -174,7 +174,7 @@ When your workload completes deployment, browse to its IP to confirm your applic From the **Workloads** page, click the link underneath your workload. If your deployment succeeded, your application opens. >**Note** -> When using a cloud-host virtual machine you may not have access to the port running the container. It can be tested in an ssh session on the local machine. Use the port number after the `:` in the link under your workload, which is 31568 in this example. +> When using a cloud-host virtual machine you may not have access to the port running the container. It can be tested in an ssh session on the local machine. Use the port number after the `:` in the link under your workload, which is 31568 in this example. ```sh @@ -182,7 +182,7 @@ gettingstarted@rancher:~$ curl http://localhost:31568 -Welcome to nginx! +Welcome to Nginx! -

Welcome to nginx!

-

If you see this page, the nginx web server is successfully installed and +

Welcome to Nginx!

+

If you see this page, the Nginx web server is successfully installed and working. Further configuration is required.

For online documentation and support please refer to -nginx.org.
+Nginx.org.
Commercial support is available at nginx.com.

-

Thank you for using nginx.

+

Thank you for using Nginx.

gettingstarted@rancher:~$ @@ -213,4 +213,4 @@ gettingstarted@rancher:~$ Congratulations! You have: - Created your first cluster. -- Deployed NGINX to your cluster using a workload. +- Deployed Nginx to your cluster using a workload. diff --git a/content/rancher/v2.x/en/quick-start-guide/images/publish_the_container_port_80.png b/src/img/rancher/container-port-field.png similarity index 100% rename from content/rancher/v2.x/en/quick-start-guide/images/publish_the_container_port_80.png rename to src/img/rancher/container-port-field.png diff --git a/content/rancher/v2.x/en/quick-start-guide/images/on_listening_port_random.png b/src/img/rancher/listening-port-field.png similarity index 100% rename from content/rancher/v2.x/en/quick-start-guide/images/on_listening_port_random.png rename to src/img/rancher/listening-port-field.png diff --git a/content/rancher/v2.x/en/quick-start-guide/images/as_a_nodeport.png b/src/img/rancher/nodeport-dropdown.png similarity index 100% rename from content/rancher/v2.x/en/quick-start-guide/images/as_a_nodeport.png rename to src/img/rancher/nodeport-dropdown.png