diff options
| author | intrigeri <intrigeri@boum.org> | 2010-06-29 15:53:51 +0200 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2010-06-29 15:53:51 +0200 |
| commit | 1786b106a9c7f448136ff47d9b6dd26d48a5dd2e (patch) | |
| tree | edfeed77be4a56ed06095bd67eb7cbc05a1a1eca /doc/setup | |
| parent | b225fdc44d4b3d2853db622d59aed7b59788aeec (diff) | |
| parent | be60d261e6cbee094e4df74e1bb24c8ad3dc393d (diff) | |
Merge remote branch 'upstream/master' into prv/po
Conflicts:
doc/plugins/po.mdwn
Diffstat (limited to 'doc/setup')
| -rw-r--r-- | doc/setup/byhand.mdwn | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/setup/byhand.mdwn b/doc/setup/byhand.mdwn index afd1ac27f..86cff5af4 100644 --- a/doc/setup/byhand.mdwn +++ b/doc/setup/byhand.mdwn @@ -177,7 +177,7 @@ about using the git repositories. Once your wiki is checked in to the revision control system, you should configure ikiwiki to use revision control. Edit your ikiwiki.setup, set -`rcs` to the the revision control system you chose to use. Be careful, +`rcs` to the revision control system you chose to use. Be careful, you may need to use the 'fullname'. For example, 'hg' doesn't work, you should use mercurial. Be sure to set `svnrepo` to the directory for your repository, if using subversion. Uncomment the configuration for the wrapper |