Merge pull request #1113 from metalivedev/docs20130702

* Documentation: fix broken link on the documentation index page
This commit is contained in:
Ken Cochrane 2013-07-03 05:52:25 -07:00
Родитель 6dbcdd3ed5 11998ae7d6
Коммит dc91a7b641
2 изменённых файлов: 10 добавлений и 5 удалений

Просмотреть файл

@ -32,7 +32,7 @@ For an overview of Docker, please see the `Introduction
<http://www.docker.io>`_. When you're ready to start working with
Docker, we have a `quick start <http://www.docker.io/gettingstarted>`_
and a more in-depth guide to :ref:`ubuntu_linux` and other
`installation </installation>`_ paths including prebuilt binaries,
:ref:`installation_list` paths including prebuilt binaries,
Vagrant-created VMs, Rackspace and Amazon instances.
Enough reading! :ref:`Try it out! <running_examples>`

Просмотреть файл

@ -1,12 +1,17 @@
:title: Documentation
:description: -- todo: change me
:keywords: todo, docker, documentation, installation, OS support
:title: Docker Installation
:description: many ways to install Docker
:keywords: docker, installation
.. _installation_list:
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
installing Docker all the time.
Contents:
.. toctree::