Commit Graph

38 Commits

Author SHA1 Message Date
Trapier Marshall 6c5174393e Correct default-address-pool to default-addr-pool
WHAT I DID:

```
git grep -l default-address-pool  |\
xargs sed -i 's:default-address-pool:default-addr-pool:g'
```

... then put the `engine/release-notes.md` back to
`--default-address-pool`, since it refers to `dockerd`.

REFERENCES:

client version 18.09.3:

```
$ docker swarm init --help |grep default-addr
      --default-addr-pool ipNetSlice           default address pool in CIDR format (default [])
      --default-addr-pool-mask-length uint32   default address pool subnet mask length (default 24)
```

server version 18.09.3:

```
$ dockerd --help |grep default-addr
      --default-address-pool pool-options       Default address pools for node specific local networks
```
2019-09-24 11:00:00 -04:00
Sebastiaan van Stijn 03d5b3396d
Use consistent formatting for notes
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-02-09 00:49:57 +01:00
Anne Henmi 329498653f
Update networking.md
Incorporated @bermudezmt's feedback
2018-09-18 21:09:47 -06:00
Anne Henmi 783cc9fb4a
Update networking.md
Incorporated Maria's feedback.
2018-09-12 18:12:57 -06:00
Anne Henmi 3bae1bb428
Update networking.md
Cleaned up Mark's additions.
2018-09-12 13:26:00 -06:00
Mark Church ea9e729e21 added default address pools installation/usage comments across UCP install, swarm install, and networking pages 2018-09-08 14:02:42 -07:00
Misty Stanley-Jones a4f5e30249
Various copyedits to reduce future tense, wordiness, and use of 'please' (#5788)
* Reword lots of instances of 'will'

* Reword lots of instances of won't

* Reword lots of instances of we'll

* Eradicate you'll

* Eradicate 'be able to' type of phrases

* Eradicate 'unable to' type of phrases

* Eradicate 'has / have to' type of phrases

* Eradicate 'note that' type of phrases

* Eradicate 'in order to' type of phrases

* Redirect to official Chef and Puppet docs

* Eradicate gratuitous 'please'

* Reduce use of e.g.

* Reduce use of i.e.

* Reduce use of N.B.

* Get rid of 'sexagesimal' and correct some errors
2018-01-25 17:37:23 -08:00
Misty Stanley-Jones 69350e7b92
Fix typo in flag name (#5376) 2017-11-22 11:48:24 -08:00
Misty Stanley-Jones 956fe5924d
Update docs for new publish syntax (#5323) 2017-11-17 12:08:29 -08:00
Misty Stanley-Jones e9fa593562 Add info about network size limits for swarm mode 2017-11-02 15:42:41 -07:00
Michael a9812d3712 Minor edit (#5114)
Using verbose args in example makes it easier to grok
2017-10-25 18:09:59 -07:00
Gwendolynne Barr 9923c1d83d Clarify VIP vs DNSRR options (#4736) 2017-09-29 14:52:21 -07:00
Mathieu Parent 5f554f4d97 Add missing option to customized docker_gwbridge (#4698) 2017-09-22 10:18:14 -07:00
Misty Stanley-Jones 93b6932f13 Update example to use official consul image (#4670) 2017-09-19 15:37:23 -07:00
zaggash a9bbafe693 Missing space (#4535) 2017-09-11 17:03:53 -07:00
Wang Jie 70dcc0d6c5 Update networking.md (#4501) 2017-09-05 14:26:34 -07:00
Misty Stanley-Jones 7f966c4c10 Remove edge-only admonitions 2017-06-28 08:31:29 -07:00
Misty Stanley-Jones 7b006d7c65 Add info about new --datapath-addr flag (#3479) 2017-06-28 08:31:29 -07:00
Misty Stanley-Jones cf3f1f6e37 Rewrite swarm service networking guide (#3454) 2017-06-01 13:42:33 -07:00
John Harris fd1fd15fa4 Add clarity note around required user-created overlay (#2972) 2017-04-21 14:06:05 -05:00
Steven Hanna b43c302c46 Spelling mistakes (#2970)
* Spelling mistakes

* Delete last_page.md
2017-04-20 17:26:18 -05:00
adamoverton 1a9993c913 fixed typo from adressses to addresses (#2358) 2017-03-16 12:01:43 -07:00
Misty Stanley-Jones fb7c73908b Update the styleguide (#2332)
* Update the styleguide

Also normalize admonition titles with the colon outside the bold.
2017-03-15 09:46:30 -07:00
Misty Stanley-Jones ef95a915eb Fixing broken links
Formatting improvements along the way
2017-01-25 11:51:14 -08:00
Misty Stanley-Jones e3a3145cd9 Sync vnext-engine branch to docker/docker SHA 2f12d2808464dcfdf45e0920fd508ce0ff12bd29
This branch will contain forward-looking Engine-specific docs
and be the equivalent of docker/docker master for docs
2017-01-19 10:10:15 -08:00
Adrien Duermael 50ee158a65 CI - added test for keywords in markdown frontmatters (#805)
* added test for keywords

Signed-off-by: Adrien Duermael <adrien@duermael.com>

* fixed keywords in some md files for tests to pass

Signed-off-by: Adrien Duermael <adrien@duermael.com>

* fixed keywords in /datacenter

Signed-off-by: Adrien Duermael <adrien@duermael.com>

* tests/Dockerfile: no need to add git

Signed-off-by: Adrien Duermael <adrien@duermael.com>

* tests/Dockerfile: changed maintainer

Signed-off-by: Adrien Duermael <adrien@duermael.com>
2016-12-06 16:45:11 -08: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 33d3d067d0 Revert "fix some frontmatter keywords values" 2016-11-04 13:30:04 -07:00
Gaetan de Villele 7a11f05943 fix some frontmatter keywords values
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2016-11-03 10:22:12 -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
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
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