Merge branch 'master' into cvs

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

diff --git a/doc/ikiwiki-makerepo.mdwn b/doc/ikiwiki-makerepo.mdwn
index 3fbfbdc827c3f0208a0cd12e5241f6fc5744bd4f..acb1211de76f787e800f58b43b47bdc9a0d56c83 100644 (file)
--- a/doc/ikiwiki-makerepo.mdwn
+++ b/doc/ikiwiki-makerepo.mdwn
@@ -4,9 +4,9 @@ ikiwiki-makerepo - check an ikiwiki srcdir into revision control
 
 # SYNOPSIS
 
 
 # SYNOPSIS
 

-ikiwiki-makerepo svn|git|monotone|darcs srcdir repository
+ikiwiki-makerepo git|svn|monotone|darcs|cvs srcdir repository

 
 

-ikiwiki-makerepo bzr|mercurial|darcs srcdir
+ikiwiki-makerepo bzr|mercurial srcdir

 
 # DESCRIPTION
 
 
 # DESCRIPTION
 


@@ -18,15 +18,19 @@ 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.
 
 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
-according to the command output! Also, the master repo's apply hook will be
-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.
+For darcs, the master repo's apply hook will be preconfigured to call a
+ikiwiki wrapper.

 
 Note that for monotone, you are assumed to already have run "mtn genkey"
 
 Note that for monotone, you are assumed to already have run "mtn genkey"

-to generate key.
+to generate a key.
+
+
+# EXAMPLE 
+
+`ikiwiki-makerepo git /var/www/wiki /home/user/wiki/`
+
+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. 

 
 # AUTHOR
 
 
 # AUTHOR