From 279bbbab27e473ee4ab7c96b92141345df43e157 Mon Sep 17 00:00:00 2001
From: Drew Erny <drew.erny@docker.com>
Date: Thu, 6 Apr 2017 11:55:54 -0700
Subject: [PATCH] Remove experimental from service logs

Service logs API is now stable. Service logs now support all features,
except retrieving details provided to the log driver.

Signed-off-by: Drew Erny <drew.erny@docker.com>
---
 docs/reference/commandline/service_logs.md | 18 ++++++++++++------
 experimental/README.md                     |  1 -
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/docs/reference/commandline/service_logs.md b/docs/reference/commandline/service_logs.md
index 844a58e0cf..fd328d0f6d 100644
--- a/docs/reference/commandline/service_logs.md
+++ b/docs/reference/commandline/service_logs.md
@@ -1,8 +1,7 @@
 ---
-title: "service logs (experimental)"
+title: "service logs"
 description: "The service logs command description and usage"
-keywords: "service, logs"
-advisory: "experimental"
+keywords: "service, task, logs"
 ---
 
 <!-- This file is maintained within the docker/docker Github
@@ -17,14 +16,16 @@ advisory: "experimental"
 # service logs
 
 ```Markdown
-Usage:  docker service logs [OPTIONS] SERVICE
+Usage:  docker service logs [OPTIONS] SERVICE|TASK
 
-Fetch the logs of a service
+Fetch the logs of a service or task
 
 Options:
-      --details        Show extra details provided to logs
   -f, --follow         Follow log output
       --help           Print usage
+      --no-resolve     Do not map IDs to Names in output
+      --no-task-ids    Do not include task IDs in output
+      --no-trunc        Do not truncate output
       --since string   Show logs since timestamp
       --tail string    Number of lines to show from the end of the logs (default "all")
   -t, --timestamps     Show timestamps
@@ -34,6 +35,11 @@ Options:
 
 The `docker service logs` command batch-retrieves logs present at the time of execution.
 
+The `docker service logs` command can be used with either the name or ID of a
+service, or with the ID of a task. If a service is passed, it will display logs
+for all of the containers in that service. If a task is passed, it will only
+display logs from that particular task.
+
 > **Note**: This command is only functional for services that are started with
 > the `json-file` or `journald` logging driver.
 
diff --git a/experimental/README.md b/experimental/README.md
index 53e42c17f8..196e67aa7d 100644
--- a/experimental/README.md
+++ b/experimental/README.md
@@ -40,7 +40,6 @@ Metrics (Prometheus) output for basic container, image, and daemon operations.
 
  * The top-level [docker deploy](../docs/reference/commandline/deploy.md) command. The
    `docker stack deploy` command is **not** experimental.
- * [`docker service logs` command](../docs/reference/commandline/service_logs.md)
  * [`--squash` option to `docker build` command](../docs/reference/commandline/build.md##squash-an-images-layers---squash-experimental-only)
  * [External graphdriver plugins](../docs/extend/plugins_graphdriver.md)
  * [Ipvlan Network Drivers](vlan-networks.md)