From 2ac86ababf2609209e24201f2c7a68c00f65813c Mon Sep 17 00:00:00 2001 From: David Calavera Date: Fri, 22 Jan 2016 13:14:48 -0500 Subject: [PATCH] Make TLSOptions and LogConfig embedded structs. That way the configuration file becomes flag, without extra keys. Signed-off-by: David Calavera --- docs/reference/commandline/daemon.md | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/docs/reference/commandline/daemon.md b/docs/reference/commandline/daemon.md index 2d9edd8de4..e59208033f 100644 --- a/docs/reference/commandline/daemon.md +++ b/docs/reference/commandline/daemon.md @@ -838,10 +838,8 @@ This is a full example of the allowed configuration options in the file: "storage-driver": "", "storage-opts": "", "labels": [], - "log-config": { - "log-driver": "", - "log-opts": [] - }, + "log-driver": "", + "log-opts": [], "mtu": 0, "pidfile": "", "graph": "", @@ -853,11 +851,9 @@ This is a full example of the allowed configuration options in the file: "log-level": "", "tls": true, "tlsverify": true, - "tls-opts": { - "tlscacert": "", - "tlscert": "", - "tlskey": "" - }, + "tlscacert": "", + "tlscert": "", + "tlskey": "", "api-cors-headers": "", "selinux-enabled": false, "userns-remap": "",