Commit Graph

36 Commits

Author SHA1 Message Date
Kai Qiang Wu(Kennan)
2a778b3600 Fix old NODE column
Some fixes was missed in last PR.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-04-06 01:39:39 +00:00
Kai Qiang Wu(Kennan)
8afd32a631 Fix doc for NODE column
Swarm docker ps output nolonger have NODE column, So this updates the doc

Fixes: #2081
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-04-06 00:41:55 +00:00
Peter Wilmott
4b0b029ce2 Change "master" to "manager"
The Docker Swarm documentation states that:

"Some documentation still refers to a primary manager as a “master”, but
that term has been superseded."

This change attempts to remove remaining references to "master" in order
to keep documentation consistent.

Signed-off-by: Peter Wilmott <p@p8952.info>
2016-03-22 17:50:00 +00:00
Mary Anthony
b9ce995ebf Updating the documentation
Signed-off-by: Mary Anthony <mary@docker.com>
2016-03-15 14:06:01 -07:00
mqliang
c1f5e17371 fix broken example list
Signed-off-by: mqliang <mqliang.zju@gmail.com>
2016-03-13 10:52:22 +08:00
mqliang
2803654488 fix typo in filter.md
Signed-off-by: mqliang <mqliang.zju@gmail.com>
2016-03-12 18:50:12 +08:00
Mary Anthony
4b8ed91226 Changing swarm to Swarm in body text
Signed-off-by: Mary Anthony <mary@docker.com>
2016-03-03 10:04:25 -08:00
Michael Friis
03b8481f01 avoid syntax highlighter confusion
Signed-off-by: Michael Friis <friism@gmail.com>
2016-03-02 09:08:37 -08:00
John Day
e94ca74a6a Syntax error - changed container to constraint
Syntax Error
From:
The `<filter-type>` is either the `affinity` or the `container` keyword. It
identifies the type filter you intend to use.
To:
The `<filter-type>` is either the `affinity` or the `constraint` keyword. It
identifies the type filter you intend to use.

Signed-off-by: John Day <john@containerx.io>
2016-03-01 04:11:29 +00:00
Mary Anthony
f93d787e3b WIP: TLS Docs for Swarm
Struct edit pass thru conceptual material
Updating with comments from Mike
Tweaking menu layout
Updating for Nigel
Updating with local images, formatting fixes
Updating with the comments from review

Signed-off-by: Mary Anthony <mary@docker.com>
2016-02-03 10:37:54 -08:00
Clément Aigreault
3ece47ff91 Fix three typo in docs/scheduler/filter.md
dafult -> default
by by -> by
want run -> want to run

Signed-off-by: Clément Aigreault <aigreaultc@gmail.com>
Signed-off-by: Uhsac <aigreaultc@gmail.com>
2016-02-02 22:09:55 +01:00
moxiegirl
e9cd4ff2a6 Merge pull request #1382 from xcl3721/patch-2
make the command clearly
2016-02-01 11:51:10 -08:00
Mary Anthony
c2ecf7f9f3 Adding new navigation
Moving API to top level
Fixing broken links to api

