From 5aa2746ad487c4559199696116ee85455e85942b Mon Sep 17 00:00:00 2001 From: lvuch Date: Mon, 30 Apr 2018 12:10:46 -0700 Subject: [PATCH 1/3] a few markdown changes --- content/_index.html | 2 +- content/rancher/quick-start-guide/_index.md | 24 ++++++---- .../create-cluster-amazon-ec2.md | 44 ++++++------------- src/js/app.js | 3 +- 4 files changed, 32 insertions(+), 41 deletions(-) diff --git a/content/_index.html b/content/_index.html index de6aba7eb7b..3ad552616f8 100644 --- a/content/_index.html +++ b/content/_index.html @@ -20,7 +20,7 @@ description: ""
-

Rancher 1.X

+

Rancher 1.6

Read the Docs
diff --git a/content/rancher/quick-start-guide/_index.md b/content/rancher/quick-start-guide/_index.md index 8021fc45dfa..2cc33f21e1a 100644 --- a/content/rancher/quick-start-guide/_index.md +++ b/content/rancher/quick-start-guide/_index.md @@ -15,20 +15,26 @@ Howdy Partner! This tutorial walks you through: This Quick Start Guide is divided into different tasks for easier consumption. -1. Begin by provisioning a Linux host. -2. [Provision a Linux Host](#provision-a-linux-host) +1. [Provision a Linux Host](#provision-a-linux-host)
+ Begin by provisioning a Linux host. -2. From your Linux host, run the Docker command for installing Rancher.[Install Rancher](#install-rancher) +2. [Install Rancher](#install-rancher)
+ From your Linux host, run the Docker command for installing Rancher. -3. Browse to your Linux host to access the Rancher UI.[Log In](#log-in) +3. [Log In](#log-in)
+ Browse to your Linux host to access the Rancher UI. -4. Use the versatile **Custom** option to clone your Linux host into a new Kubernetes cluster.[Create the Cluster](#create-the-cluster) +4. [Create the Cluster](#create-the-cluster)
+ Use the versatile **Custom** option to clone your Linux host into a new Kubernetes cluster. -5. Create a workload so that Kubernetes can distribute NGINX among your cluster nodes.[Deploy a Workload](#deploy-a-workload) +5. [Deploy a Workload](#deploy-a-workload)
+ Create a workload so that Kubernetes can distribute NGINX among your cluster nodes. -6. When your workload finishes deployment, browse to your node IP to make sure NGINX is running.[View Your Application](#view-your-application) +6. [View Your Application](#view-your-application)
+ When your workload finishes deployment, browse to your node IP to make sure NGINX is running. -7. Now that you've created a cluster and deployed NGINX, find out what else you can do with Rancher v2.0.[What's Next?](#whats-next) +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. ## Provision a Linux Host @@ -72,7 +78,7 @@ To install Rancher on your host, connect to it and then use a shell to install. $ sudo docker run -d --restart=unless-stopped -p 80:80 -p 443:443 rancher/rancher ``` -#### Result: Rancher is installed. +**Result: Rancher is installed.** ### Log In diff --git a/content/rancher/tasks/clusters/creating-a-cluster/create-cluster-amazon-ec2.md b/content/rancher/tasks/clusters/creating-a-cluster/create-cluster-amazon-ec2.md index 7d5e91ab4f0..475ac2d5558 100644 --- a/content/rancher/tasks/clusters/creating-a-cluster/create-cluster-amazon-ec2.md +++ b/content/rancher/tasks/clusters/creating-a-cluster/create-cluster-amazon-ec2.md @@ -30,37 +30,21 @@ Provision the instance according to our [requirements](../setup/requirements.md) Use {{< product >}} to clone your Linux host and configure them as Kubernetes nodes. 1. From the **Clusters** page, click **Add Cluster**. - -2. Choose **Amazon EC2**. - -3. Enter a **Cluster Name**. - -4. {{< step_create-cluster_member-roles >}} - -5. {{< step_create-cluster_cluster-options >}} - -6. {{< step_create-cluster_node-pools >}} - +1. Choose **Amazon EC2**. +1. Enter a **Cluster Name**. +1. {{< step_create-cluster_member-roles >}} +1. {{< step_create-cluster_cluster-options >}} +1. {{< step_create-cluster_node-pools >}} 1. Click **Add Node Template**. - - 2. Complete each of the following forms using information available from the [EC2 Management Console](https://aws.amazon.com/ec2). - - - **Account Access** holds the region and API Key used to create the cluster. - + Complete each of the following forms using information available from the [EC2 Management Console](https://aws.amazon.com/ec2). + - **Account Access** holds the region and API Key used to create the cluster. [Amazon Documentation: Creating Access Keys](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_access-keys.html#Using_CreateAccessKey) - - - **Zone and Network** configures the availability zone and network settings for your cluster. - - - **Security Groups** configures the security groups applied to your cluster. - - - **Instance** provisions your VM instances. - - 3. {{< step_rancher-template >}} - - 4. Click **Create**. - - 5. **Optional:** Add additional node pools. -
-6. Review your cluster settings to confirm they're correct. Then click **Create**. + - **Zone and Network** configures the availability zone and network settings for your cluster. + - **Security Groups** configures the security groups applied to your cluster. + - **Instance** provisions your VM instances. + 1. {{< step_rancher-template >}} + 1. Click **Create**. + 1. **Optional:** Add additional node pools. +1. Review your cluster settings to confirm they're correct. Then click **Create**. {{< result_create-cluster >}} diff --git a/src/js/app.js b/src/js/app.js index 1ba946e3b21..cea25783f06 100644 --- a/src/js/app.js +++ b/src/js/app.js @@ -214,6 +214,7 @@ const bootstrapNav = function () { } const bootstrapScrollSpy = function () { + $(window).resize(scrollHandler) $(window).scroll(scrollHandler) @@ -226,7 +227,7 @@ const bootstrapScrollSpy = function () { let distance = (elementOffset - scrollTop); let $mainContentHeaders = $('.main-content').find(':header:visible'); let opts = { - height: $el.outerHeight(), + height: "100vh", width: $el.outerWidth(), left: $el.offset().left, }; From 9f0056215164c83948a61c4cd62c98b492620324 Mon Sep 17 00:00:00 2001 From: lvuch Date: Mon, 30 Apr 2018 16:03:37 -0700 Subject: [PATCH 2/3] layouts --- layouts/_default/list.html | 2 +- layouts/_default/single.html | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 80a7ffc1a7c..cf069b0c768 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -28,7 +28,7 @@
{{ if ($.Scratch.Get "showSidebar") }} -