Merge branch 'master'

[ikiwiki.git] / doc / ikiwiki-makerepo.mdwn

diff --git a/doc/ikiwiki-makerepo.mdwn b/doc/ikiwiki-makerepo.mdwn
index d5034b2c724da9780890985351d1b7fc5c59b6a4..3fbfbdc827c3f0208a0cd12e5241f6fc5744bd4f 100644 (file)
--- a/doc/ikiwiki-makerepo.mdwn
+++ b/doc/ikiwiki-makerepo.mdwn
@@ -6,16 +6,17 @@ ikiwiki-makerepo - check an ikiwiki srcdir into revision control
 
 ikiwiki-makerepo svn|git|monotone|darcs srcdir repository
 
-ikiwiki-makerepo mercurial|darcs srcdir
+ikiwiki-makerepo bzr|mercurial|darcs srcdir
 
 # DESCRIPTION
 
 `ikiwiki-makerepo` injects a `srcdir` directory, containing an ikiwiki wiki,
-into a `repository` that it creates. The repository can be a svn, git, or
-mercurial repository.
+into a `repository` that it creates. The repository can be created using
+any of a variety of revision control systems.
 
-Note that for mercurial, the srcdir is converted into a mercurial
-repository. There is no need to have a separate repository with mercurial.
+Note that for mercurial and bzr, the srcdir is converted into a
+repository. There is no need to have a separate repository with mercurial
+or bzr.
 
 For darcs, the second (one-argument) form turns the given srcdir into a
 darcs master repository with the (new) srcdir inside. Adjust your ikiwiki.setup
@@ -24,8 +25,8 @@ preconfigured to call a (hypothetical) ikiwiki wrapper. The command
 reports the relevant file. Adjust it as needed or remove it if you don't use
 the cgi script.
 
-Note that for monotone, you are assumed to already have run "mtn genkey" to generate
-key.
+Note that for monotone, you are assumed to already have run "mtn genkey"
+to generate key.
 
 # AUTHOR