summaryrefslogtreecommitdiff
path: root/doc/documentation.mdwn
diff options
context:
space:
mode:
authorJoey Hess2015-04-14 14:48:03 -0400
committerJoey Hess2015-04-14 14:48:03 -0400
commit27f4c9be432c778e01d9aa7e7d4802a94501dcaf (patch)
tree5085ba41b45b015090bc7ce189de8b5075f077fe /doc/documentation.mdwn
parent7c246badf9f47ce3861494cb2eca9130eaa5202d (diff)
parent2fc30e545aa763ca7e8a03c3380723e0acdc2965 (diff)
Merge branch 'master' of ssh://propellor.branchable.com
Diffstat (limited to 'doc/documentation.mdwn')
-rw-r--r--doc/documentation.mdwn4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/documentation.mdwn b/doc/documentation.mdwn
index 340eb09f..eccdda56 100644
--- a/doc/documentation.mdwn
+++ b/doc/documentation.mdwn
@@ -1,5 +1,5 @@
The [API documentation](http://hackage.haskell.org/package/propellor) of
-Propellor's modules is the most important docuemntation of propellor.
+Propellor's modules is the most important documentation of propellor.
Other documentation:
@@ -9,6 +9,6 @@ Other documentation:
* [[Components]]
* [[Contributing]]
* [[Interface Stability]]
-* [[Coding Stye]]
+* [[Coding Style]]
* [[Security]]
* [[Debugging]]