X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/c77e9a9b3cd4d6323f57923743d7acacca24aa1d..9c2f67454b630018f3cff3cc5c1c1a7dcc15f54f:/doc/features.mdwn?ds=sidebyside

diff --git a/doc/features.mdwn b/doc/features.mdwn
index 5044147a4..332f86606 100644
--- a/doc/features.mdwn
+++ b/doc/features.mdwn
@@ -36,7 +36,7 @@ Currently implemented:
 
 * [[SubPage]]s
 
-  Arbitrarily deep hierarchies of pages with fairly simple and useful [[SubPage/LinkingRUles]]
+  Arbitrarily deep hierarchies of pages with fairly simple and useful [[SubPage/LinkingRules]]
 
 * [[blog]]s
 
@@ -88,7 +88,7 @@ Currently implemented:
   Since it uses subversion, ikiwiki takes advantage of its smart merging to
   avoid any conflicts when two people edit different parts of the same page
   at the same time. No annoying warnings about other editors, or locking,
-  etc, instead the other person's changes will be automaticaly merged with
+  etc, instead the other person's changes will be automatically merged with
   yours when you commit.
 
   In the rare cases where automatic merging fails due to the same part of a