web commit by JoshTriplett: Response.

[git.ikiwiki.info.git] / doc / ikiwiki.setup

diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup
index 69162c0e46a7097b317d1d20c6c5f41c96119009..910b2b527dcfa97538b2660d14613b5de8693710 100644 (file)
--- a/doc/ikiwiki.setup
+++ b/doc/ikiwiki.setup
@@ -29,6 +29,8 @@ use IkiWiki::Setup::Standard {
        #rcs => "git",
        #historyurl => "http://git.example.org/gitweb.cgi?p=wiki.git;a=history;f=[[file]]",
        #diffurl => "http://git.example.org/gitweb.cgi?p=wiki.git;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]",
+       #gitorigin_branch => "origin",
+       #gitmaster_branch => "master",
 
        # Tla stuff.
        #rcs => "tla"
@@ -102,7 +104,7 @@ use IkiWiki::Setup::Standard {
 
        # For use with the tag plugin, make all tags be located under a
        # base page.
-       #tagbase => "tag".
+       #tagbase => "tag",
        
        # For use with the search plugin if your estseek.cgi is located 
        # somewhere else.