docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
42,500 Commits 25 Branches 28 Tags 827 MiB
Commit Graph

16 Commits

Author SHA1 Message Date
Misty Stanley-Jones 232043cfa6 Merge pull request #148 from mstanleyjones/swarm_add_node_clarify 
Clarify what happens when a failed swarm node recovers
 2016-10-11 16:14:52 -07:00
Misty Stanley-Jones 62f4a04e39 Clarify what happens when a failed swarm node recovers 
Fixes #105
 2016-10-11 16:13:04 -07:00
John Mulhausen 2b6cbd8255 Merge pull request #150 from BSCheshir/patch-2 
node1
 2016-10-11 01:39:48 -07:00
John Mulhausen 1dc817611b Formatting fixes 2016-10-11 01:24:55 -07:00
BSCheshir a1edd7ce09 node1 
little bit before
ID                         NAME      IMAGE  NODE   DESIRED STATE  CURRENT STATE               ERROR
63s86gf6a0ms34mvboniev7bs  my-web.1  nginx  node1  Running        Running 58 seconds ago
 2016-10-11 01:40:51 +04:00
Misty Stanley-Jones 220bbed0e4 Fix incorrect information about swarm port assignment 2016-10-10 10:02:15 -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
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 c03bb7f90c Update services.md 2016-10-04 16:59:05 -07:00
John Mulhausen a0ee6c6004 Rendering fixes, part 1 (up through cs-engine) 2016-09-30 19:38:30 -07: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