Commit Graph

48946 Commits

Author SHA1 Message Date
Tammy Fox
33ef8ed45b Merge pull request #7135 from ollypom/updateeeversions
Update Variables to UCP 3.0.3
2018-08-24 16:58:43 -04:00
Tammy Fox
a7d8859020 Merge pull request #7205 from ollypom/offlinebundless
Updated UCP 3.0.4 offline bundles
2018-08-24 16:44:03 -04:00
Tammy Fox
c2e0da725b Merge pull request #7176 from carlfischer1/patch-6
extend description of Windows Server 1709 and 1803
2018-08-24 16:19:19 -04:00
Tammy Fox
a7cf91064f Merge branch 'master' into patch-6 2018-08-24 16:19:12 -04:00
Tammy Fox
0ab7b3d96f Merge pull request #7251 from bitmonk/patch-1
Remove out-of-date note about Kubernetes
2018-08-24 16:18:08 -04:00
Tammy Fox
d1c0f96fb2 Merge pull request #7261 from docker/bermudezmt-patch-3
Formatting and grammar updates
2018-08-24 16:17:16 -04:00
Tammy Fox
beb7383d74 fix liquid tag 2018-08-24 16:16:43 -04:00
Tammy Fox
bf14bccb6f put warning example in code block 2018-08-24 16:15:04 -04:00
Tammy Fox
e4afd61727 Merge pull request #6972 from carlfischer1/patch-4
Update Windows install instructions to support multiple channels
2018-08-24 16:11:37 -04:00
Tammy Fox
6cafc370d6 don't link to "here" 2018-08-24 16:11:15 -04:00
Tammy Fox
c186d7aa6c Merge pull request #7234 from docker/bermudezmt-patch-1
Reflect name change from IBM z Systems to IBM Z
2018-08-24 12:53:37 -04:00
Tammy Fox
c5712d0545 Merge pull request #7260 from docker/bermudezmt-patch-2
Remove DockerCon '18 SF advert from site
2018-08-24 12:52:29 -04:00
Maria Bermudez
55d6ea8cbf Formatting and grammar updates
- Update phrasing on "Manage Docker as a non-root user"
- Make "Docker daemon" usage consistent
- Update systemd vs daemon.json formatting
2018-08-23 16:35:55 -07:00
Maria Bermudez
05886b2dde Remove DockerCon '18 SF advert from site 2018-08-23 12:32:36 -07:00
Tammy Fox
51cb6c2de1 Merge pull request #6950 from bjsun/patch-2
fix: configuration reference link
2018-08-22 14:29:14 -04:00
Maria Bermudez
7b5e8b7aff Revert absolute path change
Existing link works on docs.docker.com
2018-08-21 15:50:35 -07:00
Justin Alan Ryan
e1dcb93035 Remove out-of-date note about Kubernetes
The documentation for the current stable release insists that Kubernetes is only available in Edge, which is confusing as the current stable release is an entire major version newer than the Edge version in which Kubernetes was introduced.

