web commit by joey

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

diff --git a/doc/features.mdwn b/doc/features.mdwn
index ac5dc03752049dcab125b8839b11b68928985eae..12e9d0528b952b72b54428e40ced848744137fa9 100644 (file)
--- a/doc/features.mdwn
+++ b/doc/features.mdwn
@@ -3,7 +3,9 @@ Some of ikiwiki's features:
 * [[Subversion]]
 
   Rather than implement its own system for storing page histories etc,
 * [[Subversion]]
 
   Rather than implement its own system for storing page histories etc,

-  ikiwiki simply uses subversion. (It's also possible to [[plugins/write]] support for other systems.)
+  ikiwiki simply uses subversion. (It's also possible to [[plugins/write]]
+  support for other systems, and ikiwiki also includes support for [[Git]]
+  now.)

 
   Instead of editing pages in a stupid web form, you can use vim and commit
   changes via svn. Or work disconnected using svk and push your changes out
 
   Instead of editing pages in a stupid web form, you can use vim and commit
   changes via svn. Or work disconnected using svk and push your changes out


@@ -35,7 +37,7 @@ Some of ikiwiki's features:
 
   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
+* [[blogging|blog]]

 
   You can turn any page in the wiki into a [[blog]]. Pages matching a
   specified [[GlobList]] will be displayed as a weblog within the blog
 
   You can turn any page in the wiki into a [[blog]]. Pages matching a
   specified [[GlobList]] will be displayed as a weblog within the blog


@@ -44,7 +46,9 @@ Some of ikiwiki's features:
   Ikiwiki's own [[TODO]], [[news]], and [[plugins]] pages are good examples
   of some of the flexible ways that this can be used.
 
   Ikiwiki's own [[TODO]], [[news]], and [[plugins]] pages are good examples
   of some of the flexible ways that this can be used.
 

-  Note that this also includes support for tag-based blogging.
+* [[tags]]
+
+  You can tag pages and use these tags in various ways.

 
 * Fast compiler
 
 
 * Fast compiler