Просмотр исходного кода

Merge pull request #3071 from lsm5/fedora-docs-update

use mattdm/fedora in fedora doc and other cosmetic changes
Andy Rothfusz 11 лет назад
Родитель
Сommit
d75fc6e529
1 измененных файлов с 8 добавлено и 8 удалено
  1. 8 8
      docs/sources/installation/fedora.rst

+ 8 - 8
docs/sources/installation/fedora.rst

@@ -1,6 +1,6 @@
 :title: Requirements and Installation on Fedora
 :title: Requirements and Installation on Fedora
 :description: Please note this project is currently under heavy development. It should not be used in production.
 :description: Please note this project is currently under heavy development. It should not be used in production.
-:keywords: Docker, Docker documentation, requirements, virtualbox, vagrant, git, ssh, putty, cygwin, linux
+:keywords: Docker, Docker documentation, fedora, requirements, virtualbox, vagrant, git, ssh, putty, cygwin, linux
 
 
 .. _fedora:
 .. _fedora:
 
 
@@ -18,25 +18,25 @@ architecture.
 Installation
 Installation
 ------------
 ------------
 
 
-Firstly, let's make sure our Fedora host is up-to-date.
+Install the ``docker-io`` package which will install Docker on our host.
 
 
 .. code-block:: bash
 .. code-block:: bash
 
 
-    sudo yum -y upgrade
+   sudo yum -y install docker-io
 
 
-Next let's install the ``docker-io`` package which will install Docker on our host.
+To update the ``docker-io`` package
 
 
 .. code-block:: bash
 .. code-block:: bash
 
 
-   sudo yum -y install docker-io
+   sudo yum -y update docker-io
 
 
-Now it's installed lets start the Docker daemon.
+Now that it's installed, let's start the Docker daemon.
 
 
 .. code-block:: bash
 .. code-block:: bash
 
 
     sudo systemctl start docker
     sudo systemctl start docker
 
 
-If we want Docker to start at boot we should also:
+If we want Docker to start at boot, we should also:
 
 
 .. code-block:: bash
 .. code-block:: bash
 
 
@@ -46,7 +46,7 @@ Now let's verify that Docker is working.
 
 
 .. code-block:: bash
 .. code-block:: bash
 
 
-   sudo docker run -i -t ubuntu /bin/bash
+   sudo docker run -i -t mattdm/fedora /bin/bash
 
 
 **Done!**, now continue with the :ref:`hello_world` example.
 **Done!**, now continue with the :ref:`hello_world` example.