web commit by joey

[git.ikiwiki.info.git] / doc / features.mdwn

diff --git a/doc/features.mdwn b/doc/features.mdwn
index 4a83604ad2b130e38ad0297ddd0ca4c5d7efb6d4..332f86606f874ff25084c87961563f5a657cd921 100644 (file)
--- a/doc/features.mdwn
+++ b/doc/features.mdwn
@@ -36,7 +36,7 @@ Currently implemented:
 
 * [[SubPage]]s
 
 
 * [[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
 
 
 * [[blog]]s
 


@@ -44,9 +44,7 @@ Currently implemented:
   matching a specified [[GlobList]] will be displayed as a weblog within
   the blog page. And an RSS feed can be generated to follow the blog.
 
   matching a specified [[GlobList]] will be displayed as a weblog within
   the blog page. And an RSS feed can be generated to follow the blog.
 

-  ikiwiki also supports generating RSS feed for individual pages that
-  do not contain a [[blog]]. These feeds can be used to be sent a new
-  version of a page when it is changed.
+  Ikiwikit's own [[TODO]] and [[news]] pages are good examples of some of the flexible ways that this can be used.

 
 * Fast compiler
 
 
 * Fast compiler
 


@@ -90,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,
   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
   yours when you commit.
 
   In the rare cases where automatic merging fails due to the same part of a


@@ -100,7 +98,7 @@ Currently implemented:
 
 * page locking
 
 
 * page locking
 

-  Wiki admin can [[lock]] pages so that only other admins can edit them.
+  Wiki admins can lock pages so that only other admins can edit them.

 
 ----
 
 
 ----