From 34c8d58839048098d151c61c796192fab05364d7 Mon Sep 17 00:00:00 2001
From: Rune Warhuus <rune@dinkdonk.no>
Date: Sat, 11 Jun 2016 15:24:33 +0200
Subject: [PATCH 1/3] =?UTF-8?q?Changed=20binary=20name=20to=20=C2=B4docker?=
 =?UTF-8?q?.js=C2=B4=20to=20mitigate=20naming=20conflict=20with=20docker?=
 =?UTF-8?q?=20CLI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 History.md          | 4 ++++
 docker => docker.js | 0
 package.json        | 4 ++--
 3 files changed, 6 insertions(+), 2 deletions(-)
 rename docker => docker.js (100%)

diff --git a/History.md b/History.md
index 8052540..d1deea6 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,9 @@
 # Docker Version History
 
+## 0.3.0
+
+ * Changed binary name to ´docker.js´ to mitigate naming conflict with docker CLI.
+
 ## 0.2.14
 
  * Improvements to handling of literals that shouldn't be matched for comments
diff --git a/docker b/docker.js
similarity index 100%
rename from docker
rename to docker.js
diff --git a/package.json b/package.json
index 235a570..ca7a6ba 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "author": "JT <jt@gosquared.com>",
   "name": "docker",
-  "version": "0.2.14",
+  "version": "0.3.0",
   "dependencies": {
     "mkdirp": "0.3.2",
     "commander": "0.5.2",
@@ -9,7 +9,7 @@
     "pygmentize-bundled": "~2.1.0"
   },
   "bin": {
-    "docker": "./docker"
+    "docker": "./docker.js"
   },
   "engines": {
     "node": ">=0.4.0"

From 762bb2049a8d110bd2f8832934f3812dfd73721a Mon Sep 17 00:00:00 2001
From: Rune Warhuus <rune@dinkdonk.no>
Date: Sat, 11 Jun 2016 15:26:31 +0200
Subject: [PATCH 2/3] Updated README to reflect binary file renaming

---
 README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 25e7f00..7442354 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ Simple: `npm install -g docker`
 ## Usage
 
 ```sh
-$ docker [options] [files ...]
+$ docker.js [options] [files ...]
 ```
 
 Available options are:
@@ -47,21 +47,21 @@ If you haven't installed with `-g` specified, replace `docker` with something li
 ### Process every file in the current directory into "doc"
 
 ```sh
-$ docker
+$ docker.js
 ```
 
 ### Process files in "src" to "documents"
 
 ```sh
-$ docker -i src -o documents
+$ docker.js -i src -o documents
 ```
 or:
 ```sh
-$ docker -o documents src
+$ docker.js -o documents src
 ```
 or:
 ```sh
-$ docker -o documents src/*
+$ docker.js -o documents src/*
 ```
 
 Note that in the first example, the contents of `src` will be mapped directly into `documents` whereas in the second and third
@@ -81,7 +81,7 @@ This is the command I use to generate [this project's documentation](http://jbt.
  * Include the File Search extra
 
 ```sh
-$ docker -o ../docker_gh-pages -c manni -s yes -I -u -x node_modules -w --extras fileSearch
+$ docker.js -o ../docker_gh-pages -c manni -s yes -I -u -x node_modules -w --extras fileSearch
 ```
 
 ## Extras

From f8b408120e2111b089f00ca9fdf5fa1a0d34b183 Mon Sep 17 00:00:00 2001
From: Rune Warhuus <rune@dinkdonk.no>
Date: Sat, 11 Jun 2016 15:29:58 +0200
Subject: [PATCH 3/3] =?UTF-8?q?Changed=20binary=20name=20to=20=C2=B4docker?=
 =?UTF-8?q?.js=C2=B4=20to=20mitigate=20naming=20conflict=20with=20docker?=
 =?UTF-8?q?=20CLI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ca7a6ba..747ad80 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
     "pygmentize-bundled": "~2.1.0"
   },
   "bin": {
-    "docker": "./docker.js"
+    "docker.js": "./docker.js"
   },
   "engines": {
     "node": ">=0.4.0"