From b81b9b0e2d5af25831f65bc1af7d3341191d699f Mon Sep 17 00:00:00 2001
From: Trent Mick <trentm@gmail.com>
Date: Mon, 25 Jan 2016 13:26:57 -0800
Subject: [PATCH] PUBAPI-1227: document the inconsistency that ListMachines
 shows *docker* instances, but ListImages does NOT show docker images

---
 CHANGES.md              | 3 ++-
 lib/do_image/do_list.js | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 1977ab6..976b1f0 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,7 +2,8 @@
 
 ## 4.3.2 (not yet released)
 
-(nothing yet)
+- PUBAPI-1227: Note that `triton image list` doesn't include Docker images, at
+  least currently.
 
 
 ## 4.3.1
diff --git a/lib/do_image/do_list.js b/lib/do_image/do_list.js
index d6716a0..0889d3f 100644
--- a/lib/do_image/do_list.js
+++ b/lib/do_image/do_list.js
@@ -126,6 +126,10 @@ do_list.help = [
     /* BEGIN JSSTYLED */
     'List images.',
     '',
+    'Note: Currently, *docker* images are not included in this endpoint\'s responses.',
+    'You must use `docker images` against the Docker service for this data center.',
+    'See <https://apidocs.joyent.com/docker>.',
+    '',
     'Usage:',
     '    {{name}} list [<options>] [<filters>]',
     '',