docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:docker/docker.github.io

This commit is contained in:
Maria Bermudez 2019-05-12 17:46:20 -07:00
parent 4d3d196bb6 bd578956f9
commit 0957271148
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
_includes/footer.html
View File

@ -86,8 +86,7 @@
<ul class="nav-social">
<li class="fa fa-twitter"><a href="http://twitter.com/docker">Twitter</a></li>
<li class="fa fa-youtube"><a href="http://www.youtube.com/user/dockerrun">Youtube</a></li>
<li class="fa fa-google-plus"><a href="https://plus.google.com/u/0/communities/108146856671494713993">Google</a></li>
<li class="fa fa-github"><a href="https://github.com/docker/docker">Github</a></li>
<li class="fa fa-github"><a href="https://github.com/docker">GitHub</a></li>
<li class="fa fa-linkedin"><a href="https://www.linkedin.com/company/docker">Linkedin</a></li>
<li class="fa fa-facebook"><a href="https://www.facebook.com/docker.run">Facebook</a></li>
<li class="fa fa-reddit"><a href="http://www.reddit.com/r/docker">Reddit</a></li>

2
docker-for-mac/edge-release-notes.md
View File

@ -23,7 +23,7 @@ for Mac](install.md#download-docker-for-mac).
[Download](https://download.docker.com/mac/edge/34207/Docker.dmg)
* Bug fixes and minor changes
- Upgrade QEMU from 2.8.0 to 3.1.0 to fix an emulation issue when building and running Java applications on Arm64 devices. [docker/for-mac#3646](https://github.com/docker/for-mac/issues/3646)
- Upgrade QEMU from 2.8.0 to 3.1.0 to fix an emulation issue when building and running Java applications on Arm64 devices.
### Docker Community Edition 2.0.4.0 2019-04-30

2
docker-for-windows/edge-release-notes.md
View File

@ -23,7 +23,7 @@ for Windows](install.md#download-docker-for-windows).
[Download](https://download.docker.com/win/edge/34207/Docker%20Desktop%20Installer.exe)
* Bug fixes and minor changes
- Upgrade QEMU from 2.8.0 to 3.1.0 to fix an emulation issue when building and running Java applications on Arm64 devices. [docker/for-mac#3646](https://github.com/docker/for-mac/issues/3646)
- Upgrade QEMU from 2.8.0 to 3.1.0 to fix an emulation issue when building and running Java applications on Arm64 devices.
### Docker Community Edition 2.0.4.0 2019-04-30

3
docker-for-windows/install.md
View File

@ -24,8 +24,7 @@ Hub](https://hub.docker.com/editions/community/docker-ce-desktop-windows){:
`docker-machine` to manage remote VMs.
* **System Requirements**:
- Windows 10 64bit: Pro, Enterprise or Education (1607 Anniversary Update,
Build 14393 or later).
- Windows 10 64bit: Pro, Enterprise or Education (Build 15063 or later).
- Virtualization is enabled in BIOS. Typically, virtualization is enabled by
default. This is different from having Hyper-V enabled. For more detail see
[Virtualization must be