summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2014-05-29 14:29:37 -0400
committerJoey Hess2014-05-29 14:29:37 -0400
commit02a808896f95f9ffd5a209d2b8c767729e749ef4 (patch)
treefe1ef8dcfcaf922d23d906e26481c1ce8efb529c
parent2b77ee8e106abd5fbcaf8d5cd4719057a8d28a67 (diff)
parentd75bb50578e391510ab753421dcd66b986aa2c95 (diff)
Merge remote-tracking branch 'origin/master'
-rw-r--r--doc/haskell_newbie.mdwn2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/haskell_newbie.mdwn b/doc/haskell_newbie.mdwn
index 7eea9f86..8e14b351 100644
--- a/doc/haskell_newbie.mdwn
+++ b/doc/haskell_newbie.mdwn
@@ -23,7 +23,7 @@ import qualified Propellor.Property.User as User
import qualified Propellor.Property.Cron as Cron
"""]]
-This loads up Propellor's modules. You'll almost certianly want these;
+This loads up Propellor's modules. You'll almost certainly want these;
many more can be found in the [API documentation](http://hackage.haskell.org/package/propellor).
[[!format haskell """