From 748a11e0480ea5cd5d4270beb926d86e6f915161 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Wed, 1 Mar 2017 15:42:01 -0600 Subject: [PATCH] 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