Commit Graph

45211 Commits

Author SHA1 Message Date
Wang Jie b976284958 Update next_steps.md
Change to sentence case.
2017-03-02 11:08:51 +08:00
Victoria Bialas 2f4c941590 Distinguish between cloud stack file and stack file 2017-03-01 17:42:56 -08:00
Victoria Bialas c25049561c Merge pull request #2035 from lukewaite/patch-1
Update docker-machine install instructions to latest version
2017-03-01 15:49:33 -08:00
Misty Stanley-Jones 91d31ead22 Merge pull request #2040 from stickperson/patch-1
Add documentation for mem_swappiness
2017-03-01 15:40:46 -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 2ad2bc5a63 Merge pull request #2041 from docker/2037_upstart
Update info about how to check whether Docker is running
2017-03-01 15:07:48 -08:00
Misty Stanley-Jones 4edeba1d45 Update info about how to check whether Docker is running 2017-03-01 15:05:57 -08:00
Joe Meissler b93760bea5 merge other changes, fix typo 2017-03-01 15:01:26 -08:00
Joe Meissler 32e4923e32 Merge branch 'master' into patch-1 2017-03-01 15:00:00 -08:00
Joe Meissler 963e6b5e6c mem_swappiness for current version and v1 2017-03-01 14:56:18 -08:00
Misty Stanley-Jones fc343a81fc Update to new Docker version scheme (#1926) 2017-03-01 14:52:34 -08:00
Brian Goff d105d415bd List other keyservers to try for cs-engine install (#2033)
* List other keyservers to try for cs-engine install

Sometimes ha.pool.sks-keyservers.net goes down, so let's provide some
other keyservers to try in such cases.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-03-01 14:49:04 -08:00
Joe Meissler 5c87ba4009 Add documentation for mem_swappiness 2017-03-01 14:48:19 -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 e737d24670 Merge pull request #2023 from shalakhin/patch-1
Update networking.md
2017-03-01 14:45:27 -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
Misty Stanley-Jones a3b95e3f0c Merge pull request #1803 from mtoothman/patch-1
Update run.md
2017-03-01 14:24:53 -08:00
Victoria Bialas 1b05f61663 Added "related topics" section 2017-03-01 13:47:13 -08:00
Brian Goff 927f1c5c34 Add release notes for 1.12.6-cs9 (#2028)
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-03-01 12:53:41 -08:00
Wang Jie 8eb744df13 Update create_pr.md (#2014)
Delete an extra space.
2017-03-01 12:28:53 -08:00
Wang Jie 8209346256 Update set_up_dev.md (#2010)
Apply Oxford Comma as described in the documentation guide.
2017-03-01 12:27:53 -08:00
Wang Jie e3b2e032ac Update set_up_dev.md (#2011)
Add periods (.) in some steps.
2017-03-01 12:27:12 -08:00
Wang Jie 6f2d400011 Update work_issue.md (#2013)
Change "id" to "ID" except for those in code.
2017-03-01 12:26:37 -08:00
Wang Jie 766f10be09 Update create_pr.md (#2015) 2017-03-01 12:26:18 -08:00
Wang Jie 713699ccaa Update work_issue.md (#2030)
Change "re-start" to "restart". Though not included in "Prefered usages" in the documentation guide, but I think "restart" is better and used more frequently. Besides, some other docs here, such as "Keep containers alive during daemon downtime" of "Admin Guide", also use "restart".
2017-03-01 12:25:59 -08:00
Luke Waite e70ef7c2f2 Update install instructions to latest version 2017-03-01 10:01:41 -05: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
Matt d53941fa43 Update run.md
Address PR feedback.
2017-02-28 21:30:53 -05:00
Joao Fernandes 2fc462fd70 Update DDC for AWS disclaimer (#2020) 2017-02-28 12:21:34 -08:00
Joao Fernandes d05bb7ca40 DTR 2.2.2 (#2022) 2017-02-28 11:12:42 -08:00
Joao Fernandes 71b9da0844 Update DDC reference urls (#2021) 2017-02-28 11:09:51 -08:00
Olexandr Shalakhin 94cdaba893 Update networking.md
fix typo with triple "m" for command word
2017-02-28 20:58:25 +02: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 b035953c9e Update test-and-docs.md (#1987) 2017-02-27 22:37:27 -08:00
Andy Clemenko 6860680644 "old.example.com.com" --> "old.example.com" (#2008)
Fixing : "old.example.com.com" --> "old.example.com"
2017-02-27 17:15:02 -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
Wang Jie 778400df19 Update test-and-docs.md (#1989) 2017-02-27 13:09:13 -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
Wang Jie 1fc4c36b94 Update test-and-docs.md (#1988)
Apply code style to "hack/make.sh".
2017-02-27 13:07:06 -08:00
Wang Jie 3b25aeda0c Update advanced-contributing.md (#1992) 2017-02-27 13:05:45 -08:00
mike 9fa709ecae Fix sentence. (#1976) 2017-02-27 13:05:13 -08:00
Wang Jie 61492aff33 Update coding-style.md (#1993) 2017-02-27 13:04:33 -08:00