Signed-off-by: Mary Anthony <mary@docker.com>
2016-01-24 09:02:53 -08:00
Sebastiaan van Stijn
cdc2cc3d84 Remove link to experimental "rescheduling"
It's in experimental, so should not be linked
from in the online documentation.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-01-13 09:27:34 -08:00
Victor Vieux
74dfe8b0f6 move doc to experimental/
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-11 18:16:31 -08:00
Victor Vieux
78008f4d4a add doc
fix tests and keep swarm id
remove duplicate on node reconnect
explicit failure

Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-11 15:59:44 -08:00
Tomasz Kopczynski
3d9d6dab3a docs: typo in scheduler/strategy.md
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl>
2016-01-11 23:23:11 +01:00
Emilien Kenler
5efac03bad docs: Typo in scheduler/filter.md
Signed-off-by: Emilien Kenler <ekenler@wizcorp.jp>
2016-01-08 11:50:35 +09:00
Dong Chen
065551eaaa Update documents on resource occupation.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2015-12-16 12:02:05 -08:00
Mary Anthony
f1fb2722a1 Chaning User guide to overview close #1483
Signed-off-by: Mary Anthony <mary@docker.com>
2015-12-12 21:22:17 -08:00
Chang Long Xu
b0653fa473 recommit
Signed-off-by: Chang Long Xu <xcl_rockman@qq.com>
2015-12-10 09:16:12 +08:00
Sven Dowideit
925ac57d6c Small fixes found by linkchecker
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-12-03 21:38:37 +10:00
Daniel Nephin
f432b63fe3 Updates to swarm filters documentation
Support reloading of docs.

Adjust the titles in docs/scheduler.filter to be more descriptive.

Also moves the meta sections about constraints out from the container affinity section.

Add a note about stopped containers being used by filters to the docs.

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-12-01 17:49:25 -08:00
Victor Costan
94d84a618c Document filter usage in image building.
Signed-off-by: Victor Costan <costan@gmail.com>
2015-11-23 13:36:05 -05:00
Mary Anthony
f1a64ea23a Updating with new tooling that supports GitHub source Markdown
Signed-off-by: Mary Anthony <mary@docker.com>
2015-10-13 04:18:50 -07:00
Mary Anthony
55692c3ec0 Fixing links after check
Signed-off-by: Mary Anthony <mary@docker.com>
2015-08-11 09:56:33 -07:00
Mary Anthony
99fb28f7d3 Fixes 1021 by reformatting the list
Changing front to frontend per vieux
Updating to get lists looking proper

Signed-off-by: Mary Anthony <mary@docker.com>
2015-07-17 09:47:10 -07:00
moxiegirl
3f7715c030 Merge pull request #959 from ahmetalpbalkan/patch-2
Container name fix scheduler/filter/README.md
2015-06-30 08:03:32 -07:00
Ahmet Alp Balkan
a65766e686 Container name fix scheduler/filter/README.md
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-06-15 14:16:12 -07:00
Mary Anthony
7858d301ff Updating for Hugo work
Updating title and other things
Removing old mkdocs file
Updating with the new sed scripts
Moving from index.md swarm-overview.md
Updating with the correct image

Signed-off-by: Mary Anthony <mary@docker.com>
2015-06-14 16:07:37 -07:00
Matt Bentley
7fc0f9f2a6 Fixed image affinity examples in docs
Signed-off-by: Matt Bentley <mbentley@mbentley.net>
2015-06-08 13:11:46 -04:00
Mary Anthony
607d585adb Updating the Introduction
- Clarifying two types of install
- Splitting out release notes
- Splitting out two install methods
- Adding in comments from review
- Adding release notes
- Updating with abronan's comments
- Updating for vieux
- Updating with comments and pulling bash

Signed-off-by: Mary Anthony <mary@docker.com>
2015-05-31 20:13:24 -07:00
Alexandre Beslic
23f66f8cc6 Merge pull request #858 from aluzzardi/addr-flag
Replace --addr with --advertise
2015-05-27 11:44:41 -07:00
Alex Chan
917653254c Small spelling and capitalisation fixes
Signed-off-by: Alex Chan <alex.chan@metaswitch.com>
2015-05-27 15:22:36 +01:00
Andrea Luzzardi
7394be0704 Replace --addr with --advertise
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-26 17:43:14 -07:00
Mary Anthony
8719caa890 Reconfigure for documentation tooling
Signed-off-by: Mary Anthony <mary@docker.com>

Removing token per Victor

Signed-off-by: Mary Anthony <mary@docker.com>

Adding in PR comments

Signed-off-by: Mary Anthony <mary@docker.com>
2015-05-22 10:43:36 -07:00