Преглед на файлове

Fixed link to kernel dependencies. Wrapped long lines. Removed old tar dependency from list.
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net> (github: metalivedev)

Andy Rothfusz преди 11 години
родител
ревизия
98518bbcad
променени са 1 файла, в които са добавени 22 реда и са изтрити 17 реда
  1. 22 17
      docs/sources/installation/binaries.rst

+ 22 - 17
docs/sources/installation/binaries.rst

@@ -12,18 +12,22 @@ Binaries
 **This instruction set is meant for hackers who want to try out Docker
 on a variety of environments.**
 
-Before following these directions, you should really check if a packaged version
-of Docker is already available for your distribution.  We have packages for many
-distributions, and more keep showing up all the time!
+Before following these directions, you should really check if a
+packaged version of Docker is already available for your distribution.
+We have packages for many distributions, and more keep showing up all
+the time!
 
 
 Check runtime dependencies
 --------------------------
 
+.. DOC COMMENT: this should be kept in sync with
+   https://github.com/dotcloud/docker/blob/master/hack/PACKAGERS.md#runtime-dependencies
+
 To run properly, docker needs the following software to be installed at runtime:
 
-- GNU Tar version 1.26 or later
-- iproute2 version 3.5 or later (build after 2012-05-21), and specifically the "ip" utility
+- iproute2 version 3.5 or later (build after 2012-05-21), and
+  specifically the "ip" utility
 - iptables version 1.4 or later
 - The LXC utility scripts (http://lxc.sourceforge.net) version 0.8 or later
 - Git version 1.7 or later
@@ -33,11 +37,11 @@ To run properly, docker needs the following software to be installed at runtime:
 Check kernel dependencies
 -------------------------
 
-Docker in daemon mode has specific kernel requirements. For details, see
-http://docs.docker.io/en/latest/articles/kernel/
+Docker in daemon mode has specific kernel requirements. For details,
+check your distribution in :ref:`installation_list`.
 
-Note that Docker also has a client mode, which can run on virtually any linux kernel (it even builds
-on OSX!).
+Note that Docker also has a client mode, which can run on virtually
+any linux kernel (it even builds on OSX!).
 
 
 Get the docker binary:
@@ -63,18 +67,18 @@ Run the docker daemon
 Giving non-root access
 ----------------------
 
-The ``docker`` daemon always runs as the root user, and since Docker version
-0.5.2, the ``docker`` daemon binds to a Unix socket instead of a TCP port. By
-default that Unix socket is owned by the user *root*, and so, by default, you
-can access it with ``sudo``.
+The ``docker`` daemon always runs as the root user, and since Docker
+version 0.5.2, the ``docker`` daemon binds to a Unix socket instead of
+a TCP port. By default that Unix socket is owned by the user *root*,
+and so, by default, you can access it with ``sudo``.
 
 Starting in version 0.5.3, if you (or your Docker installer) create a
 Unix group called *docker* and add users to it, then the ``docker``
 daemon will make the ownership of the Unix socket read/writable by the
 *docker* group when the daemon starts. The ``docker`` daemon must
-always run as the root user, but if you run the ``docker`` client as a user in
-the *docker* group then you don't need to add ``sudo`` to all the
-client commands.  
+always run as the root user, but if you run the ``docker`` client as a
+user in the *docker* group then you don't need to add ``sudo`` to all
+the client commands.
 
 .. warning:: The *docker* group is root-equivalent.
 
@@ -82,7 +86,8 @@ client commands.
 Upgrades
 --------
 
-To upgrade your manual installation of Docker, first kill the docker daemon:
+To upgrade your manual installation of Docker, first kill the docker
+daemon:
 
 .. code-block:: bash