Andy De George
b36cc1d36e
Adjust title to clarify ASP.NET Core and not .NET Core
...
We had an [issue over on the .NET Core documentation](https://github.com/dotnet/docs/pull/13278 ) regarding Docker where someone was confused about .NET Core vs ASP.NET Core and pointed out that this article used the terms interchangeably. I wanted to submit this fix to hopefully reduce that.
I also:
1. Removed the en-us from links.
2019-07-09 08:31:28 -07:00
Usha Mandya
efb42e4d36
Merge pull request #1256 from ollypom/fixinterlockliquid
...
Fixed Liquid Errors in Assemble and Interlock
2019-07-09 16:18:59 +01:00
Olly Pomeroy
6d18b4af8d
Fixed Liquid Errors in Assemble and Interlock
...
Signed-off-by: Olly Pomeroy <olly@docker.com>
2019-07-09 15:46:37 +01:00
Dawn W
f27ff20502
Merge pull request #1254 from ollypom/docsprivatemaster
...
docker.github.io master into docs-private master
2019-07-08 14:43:41 -07:00
Sebastiaan van Stijn
3b904e7a9f
Merge pull request #8582 from thaJeztah/host_networking_nits
...
Host networking touch-ups
2019-07-08 20:08:48 +02:00
Dawn W
eecdc294d9
Merge pull request #8979 from ollypom/sessiontimeoutpatch
...
Updated the UCP Configuration Timeout Settings
2019-07-08 10:18:10 -07:00
ollypom
9bafc04bcc
Fixed Conflict
2019-07-08 17:00:49 +00:00
Dawn W
4c79976483
Merge pull request #9007 from gprossliner/patch-1
...
Update index.md
2019-07-08 06:33:42 -07:00
Sebastiaan van Stijn
25cab04026
docker-compose: change overview from /compose/overview to /compose/ ( #8939 )
...
Move compose/overview to compose/
2019-07-08 11:40:00 +01:00
Ray Tung
bcf001161d
Update fluentd.md
...
Corrected default fluentd-max-retries
2019-07-07 22:21:49 +10:00
Robert Cohn
02cf8cf5b5
recommend overlay2
2019-07-03 14:55:30 -04:00
Dawn W
b18887805e
Merge pull request #9000 from RomainBelorgey/patch-1
...
Add changes for 18.09 version
2019-07-02 08:47:20 -07:00
Sebastiaan van Stijn
cc5aa64002
Merge pull request #9018 from nirajrules/patch-1
...
The notary config file section had a comma missing
2019-07-02 16:49:11 +02:00
Ulrich VACHON
3b9275c191
Release notes for 2.0.5.0 (Edge/Mac) ( #8937 )
...
Docker Desktop for Mac Edge 2.0.5.0 rel notes
2019-07-02 13:43:07 +01:00
Guillaume Tardif
6c64d5d4c5
Release notes for 2.0.5.0 (Edge) cc @gbarr01 ( #8926 )
...
Docker for win edge rel notes 2.0.5.0
2019-07-02 13:42:32 +01:00
Olly Pomeroy
6f34bb896b
Reorded the text, putting 18.09 instructions first
...
Signed-off-by: Olly Pomeroy <olly@docker.com>
2019-07-02 13:28:04 +01:00
Olly P
9878f22b17
Formatting nit
2019-07-02 10:00:19 +01:00
Jason Harrison
a931764c48
Improve grammar
2019-07-01 20:22:59 -04:00
nirajrules
db7d8d4b3f
The notary config file had a comma missing
...
Docker SA from South East
2019-07-01 18:23:21 -04:00
Usha Mandya
67be573f69
Merge pull request #9016 from ollypom/ucpconfigfilepatch
...
UCP Config File Patch
2019-07-01 15:16:55 +01:00
Usha Mandya
ab86c1c4cb
Merge pull request #9015 from ollypom/patchrelnotes
...
Patch for June Release Notes
2019-07-01 15:15:36 +01:00
ollypom
a6d08a9631
Fixed formatting error on user workload defaults
2019-07-01 14:05:37 +00:00
Sajad Torkamani
62e57571dc
Fix typo
2019-07-01 13:00:23 +01:00
Sebastiaan van Stijn
aaa2ecf8e0
Merge pull request #9013 from sajadtorkamani/patch-1
...
Fix typo
2019-07-01 12:47:59 +02:00
Sajad Torkamani
fb98aae971
Fix typo
2019-07-01 11:25:31 +01:00
ollypom
1d6bc9332c
Patch for June Release Notes
...
* Fixed broken link in UCP Rel Notes
* Fixed x.y.z naming in Engine Rel Notes
2019-06-29 12:06:42 +00:00
gprossliner
cdc8b16d69
Update index.md
...
See issue #9001 for details.
2019-06-28 12:31:18 +02:00
Dawn W Docker
15491655f2
fixing broken toc
2019-06-27 15:39:07 -07:00
Usha Mandya
38d7ab6d47
Merge pull request #8982 from ollypom/kubernetesnetworkingprereqs
...
Updated UCP Kubernetes IP ranges
2019-06-27 20:44:18 +01:00
Usha Mandya
7fac809ba8
Merge pull request #8980 from ollypom/ucp318configfilepatch
...
Added UCP 3.1.8 Configuration file and CLI reference
2019-06-27 20:43:38 +01:00
Alastair Smith
ee40a58807
fix ToC bug
2019-06-27 14:08:29 -05:00
Usha Mandya
6cc323e935
Merge pull request #8977 from usha-mandya/patch-06-2019
...
June patch release notes
2019-06-27 19:03:47 +01:00
Usha Mandya
44c5ca316a
Update engine/release-notes.md
...
Co-Authored-By: Kirill Kolyshkin <kolyshkin@users.noreply.github.com>
2019-06-27 18:50:16 +01:00
Dawn W
ebea0bc527
Merge pull request #8999 from xinfengliu/patch-4
...
Refine release notes on docker/orca#16122
2019-06-27 08:08:58 -07:00
Dawn W
96fe4faa54
Merge pull request #9002 from stevenfollis/patch-3
...
Added pre-req for Static IPs
2019-06-27 08:08:23 -07:00
Dawn W
00e58bda73
Merge pull request #8995 from ollypom/unmanagecnipatch
...
Fixed bad link in Unmanaged CNI
2019-06-27 08:07:39 -07:00
Olly Pomeroy
459200b753
Formatting Nits
...
Signed-off-by: Olly Pomeroy <olly@docker.com>
2019-06-27 15:20:48 +01:00
Steven Follis
b842889234
Added pre-req for Static IPs
2019-06-27 09:34:49 -04:00
usha-mandya
ead1e1d8d5
Added Engine release notes and update release date
2019-06-27 12:25:12 +01:00
Romain Bélorgey
01374c8606
Add changes for 18.09 version
...
The configuration of telemetry changes since 18.09 ee version.
For full information, internal escalation: https://docker.atlassian.net/browse/FIELD-1702
2019-06-27 11:46:40 +02:00
Xinfeng Liu
4b1e19eba0
Refine release notes on docker/orca#16122
2019-06-27 15:58:27 +08:00
Navajyoth MS
dcc04a90d2
Update architecture.md
2019-06-26 22:21:39 +05:30
Olly Pomeroy
29cf527249
Fixed bad link in Unmanaged CNI
...
Signed-off-by: Olly Pomeroy <olly@docker.com>
2019-06-26 16:14:38 +01:00
Sebastiaan van Stijn
781318b408
Merge pull request #8928 from AkihiroSuda/patch-9
...
Fix dockremap calculation
2019-06-26 13:15:53 +02:00
Usha Mandya
e207f863ab
Merge branch 'published' into master
2019-06-25 13:53:42 +01:00
Usha Mandya
fa9509a27c
Merge pull request #8969 from ollypom/toolboxlink
...
Added a link to the Toolbox Releases page
2019-06-25 13:40:42 +01:00
Olly Pomeroy
e7a5cf0714
Removed 1709 and added more context to UCP relnote
...
Signed-off-by: Olly Pomeroy <olly@docker.com>
2019-06-25 12:55:22 +01:00
ollypom
70e0f34b99
Fixed overview links
2019-06-25 11:13:49 +00:00
Adrian Plata
268438638c
Merge pull request #8983 from ollypom/suseredirectpatch
...
Added additional SUSE redirect
2019-06-24 13:31:08 -07:00
Olly Pomeroy
b5659dd1de
Added additional SUSE redirect
...
Signed-off-by: Olly Pomeroy <olly@docker.com>
2019-06-24 21:11:17 +01:00