From 59f76bf1c707c01ea548c4f3f2fdfba74c764e63 Mon Sep 17 00:00:00 2001 From: James Turnbull Date: Tue, 26 Nov 2013 00:16:30 -0500 Subject: [PATCH] Installation docs update * Updated TOC sort order * Fixed some grammar in Rackspace doc * Updated titles to remove Linux where not needed --- docs/sources/installation/gentoolinux.rst | 4 ++-- docs/sources/installation/index.rst | 14 +++++++------- docs/sources/installation/rackspace.rst | 17 ++++++++--------- docs/sources/installation/ubuntulinux.rst | 4 ++-- 4 files changed, 19 insertions(+), 20 deletions(-) diff --git a/docs/sources/installation/gentoolinux.rst b/docs/sources/installation/gentoolinux.rst index c4f2d220f3..d60e99c4c3 100644 --- a/docs/sources/installation/gentoolinux.rst +++ b/docs/sources/installation/gentoolinux.rst @@ -4,8 +4,8 @@ .. _gentoo_linux: -Gentoo Linux -============ +Gentoo +====== .. include:: install_header.inc diff --git a/docs/sources/installation/index.rst b/docs/sources/installation/index.rst index 1f4b12f89c..1c9ccbe7d5 100644 --- a/docs/sources/installation/index.rst +++ b/docs/sources/installation/index.rst @@ -9,7 +9,7 @@ Installation There are a number of ways to install Docker, depending on where you want to run the daemon. The :ref:`ubuntu_linux` installation is the -officially-tested version, and the community adds more techniques for +officially-tested version. The community adds more techniques for installing Docker all the time. Contents: @@ -19,13 +19,13 @@ Contents: ubuntulinux fedora - binaries - security - upgrading - kernel + archlinux + gentoolinux vagrant windows amazon rackspace - archlinux - gentoolinux + kernel + binaries + security + upgrading diff --git a/docs/sources/installation/rackspace.rst b/docs/sources/installation/rackspace.rst index 2a4bdbc955..d0005a14bc 100644 --- a/docs/sources/installation/rackspace.rst +++ b/docs/sources/installation/rackspace.rst @@ -2,7 +2,6 @@ :description: Installing Docker on Ubuntu proviced by Rackspace :keywords: Rackspace Cloud, installation, docker, linux, ubuntu -=============== Rackspace Cloud =============== @@ -14,14 +13,14 @@ straightforward, and you should mostly be able to follow the **However, there is one caveat:** -If you are using any linux not already shipping with the 3.8 kernel +If you are using any Linux not already shipping with the 3.8 kernel you will need to install it. And this is a little more difficult on Rackspace. Rackspace boots their servers using grub's ``menu.lst`` and does not -like non 'virtual' packages (e.g. xen compatible) kernels there, -although they do work. This makes ``update-grub`` to not have the -expected result, and you need to set the kernel manually. +like non 'virtual' packages (e.g. Xen compatible) kernels there, +although they do work. This results in ``update-grub`` not having the +expected result, and you will need to set the kernel manually. **Do not attempt this on a production machine!** @@ -34,7 +33,7 @@ expected result, and you need to set the kernel manually. apt-get install linux-generic-lts-raring -Great, now you have kernel installed in ``/boot/``, next is to make it +Great, now you have the kernel installed in ``/boot/``, next you need to make it boot next time. .. code-block:: bash @@ -48,9 +47,9 @@ boot next time. Now you need to manually edit ``/boot/grub/menu.lst``, you will find a section at the bottom with the existing options. Copy the top one and substitute the new kernel into that. Make sure the new kernel is on -top, and double check kernel and initrd point to the right files. +top, and double check the kernel and initrd lines point to the right files. -Make special care to double check the kernel and initrd entries. +Take special care to double check the kernel and initrd entries. .. code-block:: bash @@ -79,7 +78,7 @@ It will probably look something like this: initrd /boot/initrd.img-3.2.0-38-virtual -Reboot server (either via command line or console) +Reboot the server (either via command line or console) .. code-block:: bash diff --git a/docs/sources/installation/ubuntulinux.rst b/docs/sources/installation/ubuntulinux.rst index b5aae0cb83..7a889c294f 100644 --- a/docs/sources/installation/ubuntulinux.rst +++ b/docs/sources/installation/ubuntulinux.rst @@ -4,8 +4,8 @@ .. _ubuntu_linux: -Ubuntu Linux -============ +Ubuntu +====== .. warning::