From 748a11e0480ea5cd5d4270beb926d86e6f915161 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Wed, 1 Mar 2017 15:42:01 -0600 Subject: [PATCH 1/5] removed missed merge text --- site/installing.md | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/site/installing.md b/site/installing.md index 20f77147f..f9f97f078 100644 --- a/site/installing.md +++ b/site/installing.md @@ -4,7 +4,7 @@ menu_order: 20 --- -Weave Scope consists of three parts: the probe, the app and the user interface. Scope can be deployed in either a standalone configuration, where you run everything yourself, or by using Weave Cloud. +Weave Scope consists of three parts: the probe, the app and the user interface. Scope can be deployed in either a standalone configuration, where you run everything yourself, or you can use Weave Cloud. Weave Cloud is the recommended option if: @@ -81,15 +81,9 @@ Suppose you have the following nodes in a cluster: 192.168.100.19 192.168.100.20 - Using the IP addresses, you will manually peer each node with all of the other nodes during Scope launch. - -**1. Run the following on each node:** -======= - - In the steps that follow, you will manually peer each node with all of the other nodes during Scope launch. + Using the above IP addresses, you will manually peer each node with all of the other nodes during Scope launch: **1. To begin run the following on each node:** ->>>>>>> Docs update with new version sudo curl -L git.io/scope -o /usr/local/bin/scope sudo chmod a+x /usr/local/bin/scope From 3c59a993431c69286f49989533c2377b5db3cdec Mon Sep 17 00:00:00 2001 From: abuehrle Date: Wed, 1 Mar 2017 15:53:55 -0600 Subject: [PATCH 2/5] changed service to weave cloud --- site/introducing.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site/introducing.md b/site/introducing.md index 897efb98a..b416b63dc 100644 --- a/site/introducing.md +++ b/site/introducing.md @@ -12,7 +12,7 @@ To install Scope on your local Docker machine, run the following commands: sudo chmod a+x /usr/local/bin/scope scope launch -Scope can be used in standalone mode, where you deploy it locally onto your hosts, or you can use Weave Scope in Service Mode. Scope can be depoloyed to Kubernetes, DCOS and ECS cluster. See [Installing Weave Scope](/site/installing.md) for more information. +Scope can be used in standalone mode, where you deploy it locally onto your hosts, or you can use Weave Scope in [Weave Cloud](https://cloud.weave.works). Scope can be deployed to Kubernetes, DCOS and ECS clusters. See [Installing Weave Scope](/site/installing.md) for more information. ##Getting Microservices Under Control @@ -55,7 +55,7 @@ Controlling Scope containers goes beyond simple lifecycle operations. Scope can Weave Scope can visualize your app within: - * Docker Datacenter + * Docker Datacenters * Kubernetes * Amazon ECS From 51a50ee1632be5d4033eab8fd1ea474423f13107 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Wed, 1 Mar 2017 16:00:05 -0600 Subject: [PATCH 3/5] removed incorrect screen capture --- site/how-it-works.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/site/how-it-works.md b/site/how-it-works.md index 47d6ab84c..484eb10a7 100644 --- a/site/how-it-works.md +++ b/site/how-it-works.md @@ -70,12 +70,9 @@ Scope can also be used to feed reports to Weave Cloud. With Weave Cloud, you can To register with the service, go to [https://cloud.weave.works](https://cloud.weave.works), enter your email address and wait for the confirmation email that contains your service token. -![`Weave Cloud` Signup](images/weave-cloud-signup.png) - - The cloud token is also accessible from the Weave Cloud main page after you've logged in: -![Weave Cloud Configure Your App](images/weave-cloud-main-page.png) +![Weave Cloud Token](images/weave-cloud-token.png) ##Disabling Automatic Updates From 719f51cc8a897db80b57b12e589b42f37d6c7904 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Wed, 1 Mar 2017 16:00:44 -0600 Subject: [PATCH 4/5] fix sentence --- site/how-it-works.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/how-it-works.md b/site/how-it-works.md index 484eb10a7..4d54f6fba 100644 --- a/site/how-it-works.md +++ b/site/how-it-works.md @@ -70,7 +70,7 @@ Scope can also be used to feed reports to Weave Cloud. With Weave Cloud, you can To register with the service, go to [https://cloud.weave.works](https://cloud.weave.works), enter your email address and wait for the confirmation email that contains your service token. -The cloud token is also accessible from the Weave Cloud main page after you've logged in: +The cloud token is accessible from the Weave Cloud main page after you've logged in: ![Weave Cloud Token](images/weave-cloud-token.png) From 437d0edfdb6ad7d65a0290442bc67dc76c67d1cb Mon Sep 17 00:00:00 2001 From: abuehrle Date: Thu, 2 Mar 2017 07:13:10 -0600 Subject: [PATCH 5/5] datacenters datacenter --- site/introducing.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/introducing.md b/site/introducing.md index b416b63dc..21bd3c8ff 100644 --- a/site/introducing.md +++ b/site/introducing.md @@ -55,7 +55,7 @@ Controlling Scope containers goes beyond simple lifecycle operations. Scope can Weave Scope can visualize your app within: - * Docker Datacenters + * Docker Datacenter * Kubernetes * Amazon ECS