Commit Graph

161 Commits

Author SHA1 Message Date
CodeJuan
ae46892a29 typo, the port of consul is 8500
Signed-off-by: codejuan <xh@decbug.com>
2016-03-28 12:53:05 +08:00
Pieter
f208be4b95 Fixes typos in docs 'Swarm at scale'
Minor typos

Signed-off-by: Pieter Visser <pieter@pietervisser.nl>
2016-03-24 17:55:47 +01: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
Victor Vieux
07143cea03 fix duplicate rescheduling.md
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-03-16 17:27:32 -07:00
Victor Vieux
fc1d6a2f1d Merge pull request #1975 from moxiegirl/fix-reschedule-doc
Updating the documentation
2016-03-16 17:26:55 -07:00
Mary Anthony
b9ce995ebf Updating the documentation
Signed-off-by: Mary Anthony <mary@docker.com>
2016-03-15 14:06:01 -07:00
Victor Vieux
e90d93d6e7 Merge pull request #1957 from mqliang/get-warm-typo
fix typo in get-swarm.md
2016-03-15 13:28:37 -07:00
Victor Vieux
c142e12e79 Merge pull request #1958 from mqliang/provision-typo
fix typo in provision-with-machine.md
2016-03-15 13:28:09 -07:00
Victor Vieux
082f4b65af move rescheduling out of experimental
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-03-14 17:18:36 -07:00
Nishant Totla
42b1620f4d Merge pull request #1966 from arunwizz/issue-1965
Fixed typo for word consul
2016-03-13 22:10:46 -07:00
Nishant Totla
a80ca0e51a Merge pull request #1952 from mqliang/filter-typo
Filter typo in document
2016-03-13 12:02:41 -07:00
Nishant Totla
9a1133f7c7 Merge pull request #1959 from mqliang/intstall-w-typo
fix typo in install-w-machine.md
2016-03-13 12:01:55 -07:00
Arun Y
295c4da8d0 Fixed typo for word consul
Developer Certificate of Origin
Version 1.1

Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
660 York Street, Suite 102,
San Francisco, CA 94110 USA

Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.

Developer's Certificate of Origin 1.1

By making a contribution to this project, I certify that:

(a) The contribution was created in whole or in part by me and I
    have the right to submit it under the open source license
    indicated in the file; or

(b) The contribution is based upon previous work that, to the best
    of my knowledge, is covered under an appropriate open source
    license and I have the right under that license to submit that
    work with modifications, whether created in whole or in part
    by me, under the same open source license (unless I am
    permitted to submit under a different license), as indicated
    in the file; or

(c) The contribution was provided directly to me by some other
    person who certified (a), (b) or (c) and I have not modified
    it.

(d) I understand and agree that this project and the contribution
    are public and that a record of the contribution (including all
    personal information I submit with it, including my sign-off) is
    maintained indefinitely and may be redistributed consistent with
    this project or the open source license(s) involved.

Signed-off-by: Arun Y <arunwizz@gmail.com>
2016-03-13 19:58:29 +05:30
mqliang
aa70529d3f fix typo in install-w-machine.md
Signed-off-by: mqliang <mqliang.zju@gmail.com>
2016-03-13 15:53:27 +08:00
mqliang
97efac9d0c fix typo in provision-with-machine.md
Signed-off-by: mqliang <mqliang.zju@gmail.com>
2016-03-13 15:36:46 +08:00
mqliang
e7ce927e9d fix typo in get-swarm.md
Signed-off-by: mqliang <mqliang.zju@gmail.com>
2016-03-13 15:20:38 +08:00
mqliang
c1f5e17371 fix broken example list
Signed-off-by: mqliang <mqliang.zju@gmail.com>
2016-03-13 10:52:22 +08:00
mqliang
2d7c594270 remove redundant word in docs
Signed-off-by: mqliang <mqliang.zju@gmail.com>
2016-03-12 19:03:33 +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
Alexandre Beslic
045bfe93d1 Merge pull request #1845 from thaJeztah/fix-api-markdown
Update Swarm API documentation
2016-03-02 11:23:04 -08:00
Alexandre Beslic
5ce850f0f4 Merge pull request #1903 from wenchma/typo
Fix some typo error for install-manual.md
2016-03-02 10:34:35 -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
Wen Cheng Ma
6e4ad3f093 Fix some typo error for install-manual.md
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2016-02-29 11:42:40 +08:00
Mary Anthony
ec8ceae209 Fixing problems with the instructions
Updating the application after test
Removing the sudo as it caused issues
Adding new screen shots
Breaking into several files/sections
Adding in the alias from the old single page version
Moving to old path to avoid an alias
Adding in Dong's comments
Updating with latest fixes
Fixing nits and more

