From fec8cc9f8029534e3efdeed5fe5152c8d5814f18 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 20 Jan 2016 11:07:28 -0800
Subject: [PATCH] Update documentation for `external` param

Signed-off-by: Joffrey F <joffrey@docker.com>

Conflicts:
	docs/compose-file.md
---
 docs/compose-file.md | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/docs/compose-file.md b/docs/compose-file.md
index 5969b8550..67adeb82f 100644
--- a/docs/compose-file.md
+++ b/docs/compose-file.md
@@ -627,7 +627,11 @@ documentation for more information. Optional.
 ## external
 
 If set to `true`, specifies that this volume has been created outside of
-Compose.
+Compose. `docker-compose up` will not attempt to create it, and will raise
+an error if it doesn't exist.
+
+`external` cannot be used in conjunction with other volume configuration keys
+(`driver`, `driver_opts`).
 
 In the example below, instead of attemping to create a volume called
 `[projectname]_data`, Compose will look for an existing volume simply
@@ -712,7 +716,11 @@ A full example:
 ### external
 
 If set to `true`, specifies that this network has been created outside of
-Compose.
+Compose. `docker-compose up` will not attempt to create it, and will raise
+an error if it doesn't exist.
+
+`external` cannot be used in conjunction with other network configuration keys
+(`driver`, `driver_opts`, `ipam`).
 
 In the example below, `proxy` is the gateway to the outside world. Instead of
 attemping to create a network called `[projectname]_outside`, Compose will