summaryrefslogtreecommitdiff
path: root/doc/README.mdwn
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2014-04-19 17:08:23 -0400
committerJoey Hess <joey@kitenet.net>2014-04-19 17:08:23 -0400
commitbdc09d07f20f6e30415a31ad88676f7dd30e75c5 (patch)
treef4c477684748db79f90ce21daaabfa0d2a9805f7 /doc/README.mdwn
parent8834a8ff3cdf69f51e285d83c5b09fc4086737f8 (diff)
parent628c06fdfba15f087baa844ca14a16a233c2b301 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'doc/README.mdwn')
-rw-r--r--doc/README.mdwn6
1 files changed, 5 insertions, 1 deletions
diff --git a/doc/README.mdwn b/doc/README.mdwn
index f463cfa5..eec3d76f 100644
--- a/doc/README.mdwn
+++ b/doc/README.mdwn
@@ -5,7 +5,8 @@ are satisfied.
Propellor is configured via a git repository, which typically lives
in `~/.propellor/` on your development machine. Propellor clones the
-repository to each host it manages, in a [[secure|security]] way.
+repository to each host it manages, in a
+[secure](http://propellor.branchable.com/security/) way.
To trigger propellor to run on a host, run `propellor --spin $host`.
Or run `/usr/local/propellor/propellor` on the host. Or use the
@@ -21,6 +22,9 @@ the full power of Haskell. Hopefully that power can be put to good use in
making declarative properties that are powerful, nicely idempotent, and
easy to adapt to a system's special needs!
+If using Haskell to configure Propellor seems intimidating,
+see [configuration_for_the_Haskell_newbie](https://propellor.branchable.com/haskell_newbie/).
+
## quick start
1. Get propellor installed