Commit Graph

52 Commits

Author SHA1 Message Date
Victoria Bialas 59c5544d8b added advisory banner to legacy swarm docs w/links to swarm mode
copyedit

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-12-06 17:03:45 -08:00
Alexander von Renteln db57d05eca Fix links on docs.docker.com/machine/get-started-cloud/ (#774)
Fix the link to drivers and reference.
2016-12-05 01:32:02 -08:00
Eisenberger Tamás c717eb71f7 Document virtualbox-share-folder switch of docker-machine virtual box… (#647)
* Document virtualbox-share-folder switch of docker-machine virtual box driver

* Add --virtualbox-share-folder to the fefaults table too

* Updated wording for virtualbox-share-folder

* Update virtualbox.md
2016-11-29 13:56:44 -08:00
Victoria Bialas fd49e78fb0 clarify syntax on swarm heartbeat for create machine command
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-11-21 11:40:28 -08:00
André Carvalho f458e86929 machine: add available 3rd party drivers list (#250)
* machine: add available 3rd party drivers list

This commit re-adds the deleted list of 3rd party drivers. I believe this was missed when moving the docs as this list is
referenced by other parts of the documentation.

Rename AVAILABLE_DRIVER_PLUGINS to AVAILABLE_DRIVER_PLUGINS.md

Update get-started-cloud.md

* machine: fix list of machine plugins markup
2016-11-16 15:28:02 -08:00
Peter Schultz 5bde9b0fde machine/gce: explain how to use image families 2016-11-13 18:14:22 +01:00
Gaetan 75fe044313 fix type of keywords entry in frontmatter (in /machine/) (#556)
keywords should be a string, not an array containing one string

Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2016-11-11 14:51:12 -08:00
Gaetan 1589927ce8 fix duplicated titles having different values (#514)
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2016-11-10 11:57:20 -08:00
John Mulhausen 57757ddcfd Merge pull request #409 from mstanleyjones/fix_liquid_warnings
Fix some Liquid warnings
2016-11-04 16:11:50 -07:00
John Mulhausen 558314bf56 Converges titles to imperative-form, front-matter based, and sentence-case (#438)
Multiple title fixes, consistency fixes, convergence into metadata-based titles.
2016-11-04 15:38:40 -07:00
Misty Stanley-Jones 1a193d749b Revert "Merge pull request #437 from gdevillele/fix_keywords_format"
This reverts commit 13ddc1350e, reversing
changes made to 7a11f05943.
2016-11-04 13:33:29 -07:00
Gaetan 8bb4d6226a fix more frontmatter keywords values (#439)
* fix format of frontmatter keyword entry in some .md files

Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2016-11-04 10:48:38 -07:00
Misty Stanley-Jones 62a3473be4 Fix re-import of machine 2016-11-02 10:01:42 -07:00
Tino Breddin 69283150a5 FreeBSD: add build support
Signed-off-by: Tino Breddin <t@tolbrino.com>
2016-11-02 09:54:44 -07:00
Misty Stanley-Jones d6ef6d5bb9 added info about d4mac, d4win in preparation for v1.12 publish set
copy-edit to remove extra/repeated info not needed in both sections

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-11-02 09:16:45 -07:00
Misty Stanley-Jones 20a6e1f31b Fix some Liquid warnings 2016-11-01 09:45:00 -07:00
Victoria Bialas 08d35416c9 Revert "Doc change to support custom userdata option for docker-machine AWS driver" 2016-10-26 14:23:25 -07:00
Victoria Bialas 796ec3d67c incorporated Misty's rewrite from pr#256 with additional info
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-10-25 16:42:03 -07:00
Joao Fernandes 9482ecaa40 Merge pull request #343 from joaofnfernandes/machine-reference
Update code blocks in machine/reference
2016-10-25 14:01:27 -07:00
Joao Fernandes 5ea225187a Update code blocks in machine/reference 2016-10-25 13:58:10 -07:00
LRubin c343c03782 Merge pull request #342 from sanscontext/ocean-xmpl
troubleshooting kramdown issues in a real editor
2016-10-25 13:57:36 -07:00
LRubin 6976e5912c troubleshooting kramdown issues in a real editor
Signed-off-by: LRubin <lrubin@docker.com>
2016-10-25 13:56:10 -07:00
Victoria Bialas 43952452b9 Revert "Clarify Hyper-V and VirtualBox info for Docker for Windows" 2016-10-25 13:53:24 -07:00
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