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 | |
| parent | 33557b73e518e0549e3dabc9a89a2c805c2a62f1 (diff) | |
| parent | a3a014542bddda8ba54f45078232cceeadfa505b (diff) | |
Merge branch '_multilang' into multilang
Conflicts (manually resolved):
Makefile
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | ikiwiki.setup | 2 | ||||
| -rw-r--r-- | ikiwiki_da.setup | 2 | ||||
| -rw-r--r-- | ikiwiki_nb.setup | 4 | ||||
| m--------- | javascript | 0 | ||||
| m--------- | openid-selector | 0 | ||||
| m--------- | smiley | 0 |
7 files changed, 5 insertions, 5 deletions
@@ -12,7 +12,7 @@ ikiwiki_LOCALES = da nb #dummy_MODULES = content_dummy # uncomment this when ikiwiki.setup is configured for the local environment -#CONFIGS = ikiwiki_da.setup ikiwiki_no.setup ikiwiki.setup +#CONFIGS = ikiwiki_da.setup ikiwiki_nb.setup ikiwiki.setup # Everything after this is generic diff --git a/ikiwiki.setup b/ikiwiki.setup index 6ba6574..18ad418 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -25,7 +25,7 @@ use IkiWiki::Setup::Standard { # cgi wrapper to generate cgi_wrapper => $ENV{'HOME'} . '/public_cgi/wiki.example.org/ikiwiki.en.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 diff --git a/ikiwiki_da.setup b/ikiwiki_da.setup index 44e84ff..008197b 100644 --- a/ikiwiki_da.setup +++ b/ikiwiki_da.setup @@ -25,7 +25,7 @@ use IkiWiki::Setup::Standard { # cgi wrapper to generate cgi_wrapper => $ENV{'HOME'} . '/public_cgi/wiki.example.org/ikiwiki.da.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 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) diff --git a/javascript b/javascript -Subproject dea1eff3d9e9781e5b92a326ad7df17d3ba8ba1 +Subproject 9bf18ddbcb122e0f0005c06870c3b792bf7d9b0 diff --git a/openid-selector b/openid-selector -Subproject b4852ae1f1905a285d69947d6352b6898303324 +Subproject 517a71e93b14812d722f000ab42a6e61cb7b402 diff --git a/smiley b/smiley -Subproject 30dd469765c2396ded03355876af391e922e89b +Subproject 0f24195c7ac3858346dff976970b8b21e911242 |