Signed-off-by: Mary Anthony <mary@docker.com>
2016-02-27 09:04:49 -08:00
wenchma
482830b296 Reformat to make it look more graceful
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>

Fixing formatting carry and close #1886

Signed-off-by: Mary Anthony <mary@docker.com>
2016-02-27 08:28:52 -08:00
moxiegirl
9617bdb860 Merge pull request #1875 from moxiegirl/carry-close-1852
Fixed typos and formatting issues.
2016-02-24 09:28:03 -08:00
Rolfe Dlugy-Hegwer
b9f7b8a91a Fixed typos and formatting issues.
Signed-off-by: Rolfe Dlugy-Hegwer <rollfedh-contractor@docker.com>
Adding in comments

Signed-off-by: Mary Anthony <mary@docker.com>
2016-02-24 09:17:06 -08:00
Rolfe Dlugy-Hegwer
e8fad3d657 command reference and docker file 22:05
fix bad links

Signed-off-by: Rolfe Dlugy-Hegwer <rollfedh-contractor@docker.com>
2016-02-24 08:44:58 -08:00
skohar
744a811206 Remove redundant spaces
Signed-off-by: skohar <skohar@users.noreply.github.com>
2016-02-23 11:40:27 +09:00
Sebastiaan van Stijn
0adeae325e Remove tutorials from Dockerfile
The "docker/tutorials" repository is now
private, causing building the docs to fail.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-02-19 13:02:06 +01:00
Sebastiaan van Stijn
f9aca81b67 Update Swarm API documentation
This updates the Swarm API documentation;

- Fix heading levels (changed H1 -> H2)
- Replace the "Endpoints which behave differently" with a table
- Fix Markdown markup in "Registry Authentication" section
- Changed the "Registry Authentication" examples from a bullet-list
  to sub-sections and promoted "token-based authentication" as the preferred
  authentication method (adding notes that password-based authentication
  stores credentials unencrypted)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-02-19 12:59:58 +01:00
moxiegirl
1fab0aed5a Merge pull request #1797 from nishanttotla/improve-swarm-machine
Removing hard-coded ips from swarm w/ machine doc
2016-02-12 13:23:56 -08:00
skohar
eb725973a2 Fix typo
Signed-off-by: skohar <skohar@users.noreply.github.com>
2016-02-12 09:21:34 +09:00
Nishant Totla
ee39394741 Removing hard-coded ip from swarm w/ machine doc
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-02-11 14:27:09 -08:00
Arthur Barr
a08742eb72 Fix typo
Signed-off-by: Arthur Barr <arthur.barr@uk.ibm.com>
2016-02-10 12:01:45 +00:00
Nishant Totla
95e97d6151 Fixing typo in install w machine doc
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-02-09 08:54:49 -08:00
moxiegirl
c31ce7475d Merge pull request #1764 from dongluochen/tlsDoc
Update configure-tls.md
2016-02-08 18:19:03 -08:00
Nishant Totla
27d9fde0af Fixing Swarm Install with Machine doc
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-02-08 18:08:02 -08:00
Mary Anthony
c48aa79979 Fixing links after move of repo
Signed-off-by: Mary Anthony <mary@docker.com>
2016-02-07 19:52:22 -08:00
Victor Vieux
c7eb7ee52f remove build step
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-06 10:59:17 -08:00
Dong Chen
e96c222722 Update configure-tls.md.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-02-05 14:18:36 -08:00
Victor Vieux
573dd33995 Merge pull request #1757 from moxiegirl/fix-format
Fix format for command
2016-02-04 10:50:56 -08:00
runseb
e121dd0986 Update networking.md
Small typo in bridge driver when creating bridge network.

Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
2016-02-04 14:46:43 +01:00
Mary Anthony
a1e183c4bd Fix format for command
Signed-off-by: Mary Anthony <mary@docker.com>
2016-02-04 05:13:19 -08:00
Rolfe Dlugy-Hegwer
b88cb64358 new content for install-on-aws and images for other topics
Issues #1606 #1605

Signed-off-by: Rolfe Dlugy-Hegwer <rollfedh-contractor@docker.com>
2016-02-03 17:13:56 -08:00
Sven Dowideit
be31e00c09 Move the get-swarm doc into the new DockerSwarm menu
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-02-03 16:14:44 -08:00
Victor Vieux
658280c5d7 Merge pull request #1694 from moxiegirl/securing-swarm
High-level docs for Swarm
2016-02-03 13:13:19 -08:00
Mary Anthony
2dd1f47c5b Updating with Dong's fine
Signed-off-by: Mary Anthony <mary@docker.com>
2016-02-03 12:45:25 -08:00