Commit Graph

876 Commits

Author SHA1 Message Date
Misty Stanley-Jones 4c23e132f8 Clarify missing parent images (#2566)
Fixes #636
2017-03-30 15:13:44 -07:00
Misty Stanley-Jones c6aca8acee Improve bootstrap tabs (#2546)
Use data-target instead of href
Move tab-syncing code into site-wide JS so everyone can use it
Add example for syncing tab groups on the same page
2017-03-30 12:57:37 -07:00
Andrew Hsu 19308787ca remove extra slash (#2516)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-03-28 17:49:38 -07:00
Misty Stanley-Jones 78768013fb Clarify what an absolute path looks like on Windows (#2524)
Fixes #561
2017-03-28 17:25:23 -07:00
Misty Stanley-Jones 616c1b5411 Add step to install software-properties-common (#2523)
This is needed for the `lsb_release` command that is used further down the Dockerfile.

Fixes #424.
2017-03-28 17:20:00 -07:00
Misty Stanley-Jones 669b51a889 Fix broken links (#2521) 2017-03-28 16:42:44 -07:00
Victor Vieux ad065409d9 bump api to 1.27 (#2461)
* bump api to 1.27

Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-03-28 09:31:53 -07:00
jgasparetti 38481b0132 Update index.md (#2482)
Fixed version -> version typo
2017-03-28 09:29:45 -07:00
Dave Henderson 0cc0a14596 Renaming README to README.md for better display (#2467)
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
2017-03-28 09:28:02 -07:00
Misty Stanley-Jones cd89f5434d Update URL for Windows binaries, rewrite install.sh topic (#2354) 2017-03-28 09:15:36 -07:00
Misty Stanley-Jones 878670c252 Add instructions for Wheezy to remove the deb-src repo (#2422) 2017-03-28 08:51:39 -07:00
Andrew Hsu ff26006b5c fix instructions for ubuntu to look for deb files (#2507)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-03-27 17:12:04 -07:00
Jim Galasyn 9f8b9d78d5 Fix bridge image (#2502) 2017-03-27 16:53:27 -07:00
Misty Stanley-Jones 269d8e14fb Fix incorrect installation paths for package-based installs (#2479)
Additional edits for consistency
2017-03-27 16:37:57 -07:00
Jim Galasyn d8a53c0677 Fix typo (#2504)
Added "try" per #2204
2017-03-27 16:11:24 -07:00
Victoria Bialas c159f28cea removed on-page TOC (#2487) 2017-03-26 22:49:29 -07:00
İrfan Evrens 7ec65b3c6a deleted unnecessary codes. 2017-03-23 14:56:19 -07:00
Scott Stientjes 7dcc7469b0 Update content_trust.md
Removed "Using default tag: latest" from sample command output.  The testing tag was specified in the command, so it would not being using the default tag.
2017-03-23 14:54:43 -07:00
Elton Stoneman a2d1a8213f Fix Windows container reference (#2426)
Clarified the sentence on running Linux containers on Windows. You can't do that, but you can run Linux containers with *Docker for Windows*, which spins up a Moby VM for Linux containers.
2017-03-22 10:15:02 -07:00
Jim Galasyn 92c641ee2f Change old versions to new for boot2docker version (#2428) 2017-03-21 17:57:25 -07:00
Joao Fernandes 7b90ef4bdc Fix spelling errors (#2409) 2017-03-21 11:49:07 -07:00
Tanguy ⧓ Herrmann 0c789392b1 Typo on storage-driver options in daemon.json (#2419) 2017-03-21 11:45:45 -07:00
Quentin L'eilde 6230ab47e9 update step_three.md (#2391)
* update step_three.md

Update docker hub link by docker store link (docker/whalesay is no more in the results of docker hub search). Would be interesting to update the illustration images with docker store illustrations.

* Update step_three.md
2017-03-20 14:59:11 -07:00
Vishnu Narayanan 0d71b86c0c Improved word usage (#2385) 2017-03-20 14:55:33 -07:00
John Mulhausen 1cad0f77c2 Fix for tabs on Engine API 2017-03-17 13:56:14 -07:00
Alexandre Beslic 1bd064a8a5 Fix typo in SDK list (#2367)
Fix typo `shiplist` -> `shiplift`.
2017-03-17 11:58:34 -07:00
Victoria Bialas 61dff0f8b7 improved bullet formatting (#2372)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-03-17 02:22:01 -07:00
Victoria Bialas 7af98e49bc added Toolbox, Windows 7/8 to node setup (#2369)
* added Toolbox, Windows 7/8 to node setup

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* clarified platform details

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-03-17 01:39:56 -07:00
Matt Bentley 9c74818cf5 Added clarification for deferred deletion (#2266)
Signed-off-by: Matt Bentley <matt.bentley@docker.com>
2017-03-16 20:05:53 -07:00
David Greaves 66996126eb bridge option syntax (#2342)
It seems that the syntax is either:
-b <bridge>
or
--bridge=<bridge>
2017-03-16 20:04:09 -07:00
Misty Stanley-Jones aa6dcc43bc Update systemd.md (#2353)
Addressing feedback in #1997
2017-03-16 14:51:40 -07:00
adamoverton 1a9993c913 fixed typo from adressses to addresses (#2358) 2017-03-16 12:01:43 -07:00
Victoria Bialas 5591401a2d clarified Compose file topic structure, and file examples (#2322)
copyedits, rewrite

fixed some links

simplified/shortened this topic

tweaked description of key, option, value

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-03-15 10:13:11 -07:00
Misty Stanley-Jones fb7c73908b Update the styleguide (#2332)
* Update the styleguide

Also normalize admonition titles with the colon outside the bold.
2017-03-15 09:46:30 -07:00
Ayushya Chitrannsh d0bb393afe Brief introduction of "swarm" (#2299)
Word Swarm has been used here for the first time, and one line introduction, to what swarm is, would be very beneficial in helping to decide where to begin with.
2017-03-14 18:29:40 -07:00
Myles Keating 75e35c58fb Add Microsoft to list of images (#2304) 2017-03-14 18:27:51 -07:00
Sava Gerov 8481cacd3e Add info about check-config.sh (#2106) 2017-03-14 17:11:34 -07:00
lostwong d4822bf8b2 Update step_six.md (#2309)
Minor fix to indicate that the image id is in the third column
2017-03-14 11:10:51 -07:00
Anthony Vanelverdinghe 86fecbb87f Fix typo "visulizer" (#2297) 2017-03-14 10:02:54 -07:00
Anthony Vanelverdinghe d867751f2d Fix typo "commmands" (#2295) 2017-03-14 02:01:25 -07:00
Victoria Bialas 2ffde079d4 updated command variables for consistency (#2282) 2017-03-13 12:04:32 -07:00
Danny Ruiz 2452effd33 Fix wording in secrets.md (#2272) 2017-03-13 11:54:17 -07:00
Brian Goff dd0207cf47 Remove logdriver details for NATS (#2240)
The NATS driver was never integrated into Docker and should not be in
the docs.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-03-10 12:37:23 -08:00
Roman Hotsiy c6c3476c6c Upgrade to ReDoc 1.11.0, closes #2246 (#2249) 2017-03-10 11:53:37 -08:00
Victoria Bialas 5756339274 updated links to Docker for Mac and Windows install (#2248) 2017-03-09 23:40:03 -08:00
John Mulhausen 1127efaa78 Update ubuntu.md 2017-03-09 17:36:37 -08:00
Alan Thompson 5ce24b0587 Update work-with-networks.md (#2236)
Clarify what is being connected to the network.
2017-03-09 17:10:04 -08:00
Victoria Bialas 7ea080d16e Merge pull request #2244 from londoncalling/single-node-swarm
added instructions on removing an app
2017-03-09 16:53:39 -08:00
Alan Thompson dfd33195bd Update work-with-networks.md (#2235)
Fix typo 3 -> 4.  Add clarification that we are using container4 to ping container4.
2017-03-09 16:46:28 -08:00
Victoria Bialas f9c2eef3ba added instructions on removing an app
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-03-09 16:41:20 -08:00
Misty Stanley-Jones c9ac1eedeb Merge pull request #2215 from cloojure/patch-2
Update work-with-networks.md
2017-03-09 15:50:35 -08:00
Misty Stanley-Jones 7a61d77d70 Merge pull request #2214 from cloojure/patch-1
Update work-with-networks.md
2017-03-09 15:49:06 -08:00
Misty Stanley-Jones 566110ba4e Merge pull request #2112 from delfuego/patch-1
Remove incorrect iptables-related information
2017-03-09 15:33:32 -08:00
Victoria Bialas bf36662513 changed rm images example to rmi
updated to include both commands

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-03-08 20:31:24 -08:00
Alan Thompson 317a695a03 Update work-with-networks.md
grammer error
2017-03-08 19:09:27 -08:00
Alan Thompson 1dbafefda6 Update work-with-networks.md
small typo
2017-03-08 18:57:25 -08:00
Victoria Bialas 26f0144dc6 tip re: Windows encoding errors on file downloads
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-03-08 17:53:09 -08:00
Victoria Bialas 051fcffccb copy-edit, more explanation on command line savvy 2017-03-08 16:54:06 -08:00
Roman Vynar 504fdf9295 Fix the command for generating content trust delegation cert. (#2163) 2017-03-08 14:29:36 -08:00
Victoria Bialas a08459dd67 updates to voting app intro, moved services descriptions under config file topic
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-03-08 13:23:40 -08:00
Misty Stanley-Jones d8e65c68b5 Fix repo paths in SLES instructions 2017-03-08 10:20:00 -08:00
Victoria Bialas 4e0c5c2ccc Explained deploy key for services not in example 2017-03-07 19:18:26 -08:00
Victoria Bialas 2b3bdf94d7 simplify, clarify, and improve intro to voting app
clarified details on which method we'll use to log into nodes

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-03-07 18:21:14 -08:00
Misty Stanley-Jones a1ed9bd5db Merge pull request #2074 from Djelibeybi/patch-1
Update upstream package names
2017-03-07 15:36:31 -08:00
Ivan Ivanov 69f4cb34ab Update consistency of <manager-IP>:<port> (#2117)
This is the same issue as the page "Try it out and vote". I have updated the consistency of format to be the same through all pages. (and I hope I do not overdo these small things, but I just like the ease of proposing changes to the documentation and I hope that it is getting better this way)
2017-03-06 12:01:45 -08:00
Ivan Ivanov 5ee2ad9a8c Update consistency of <manager-IP>:<port> (#2111)
On the "Sample app overview" page all blocks of IP address and port are shown as <manager-IP>:5000 or <manager-IP>:5001.
On this page "Try it out and vote" I see some inconsistency of these forms and fixed them, because I think the style format must be in the form "<manager-IP>:5000", e.g., colon after character ">".
2017-03-05 07:49:25 -08:00
Jason Levine ee05ddfb21 Remove incorrect iptables-related information
At the current time, Docker flushes any pre-existing DOCKER and DOCKER-ISOLATION chains, meaning that the previous advice was misleading and led users in the wrong direction regarding restricting access to containers via iptables.
2017-03-04 19:17:01 -05:00
Ivan Ivanov 3b57a7ca71 FIX Duplicate "are" (#2110)
"on Mac and Windows are are as follows"
Removed the duplicated "are".
2017-03-04 15:06:23 -08:00
Victoria Bialas 2910fd413e clean up code and images
simplified stack file sample and instructions

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-03-03 16:51:22 -08:00
John Mulhausen 81de59357a Update overview.md 2017-03-03 13:31:23 -08:00
Ivan Ivanov 4e09a4ab2b 2 small changes (#2091)
"(indicated by the stretch suffix on the version, in this example)"
The example uses jessie, not stretch.

"change the word stable in the > URL to edge"
I do not know why this character ">" appeared, maybe it is a mistake and I have removed it?
2017-03-03 12:15:05 -08:00
travisjs 0647b485c5 Update step_six.md (#2095)
* Update step_six.md

I need to add the -f option to remove image, otherwise: Error response from daemon: conflict: unable to delete e867bc17a0bb (must be forced) - image is referenced in multiple repositories

* Fix for image remove command
2017-03-03 12:12:46 -08:00
Ivan Ivanov 02f2717eed 3 typo changes (#2093)
```bash
    sudo nano /etc/docker/daemon.json
    ```
Here a $ sign is missing and the command in the web site appears as "bash sudo nano /etc/docker/daemon.json", which is not correct. It shoud look like: "$ sudo nano /etc/docker/daemon.json".

"which is 2375 if you do not use TLS, and 2376 if you do."
On all other lines the ports are in backquotes, so I have added backquotes here also.

"In this case, steps 3 and 4."
Missing verb like "repeat", I have added it.
2017-03-03 12:09:25 -08:00
Misty Stanley-Jones 8d9e90a6cd Lots of formatting fixes to do with buttons 2017-03-02 15:51:17 -08:00
Avi Miller 6ee54bab0f Update upstream package names
Oracle Linux never shipped the upstream (RHEL) Docker packages but did ship `docker-engine-selinux` which would need to be removed.

Though, given the new Docker EE/CE naming convention, yum would just replace any existing `docker-engine` and `docker-engine-selinux` packages anyway.
2017-03-03 09:51:46 +11:00
John Mulhausen e571acab56 Merge pull request #2066 from canzanos/patch-1
Update step_four.md
2017-03-02 12:56:37 -08:00
Misty Stanley-Jones ef93f3ecd2 Merge pull request #2068 from mstanleyjones/fix_matrix
Fix platform matrix table
2017-03-02 12:53:19 -08:00
Misty Stanley-Jones aef34f101c Fix platform matrix table 2017-03-02 12:22:31 -08:00
Paul V. Novarese 668629441f s/Ubuntu/CentOS/ (#2057) 2017-03-02 11:54:56 -08:00
John Mulhausen 7f5915dcdd Merge pull request #2047 from ansmirnov/patch-1
Fixed error in link
2017-03-02 11:07:05 -08:00
Stephen Canzano 74395f9c69 Update step_four.md 2017-03-02 13:31:58 -05:00
David Xia 142e4a95bb
Fix typo in networking docs
should be "nameserver" instead of "server."
2017-03-02 13:23:27 -05:00
Misty Stanley-Jones cc4d70cf78 Fix yum variables again 2017-03-02 08:36:46 -08:00
Misty Stanley-Jones 8f3267b9b0 Correction to Yum variable 2017-03-02 06:53:44 -08:00
Misty Stanley-Jones 3108d86b6d Docker 17.03 release (#2050)
* First pass of tabs-based organization

* Improvements

* Second pass at tabs org

* Move tab highlighting to Liquid instead of JS

* Adding forwarding links for in-product TOCs

* Move to pre-rendered left-navs instead of post-load JS for TOC sync

* Optimizations and nosync-ing the Reference section

* Optimizations, fix Cloud YAML

* Make a "Sample applications" node

* Update index.md

* Tabs CSS fixes and 12-factor reposition

* Theme Start (#1709)

* Hooking up nav to real TOC data, formatting fixes

* Fixing JS error

* Layout updates, dark themes, tons o stuff (#1971)

* Add cookie saving for day/night mode

* Newsite tabs (#2004)

* Layout updates, dark themes, tons o stuff

* Update themes

Theme updates + scaffolding

* Update style.css

* Update style-alt.css

* Missing font fixes

* Import Open Sans from Google

* Font fix, archive removal in TOC, favicon, Feedback img fix

* Oops, returning -webkit-font-smoothing: antialiased;

* Add old favicon.ico

* Make archives a non-tiered link

* Reorder docs archive to newest-first, add local instructions

* Commenting out day/night switch for now

* Fix 'rate this page'

* Rate this page fixes

* Autocomplete and Docker Cloud fixes

* Open tree to current page

* Adding indentation for nav collapse in

* Ensure left nav visibly displays the current topic

* Update flex layout

- adjust rescale
- code block styles

* add focus to search

- force code block color (for now)
- increase section max-width

* increase content padding

- add padding to toc for wrapping long strings.

* grid adjustment

- grid
- content and wrapper adjustments for mobile

* left/right sidebar adjustments

- refine position on scroll for toc on landing

- add default height to compensate for upcoming position absolute
onScroll

* side bar overflow

- hidden on X-scroll

* fix version button

- override bstrap defaults

* tabs + buttons

* update landing svgs

* fix sidebar height

set to 100% on landing pre-affix

* Update blurb about engine/editions on front page

* add side menu to mobile collapse menu

* update classnames

* overall mobile tweaks

* Right-nav highlighting and auto-scroll

* Slightly slower right-nav highlighting, correct version

* add toggle menus for small devices

* Fixing JS error/Docker 1.13>17.03

* header updates

* re-add fan to header

* update transition time

* Add first 20 words to Twitter card

* fixed width of components

- lockdown elements on rescale (wil need more TLC)

* set max-width of content

* Left and right nav resizing w/footer scroll and window resize

* update links on landing page

* Fix for overzealous resizing, JS redundancies

* Fix for JS error on homepage

* JS error fixes

* toggle adjustments

- wrap toggle button

* add tab width

* version button type

* version button both headers

* tabs - fix typo

* landing page grid

* components

* Share images, JS fixes, Marketo removal

* Anchor links fix

* Fix for black space on mobile

* Restore hamburger (partial)

* Update run.md

Minor grammar cleanup.

* Update apparmor.md

I'm a little confused about which one is better to be used here, a period (.) or a colon (:),  as a command is given below. Or both are OK, and we only have to keep consistency in a single page.

* Update apparmor.md

Fixed the indentation for the codeblock (indented by 4 spaces). Thank you for your careful review.

* Replacing service with secret

* Update networking.md

fix typo with triple "m" for command word

* Update run.md

Address PR feedback.

* Update install instructions to latest version

* Added "related topics" section

* Add documentation for mem_swappiness

* Update to new Docker version scheme (#1926)

* mem_swappiness for current version and v1

* merge other changes, fix typo

* There is no OpenSuSE and there never was

though we had SuSE and S.u.S.E.

* Add release notes for 1.12.6-cs9 (#2028)

Signed-off-by: Brian Goff <cpuguy83@gmail.com>

* need sudo to access key cache (#1931)

* need sudo to access key cache

* 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>

* 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".

* Update create_pr.md (#2015)

* Update work_issue.md (#2013)

Change "id" to "ID" except for those in code.

* Update set_up_dev.md (#2011)

Add periods (.) in some steps.

* Update set_up_dev.md (#2010)

Apply Oxford Comma as described in the documentation guide.

* Update create_pr.md (#2014)

Delete an extra space.

* 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.

* Update content_trust.md (#1912)

* Update content_trust.md

* update deprecation policy

Signed-off-by: Victor Vieux <victorvieux@gmail.com>

* Update info about how to check whether Docker is running

* Updated docs to reflect edge channel

Signed-off-by: French Ben <frenchben@docker.com>

* Updated wording for SP creation

Signed-off-by: French Ben <frenchben@docker.com>

* beta to edge, cloud features first draft

added cloud images

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* Distinguish between cloud stack file and stack file

* Added EE links

Signed-off-by: French Ben <frenchben@docker.com>

* Use variables

Signed-off-by: French Ben <frenchben@docker.com>

* Replace deprecated MAINTAINER with LABEL (#1445)

Replace MAINTAINER instruction with LABEL as MAINTAINER was deprecated in https://github.com/docker/docker/pull/25466

* Updates for Docker CE and Docker EE

* Updated DDC launch button

Signed-off-by: French Ben <frenchben@docker.com>

* added Docker Cloud topics for Mac and Windows

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* d4mac, d4win stable and beta release notes for 17.03.0

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-03-02 05:54:49 -08:00
Andrey S 476cfa4449 Fixed error in link 2017-03-02 12:35:14 +04: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
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
scjane 39eb8edf8a Update apparmor.md
Fixed the indentation for the codeblock (indented by 4 spaces). Thank you for your careful review.
2017-02-23 14:03:06 +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 22e52d7b1b Merge pull request #1924 from docker/1911_fix_grammar
Fix grammar
2017-02-22 13:50:05 -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
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 7b24cef2c1 Merge pull request #1880 from scjane/patch-40
Update seccomp.md
2017-02-22 10:08:41 -08:00