diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2009-04-04 17:27:48 -0400 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2009-04-04 17:27:48 -0400 |
| commit | 8e92468eae9ac0ab8161a0c71ff6c6a0a8aef07a (patch) | |
| tree | 9e26465e0ca98a5f3cbc6c72a0cace4bf83b93db /doc/ikiwiki-makerepo.mdwn | |
| parent | 78a69e5bd632eb86ef8135e9c1d05d2c48b43362 (diff) | |
| parent | 08fda4c9d374de1d3de3172a192d4d915d3dc0c1 (diff) | |
| download | ikiwiki-8e92468eae9ac0ab8161a0c71ff6c6a0a8aef07a.tar ikiwiki-8e92468eae9ac0ab8161a0c71ff6c6a0a8aef07a.tar.gz | |
Merge branch 'master'
Conflicts:
doc/ikiwiki-makerepo.mdwn
Diffstat (limited to 'doc/ikiwiki-makerepo.mdwn')
| -rw-r--r-- | doc/ikiwiki-makerepo.mdwn | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/doc/ikiwiki-makerepo.mdwn b/doc/ikiwiki-makerepo.mdwn index d5034b2c7..3fbfbdc82 100644 --- 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 |