aboutsummaryrefslogtreecommitdiff
path: root/doc/features.mdwn
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-09-06 20:31:55 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-09-06 20:31:55 +0000
commitf7f3b0bb7d91c74f67023e970cee71ad2ea260da (patch)
tree5944ff8e2c28172497d4ae8262f4eb7f2a843ddf /doc/features.mdwn
parent513af0c0df210bbab175f3408013f058cec05ef1 (diff)
downloadikiwiki-f7f3b0bb7d91c74f67023e970cee71ad2ea260da.tar
ikiwiki-f7f3b0bb7d91c74f67023e970cee71ad2ea260da.tar.gz
* Add support for mercurial, contributed by Emanuele Aina.
Diffstat (limited to 'doc/features.mdwn')
-rw-r--r--doc/features.mdwn16
1 files changed, 8 insertions, 8 deletions
diff --git a/doc/features.mdwn b/doc/features.mdwn
index d5fa4026b..c568213bf 100644
--- a/doc/features.mdwn
+++ b/doc/features.mdwn
@@ -4,18 +4,18 @@ An overview of some of ikiwiki's features:
## Uses a real RCS
Rather than implement its own system for storing page histories etc,
-ikiwiki uses a real RCS. This isn't because we're lazy, it's because a
-real RCS is a good thing to have, and there are advantages to using one
-that are not possible with a standard wiki.
+ikiwiki uses a real Revision Control System. This isn't because we're
+lazy, it's because a real RCS is a good thing to have, and there are
+advantages to using one that are not possible with a standard wiki.
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. Or use git or tla to work in a distributed fashion
-all the time. (It's also possible to [[plugins/write]] a plugin to support
-other systems.)
+changes via [[Subversion]]. Or work disconnected using svk and push your
+changes out when you come online. Or use [[git]], [[tla]], or [[mercurial]]
+to work in a distributed fashion all the time. (It's also possible to
+[[plugins/write]] a plugin to support other systems.)
ikiwiki can be run from a [[post-commit]] hook to update your wiki
-immediately whenever you commit.
+immediately whenever you commit a change using the RCS.
Note that ikiwiki does not require a RCS to function. If you want to
run a simple wiki without page history, it can do that too.