web commit by JeroenSchot: escape [[]]'s.

[ikiwiki.git] / doc / features.mdwn

diff --git a/doc/features.mdwn b/doc/features.mdwn
index 4699f309676b899cae6aa79965673691c7b22e78..332f86606f874ff25084c87961563f5a657cd921 100644 (file)
--- a/doc/features.mdwn
+++ b/doc/features.mdwn
@@ -27,13 +27,6 @@ Currently implemented:
   and is quite smart about converting it to html. The only additional markup
   provided by ikiwiki aside from regular markdown is the [[WikiLink]].
 
-* [[RSS]]
-
-  ikiwiki supports generating RSS (2.0) feed for individual pages. These
-  feeds can be subscribed to, to get an update when a page is changed.
-
-  (Support for proper blogs is also planned.)
-
 * support for other file types
 
   ikiwiki also supports files of any other type, including raw html, text,
@@ -43,11 +36,21 @@ 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
+
+  You can turn any page in the wiki into a [[blog]]. Pages with names 
+  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.
+
+  Ikiwikit's own [[TODO]] and [[news]] pages are good examples of some of the flexible ways that this can be used.
 
 * Fast compiler
 
-  ikiwiki is fast and smart about updating a wiki, it only builds pages that have changed (and tracks things like creation of new pages and links that can indirectly cause a page to need a rebuild)
+  ikiwiki is fast and smart about updating a wiki, it only builds pages
+  that have changed (and tracks things like creation of new pages and links
+  that can indirectly cause a page to need a rebuild)
 
 * [[Templates]]
 
@@ -85,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
@@ -95,7 +98,7 @@ Currently implemented:
 
 * 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.
 
 ----