summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2014-04-19 17:22:06 -0400
committerJoey Hess2014-04-19 17:22:06 -0400
commit934ea2fcadbdc35b4789aa0c0f4ba3df437bb318 (patch)
tree9597c68bed847baa2d7c70803b17fcf278731132
parent5b78dcae2a2dc35919381d3ee12327b2da76a7e5 (diff)
parentedc98be8b3b9c3ce4e978162ff64dd795140febb (diff)
Merge branch 'joeyconfig'
-rw-r--r--doc/README.mdwn14
1 files changed, 13 insertions, 1 deletions
diff --git a/doc/README.mdwn b/doc/README.mdwn
index a9a99407..8874e937 100644
--- a/doc/README.mdwn
+++ b/doc/README.mdwn
@@ -15,7 +15,19 @@ to have Propellor set up a cron job.
Properties are defined using Haskell. Edit `~/.propellor/config.hs`
to get started. There is fairly complete
-[API documentation](http://hackage.haskell.org/package/propellor/).
+[API documentation](http://hackage.haskell.org/package/propellor/),
+which includes many built-in Properties for dealing with
+[Apt](http://hackage.haskell.org/package/propellor-0.4.0/docs/Propellor-Property-Apt.html)
+and
+[Apache](http://hackage.haskell.org/package/propellor-0.4.0/docs/Propellor-Property-Apache.html)
+,
+[Cron](http://hackage.haskell.org/package/propellor-0.4.0/docs/Propellor-Property-Cron.html)
+and
+[Commands](http://hackage.haskell.org/package/propellor-0.4.0/docs/Propellor-Property-Cmd.html)
+,
+[Dns](http://hackage.haskell.org/package/propellor-0.4.0/docs/Propellor-Property-Dns.html)
+and
+[Docker](http://hackage.haskell.org/package/propellor-0.4.0/docs/Propellor-Property-Docker.html), etc.
There is no special language as used in puppet, chef, ansible, etc.. just
the full power of Haskell. Hopefully that power can be put to good use in