Merge pull request #12154 from moxiegirl/carry-pr-11409

Carrying 11409 for a contributor
This commit is contained in:
moxiegirl 2015-04-07 15:00:26 -07:00
commit 8b71930570
1 changed files with 2 additions and 2 deletions

View File

@ -69,8 +69,8 @@ A Dockerfile is similar to a Makefile.
multiple images. Make a note of the last image ID output by the commit before
each new **FROM** command.
-- If no tag is given to the **FROM** instruction, latest is assumed. If the
used tag does not exist, an error is returned.
-- If no tag is given to the **FROM** instruction, Docker applies the
`latest` tag. If the used tag does not exist, an error is returned.
**MAINTAINER**
-- **MAINTAINER** sets the Author field for the generated images.