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

Fixing merge conflict

This commit is contained in:
John Mulhausen 2016-11-28 14:59:56 -08:00
parent 03763b45b1 70617e697b
commit 526a9b90ab
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engine/installation/linux/ubuntulinux.md
View File

@ -13,6 +13,7 @@ Docker is supported on these Ubuntu operating systems:
- Ubuntu Wily 15.10
- Ubuntu Trusty 14.04 (LTS)
- Ubuntu Precise 12.04 (LTS)
- Ubuntu Yakkety 16.10 (LTS)
This page instructs you to install Docker on Ubuntu, using packages provided by
Docker. Using these packages ensures you get the latest official
@ -76,6 +77,7 @@ To set `APT` to use packages from the Docker repository:
| Trusty 14.04 (LTS) | `deb https://apt.dockerproject.org/repo ubuntu-trusty main` |
| Wily 15.10 | `deb https://apt.dockerproject.org/repo ubuntu-wily main` |
| Xenial 16.04 (LTS) | `deb https://apt.dockerproject.org/repo ubuntu-xenial main` |
| Yakkety 16.10 (LTS) | `deb https://apt.dockerproject.org/repo ubuntu-yakkety main` |
>**Note**: Docker does not provide packages for all architectures. Binary artifacts
@ -618,4 +620,4 @@ following command:
$ rm -rf /var/lib/docker
```
You must delete any customized configuration files manually.
You must delete any edited configuration files manually.