centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-03-31 16:28:59 +07:00
Code Issues Packages Projects Releases Wiki Activity
1,757 Commits 54 Branches 28 Tags
c44151ff4a796a5cd38b46985050c19b5c68ced8
Commit Graph

26 Commits

Author SHA1 Message Date
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
Andrea Luzzardi
1a58a85b44 discovery: KV Path is now an optional prefix. 
"consul://addr1" will store discovery entries into "docker/swarm/nodes"
"consul://addr2/foo" will store entries in "foo/docker/swarm/nodes"

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-26 14:25:23 -07:00
Victor Vieux
10a7abd89e Merge pull request #833 from abronan/docs_changes 
Add example of secured setup using docker-machine, marks the manual setup as insecure
 2015-05-22 14:55:30 -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
Alexandre Beslic
ebd7576e41 temporary fix on node/agent term usage, fix docker info example 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-05-22 10:24:07 -07:00
Alexandre Beslic
928beefe21 Add example of secured setup using docker-machine, marks the manual setup as *unsecure* 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-05-21 20:40:58 -07:00
James Turnbull
d52e971190 Fixed typo 
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
 2015-04-14 13:50:51 -04:00
James Turnbull
658c807eb9 Did a quick pass on the docs to fix numerous formatting, spelling and grammar errors 
Signed-off-by: James Turnbull <james@lovedthanlost.net>
 2015-04-14 11:59:50 -04:00
Fred Lifton
71f4e13493 Updates for 1.6 release 
Adds release notes and getting help section.

Signed-off-by: Fred Lifton <fred.lifton@docker.com>
 2015-04-09 15:51:38 -07:00
Victor Vieux
0f6a1846e2 Merge pull request #512 from abronan/doc_config_changes 
Move note on top of Nodes config to avoid confusion
 2015-03-30 16:33:34 -07:00
Alexandre Beslic
a900458756 Removed useless code blocks and fixed templates 
Signed-off-by: Alexandre Beslic <alexandre.beslic@gmail.com>
 2015-03-30 15:16:06 -07:00
Alexandre Beslic
e421df418a Fixed indentation and template commands 
Signed-off-by: Alexandre Beslic <alexandre.beslic@gmail.com>
 2015-03-30 15:06:18 -07:00
Alexandre Beslic
24745b7703 Change doc structure to better explain pre-requisites and Set-up process 
Signed-off-by: Alexandre Beslic <alexandre.beslic@gmail.com>
 2015-03-30 14:16:33 -07:00
Tom Kapanka
56626698fa Fix 404s that manifest in GitHub but not in the Docs site. Links should work in both. 
Spoke with Mary (Moxiegirl) about this issue and it occurs because
when Docs is built, it pulls files from various places. This causes
the GitHub view to have broken links (and images) which isn't ideal
since people may come to the docs via either approach.

Signed-off-by: Tom Kapanka <tom@kapanka.com>
 2015-03-25 20:45:19 -07:00
Jonathan Rudenberg
a55f4fc36e Remove Flynn from potential users in docs 
Flynn doesn't use the Docker API.
 2015-03-25 17:08:55 -07:00
Alexandre Beslic
ca245c6ad3 Move note on top of Nodes config to avoid confusion 
Signed-off-by: Alexandre Beslic <alexandre.beslic@gmail.com>
 2015-03-25 11:34:11 -07:00
Ben Firshman
509a246a27 Add beta warning to docs 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2015-02-26 10:54:50 +00:00
Victor Vieux
621b83fc6f Merge pull request #420 from SvenDowideit/lets-use-the-right-repo-name 
Spelling error in naming the image built
 2015-02-25 17:40:44 -08:00
Sven Dowideit
c530cd1523 add an index and go make some small tweaks 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-02-26 11:19:14 +10:00
Sven Dowideit
dec31d9cd8 Spelling error in naming the image built 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-02-26 09:51:30 +10:00
Victor Vieux
a114c363b3 start the manager in bg 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-02-24 11:49:53 -08:00
Sven Dowideit
11b2121105 add ./script/doc to build swarm documentation using the docs.docker.com tooling 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-02-24 12:12:23 +10:00