diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-10-16 12:30:34 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-10-16 12:30:34 -0400 |
| commit | 51634a1bfc091b0c2e005e58266771dab0710ffe (patch) | |
| tree | b0ae2dc87cf6d3a21bc81dbd4dcb0b63afb1d612 /src/Propellor.hs | |
| parent | 5cbbc8fbc5cfe0862ac278b63bb5f16f35998ee8 (diff) | |
| parent | e5b5a190b7de979cd889c92ecff530417534864e (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor.hs')
| -rw-r--r-- | src/Propellor.hs | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/Propellor.hs b/src/Propellor.hs index 4f777f11..9d45c376 100644 --- a/src/Propellor.hs +++ b/src/Propellor.hs @@ -1,7 +1,7 @@ {-# OPTIONS_GHC -fno-warn-duplicate-exports #-} --- | When propellor runs on a Host, it ensures that its list of Properties --- is satisfied, taking action as necessary when a Property is not +-- | When propellor runs on a Host, it ensures that its Properties +-- are satisfied, taking action as necessary when a Property is not -- currently satisfied. -- -- A simple propellor program example: @@ -32,13 +32,14 @@ module Propellor ( , Property , RevertableProperty , (<!>) - -- * Core config file + , module Propellor.Types + -- * Config file , defaultMain , host , (&) , (!) + -- * Propertries , describe - -- * Combining properties -- | Properties are often combined together in your propellor -- configuration. For example: -- @@ -47,11 +48,6 @@ module Propellor ( , requires , before , onChange - -- * Included modules - -- | These are only the core modules you'll need. There are many - -- more in propellor that you can import. - , module Propellor.Types - -- | Additional data types used by propellor , module Propellor.Property -- | Everything you need to build your own properties, -- and useful property combinators |