diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-08-30 19:48:50 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-08-30 19:48:50 +0200 |
| commit | 00416c4072095e97f099116ccc31675e2a3c881b (patch) | |
| tree | 9cc54a88d5b57212b420625417f085d0706e4cbb /ikiwiki_nb.setup | |
| parent | 33557b73e518e0549e3dabc9a89a2c805c2a62f1 (diff) | |
| parent | a3a014542bddda8ba54f45078232cceeadfa505b (diff) | |
Merge branch '_multilang' into multilang
Conflicts (manually resolved):
Makefile
Diffstat (limited to 'ikiwiki_nb.setup')
| -rw-r--r-- | ikiwiki_nb.setup | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ikiwiki_nb.setup b/ikiwiki_nb.setup index 17886ac..182ba39 100644 --- a/ikiwiki_nb.setup +++ b/ikiwiki_nb.setup @@ -25,7 +25,7 @@ use IkiWiki::Setup::Standard { # cgi wrapper to generate cgi_wrapper => $ENV{'HOME'} . '/public_cgi/wiki.example.org/ikiwiki.nb.cgi', # mode for cgi_wrapper (can safely be made suid) - cgi_wrappermode => '06755', + cgi_wrappermode => '00755', # rcs backend to use rcs => '', # plugins to add to the default configuration @@ -57,7 +57,7 @@ use IkiWiki::Setup::Standard { # strftime format string to display date timeformat => '%c', # UTF-8 locale to use - locale => 'no_NB.UTF-8', + locale => 'nb_NO.UTF-8', # put user pages below specified page userdir => '', # how many backlinks to show before hiding excess (0 to show all) |