浏览代码

try out @metalivedev's suggestion, including FQIN

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Sven Dowideit 11 年之前
父节点
当前提交
a049e93a4c
共有 2 个文件被更改,包括 18 次插入15 次删除
  1. 13 10
      docs/sources/terms/repository.rst
  2. 5 5
      docs/sources/use/workingwithrepository.rst

+ 13 - 10
docs/sources/terms/repository.rst

@@ -7,21 +7,24 @@
 Repository
 Repository
 ==========
 ==========
 
 
-A repository is a tagged set of images either on your local docker server, or
+A repository is a set of images either on your local Docker server, or
 shared, by pushing it to a :ref:`Registry<registry_def>` server.
 shared, by pushing it to a :ref:`Registry<registry_def>` server.
 
 
-Images can be labeld into a repository using ``sudo docker build -t LABEL``, 
-``sudo docker commit CONTAINERID LABEL`` or ``sudo docker tag IMAGEID LABEL``.
+Images can be associated with a repository (or multiple) by giving them an image name 
+using one of three different commands:
 
 
-The label can be made up of 3 parts:
+1. At build time (e.g. ``sudo docker build -t IMAGENAME``),
+2. When committing a container (e.g. ``sudo docker commit CONTAINERID IMAGENAME``) or
+3. When tagging an image id with an image name (e.g. ``sudo docker tag IMAGEID IMAGENAME``).
 
 
-[registry_hostname[:port]/][user_name/]( repository_name[:version_tag] | image_id )
-[REGISTRYHOST/][USERNAME/]NAME[:TAG]
+A `Fully Qualified Image Name` (FQIN) can be made up of 3 parts:
 
 
-TAG defaults to ``latest``, USERNAME and REGISTRYHOST default to an empty string.
-When REGISTRYHOST is an empty string, then ``docker push`` will push to ``index.docker.io:80``.
+``[registry_hostname[:port]/][user_name/](repository_name[:version_tag])``
 
 
-If you create a new repository which you want to share, you will need to set the 
-first part, as the 'default' blank REPOSITORY prefix is reserved for official Docker images.
+``version_tag`` defaults to ``latest``, ``username`` and ``registry_hostname`` default to an empty string.
+When ``registry_hostname`` is an empty string, then ``docker push`` will push to ``index.docker.io:80``.
+
+If you create a new repository which you want to share, you will need to set at least the 
+``user_name``, as the 'default' blank ``user_name`` prefix is reserved for official Docker images.
 
 
 For more information see :ref:`Working with Repositories<working_with_the_repository>`
 For more information see :ref:`Working with Repositories<working_with_the_repository>`

+ 5 - 5
docs/sources/use/workingwithrepository.rst

@@ -31,7 +31,7 @@ client for these services via ``docker search, pull, login`` and
 Local Repositories
 Local Repositories
 ------------------
 ------------------
 
 
-Docker images which have been created and labled on your local docker server
+Docker images which have been created and labeled on your local Docker server
 need to be pushed to a Public or Private registry to be shared.
 need to be pushed to a Public or Private registry to be shared.
 
 
 .. _using_public_repositories:
 .. _using_public_repositories:
@@ -64,8 +64,8 @@ Find Public Images on the Central Index
 ---------------------------------------
 ---------------------------------------
 
 
 You can search the Central Index `online <https://index.docker.io>`_
 You can search the Central Index `online <https://index.docker.io>`_
-or by the CLI. Searching can find images by name, user name or
-description:
+or using the command line interface. Searching can find images by name, user
+name or description:
 
 
 .. code-block:: bash
 .. code-block:: bash
 
 
@@ -162,7 +162,7 @@ Trusted Builds
 --------------
 --------------
 
 
 Trusted Builds automate the building and updating of images from GitHub, directly 
 Trusted Builds automate the building and updating of images from GitHub, directly 
-on docker.io servers. It works by adding a commit hook to your selected repository,
+on ``docker.io`` servers. It works by adding a commit hook to your selected repository,
 triggering a build and update when you push a commit.
 triggering a build and update when you push a commit.
 
 
 To setup a trusted build
 To setup a trusted build
@@ -186,7 +186,7 @@ If you want to see the status of your Trusted Builds you can go to your
 `Trusted Builds page <https://index.docker.io/builds/>`_ on the Docker index,
 `Trusted Builds page <https://index.docker.io/builds/>`_ on the Docker index,
 and it will show you the status of your builds, and the build history.
 and it will show you the status of your builds, and the build history.
 
 
-Once you've created a Trusted Build you can deactive or delete it. You cannot
+Once you've created a Trusted Build you can deactivate or delete it. You cannot
 however push to a Trusted Build with the ``docker push`` command. You can only
 however push to a Trusted Build with the ``docker push`` command. You can only
 manage it by committing code to your GitHub repository.
 manage it by committing code to your GitHub repository.