summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-10-23 15:58:50 +0200
committerJonas Smedegaard <dr@jones.dk>2008-10-23 15:58:50 +0200
commit892a8c8634eb48e08462cf6329fa38fd782141ca (patch)
treee9e169abfebecf165dc22cbc0a50e252e49cda70
parentb3fd712357c135e288fc1b71957e54aca995c2cc (diff)
parentf1b34caf087ee01d9de744bee5fbde7d296fd63f (diff)
Merge branch 'nonedit' into allinone-da
Conflicts (manually resolved): ikiwiki_admin.setup ikiwiki_da_admin.setup
-rw-r--r--ikiwiki_da.setup10
-rw-r--r--ikiwiki_da_admin.setup12
2 files changed, 11 insertions, 11 deletions
diff --git a/ikiwiki_da.setup b/ikiwiki_da.setup
index 274ad5b..173718e 100644
--- a/ikiwiki_da.setup
+++ b/ikiwiki_da.setup
@@ -21,9 +21,9 @@ use IkiWiki::Setup::Standard {
# base url to the wiki
url => 'http://wiki.example.org',
# url to the ikiwiki.cgi
- cgiurl => 'http://wiki.example.org/ikiwiki.cgi',
+ cgiurl => 'http://wiki.example.org/ikiwiki.da.cgi',
# cgi wrapper to generate
- cgi_wrapper => $ENV{'HOME'} . '/public_cgi/wiki.example.org/ikiwiki.cgi',
+ cgi_wrapper => $ENV{'HOME'} . '/public_cgi/wiki.example.org/ikiwiki.da.cgi',
# mode for cgi_wrapper (can safely be made suid)
cgi_wrappermode => '06755',
# rcs backend to use
@@ -59,7 +59,7 @@ use IkiWiki::Setup::Standard {
# extension to use for new pages
default_pageext => 'mdwn',
# extension to use for html files
- htmlext => 'html',
+ htmlext => 'da.html',
# strftime format string to display date
timeformat => '%c',
# UTF-8 locale to use
@@ -133,13 +133,13 @@ use IkiWiki::Setup::Standard {
# mode for git_wrapper (can safely be made suid)
#git_wrappermode => '06755',
# gitweb url to show file history ([[file]] substituted)
- #historyurl => 'http://git.example.org/gitweb.cgi?p=wiki.git;a=history;f=[[file]]', # ;hb=master
+ #historyurl => 'http://git.example.org/gitweb.cgi?p=wiki.git;a=history;f=[[file]];hb=master-da',
# gitweb url to show a diff ([[sha1_to]], [[sha1_from]], [[sha1_parent]], and [[file]] substituted)
#diffurl => 'http://git.example.org/gitweb.cgi?p=wiki.git;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]',
# where to pull and push changes (set to empty string to disable)
#gitorigin_branch => 'samplewiki',
# branch that the wiki is stored in
- #gitmaster_branch => 'master',
+ #gitmaster_branch => 'master-da',
# htmlscrubber plugin
# PageSpec specifying pages not to scrub
diff --git a/ikiwiki_da_admin.setup b/ikiwiki_da_admin.setup
index 431cc09..397e096 100644
--- a/ikiwiki_da_admin.setup
+++ b/ikiwiki_da_admin.setup
@@ -21,9 +21,9 @@ use IkiWiki::Setup::Standard {
# base url to the wiki
url => 'http://admin.wiki.example.org',
# url to the ikiwiki.cgi
- cgiurl => 'http://admin.wiki.example.org/ikiwiki.cgi',
+ cgiurl => 'http://admin.wiki.example.org/ikiwiki.da.cgi',
# cgi wrapper to generate
- cgi_wrapper => $ENV{'HOME'} . '/public_cgi/admin.wiki.example.org/ikiwiki.cgi',
+ cgi_wrapper => $ENV{'HOME'} . '/public_cgi/admin.wiki.example.org/ikiwiki.da.cgi',
# mode for cgi_wrapper (can safely be made suid)
cgi_wrappermode => '06755',
# rcs backend to use
@@ -33,7 +33,7 @@ use IkiWiki::Setup::Standard {
# plugins to disable
disable_plugins => [],
# location of template files
- templatedir => $ENV{'HOME'} . '/private_webdata/samplewiki/templates',
+ templatedir => $ENV{'HOME'} . '/private_webdata/samplewiki/templates_l10n/da',
# base wiki source location
underlaydirs => [
#$ENV{'HOME'} . "/private_webdata/samplewiki/smiley_l10n/da",
@@ -58,7 +58,7 @@ use IkiWiki::Setup::Standard {
# extension to use for new pages
default_pageext => 'mdwn',
# extension to use for html files
- htmlext => 'html',
+ htmlext => 'da.html',
# strftime format string to display date
timeformat => '%c',
# UTF-8 locale to use
@@ -132,13 +132,13 @@ use IkiWiki::Setup::Standard {
# mode for git_wrapper (can safely be made suid)
#git_wrappermode => '06755',
# gitweb url to show file history ([[file]] substituted)
- #historyurl => 'http://git.example.org/gitweb.cgi?p=wiki.git;a=history;f=[[file]]', # ;hb=master
+ #historyurl => 'http://git.example.org/gitweb.cgi?p=wiki.git;a=history;f=[[file]];hb=master-da',
# gitweb url to show a diff ([[sha1_to]], [[sha1_from]], [[sha1_parent]], and [[file]] substituted)
#diffurl => 'http://git.example.org/gitweb.cgi?p=wiki.git;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]',
# where to pull and push changes (set to empty string to disable)
#gitorigin_branch => 'samplewiki',
# branch that the wiki is stored in
- #gitmaster_branch => 'master',
+ #gitmaster_branch => 'master-da',
# htmlscrubber plugin
# PageSpec specifying pages not to scrub