Browse code

Merge pull request #23066 from SvenDowideit/docs-cherry-picks-29may2016

Docs cherry picks 29may2016

Sebastiaan van Stijn authored on 2016/05/28 04:19:32
Showing 6 changed files
... ...
@@ -33,7 +33,7 @@ more details about the `docker stats` command.
33 33
 ## Control groups
34 34
 
35 35
 Linux Containers rely on [control groups](
36
-https://www.kernel.org/doc/Documentation/cgroups/cgroups.txt)
36
+https://www.kernel.org/doc/Documentation/cgroup-v1/cgroups.txt)
37 37
 which not only track groups of processes, but also expose metrics about
38 38
 CPU, memory, and block I/O usage. You can access those metrics and
39 39
 obtain network usage metrics as well. This is relevant for "pure" LXC
... ...
@@ -256,7 +256,7 @@ compatibility reasons.
256 256
 Block I/O is accounted in the `blkio` controller.
257 257
 Different metrics are scattered across different files. While you can
258 258
 find in-depth details in the [blkio-controller](
259
-https://www.kernel.org/doc/Documentation/cgroups/blkio-controller.txt)
259
+https://www.kernel.org/doc/Documentation/cgroup-v1/blkio-controller.txt)
260 260
 file in the kernel documentation, here is a short list of the most
261 261
 relevant ones:
262 262
 
... ...
@@ -39,7 +39,7 @@ Starting Couchbase Server -- Web UI available at http://<ip>:8091
39 39
 > Docker using Docker machine, you can obtain the IP address
40 40
 > of the Docker host using `docker-machine ip <MACHINE-NAME>`.
41 41
 
42
-The logs show that Couchbase console can be accessed at http://192.168.99.100:8091. The default username is `Administrator` and the password is `password`.
42
+The logs show that Couchbase console can be accessed at `http://192.168.99.100:8091`. The default username is `Administrator` and the password is `password`.
43 43
 
44 44
 ## Configure Couchbase Docker container
45 45
 
... ...
@@ -228,7 +228,7 @@ cbq> select * from `travel-sample` limit 1;
228 228
 
229 229
 [Couchbase Web Console](http://developer.couchbase.com/documentation/server/4.1/admin/ui-intro.html) is a console that allows to manage a Couchbase instance. It can be seen at:
230 230
 
231
-http://192.168.99.100:8091/
231
+`http://192.168.99.100:8091/`
232 232
 
233 233
 Make sure to replace the IP address with the IP address of your Docker Machine or `localhost` if Docker is running locally.
234 234
 
... ...
@@ -43,7 +43,7 @@ Plugin
43 43
 ----------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
44 44
 [Contiv Networking](https://github.com/contiv/netplugin)                            | An open source network plugin to provide infrastructure and security policies for a multi-tenant micro services deployment, while providing an integration to physical network for non-container workload. Contiv Networking implements the remote driver and IPAM APIs available in Docker 1.9 onwards.
45 45
 [Kuryr Network Plugin](https://github.com/openstack/kuryr)                          | A network plugin is developed as part of the OpenStack Kuryr project and implements the Docker networking (libnetwork) remote driver API by utilizing Neutron, the OpenStack networking service. It includes an IPAM driver as well.
46
-[Weave Network Plugin](http://docs.weave.works/weave/latest_release/plugin.html)    | A network plugin that creates a virtual network that connects your Docker containers - across multiple hosts or clouds and enables automatic discovery of applications. Weave networks are resilient, partition tolerant, secure and work in partially connected networks, and other adverse environments - all configured with delightful simplicity.
46
+[Weave Network Plugin](https://www.weave.works/docs/net/latest/introducing-weave/)    | A network plugin that creates a virtual network that connects your Docker containers - across multiple hosts or clouds and enables automatic discovery of applications. Weave networks are resilient, partition tolerant, secure and work in partially connected networks, and other adverse environments - all configured with delightful simplicity.
47 47
 
48 48
 ### Volume plugins
49 49
 
... ...
@@ -896,7 +896,7 @@ This is a full example of the allowed configuration options in the file:
896 896
 	"pidfile": "",
897 897
 	"graph": "",
898 898
 	"cluster-store": "",
899
-	"cluster-store-opts": [],
899
+	"cluster-store-opts": {},
900 900
 	"cluster-advertise": "",
901 901
 	"debug": true,
902 902
 	"hosts": [],
... ...
@@ -23,5 +23,5 @@ the process is unaware, and unable to capture, that it is being suspended,
23 23
 and subsequently resumed.
24 24
 
25 25
 See the
26
-[cgroups freezer documentation](https://www.kernel.org/doc/Documentation/cgroups/freezer-subsystem.txt)
26
+[cgroups freezer documentation](https://www.kernel.org/doc/Documentation/cgroup-v1/freezer-subsystem.txt)
27 27
 for further details.
... ...
@@ -20,5 +20,5 @@ The `docker unpause` command uses the cgroups freezer to un-suspend all
20 20
 processes in a container.
21 21
 
22 22
 See the
23
-[cgroups freezer documentation](https://www.kernel.org/doc/Documentation/cgroups/freezer-subsystem.txt)
23
+[cgroups freezer documentation](https://www.kernel.org/doc/Documentation/cgroup-v1/freezer-subsystem.txt)
24 24
 for further details.