From 92dc3a44653a64ddddd294c84128b807ecaa5692 Mon Sep 17 00:00:00 2001 From: Robin Naundorf Date: Fri, 1 Apr 2016 14:03:04 +0200 Subject: [PATCH] Fixing help text of "docker network --help" to be consistend Changed from hashmap to multidimensional array as in "docker volume --help" closes #21710 Signed-off-by: Robin Naundorf Upstream-commit: 737219bbdbd5c18a2f581c73ac740ea44266b82b Component: engine --- components/engine/api/client/network.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/components/engine/api/client/network.go b/components/engine/api/client/network.go index 4bbc715403..83d958bf4e 100644 --- a/components/engine/api/client/network.go +++ b/components/engine/api/client/network.go @@ -372,19 +372,19 @@ func subnetMatches(subnet, data string) (bool, error) { } func networkUsage() string { - networkCommands := map[string]string{ - "create": "Create a network", - "connect": "Connect container to a network", - "disconnect": "Disconnect container from a network", - "inspect": "Display detailed network information", - "ls": "List all networks", - "rm": "Remove a network", + networkCommands := [][]string{ + {"create", "Create a network"}, + {"connect", "Connect container to a network"}, + {"disconnect", "Disconnect container from a network"}, + {"inspect", "Display detailed network information"}, + {"ls", "List all networks"}, + {"rm", "Remove a network"}, } help := "Commands:\n" - for cmd, description := range networkCommands { - help += fmt.Sprintf(" %-25.25s%s\n", cmd, description) + for _, cmd := range networkCommands { + help += fmt.Sprintf(" %-25.25s%s\n", cmd[0], cmd[1]) } help += fmt.Sprintf("\nRun 'docker network COMMAND --help' for more information on a command.")