From 3d4813ffd222f20625c1f22db5b4102b12657b62 Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Wed, 17 Aug 2016 09:59:36 +0200 Subject: [PATCH] Merge pull request #25751 from yuexiao-wang/clean-docs Remove mess words in installation doc (cherry picked from commit bbd5396955a8c36b9f208d64fe580b769c1686f5) Signed-off-by: Charles Smith --- docs/installation/linux/ubuntulinux.md | 63 +++++++++++++++++--------- 1 file changed, 42 insertions(+), 21 deletions(-) diff --git a/docs/installation/linux/ubuntulinux.md b/docs/installation/linux/ubuntulinux.md index 91478489da..ca38e8c958 100644 --- a/docs/installation/linux/ubuntulinux.md +++ b/docs/installation/linux/ubuntulinux.md @@ -142,27 +142,48 @@ For Ubuntu Precise, Docker requires the 3.13 kernel version. If your kernel version is older than 3.13, you must upgrade it. Refer to this table to see which packages are required for your environment: - - -
linux-image-generic-lts-trusty Generic -Linux kernel image. This kernel has AUFS built in. This is required to run -Docker.
linux-headers-generic-lts-trustyAllows packages such as ZFS and VirtualBox guest additions -which depend on them. If you didn't install the headers for your existing -kernel, then you can skip these headers for the"trusty" kernel. If you're -unsure, you should include this package for safety.
xserver-xorg-lts-trusty Optional in non-graphical environments without Unity/Xorg. -Required when running Docker on machine with a graphical environment. -
-
To learn more about the reasons for these packages, read the installation -instructions for backported kernels, specifically the LTS -Enablement Stack — refer to note 5 under each version. -
libgl1-mesa-glx-lts-trusty
  + + + + + + + + + + + + + + + + + + + + + + + + +
PackageDescription
linux-image-generic-lts-trusty + Generic Linux kernel image. This kernel has AUFS built in. This is + required to run Docker. +
linux-headers-generic-lts-trusty + Allows packages such as ZFS and VirtualBox guest additions which depend + on them. If you didn't install the headers for your existing kernel, then + you can skip these headers for the"trusty" kernel. If you're unsure, you + should include this package for safety. +
xserver-xorg-lts-trusty + Optional in non-graphical environments without Unity/Xorg. + Required when running Docker on machine with a graphical + environment.

+ To learn more about the reasons for these packages, read the installation + instructions for backported kernels, specifically the LTS Enablement Stack — refer to note 5 under each + version. +
libgl1-mesa-glx-lts-trusty
To upgrade your kernel and install the additional packages, do the following: