From 07bc1eecab8186640225f156fa465a4b5ef81025 Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Thu, 14 Jul 2016 11:23:03 +0200
Subject: [PATCH] Update service inspect --pretty reference docs

Update the output and fix wrong usage in a tutorial page.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit cc651bc642e3478062416b50171dbf5595daf4e4)
Signed-off-by: Tibor Vass <tibor@docker.com>
---
 docs/reference/commandline/service_inspect.md | 3 ---
 docs/swarm/swarm-tutorial/inspect-service.md  | 1 -
 docs/swarm/swarm-tutorial/rolling-update.md   | 8 +-------
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/docs/reference/commandline/service_inspect.md b/docs/reference/commandline/service_inspect.md
index 66bb613da9..21d667c2c4 100644
--- a/docs/reference/commandline/service_inspect.md
+++ b/docs/reference/commandline/service_inspect.md
@@ -120,14 +120,11 @@ Labels:
 Mode:		REPLICATED
  Replicas:		5
 Placement:
- Strategy:	Spread
 UpdateConfig:
  Parallelism:	0
 ContainerSpec:
  Image:		nginx:alpine
 Resources:
-Reservations:
-Limits:
 Ports:
  Name =
  Protocol = tcp
diff --git a/docs/swarm/swarm-tutorial/inspect-service.md b/docs/swarm/swarm-tutorial/inspect-service.md
index 920b948f30..15d93d7563 100644
--- a/docs/swarm/swarm-tutorial/inspect-service.md
+++ b/docs/swarm/swarm-tutorial/inspect-service.md
@@ -33,7 +33,6 @@ about a service in an easily readable format.
     Mode:		REPLICATED
      Replicas:		1
     Placement:
-     Strategy:	SPREAD
     UpdateConfig:
      Parallelism:	1
     ContainerSpec:
diff --git a/docs/swarm/swarm-tutorial/rolling-update.md b/docs/swarm/swarm-tutorial/rolling-update.md
index 5baa63e801..7c2dc0cb66 100644
--- a/docs/swarm/swarm-tutorial/rolling-update.md
+++ b/docs/swarm/swarm-tutorial/rolling-update.md
@@ -44,22 +44,19 @@ every 10 seconds:
 3. Inspect the `redis` service:
 
     ```bash
-    $ docker service inspect redis --pretty
+    $ docker service inspect --pretty redis
 
     ID:             0u6a4s31ybk7yw2wyvtikmu50
     Name:           redis
     Mode:           Replicated
      Replicas:      3
     Placement:
-     Strategy:      Spread
     UpdateConfig:
      Parallelism:   1
      Delay:         10s
     ContainerSpec:
      Image:         redis:3.0.6
     Resources:
-    Reservations:
-    Limits:
     ```
 
 4. Now you can update the container image for `redis`. The swarm  manager
@@ -81,15 +78,12 @@ desired state:
     Mode:           Replicated
      Replicas:      3
     Placement:
-     Strategy:      Spread
     UpdateConfig:
      Parallelism:   1
      Delay:         10s
     ContainerSpec:
      Image:         redis:3.0.7
     Resources:
-    Reservations:
-    Limits:
    ```
 
 6. Run `docker service tasks <TASK-ID>` to watch the rolling update: