Commit Graph

45228 Commits

Author SHA1 Message Date
Victoria Bialas 1b8578308d Merge pull request #1949 from docker/revert-1669-cloud-docs-with-swarm
Revert "re-organize docker cloud topics, public intro to swarm mode"
2017-02-23 12:06:37 -08:00
Misty Stanley-Jones 6b0a5f9be4 Revert "re-organize docker cloud topics, public intro to swarm mode" 2017-02-23 11:44:11 -08:00
Victoria Bialas 00f7303806 Merge pull request #1669 from londoncalling/cloud-docs-with-swarm
re-organize docker cloud topics, public intro to swarm mode
2017-02-23 11:18:36 -08:00
Victoria Bialas dc699e8558 WIP: re-organize docker cloud topics, public intro to swarm mode
edited screen snap

breaking out topics for Docker Cloud swarm mode

added another where-to-next link

added more where-to-next links

added back in on-page TOC for create swarm topic

incorporated Ryan's review comments on first draft

more Ryan's review comments, sweep thru all for consistency, notoc on short pages, etc.

removed duplicate link to 'create a new swarm in docker cloud'

Laura's comments incorporated

re-organized Cloud topics, added in Swarm Mode

Ryan's review comments on Cloud, added new type of advisory for Beta previews

more review comments, manage infrastructure --> standard mode

fixing image

testing cloud images

updates to Cloud welcome page for Swarm, non-Swarm descriptions

add new cloud repository image

retake of corrupted image

fixed the other instance of corrupted image by referencing the retake

fixing corrupted image on GitHub

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-02-23 10:58:36 -08:00
Victoria Bialas fee69c2c00 Merge pull request #1947 from londoncalling/d4mac-install-links
added link target for legacy system requirements location
2017-02-23 10:52:12 -08:00
Victoria Bialas f877b4ca97 added a link target for legacy location system requirements w/x-ref to new location
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-02-23 10:14:19 -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
scjane a82ee88aa8 Update manage-nodes.md 2017-02-23 17:50:35 +08:00
scjane a90f70e360 Update join-nodes.md (#1936) 2017-02-23 01:27:46 -08:00
scjane e970a64a97 Update create-swarm.md (#1934) 2017-02-23 01:18:15 -08:00
scjane cb79fe5a1a Update create-swarm.md (#1933) 2017-02-23 01:17:02 -08:00
Victoria Bialas b1c3c6d838 more copyedits 2017-02-22 23:57:39 -08:00
Victoria Bialas 10f8f760f7 more copy-edits 2017-02-22 23:56:25 -08:00
Victoria Bialas 21f8c37283 copy-edit 2017-02-22 23:55:11 -08:00
Victoria Bialas a5f09148a5 Merge pull request #1932 from londoncalling/voting-app-graceful-swarm-shutdown
voting app graceful shutdown, d4win compatibility
2017-02-22 23:23:05 -08:00
Victoria Bialas 1d21dea18e voting app graceful shutdown, d4win compatibility
fixed tips and links

copy-edits and re-wording finishing touches

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-02-22 21:27:33 -08:00
Misty Stanley-Jones 80a49f2b51 Merge pull request #1908 from scjane/patch-39
Update FAQ.md
2017-02-22 21:00:32 -08:00
scjane be194a35b4 Update FAQ.md
I wonder how the original blank line in line 48 is missing. Is this incurred by my misoperation? Hard to remember. Anyway, I added the blank line again. Thanks for your careful review.
2017-02-23 11:44:37 +08:00
Victoria Bialas d7e8f8c03d Merge pull request #1930 from londoncalling/d4mac-win-17.03.0-ce-rc1
updates for d4mac, d4win CE v.17.03.0
2017-02-22 17:45:11 -08:00
Victoria Bialas 9490085b32 updates for d4mac, d4win CE v.17.03.0
more updates on d4mac, d4win home pages

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-02-22 17:06:31 -08:00
Viktor Stanchev 42980ee64f document rethinkcli and remove old information (#1845)
* document rethinkcli and remove old information

* document recovering from ha degraded mode #815

* fixes

* fixes

* Improve DTR troubleshoot instructions
2017-02-22 14:09:56 -08:00
John Mulhausen 4d93d1790b Fixes #1887 2017-02-22 13:56:50 -08:00
Misty Stanley-Jones 22e52d7b1b Merge pull request #1924 from docker/1911_fix_grammar
Fix grammar
2017-02-22 13:50:05 -08:00
Misty Stanley-Jones fec7faa051 Merge pull request #1925 from docker/install_doc_grammar_fix
Fix a typo
2017-02-22 13:49:45 -08:00
John Mulhausen 3d0a1d7544 Update manuals.md 2017-02-22 13:44:04 -08:00
Misty Stanley-Jones f1c74e8793 Fix a typo
Just missing a word.
2017-02-22 13:42:48 -08:00
Misty Stanley-Jones de2d6f8191 Fix grammar
Fixes #1911
2017-02-22 13:37:22 -08:00
Avi Miller 828e6212ce Updating the Oracle Linux installation documentation (#1922)
* Updated Oracle Linux instructions

* Change the note about the UEK4, because it's not only required for `btrfs` support
* Added a note about the fact that Oracle also ships a supported package with the same name as upstream
* Added a note about the fact that we've already deprecated docker-engine-selinux
* Added a link to the Oracle Linux Docker User's Guide
* Fixed the GPG key section as it will not be shown during the `makecache fast` run but rather will automatically be accepted when the yum install command is run. 
* Added a note about disabling the `-y` parameter to prevent the automatic acceptance of the upstream GPG key
* Provided the specific GPG key output for better validation
* Provide context about the fact that `docker-engine` exists in the Oracle Linux addons repo as well and may appear in the results of the `yum ilst` command.
* Provide more context for the `btrfs` subvolume removal

* overlay2 is only supported on UEK4

The default RHCK (3.10) does not support overlay2.

Signed-off-by: Avi Miller <avi.miller@gmail.com>
2017-02-22 13:30:50 -08:00
Arun Gupta aa4e3f0b0e Fixing a typo (#1914)
* Fixing a typo

Instructions says to list name but the format lists container id

* Updating command output based upon the request

* Update docker_stats.yaml

Fixing the column name
2017-02-22 13:21:21 -08:00
mw75 dddd864438 Update services.md (#1504)
* Update services.md
2017-02-22 11:15:15 -08:00
scjane 751ef1ac3c Update baseimages.md (#1671)
* Update baseimages.md
2017-02-22 10:56:37 -08:00
scjane dbe18ae730 Update dockerfile_best-practices.md (#1672)
* Update dockerfile_best-practices.md
2017-02-22 10:55:28 -08:00
Misty Stanley-Jones 4576e1a6b7 Merge pull request #1921 from docker/fix-secrets-mode-doc
Fix error about permissions in secrets doc
2017-02-22 10:39:22 -08:00
Nicola Kabar aa4afd975c Update aws.md (#1646)
updated example to reflect new HRM syntax
2017-02-22 10:38:56 -08:00
Misty Stanley-Jones f62ffa929b Merge pull request #1918 from ngratin/add-blank-line
Add blank line
2017-02-22 10:37:46 -08:00
scjane c14c418bbd Update get-help.md (#1910)
* Update get-help.md
2017-02-22 10:29:56 -08:00
Misty Stanley-Jones d2d1d44a09 Merge pull request #1909 from scjane/patch-41
Update FAQ.md
2017-02-22 10:15:12 -08:00
Misty Stanley-Jones 93709c2b12 Merge pull request #1900 from shin-/missing_options_composefileref
Updated miscellaneous list of options for each format
2017-02-22 10:13:39 -08:00
Misty Stanley-Jones 7b24cef2c1 Merge pull request #1880 from scjane/patch-40
Update seccomp.md
2017-02-22 10:08:41 -08:00
scjane e55d2893bf Update trust_delegation.md (#1866)
* Update trust_delegation.md

Fix subject-pronoun disaggrement.
2017-02-22 09:51:49 -08:00
Misty Stanley-Jones 33857cfe29 Tweaks 2017-02-22 09:49:09 -08:00
Misty Stanley-Jones 85bcea8ac1 Fix error about permissions in secrets doc
Also link to a resource for figuring out the right mode, since not all our readers are UNIX gurus.
2017-02-22 09:45:56 -08:00
Misty Stanley-Jones 9578525701 Merge pull request #1853 from knaperek/patch-1
Clarify compatibility of "networks" with more recent versions of compose.
2017-02-22 09:35:06 -08:00
Masafumi Noguchi 839e56255a Add blank line 2017-02-23 00:10:08 +09:00
scjane a72f1e14df Update FAQ.md 2017-02-22 14:35:29 +08:00
scjane 9c142c7912 Update FAQ.md 2017-02-22 14:31:21 +08:00
scjane 80483cd487 Update seccomp.md (#1879) 2017-02-21 18:50:42 -08:00
Victoria Bialas 92b1faffc6 Merge pull request #1906 from londoncalling/voting-app-images-update
adding new images for change in voting app .yml
2017-02-21 18:22:24 -08:00
Victoria Bialas 74ddfa90eb adding new images for change in voting app .yml
finishing touches on documenting updated .yml

modifed more images and text per new .yml config

more updates to images

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-02-21 18:01:50 -08:00