Merge branch 'vladfr-365-document-boot2docker'

docs/boot2docker.md

+# Using with Boot2docker
+
+For usage with boot2docker, there is a helper function in the utils package named `kwargs_from_env`, it will pass any environment variables from Boot2docker to the Client.
+
+First run boot2docker in your shell:
+```bash
+$ $(boot2docker shellinit)
+Writing /Users/you/.boot2docker/certs/boot2docker-vm/ca.pem
+Writing /Users/you/.boot2docker/certs/boot2docker-vm/cert.pem
+Writing /Users/you/.boot2docker/certs/boot2docker-vm/key.pem
+export DOCKER_HOST=tcp://192.168.59.103:2376
+export DOCKER_CERT_PATH=/Users/you/.boot2docker/certs/boot2docker-vm
+export DOCKER_TLS_VERIFY=1
+```
+
+You can then instantiate `docker.Client` like this:
+```python
+from docker.client import Client
+from docker.utils import kwargs_from_env
+
+client = Client(**kwargs_from_env())
+print client.version()
+```

docs/contributing.md

 # Contributing
-See the [Docker contributing guidelines](https://github.com/docker/docker/blob/master/CONTRIBUTING.md). 
+See the [Docker contributing guidelines](https://github.com/docker/docker/blob/master/CONTRIBUTING.md).
 The following is specific to docker-py.
 
 ## Running the tests & Code Quality
@@ -14,7 +14,7 @@ $ tox
 ```
 
 ## Building the docs
-Docs are built with [MkDocs](http://www.mkdocs.org/). For development, you can 
+Docs are built with [MkDocs](http://www.mkdocs.org/). For development, you can
 run the following in the project directory:
 ```
 $ pip install -r docs-requirements.txt
@@ -32,5 +32,5 @@ Before a new release, please go through the following checklist:
 
 ## Vulnerability Reporting
 For any security issues, please do NOT file an issue or pull request on github!
-Please contact [security@docker.com](mailto:security@docker.com) or read [the 
+Please contact [security@docker.com](mailto:security@docker.com) or read [the
 Docker security page](https://www.docker.com/resources/security/).

docs/index.md

@@ -12,5 +12,4 @@ Our latest stable is always available on PyPi.
 Full documentation is available in the `/docs/` directory.
 
 ## License
-Docker is licensed under the Apache License, Version 2.0. See LICENSE for full 
-license text
+Docker is licensed under the Apache License, Version 2.0. See LICENSE for full license text

docs/port-bindings.md

@@ -29,8 +29,8 @@ like such in both the `create_container()` and `start()` calls:
 
 ```python
 container_id = c.create_container(
-	'busybox', 
-	'ls', 
+	'busybox',
+	'ls',
 	ports=[(1111, 'udp'), 2222]
 )
 c.start(container_id, port_bindings={'1111/udp': 4567, 2222: None})

docs/tls.md

@@ -28,7 +28,7 @@ https://docs.python.org/3.4/library/ssl.html#ssl.PROTOCOL_TLSv1)
 client = docker.Client(base_url='<https_url>', tls=True)
 ```
 
-Equivalent CLI options: 
+Equivalent CLI options:
 ```bash
 docker --tls ...
 ```
@@ -48,7 +48,7 @@ tls_config = docker.tls.TLSConfig(ca_cert='/path/to/ca.pem')
 client = docker.Client(base_url='<https_url>', tls=tls_config)
 ```
 
-Equivalent CLI options: 
+Equivalent CLI options:
 ```bash
 docker --tlsverify --tlscacert /path/to/ca.pem ...`
 

docs/volumes.md

 # Using volumes
 
-Volume declaration is done in two parts. First, you have to provide a list of 
-mountpoints to the `Client().create_container()` method.
+Volume declaration is done in two parts. First, you have to provide
+a list of mountpoints to the `Client().create_container()` method.
 
 ```python
 c.create_container('busybox', 'ls', volumes=['/mnt/vol1', '/mnt/vol2'])

mkdocs.yml

@@ -11,5 +11,6 @@ pages:
 - [volumes.md, Using Volumes]
 - [tls.md, Using TLS]
 - [host-devices.md, Host devices]
+- [boot2docker.md, Using with boot2docker]
 - [change_log.md, Change Log]
 - [contributing.md, Contributing]