github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-03-03 10:11:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2289 from weaveworks/merge-error-fix

Browse Source 
Removed missed merge text and made terminology consistent
This commit is contained in:
Anita Buehrle
2017-03-02 07:18:24 -06:00
committed by GitHub
parent 4f24d9bba8 437d0edfdb
commit 4818cd873e
3 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
site/how-it-works.md
View File

@@ -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 accessible from the Weave Cloud main page after you've logged in:
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)
##<a name="disable"></a>Disabling Automatic Updates

10
site/installing.md
View File

@@ -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

2
site/introducing.md
View File

@@ -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