From 2ae8817d91bb05fde9a3d71956997c68e8e564a0 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Tue, 6 Mar 2012 13:07:25 +0100
Subject: Sync config with public git: add plugins branding and rawhtml (not
 html). comment out disabled gitorigin_branch. use tagbase blog (not tag).

---
 config/ikiwiki.setup.in | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/config/ikiwiki.setup.in b/config/ikiwiki.setup.in
index 12fe426..d5c79d1 100644
--- a/config/ikiwiki.setup.in
+++ b/config/ikiwiki.setup.in
@@ -8,6 +8,7 @@ url: http://dr.jones.dk/
 cgiurl: http://dr.jones.dk/ikiwiki.cgi
 add_plugins:
 - search
+- branding
 - topbar
 - sidebar
 - farbar
@@ -19,7 +20,7 @@ add_plugins:
 - map
 - linkmap
 - aggregate
-- html
+- rawhtml
 - graphviz
 disable_plugins:
 - htmlscrubber
@@ -33,7 +34,7 @@ timezone: Europe/Copenhagen
 allow_symlinks_before_srcdir: 1
 historyurl: http://source.jones.dk/?p=jones/content.git;a=history;f=[[file]]
 diffurl: http://source.jones.dk/?p=jones/content.git;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]
-gitorigin_branch: ''
+#gitorigin_branch: ''
 gitmaster_branch: master
 htmlscrubber_skip: '!*/Discussion'
 allowrss: 1
@@ -48,5 +49,5 @@ po_slave_languages:
 po_translatable_pages: '* and !*/talk/* and !emdebian/fb/*'
 po_link_to: negotiated
 aggregateinternal: 1
-tagbase: tag
+tagbase: blog
 tag_autocreate_commit: 1
-- 
cgit v1.2.3