Merge pull request docker#1314 from AntaresS/update-docs

update docs with currently supported features options

Signed-off-by: nashasha1 <[email protected]>

docs/reference/commandline/dockerd.md

@@ -1424,6 +1424,16 @@ This is a full example of the allowed configuration options on Windows:
 }
 ```
 
+#### Feature options
+The optional field `features` in `daemon.json` allows users to enable or disable specific 
+daemon features. For example, `{"features":{"buildkit": true}}` enables `buildkit` as the 
+default docker image builder.
+
+The list of currently supported feature options:
+- `buildkit`: It enables `buildkit` as default builder when set to `true` or disables it by
+`false`. Note that if this option is not explicitly set in the daemon config file, then it
+is up to the cli to determine which builder to invoke.
+
 #### Configuration reload behavior
 
 Some options can be reconfigured when the daemon is running without requiring

e2e/stack/remove_test.go

@@ -46,7 +46,7 @@ func deployFullStack(t *testing.T, orchestrator, stackname string) {
 }
 
 func cleanupFullStack(t *testing.T, orchestrator, stackname string) {
-	// FIXME(vdemeester) we shouldn't have to do that. it is hidding a race on docker stack rm
+	// FIXME(vdemeester) we shouldn't have to do that. it is hiding a race on docker stack rm
 	poll.WaitOn(t, stackRm(orchestrator, stackname), pollSettings)
 	poll.WaitOn(t, taskCount(orchestrator, stackname, 0), pollSettings)
 }