Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed missed merge text and made terminology consistent #2289

Merged
merged 5 commits into from
Mar 2, 2017

Conversation

abuehrle
Copy link
Contributor

@abuehrle abuehrle commented Mar 1, 2017

There was some merge text on the install page that I have deleted @2opremio

@abuehrle abuehrle changed the title removed missed merge text Removed missed merge text and made terminology consistent Mar 1, 2017
@@ -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

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

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

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

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

This comment was marked as abuse.

@abuehrle abuehrle merged commit 4818cd8 into master Mar 2, 2017
@abuehrle abuehrle deleted the merge-error-fix branch March 2, 2017 13:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants