From 04676aa10469abb060e3fa0e434aa132792c593d Mon Sep 17 00:00:00 2001
From: Antonio Murdaca <runcom@redhat.com>
Date: Fri, 4 Nov 2016 17:20:55 +0100
Subject: [PATCH] docs: update for new secopts struct in GET /info

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: e6ec90608ca06431920afa6d4c56130af9c02a28
Component: engine
---
 .../docs/reference/api/docker_remote_api.md   |  1 +
 .../reference/api/docker_remote_api_v1.25.md  | 24 +++++++++++++++----
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/components/engine/docs/reference/api/docker_remote_api.md b/components/engine/docs/reference/api/docker_remote_api.md
index 51814a5f30..a8e62d10f9 100644
--- a/components/engine/docs/reference/api/docker_remote_api.md
+++ b/components/engine/docs/reference/api/docker_remote_api.md
@@ -165,6 +165,7 @@ This section lists each version from latest to oldest.  Each listing includes a
 * The `SecurityOptions` field within the `GET /info` response now includes `userns` if user namespaces are enabled in the daemon.
 * `GET /nodes` and `GET /node/(id or name)` now return `Addr` as part of a node's `Status`, which is the address that that node connects to the manager from.
 * The `HostConfig` field now includes `NanoCPUs` that represents CPU quota in units of 10<sup>-9</sup> CPUs.
+* `GET /info` now returns more structured information about security options.
 
 ### v1.24 API changes
 
diff --git a/components/engine/docs/reference/api/docker_remote_api_v1.25.md b/components/engine/docs/reference/api/docker_remote_api_v1.25.md
index 78f3000b68..a174e1c068 100644
--- a/components/engine/docs/reference/api/docker_remote_api_v1.25.md
+++ b/components/engine/docs/reference/api/docker_remote_api_v1.25.md
@@ -2509,10 +2509,26 @@ Display system-wide information
             ]
         },
         "SecurityOptions": [
-            "apparmor",
-            "seccomp",
-            "selinux",
-            "userns"
+            {
+                "Key": "Name",
+                "Value": "seccomp"
+            },
+            {
+                "Key": "Profile",
+                "Value": "default"
+            },
+            {
+                "Key": "Name",
+                "Value": "apparmor"
+            },
+            {
+                "Key": "Name",
+                "Value": "selinux"
+            },
+            {
+                "Key": "Name",
+                "Value": "userns"
+            }
         ],
         "ServerVersion": "1.9.0",
         "SwapLimit": false,