Commit Graph

124 Commits

Author SHA1 Message Date
John Mulhausen 2a696ed430 Merge pull request #367 from cavemandaveman/dockerd
Alphabetize daemon config file options
2016-11-01 12:18:44 -07:00
Adrien Duermael e7ab7f7d03 removed menu.md files
Signed-off-by: Adrien Duermael <adrien@duermael.com>
2016-10-31 13:45:56 -07:00
cavemandaveman bda6bc6bf6 Alphabetize daemon config file options 2016-10-27 14:11:03 -05:00
John Mulhausen 10b907190f Fix #332
Fix #332
2016-10-24 18:40:19 -07:00
weslord 8ac3830f70 Add aliases to engine/reference/ subdirs for backwards compatible links 2016-10-22 15:32:58 -07:00
John Mulhausen bb793f22d0 Merge pull request #175 from dsheets/patch-1
Engine reference BUILD tarball contexts mangled
2016-10-19 10:43:46 -07:00
John Mulhausen fdb632d304 Merge pull request #265 from liubin/liubin-patch-1
fix markdown syntax issue
2016-10-19 10:42:41 -07:00
Bin Liu 40eef2da44 fix markdown syntax issue
The markdown issue generated a strange html page at https://docs.docker.com/engine/reference/commandline/swarm_leave/
2016-10-19 01:29:15 +08: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
drlukeangel d0eaa59c88 Small update to the scale documentation (#142)
* Small update to the scale documentation

Just a small update to make it a bit clearer with a bit more functionality.
2016-10-13 08:57:33 -07:00
David Sheets 7b41a45abe Engine reference BUILD tarball contexts mangled
Closed code fence, removed duplicate text. Perhaps caused by bad merge?
2016-10-12 12:23:12 +01:00
Misty Stanley-Jones 6955815d23 Merge pull request #111 from yuj/patch-1
Update restart.md
2016-10-11 15:53:52 -07:00
John Mulhausen ac39558cb1 Formatting fix 2016-10-11 01:10:13 -07: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
James Yu 0688247f2e Update restart.md 2016-10-06 14:19:47 -07: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
Benjamin R. Haskell 57542590b3 Add missing close tag for fenced code block 2016-10-05 02:17:41 -04: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
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
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 9d5e59d503 Moved engine imported docs to the engine subdirectory 2016-09-29 11:19:31 -07:00