From d3f2c73453b60bb2ca3faaf6f8395f8b66b3f9ba Mon Sep 17 00:00:00 2001
From: David Calavera <david.calavera@gmail.com>
Date: Mon, 25 Jan 2016 16:30:33 -0500
Subject: [PATCH] Allow network configuration via daemon config file.

Signed-off-by: David Calavera <david.calavera@gmail.com>
---
 docs/reference/commandline/daemon.md | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/docs/reference/commandline/daemon.md b/docs/reference/commandline/daemon.md
index b84b097bbf..7d950affd4 100644
--- a/docs/reference/commandline/daemon.md
+++ b/docs/reference/commandline/daemon.md
@@ -859,7 +859,20 @@ This is a full example of the allowed configuration options in the file:
 	"userns-remap": "",
 	"group": "",
 	"cgroup-parent": "",
-	"default-ulimits": {}
+	"default-ulimits": {},
+       "ipv6": false,
+       "iptables": false,
+       "ip-forward": false,
+       "ip-mask": false,
+       "userland-proxy": false,
+       "ip": "0.0.0.0",
+       "bridge": "",
+       "bip": "",
+       "fixed-cidr": "",
+       "fixed-cidr-v6": "",
+       "default-gateway": "",
+       "default-gateway-v6": "",
+       "icc": false
 }
 ```