web commit from 66.118.98.137:

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

diff --git a/doc/features.mdwn b/doc/features.mdwn
index 93a5f5b8a4ae4e68571c213f3905d8679709d72f..8ba65fc55698123cebc79f09269230cfe28ecd35 100644 (file)
--- a/doc/features.mdwn
+++ b/doc/features.mdwn
@@ -4,7 +4,7 @@ Currently implemented:
 
   Rather than implement its own system for storing page histories etc, ikiwiki      simply uses subversion. (Supporting other revision control systems is also possible, ikiwiki only needs $FOO add, $FOO commit, and $FOO log).
 
 
   Rather than implement its own system for storing page histories etc, ikiwiki      simply uses subversion. (Supporting other revision control systems is also possible, ikiwiki only needs $FOO add, $FOO commit, and $FOO log).
 

-  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 when you come online.
+  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 when you come online. Deal with edit conflicts with others in a sane environment. Take advantage of subversion's smart merges.

 
  ikiwiki can be run from a [[post-commit]] hook to update your wiki immediatly whenever you commit.
 
 
  ikiwiki can be run from a [[post-commit]] hook to update your wiki immediatly whenever you commit.
 


@@ -29,9 +29,8 @@ Currently implemented:
 
 * [[RecentChanges]], editng pages in a web browser
 
 
 * [[RecentChanges]], editng pages in a web browser
 

-  Nearly the definition of a wiki, although perhaps ikiwiki challanges how much of that web gunk a wiki really needs. These features are optional and can be enabled by enabling [[CGI]].
+  Nearly the definition of a wiki, although perhaps ikiwiki challenges how much of that web gunk a wiki really needs. These features are optional and can be enabled by enabling [[CGI]].

 
 ----
 
 
 ----
 

-
-[[TODO]]
\ No newline at end of file
+It also has lots of [[TODO]] items and [[Bugs]]. This wiki is not ready for production!
\ No newline at end of file