check ikiwiki.pot into svn to avoid problems

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

diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup
index 52b112a44c9e3430425788a6eb2b395f1ffc171d..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]]",
        #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"
 
        # Tla stuff.
        #rcs => "tla"


@@ -81,7 +83,7 @@ use IkiWiki::Setup::Standard {
        discussion => 1,
        # To exclude files matching a regexp from processing. This adds to
        # the default exclude list.
        discussion => 1,
        # To exclude files matching a regexp from processing. This adds to
        # the default exclude list.

-       #exclude => qr/\*.wav/,
+       #exclude => qr/*\.wav/,

        # Time format (for strftime)
        #timeformat => '%c',
        # Locale to use. Must be a UTF-8 locale.
        # Time format (for strftime)
        #timeformat => '%c',
        # Locale to use. Must be a UTF-8 locale.


@@ -102,7 +104,7 @@ use IkiWiki::Setup::Standard {
 
        # For use with the tag plugin, make all tags be located under a
        # base page.
 
        # 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.
        
        # For use with the search plugin if your estseek.cgi is located 
        # somewhere else.