From 1a8a540209c997f5e75a476b942365aad892ad35 Mon Sep 17 00:00:00 2001
From: Morten Siebuhr <sbhr@sbhr.dk>
Date: Fri, 30 Aug 2013 15:23:32 +0200
Subject: [PATCH] Document FROM <image>:<tag> Dockerfile instruction.

---
 docs/sources/use/builder.rst | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docs/sources/use/builder.rst b/docs/sources/use/builder.rst
index 7a985e766b..61c7fccd1d 100644
--- a/docs/sources/use/builder.rst
+++ b/docs/sources/use/builder.rst
@@ -68,6 +68,10 @@ building images.
 
     ``FROM <image>``
 
+Or
+
+    ``FROM <image>:<tag>``
+
 The ``FROM`` instruction sets the :ref:`base_image_def` for subsequent
 instructions. As such, a valid Dockerfile must have ``FROM`` as its
 first instruction. The image can be any valid image -- it is
@@ -81,6 +85,9 @@ especially easy to start by **pulling an image** from the
 to create multiple images. Simply 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 will be returned.
+
 3.2 MAINTAINER
 --------------