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

Merge pull request #12288 from sunyuan3/ubuntu 

update ubuntulinux.md
This commit is contained in:
James Turnbull 2015-04-11 09:25:55 -05:00
parent e3c1cc8d77 a8fddbdeae
commit 6d8102466a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/sources/installation/ubuntulinux.md
View File

@ -94,7 +94,7 @@ prerequisite installed, Docker's installation process adds it.
##Installing Docker on Ubuntu ##Installing Docker on Ubuntu
Make sure you have intalled the prerequisites for your Ubuntu version. Then, Make sure you have installed the prerequisites for your Ubuntu version. Then,
install Docker using the following: install Docker using the following:
1. Log into your Ubuntu installation as a user with `sudo` privileges. 1. Log into your Ubuntu installation as a user with `sudo` privileges.
@ -253,7 +253,7 @@ The warning occurs because Docker containers can't use the local DNS nameserver.
Instead, Docker defaults to using an external nameserver. Instead, Docker defaults to using an external nameserver.
To avoid this warning, you can specify a DNS server for use by Docker To avoid this warning, you can specify a DNS server for use by Docker
containers. Or, you can disable `dnsmasq` in NetworkManager. Though, disabiling containers. Or, you can disable `dnsmasq` in NetworkManager. Though, disabling
`dnsmasq` might make DNS resolution slower on some networks. `dnsmasq` might make DNS resolution slower on some networks.
To specify a DNS server for use by Docker: To specify a DNS server for use by Docker: