From 970bb771f9563b1af5ebab0e8a03b9f86e93f1cd Mon Sep 17 00:00:00 2001 From: James Phillips Date: Thu, 25 Aug 2016 17:12:02 -0700 Subject: [PATCH] Tweaks formatting of Consul version. --- command/version.go | 4 ++-- website/source/docs/upgrading.html.markdown | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/command/version.go b/command/version.go index b588d5c2c0..cc26859f06 100644 --- a/command/version.go +++ b/command/version.go @@ -18,7 +18,7 @@ func (c *VersionCommand) Help() string { } func (c *VersionCommand) Run(_ []string) int { - c.Ui.Output(fmt.Sprintf("Consul Version: %s", c.HumanVersion)) + c.Ui.Output(fmt.Sprintf("Consul %s", c.HumanVersion)) config := agent.DefaultConfig() var supplement string @@ -26,7 +26,7 @@ func (c *VersionCommand) Run(_ []string) int { supplement = fmt.Sprintf(" (agent will automatically use protocol >%d when speaking to compatible agents)", config.Protocol) } - c.Ui.Output(fmt.Sprintf("Protocol Version: speaks %d by default, understands %d to %d%s", + c.Ui.Output(fmt.Sprintf("Protocol %d spoken by default, understands %d to %d%s", config.Protocol, consul.ProtocolVersionMin, consul.ProtocolVersionMax, supplement)) return 0 diff --git a/website/source/docs/upgrading.html.markdown b/website/source/docs/upgrading.html.markdown index 80dd28bd18..7ed12628f4 100644 --- a/website/source/docs/upgrading.html.markdown +++ b/website/source/docs/upgrading.html.markdown @@ -73,8 +73,8 @@ running `consul -v`. You'll see output similar to that below: ``` $ consul -v -Consul Version: v0.7.0 -Protocol Version: speaks 2 by default, understands 2 to 3 (agent will automatically use protocol >2 when speaking to compatible agents) +Consul v0.7.0 +Protocol 2 spoken by default, understands 2 to 3 (agent will automatically use protocol >2 when speaking to compatible agents) ``` This says the version of Consul as well as the protocol versions this