Skip to content

Commit 62d6aa5

Browse files
committed
Update mkdocs.yml to reference new Machine page.
Signed-off-by: Joffrey F <[email protected]>
1 parent c3f76e6 commit 62d6aa5

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

.dockerignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dist
1010
.tox
1111
.coverage
1212
html/*
13-
tests/__pycache__
13+
__pycache__
1414

1515
# Compiled Documentation
1616
site/

docs/machine.md

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# Using with Docker Toolbox and Machine
22

3-
In development, we recommend using [Docker Toolbox](https://www.docker.com/products/docker-toolbox) to set up Docker. It includes a tool called Machine which will create a VM running Docker Engine and point your shell at it using environment variables.
3+
In development, Docker recommends using
4+
[Docker Toolbox](https://www.docker.com/products/docker-toolbox) to set up
5+
Docker. It includes a tool called Machine which will create a VM running
6+
Docker Engine and point your shell at it using environment variables.
47

58
To configure docker-py with these environment variables
69

@@ -16,4 +19,8 @@ client = docker.from_env(assert_hostname=False)
1619
print client.version()
1720
```
1821

19-
**Note:** We are disabling TLS hostname checking with `assert\_hostname=False`. Machine provides us with the exact certificate the server is using so this is safe. If you are not using Machine and verifying the host against a certificate authority, you'll want to enable this.
22+
**Note:** This snippet is disabling TLS hostname checking with
23+
`assert\_hostname=False`. Machine provides us with the exact certificate
24+
the server is using so this is safe. If you are not using Machine and verifying
25+
the host against a certificate authority, you'll want to enable hostname
26+
verification.

mkdocs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ pages:
1414
- Host configuration: hostconfig.md
1515
- Network configuration: networks.md
1616
- Using tmpfs: tmpfs.md
17-
- Using with boot2docker: boot2docker.md
17+
- Using with Docker Machine: machine.md
1818
- Change Log: change_log.md
1919
- Contributing: contributing.md

0 commit comments

Comments
 (0)