web commit by joey

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

diff --git a/doc/features.mdwn b/doc/features.mdwn
index 5765552f01d85482ea8deb08df2e359b60dc88cb..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,14 +37,18 @@ 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 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.
+  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
+  page. And an RSS feed can be generated to follow the blog.

 
 

-  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.
+
+* [[tags]]
+
+  You can tag pages and use these tags in various ways.

 
 * Fast compiler
 
 
 * Fast compiler
 


@@ -97,9 +103,6 @@ Some of ikiwiki's features:
   shown in the file to resolve the conflict, so if you're already familiar
   with that there's no new commit marker syntax to learn.
 
   shown in the file to resolve the conflict, so if you're already familiar
   with that there's no new commit marker syntax to learn.
 

-  For all the gory details of how ikiwiki handles this behind the scenes,
-  see [[commit-internals]].
-

 * page locking
 
   Wiki admins can lock pages so that only other admins can edit them.
 * page locking
 
   Wiki admins can lock pages so that only other admins can edit them.