From 96150d3faa7c772cd336109679eea3a44c1ec7a9 Mon Sep 17 00:00:00 2001
From: "Arnaud Porterie (icecrime)" <arnaud.porterie@docker.com>
Date: Tue, 14 Jun 2016 17:36:37 -0700
Subject: [PATCH] Make `--dispatcher-heartbeat-period` a duration

Make `--dispatcher-heartbeat-period` a duration in `docker swarm
update`, allowing to express the value as "5s", "1h", etc.

Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
---
 contrib/completion/bash/docker             |  2 +-
 docs/reference/commandline/swarm_update.md | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker
index 180e95ab7b..abde5ce14c 100644
--- a/contrib/completion/bash/docker
+++ b/contrib/completion/bash/docker
@@ -1641,7 +1641,7 @@ _docker_swarm_join() {
 _docker_swarm_update() {
 	case "$cur" in
 		-*)
-			COMPREPLY=( $( compgen -W "--auto-accept --dispatcher-heartbeat-period --help --secret --task-history-limit" -- "$cur" ) )
+			COMPREPLY=( $( compgen -W "--auto-accept --dispatcher-heartbeat --help --secret --task-history-limit" -- "$cur" ) )
 			;;
 	esac
 }
diff --git a/docs/reference/commandline/swarm_update.md b/docs/reference/commandline/swarm_update.md
index 26a06a734c..942a330ea1 100644
--- a/docs/reference/commandline/swarm_update.md
+++ b/docs/reference/commandline/swarm_update.md
@@ -12,15 +12,16 @@ parent = "smn_cli"
 
 # swarm update
 
-	Usage:    docker swarm update [OPTIONS]
-
-	update the Swarm.
-
-	Options:
-	      --auto-accept value   Acceptance policy (default [worker,manager])
-	      --help                Print usage
-	      --secret string       Set secret value needed to accept nodes into cluster
-
+    Usage:  docker swarm update [OPTIONS]
+    
+    update the Swarm.
+    
+    Options:
+          --auto-accept value               Auto acceptance policy (worker, manager or none)
+          --dispatcher-heartbeat duration   Dispatcher heartbeat period (default 5s)
+          --help                            Print usage
+          --secret string                   Set secret value needed to accept nodes into cluster
+          --task-history-limit int          Task history retention limit (default 10)
 
 Updates a Swarm cluster with new parameter values. This command must target a manager node.