Commit Graph

279 Commits

Author SHA1 Message Date
LRubin 454ad15950 Three, not four spaces 2016-10-25 12:18:13 -07:00
LRubin a73288f7c6 Fix list formatting 2016-10-25 12:14:01 -07:00
LRubin ef0f8459e6 Fix code fence 2016-10-25 12:09:27 -07:00
Misty Stanley-Jones a2e8bd110c Clarify Hyper-V and VirtualBox info for Docker for Windows
Fixes #134

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-10-20 16:30:54 -07:00
John Mulhausen 35ee09ac09 Merge pull request #231 from kamotos/patch-1
[docker-machine ] Adding machine provision reference link
2016-10-18 15:03:40 -07:00
Alicia Lauerman 356de6262e update /installation/windows -> /docker-for-windows
Signed-off-by: Alicia Lauerman <allydevour@me.com>
2016-10-18 14:31:01 -04:00
Misty Stanley-Jones 01910ab6d9 Update branding for macOS
Apple has changed their branding guidelines from 'OS X' to 'macOS'
so we should update ours to be within trademark / branding
guidelines. See http://www.apple.com/macos/sierra/

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-10-18 09:21:09 -07:00
Zahim Anas e0decc85ca [docker-machine ] Adding machine provision reference link 2016-10-17 12:48:29 +01:00
Victoria Bialas b54e3a23f1 Merge pull request #131 from Samureus/patch-1
Update install-machine.md to version 0.8.2
2016-10-14 16:52:03 -07:00
Misty Stanley-Jones e916f7f88e Change 'draft: true' to 'published: false' for Jekyll 2016-10-10 16:19:47 -07:00
Samuel Villamonte 5b1ab4c0c6 Update install-machine.md to version 0.8.2
Updated to version 0.8.2 instructions
2016-10-08 18:50:39 -05:00
John Mulhausen 8bfa1bda07 Merge pull request #114 from benizi/fix/raw-variables-targeted
Prevent Liquid from mangling `{{` in a more targeted way
2016-10-07 13:30:05 -07:00
Andrew Starr-Bochicchio 3f7a061d99 Fix broken images in DigitalOcean examples. Closes: #118 2016-10-07 14:55:06 -04:00
Benjamin R. Haskell 362e94b2bc Disable Liquid templating for blocks with `{{`
Instead of disabling templating for entire files, fix instances
individually by wrapping blocks in:

    ```{% raw %}
    ... content ...
    {% endraw %}```

Signed-off-by: Benjamin R. Haskell <docker@benizi.com>
2016-10-07 00:58:08 -04:00
Benjamin R. Haskell 65ec3a3763 Revert pull request #48
Reverts commit b3a620808a in order to
replace it with more-targeted blocks.
2016-10-07 00:56:17 -04:00
John Mulhausen cb3f6f04a1 Merge pull request #48 from benizi/fix/raw-variables
Fix formatting for Markdown files containing `{{`
2016-10-06 09:46:51 -07:00
Victoria Bialas 2ab7fa3aff Revert "Merge pull request #36 from mrburrito/aws-iam-roles"
This reverts commit 82d9ab91b2, reversing
changes made to c1188953ba.
2016-10-05 12:52:04 -07:00
Benjamin R. Haskell b3a620808a Fix formatting for Markdown files containing `{{`
They're usually examples of Go-style text templates.  But, Liquid templating is treating them as variable substitutions.  E.g., in `engine/reference/commandline/ps.md`:

```bash
$ docker ps --filter volume=remote-volume --format "table {{.ID}}\t{{.Mounts}}"
```

is rendered as:

```bash
$ docker ps --filter volume=remote-volume --format "table \t"
```

Solution is to wrap entire files in `{% raw %} ... {% endraw %}` blocks.
2016-10-05 01:58:24 -04:00
Marc-Aurèle Brothier 3fe070e848 Exoscale: fix letter casing
Following change a059edd949

Signed-off-by: Marc-Aurèle Brothier <m@brothier.org>
2016-10-05 07:35:42 +02:00
John Mulhausen a059edd949 Matching PR #3753 @ Machine
A PR slipped in post-migration at https://github.com/docker/machine/pull/3753/files
2016-10-04 18:06:30 -07:00
Victoria Bialas 82d9ab91b2 Merge pull request #36 from mrburrito/aws-iam-roles
Doc update to support standard AWS credential loading.
2016-10-04 15:41:45 -07:00
Gordon Shankman a9b79591cf Migrating docs changes from machine PR https://github.com/docker/machine/pull/3779
Signed-off-by: Gordon Shankman <gshankman@gmail.com>
2016-10-04 17:05:20 -04:00
Gordon Shankman f590974263 Docs changes from machine PR https://github.com/docker/machine/pull/3799
Signed-off-by: Gordon Shankman <gshankman@gmail.com>
2016-10-04 16:59:58 -04:00
John Mulhausen 0133cb646d Merge pull request #21 from pborreli/typos
Fixed typos
2016-09-30 11:51:42 -07:00
John Mulhausen 066b78bf86 Content rendering fixes 2016-09-30 01:51:56 -07:00
John Mulhausen 99bab305bd Removing merge detritus 2016-09-29 23:38:12 -07:00
Pascal Borreli 6cd3fe8bd2 Fixed typos 2016-09-30 01:52:12 +01:00
Misty Stanley-Jones d53c6798c9 Convert TOML to YAML, tweaks to work with Jekyll 2016-09-29 17:16:03 -07:00
Misty Stanley-Jones 17f54b8475 Move machine docs to machine subdirectory 2016-09-28 20:45:49 -07:00