From 0fb1845e957353792b39475751221d1b8b66da52 Mon Sep 17 00:00:00 2001 From: Zuhayr Elahi Date: Wed, 18 Nov 2015 20:35:34 -0800 Subject: [PATCH 1/2] Modified ubuntulinux.md for instructions to configure DNS for Ubuntu 15.04 or greater modified note to provide a link for installation instructions on Ubuntu 15.04 or above cleaned up typos for ubuntulinux.md Signed-off-by: Zuhayr Elahi --- docs/installation/ubuntulinux.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/installation/ubuntulinux.md b/docs/installation/ubuntulinux.md index d66f392882..c1d3448575 100644 --- a/docs/installation/ubuntulinux.md +++ b/docs/installation/ubuntulinux.md @@ -349,6 +349,11 @@ To avoid this warning, you can specify a DNS server for use by Docker containers. Or, you can disable `dnsmasq` in NetworkManager. Though, disabling `dnsmasq` might make DNS resolution slower on some networks. +The instructions below describe how to configure the Docker daemon running on +Ubuntu 14.10 or below. Ubuntu 15.04 and above use systemd as its boot +and service manager. Refer to [control and configure Docker with systemd](../articles/systemd.md#custom-docker-daemon-options) +to configure a daemon controled by systemd. + To specify a DNS server for use by Docker: 1. Log into Ubuntu as a user with `sudo` privileges. From 0f2986cee57e1854f3346ca7609740bdd51d0dcb Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 2 Dec 2015 17:08:54 +0100 Subject: [PATCH 2/2] fix minor markup issues Signed-off-by: Sebastiaan van Stijn --- docs/installation/ubuntulinux.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/installation/ubuntulinux.md b/docs/installation/ubuntulinux.md index c1d3448575..a83de423a8 100644 --- a/docs/installation/ubuntulinux.md +++ b/docs/installation/ubuntulinux.md @@ -349,10 +349,11 @@ To avoid this warning, you can specify a DNS server for use by Docker containers. Or, you can disable `dnsmasq` in NetworkManager. Though, disabling `dnsmasq` might make DNS resolution slower on some networks. -The instructions below describe how to configure the Docker daemon running on -Ubuntu 14.10 or below. Ubuntu 15.04 and above use systemd as its boot -and service manager. Refer to [control and configure Docker with systemd](../articles/systemd.md#custom-docker-daemon-options) -to configure a daemon controled by systemd. +The instructions below describe how to configure the Docker daemon +running on Ubuntu 14.10 or below. Ubuntu 15.04 and above use `systemd` +as the boot and service manager. Refer to [control and configure Docker +with systemd](../articles/systemd.md#custom-docker-daemon-options) to +configure a daemon controlled by `systemd`. To specify a DNS server for use by Docker: