From b2f60db9d192f1fe6b761b58839a44b8002dcfa6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 1 Nov 2014 13:34:22 -0400
Subject: reorg

---
 doc/coding_style.mdwn | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/doc/coding_style.mdwn b/doc/coding_style.mdwn
index d2dbaf2f..64d1fb69 100644
--- a/doc/coding_style.mdwn
+++ b/doc/coding_style.mdwn
@@ -30,17 +30,6 @@ each indented with a tab.
 		foo = ...
 		bar = ...
 
-Note for emacs users: You can put the following snippet into a file called 
-`.dir-locals.el` at root of propellor's source tree to ensure these indentation
-rules are enforced:
-
-	((nil . ((indent-tabs-mode . t)
-	         (tab-width . 4)
-	         (fill-column . 80)))
-	 ;; Warn about spaces used for indentation:
-	 (haskell-mode . ((eval . (highlight-regexp "^ *")))))
-
-
 Where clauses for instance definitions and modules tend to appear at the end
 of a line, rather than on a separate line.
 
@@ -107,3 +96,14 @@ If you feel that this coding style leads to excessive amounts of horizontal
 or vertical whitespace around your code, making it hard to fit enough of it
 on the screen, consider finding a better abstraction, so the code that
 does fit on the screen is easily understandable. ;)
+
+----
+
+Note for emacs users: You can put the following snippet into a file called 
+`.dir-locals.el` at root of propellor's source tree to use tabs for indentation:
+
+	((nil . ((indent-tabs-mode . t)
+	         (tab-width . 4)
+	         (fill-column . 80)))
+	 ;; Warn about spaces used for indentation:
+	 (haskell-mode . ((eval . (highlight-regexp "^ *")))))
-- 
cgit v1.3-2-g0d8e


From 9755b761bb46bc40d19a2723165424a1f8a27cbb Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 8 Nov 2014 15:55:58 -0400
Subject: Docker: Stop using docker.io; that was a compat symlink in the Debian
 package which has been removed in docker.io 1.3.1~dfsg1-2.

---
 debian/changelog                 | 2 ++
 src/Propellor/Property/Docker.hs | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 5b45c853..8c79d519 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ propellor (0.9.2) UNRELEASED; urgency=medium
   * Added nginx module, contributed by Félix Sipma.
   * Added firewall module, contributed by Arnaud Bailly.
   * Apache: Fix daemon reload when enabling a new module or site.
+  * Docker: Stop using docker.io; that was a compat symlink in
+    the Debian package which has been removed in docker.io 1.3.1~dfsg1-2.
 
  -- Joey Hess <joeyh@debian.org>  Thu, 30 Oct 2014 16:36:06 -0400
 
diff --git a/src/Propellor/Property/Docker.hs b/src/Propellor/Property/Docker.hs
index d9d5f191..5a7a0840 100644
--- a/src/Propellor/Property/Docker.hs
+++ b/src/Propellor/Property/Docker.hs
@@ -567,7 +567,7 @@ readIdentFile cid = fromMaybe (error "bad ident in identFile")
 	. readish <$> readFile (identFile cid)
 
 dockercmd :: String
-dockercmd = "docker.io"
+dockercmd = "docker"
 
 report :: [Bool] -> Result
 report rmed
-- 
cgit v1.3-2-g0d8e