Merge pull request #384 from tianon/fat-message

tianon · tianon · commit 3fa783291c9c · 2015-08-12T13:55:49.000-07:00
Trim down our default message
diff --git a/DEPRECATION_WARNING b/DEPRECATION_WARNING
@@ -0,0 +1,6 @@
+
+  WARNING: The 'boot2docker' command line interface is officially deprecated.
+
+  Please switch to Docker Machine (https://docs.docker.com/machine/) ASAP.
+
+  Docker Toolbox (https://docker.com/toolbox) is the recommended install method.
diff --git a/main.go b/main.go
@@ -15,10 +15,11 @@ var (
 
 const (
 	hardcodedWarning = `
-        WARNING: The 'boot2docker' command line interface is being officially deprecated.
-	Users are expected to switch to Docker Machine (https://docs.docker.com/machine/) instead ASAP.
-	The Docker Toolbox is the recommended way to install it: https://docker.com/toolbox/
+  WARNING: The 'boot2docker' command line interface is officially deprecated.
 
+  Please switch to Docker Machine (https://docs.docker.com/machine/) ASAP.
+
+  Docker Toolbox (https://docker.com/toolbox) is the recommended install method.
 `
 	warningURL = "https://raw.githubusercontent.com/boot2docker/boot2docker-cli/master/DEPRECATION_WARNING"
 )

Original file line number	Diff line number	Diff line change
`@@ -15,10 +15,11 @@ var (`
`15`	`15`
`16`	`16`	`const (`
`17`	`17`	hardcodedWarning = `
`18`		`- WARNING: The 'boot2docker' command line interface is being officially deprecated.`
`19`		`- Users are expected to switch to Docker Machine (https://docs.docker.com/machine/) instead ASAP.`
`20`		`- The Docker Toolbox is the recommended way to install it: https://docker.com/toolbox/`
	`18`	`+ WARNING: The 'boot2docker' command line interface is officially deprecated.`
`21`	`19`
	`20`	`+ Please switch to Docker Machine (https://docs.docker.com/machine/) ASAP.`
	`21`	`+`
	`22`	`+ Docker Toolbox (https://docker.com/toolbox) is the recommended install method.`
`22`	`23`	`
`23`	`24`	`warningURL = "https://raw.githubusercontent.com/boot2docker/boot2docker-cli/master/DEPRECATION_WARNING"`
`24`	`25`	`)`