This blurb is easily enough removed. :)
2018-08-21 13:49:23 -07:00
ollypom
61b5f1302f Added 2.0.4
Signed-off-by: ollypom <oppomeroy@gmail.com>
2018-08-21 19:03:49 +01:00
ollypom
b9c4dde620 Add UCP 2.2.12
Signed-off-by: ollypom <oppomeroy@gmail.com>
2018-08-21 19:02:32 +01:00
ollypom
696678b5e4 Moved to 3.0.4
Signed-off-by: ollypom <oppomeroy@gmail.com>
2018-08-21 19:02:32 +01:00
ollypom
7a558ebb3b Update DTR ver
Signed-off-by: ollypom <oppomeroy@gmail.com>
2018-08-21 19:02:32 +01:00
ollypom
b3d3c8d03e Updated EE Versions
Signed-off-by: ollypom <oppomeroy@gmail.com>
2018-08-21 19:02:32 +01:00
Maria Bermudez
7a9bc8d212 Reflect name change from IBM z Systems to IBM Z
See the change details here: https://en.wikipedia.org/wiki/IBM_Z
2018-08-20 10:28:09 -07:00
Tammy Fox
1d6f60124d Merge pull request #7018 from javabrett/depends_on-anchor
Fixed anchor error #depends-on -> #depends_on.
2018-08-17 23:28:06 -04:00
Maria Bermudez
68593a7d59 Grammatical and spelling updates
- Fix misspelling
- Remove unnecessary comma
2018-08-17 17:44:52 -07:00
Tammy Fox
fb9f81bfea Merge pull request #7230 from docker/tfoxnc-patch-1
clarify --external-server-cert description, fix syntax highlighting
2018-08-17 18:46:53 -04:00
Tammy Fox
3bc455cedc clarify --external-server-cert description, fix syntax highlighting 2018-08-17 18:08:56 -04:00
Maria Bermudez
17fa6162ef Merge pull request #7008 from darwin-traver/patch-4
Ubuntu 18.04 support added in 18.03.1-ee-1
2018-08-17 15:03:49 -07:00
Maria Bermudez
4dc15233cb Update release-notes.md
- Reviewed Compatibility matrix to confirm support.
- Added a period for consistency.
2018-08-17 14:53:19 -07:00
Sebastiaan van Stijn
4608b0a8fb Merge pull request #7207 from tlvince/patch-1
Fix rm removes typo
2018-08-12 12:01:27 +02:00
Tom Vincent
1d5d5cb29c Fix rm removes typo 2018-08-12 10:37:34 +01:00
ollypom
2b7a0845ba Add UCP 2.2.12
Signed-off-by: ollypom <oppomeroy@gmail.com>
2018-08-10 15:34:42 +01:00
ollypom
061449cc75 Updated 3.0.4 offline bundles
Signed-off-by: ollypom <oppomeroy@gmail.com>
2018-08-10 13:34:50 +01:00
Brett Randall
8d8b00b2d2 Fixed anchor error #depends-on -> #depends_on.
Target https://docs.docker.com/compose/compose-file/#depends_on .

Signed-off-by: Brett Randall <javabrett@gmail.com>
2018-08-10 19:21:38 +10:00
Tammy Fox
daa3aebf88 Merge pull request #7196 from millerdz/patch-5
updating link to engine specs
2018-08-09 17:51:39 -04:00
Tammy Fox
53f4908143 Merge pull request #7197 from docker/tfoxnc-patch-1
updating wording from wsong
2018-08-09 16:55:32 -04:00
Tammy Fox
4a80e2a146 updating wording from wsong 2018-08-09 16:54:49 -04:00
Derrick Miller
09bdf7d4b1 updating link to engine specs
link was redirecting to CE engine page. the link has been fixed to redirect to the EE engine page.
2018-08-09 15:15:50 -04:00
Tammy Fox
71e720a3d6 Merge pull request #7194 from docker/tfoxnc-patch-1
add known issue
2018-08-09 14:28:14 -04:00
Tammy Fox
3db96f6368 add known issue 2018-08-09 14:27:56 -04:00
Tammy Fox
c5f6ba391a Merge pull request #6844 from darwin-traver/patch-2
Content Trust link update
2018-08-09 13:33:58 -04:00
Tammy Fox
0e8265fa7c fix url format 2018-08-09 13:33:42 -04:00
Tammy Fox
4665d5d4b7 Merge pull request #7192 from docker/tfoxnc-patch-1
release notes for 2.2.12 and 3.0.4
2018-08-09 12:05:19 -04:00
Tammy Fox
3c90daa8f5 Merge pull request #7193 from docker/tfoxnc-patch-2
update command per wsong
2018-08-09 11:59:29 -04:00
Tammy Fox
a40b365e92 update command per wsong 2018-08-09 11:41:46 -04:00
Tammy Fox
ab8dde9f72 update article link 2018-08-09 11:34:00 -04:00
Tammy Fox
3771b98879 release notes for 2.2.12 and 3.0.4 2018-08-09 09:22:48 -04:00
Tammy Fox
806f138b05 Merge pull request #7152 from squizzi/patch_clarify-255-char-limit
[manage-images] Clarify character limitations on image names
2018-08-07 11:40:00 -04:00
Tammy Fox
fbbe0ccddd fix formatting 2018-08-06 22:45:21 -04:00
Tammy Fox
10eb33ab91 Merge pull request #7116 from omegamormegil/patch-5
Linked to UCP and DTR LB requirements
2018-08-06 22:24:46 -04:00