diff options
| author | Amitai Schlair <schmonz-web-ikiwiki@schmonz.com> | 2012-02-07 01:38:53 -0500 |
|---|---|---|
| committer | Amitai Schlair <schmonz-web-ikiwiki@schmonz.com> | 2012-02-07 01:38:53 -0500 |
| commit | 64aca7c30b5ffc48546bdd7f3001b0a0b4bae072 (patch) | |
| tree | 4ce5425946e16254c8f31e19e947e9e4b1bbda6a | |
| parent | cd7eb3e62572f14f52a7bced4e8aea946368ccff (diff) | |
| parent | b2af77da343733d6633d6f0224ddbc8f4359ed46 (diff) | |
| download | ikiwiki-64aca7c30b5ffc48546bdd7f3001b0a0b4bae072.tar ikiwiki-64aca7c30b5ffc48546bdd7f3001b0a0b4bae072.tar.gz | |
Merge branch 'master' into cvs
| -rw-r--r-- | doc/ikiwiki-makerepo.mdwn | 27 | ||||
| -rw-r--r-- | doc/sandbox.mdwn | 2 |
2 files changed, 18 insertions, 11 deletions
diff --git a/doc/ikiwiki-makerepo.mdwn b/doc/ikiwiki-makerepo.mdwn index acb1211de..eccfb692a 100644 --- a/doc/ikiwiki-makerepo.mdwn +++ b/doc/ikiwiki-makerepo.mdwn @@ -4,19 +4,24 @@ ikiwiki-makerepo - check an ikiwiki srcdir into revision control # SYNOPSIS -ikiwiki-makerepo git|svn|monotone|darcs|cvs srcdir repository +ikiwiki-makerepo git|svn|monotone|darcs|cvs srcdir repo ikiwiki-makerepo bzr|mercurial srcdir # DESCRIPTION -`ikiwiki-makerepo` injects a `srcdir` directory, containing an ikiwiki wiki, -into a `repository` that it creates. The repository can be created using -any of a variety of revision control systems. +`ikiwiki-makerepo` injects an existing `srcdir` directory, containing +sources for an ikiwiki wiki, into revision control. It is rarely +run directly; consider using `ikiwiki -setup /etc/ikiwiki/wiki.setup` instead +to set up a wiki. -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 git, the `repo` is created as a bare git repository, and the srcdir is +made into a clone of it. (monotone and darcs are similar.) + +For svn and cvs, the `repo` is the centralized repository, and the `srcdir` +is a checkout of it. + +For mercurial and bzr, the srcdir is the only repository set up. For darcs, the master repo's apply hook will be preconfigured to call a ikiwiki wrapper. @@ -24,13 +29,13 @@ ikiwiki wrapper. Note that for monotone, you are assumed to already have run "mtn genkey" to generate a key. - # EXAMPLE -`ikiwiki-makerepo git /var/www/wiki /home/user/wiki/` +`ikiwiki-makerepo git /srv/web/wiki /srv/git/wiki.git/` -The above command creates a new git repo in /home/user/wiki as well as a new git repo in the /var/www/wiki directory. -It then initializes the /home/user/wiki git repo and makes the /var/www/wiki a clone. +This creates a bare repository `/srv/git/wiki.git/`, +and sets up `/srv/web/wiki` to be a clone of it, committing +any files that already exist in that directory. # AUTHOR diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 2f173677b..c3fb32b30 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -171,3 +171,5 @@ endmodule #<asd> This is simple enough for now [[sandbocen]] no? + + Do code tags work? |