centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-04-05 18:58:55 +07:00
Code Issues Packages Projects Releases Wiki Activity
45,223 Commits 56 Branches 28 Tags
a6ce22e76da44c7fa89bd099a2ecf33e8bc9fa8d
Commit Graph

693 Commits

Author SHA1 Message Date
Misty Stanley-Jones
33328e5761 Escape some Go formatting code 2017-03-06 09:54:28 -08:00
Misty Stanley-Jones
405d44a077 Fix URLs for docs-hosted repo files for 1.13 in archive 2017-03-06 09:29:02 -08:00
John Mulhausen
62fc540785 Preparing v1.13 archive 2017-03-02 13:38:28 -08:00
Victoria Bialas
61e9f0c82f Merge pull request #2042 from londoncalling/clarify-docker-stack-deploy-voting-app 
clarified docker stack deploy and bundles
 2017-03-01 22:16:01 -08:00
Michael Pereira
85ada8850d Replace deprecated MAINTAINER with LABEL (#1445) 
Replace MAINTAINER instruction with LABEL as MAINTAINER was deprecated in https://github.com/docker/docker/pull/25466
 2017-03-01 19:54:22 -08:00
Victoria Bialas
09c432495f clarified docker stack deploy and bundles 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2017-03-01 18:30:48 -08:00
Misty Stanley-Jones
a7c813fe63 Merge pull request #2007 from vieux/update_deprecation_policy 
update deprecation policy
 2017-03-01 15:25:15 -08:00
Victor Vieux
ee33fb65a0 update deprecation policy 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2017-03-01 15:20:22 -08:00
Misty Stanley-Jones
4edeba1d45 Update info about how to check whether Docker is running 2017-03-01 15:05:57 -08:00
Misty Stanley-Jones
f3cddaad80 Merge pull request #2032 from ralflang/patch-2 
There is no OpenSuSE and there never was
 2017-03-01 14:46:08 -08:00
Misty Stanley-Jones
0ef0fc321b Merge pull request #1985 from mkalish/patch-1 
Replacing service with secret
 2017-03-01 14:33:54 -08:00
Eli Flanagan
25781d61d5 need sudo to access key cache (#1931) 
* need sudo to access key cache
 2017-03-01 14:31:49 -08:00
Wang Jie
670a2d580a Update content_trust.md (#1912) 
* Update content_trust.md
 2017-03-01 14:30:00 -08:00
Wang Jie
63bd8f6d41 Update trust_key_mng.md (#1883) 
* Update trust_key_mng.md

* Update trust_key_mng.md

I don‘t know how the whitespace appears, and it seems that it appears because something happened related to its original format (right-aligned pipe characters) and my change. Still unknown. 

Now I've deleted some redundant whitespace.

* Update 

I don‘t know how the whitespace appears, and it seems that it appears because something happened related to its original format (right-aligned pipe characters) and my change. Still unknown. 

Now I've deleted some redundant whitespace.
 2017-03-01 14:27:47 -08:00
Misty Stanley-Jones
9122e75ca5 Merge pull request #1877 from scjane/patch-38 
Update apparmor.md
 2017-03-01 14:26:37 -08:00
Ralf Lang
9c37a97721 There is no OpenSuSE and there never was 
though we had SuSE and S.u.S.E.
 2017-03-01 15:07:20 +01:00
Wang Jie
de9a0b0fc0 Update index.md (#1965) 
Is a "delete" missing here? Or, shall we change this to "connect containers to and disconnect from it"?
 2017-02-27 22:39:26 -08:00
Wang Jie
cd410b5cee Update btrfs-driver.md (#1963) 
It seems that some word is missing. Added a "for".
 2017-02-27 22:38:22 -08:00
Wang Jie
31d10935fb Update scale-service.md (#1961) 
Deleted "you can" because it shoud be "you must" in fact, so use imperative instead.
 2017-02-27 13:11:01 -08:00
Wang Jie
b7bb7a29c2 Update swarm_manager_locking.md (#1960) 
Modified the "Warning" style to comform to the style described in "Notes" in the documentation guide.
 2017-02-27 13:10:15 -08:00
Wang Jie
0f762d3d5a Update swarm_manager_locking.md (#1959) 
Deleted an extra "you".
 2017-02-27 13:09:45 -08:00
olivierperes
73c903a9e0 Fix docker-machine stop (#1975) 
The current version stops the worker twice. If I understand correctly, it should be: stop worker, then stop manager.
 2017-02-27 13:08:40 -08:00
mike
9fa709ecae Fix sentence. (#1976) 2017-02-27 13:05:13 -08:00
Wang Jie
1e03ea30b2 Update trust_sandbox.md (#2000) 
Should it be "Now, you xxx" or "Now that you xxx"?
 2017-02-27 12:59:15 -08:00
Michael Kalish
5d83182b65 Replacing service with secret 2017-02-26 18:04:55 -05:00
Victoria Bialas
b50a948cd1 removed Tip on setting env variables, not needed 2017-02-26 02:51:45 -08:00
Victoria Bialas
c3d60c11e3 feedback on PowerShell env setup, clarified env vs. ssh 
copyedits for Mac and Windows distinctions

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2017-02-26 02:18:38 -08:00
scjane
41d57e3ba0 Update trust_sandbox.md (#1966) 
Added a colon (:). But I'm not sure whether a period (.) is more appropriate here.
 2017-02-24 13:53:39 -08:00
scjane
a1f580fb11 Update admin_guide.md (#1967) 2017-02-24 13:51:18 -08:00
scjane
ad5ddc3f76 Update admin_guide.md (#1968) 
* Update admin_guide.md

Fixed an invalid link.

* Update admin_guide.md
 2017-02-24 13:50:20 -08:00
Victoria Bialas
e6ef517148 fixed link to .yml example file 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2017-02-23 23:56:01 -08:00
Victoria Bialas
d314a49671 copy-edit to remove extra backtick in command 2017-02-23 18:48:07 -08:00
Victoria Bialas
e7791c4c76 updated note re: virtualbox download 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2017-02-23 18:21:45 -08:00
Victoria Bialas
5f152ba7d9 Merge pull request #1952 from londoncalling/swarm-tutorial-onpage-links 
swarm mode tutorial improvements
 2017-02-23 18:10:01 -08:00
Victoria Bialas
7aaf72119d updated swarm and voting app tutorials per d4mac, d4win, toolbox and driver issues 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2017-02-23 17:48:22 -08:00
Misty Stanley-Jones
2c1309d80d Merge pull request #1944 from hobti01/patch-1 
Add troubleshooting tip for default https port
 2017-02-23 17:03:17 -08:00
Misty Stanley-Jones
eb43f86a67 Merge pull request #1941 from scjane/patch-50 
Update nodes.md
 2017-02-23 17:02:17 -08:00
scjane
52451c4bad Update manage-nodes.md (#1939) 
* Update manage-nodes.md
 2017-02-23 17:01:41 -08:00
Misty Stanley-Jones
a0e23cc131 Merge pull request #1938 from scjane/patch-48 
Update manage-nodes.md
 2017-02-23 16:57:09 -08:00
scjane
1ad3112d03 Update rolling-update.md (#1935) 
* Update rolling-update.md
 2017-02-23 16:56:13 -08:00
Brian Kaufman
b6953e5b22 Step 14 incomplete (#1916) 
* Step 14 incomplete

Mention of a daemon file but its exact location is absent , I've added this in
 2017-02-23 16:36:23 -08:00
Brian Kaufman
966fcfc6db Step 2 is incomplete (#1915) 
* Step 2 is incomplete

Step 2 asks you to install the LVM2 package however instructions on how to do this are missing. I've added that in for completeness.
 2017-02-23 16:31:29 -08:00
Victoria Bialas
d4add4ee20 swarm mode tutorial improvements 
modified what's next link to map to left nav TOC

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2017-02-23 15:21:31 -08:00
scjane
16f87ee78f Update etwlogs.md (#1942) 2017-02-23 14:25:22 -08:00
scjane
71ccca95b9 Update join-nodes.md (#1937) 2017-02-23 14:24:52 -08:00
Victoria Bialas
be40ae6369 Merge pull request #1950 from londoncalling/voting-app-tweaks 
tweaked note re: d4win on sample workflow
 2017-02-23 12:55:34 -08:00
Victoria Bialas
3181700000 Re-wording, simplify 2017-02-23 12:54:30 -08:00
Victoria Bialas
735a09c391 tweaked note re: d4win on sample workflow 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2017-02-23 12:39:15 -08:00
Tim H
d636c8781d Add troubleshooting tip for default https port 
Rename the CA certificate file to ca.crt: It is not the cert of the server, but of the CA.
 2017-02-23 13:42:51 +01:00
scjane
18a0f31566 Update nodes.md 2017-02-23 18:30:52 +08:00