summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJoey Hess2015-03-09 12:03:09 -0400
committerJoey Hess2015-03-09 12:03:09 -0400
commit4c94fd470350abddfe9328cf80e74879609f773e (patch)
treec9b73cb89f70cd9ae97e6d1876d66ff16b61eef2 /doc
parent9940b7fb2581c54154d8cf73f7fbe5042b12780e (diff)
parent51dd9a9c63e6e04103ffad13510cf46c726ccf23 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'doc')
-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 e62ffea0..39a62f45 100644
--- a/doc/haskell_newbie.mdwn
+++ b/doc/haskell_newbie.mdwn
@@ -8,7 +8,7 @@ configure Propellor!
Let's take a quick tour of the `config.hs` file..
[[!format haskell """
--- | This is the main configuration file for Propellor, and is used to build
+-- This is the main configuration file for Propellor, and is used to build
-- the propellor program.
"""]]