diff options
author | Joey Hess <joeyh@joeyh.name> | 2018-02-04 12:22:40 -0400 |
---|---|---|
committer | Joey Hess <joeyh@joeyh.name> | 2018-02-04 12:22:40 -0400 |
commit | 25f0cf84b5692822f63a6d110994d347e3f430cc (patch) | |
tree | ac67344d6cc0010a789ffe31813a7d772a0ef1b4 | |
parent | f835499cf07459c551795b39cdfb8fb345aa0fe5 (diff) | |
parent | cd9855031cfef40145d28e1cd18cc6346770dd13 (diff) |
Merge branch 'joeyconfig'
-rw-r--r-- | doc/README.mdwn | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/doc/README.mdwn b/doc/README.mdwn index 6d7e6508..8bdb6c83 100644 --- a/doc/README.mdwn +++ b/doc/README.mdwn @@ -18,12 +18,10 @@ There is fairly complete which includes many built-in Properties for dealing with [Apt](http://hackage.haskell.org/package/propellor/docs/Propellor-Property-Apt.html) and -[Apache](http://hackage.haskell.org/package/propellor/docs/Propellor-Property-Apache.html) -, +[Apache](http://hackage.haskell.org/package/propellor/docs/Propellor-Property-Apache.html), [Cron](http://hackage.haskell.org/package/propellor/docs/Propellor-Property-Cron.html) and -[Commands](http://hackage.haskell.org/package/propellor/docs/Propellor-Property-Cmd.html) -, +[Commands](http://hackage.haskell.org/package/propellor/docs/Propellor-Property-Cmd.html), [Dns](http://hackage.haskell.org/package/propellor/docs/Propellor-Property-Dns.html) and [Docker](http://hackage.haskell.org/package/propellor/docs/Propellor-Property-Docker.html), etc. |