commit of setup files

diff --git a/ikiwiki.setup b/ikiwiki.setup
index 4b1205fcfbac0aec82bdf800a969de7e5c7c1bbe..3b8148e89b08518425190718ef23856dcf7bf319 100644 (file)
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -8,9 +8,9 @@
 # Remember to re-run ikiwiki --setup any time you edit this file.
 #
 # name of the wiki
-wikiname: charles
+wikiname: Chez Charles
 # contact email for wiki
-adminemail: charles@plessy.org
+adminemail: webmaster@plessy.org
 # users who are wiki admins
 adminuser:
   - https://launchpad.net/~plessy
@@ -54,6 +54,7 @@ add_plugins:
   - testpagespec
   - version
   - theme
+  - po
 # plugins to disable
 disable_plugins: []
 # additional directory to search for template files
@@ -71,11 +72,11 @@ prefix_directives: 1
 # use page/index.mdwn source files
 indexpages: 0
 # enable Discussion pages?
-discussion: 1
+discussion: 0
 # name of Discussion pages
 discussionpage: Discussion
 # generate HTML5? (experimental)
-html5: 0
+html5: 1
 # only send cookies over SSL connections?
 sslcookie: 0
 # extension to use for new pages
@@ -221,16 +222,14 @@ langdefdir: /usr/share/highlight/langDefs
 
 # po plugin
 # master language (non-PO files)
-#po_master_language: en|English
+po_master_language: fr|French
 # slave languages (translated via PO files) format: ll|Langname
-#po_slave_languages:
-#  - fr|Français
-#  - es|Español
-#  - de|Deutsch
+po_slave_languages:
+  - en|English
 # PageSpec controlling which pages are translatable
-#po_translatable_pages: '* and !*/Discussion'
+po_translatable_pages: ''
 # internal linking behavior (default/current/negotiated)
-#po_link_to: current
+po_link_to: default
 
 ######################################################################
 # misc plugins
@@ -239,9 +238,8 @@ langdefdir: /usr/share/highlight/langDefs
 
 ######################################################################
 # web plugins
-#   (404, attachment, comments, editdiff, edittemplate, getsource, google,
-#    goto, mirrorlist, remove, rename, repolist, search, theme, websetup,
-#    wmd)
+#   (404, attachment, comments, editdiff, edittemplate, google, goto,
+#    mirrorlist, remove, rename, repolist, search, theme, websetup, wmd)
 ######################################################################
 
 # attachment plugin
@@ -252,21 +250,17 @@ virus_checker: clamdscan -
 
 # comments plugin
 # PageSpec of pages where comments are allowed
-#comments_pagespec: blog/* and !*/Discussion
+comments_pagespec: ''
 # PageSpec of pages where posting new comments is not allowed
-#comments_closed_pagespec: blog/controversial or blog/flamewar
+comments_closed_pagespec: ''
 # Base name for comments, e.g. "comment_" for pages like "sandbox/comment_12"
-#comments_pagename: ''
+comments_pagename: comment_
 # Interpret directives in comments?
 #comments_allowdirectives: 0
 # Allow anonymous commenters to set an author name?
 #comments_allowauthor: 0
 # commit comments to the VCS
-#comments_commit: 1
-
-# getsource plugin
-# Mime type for returned source.
-#getsource_mimetype: text/plain; charset=utf-8
+comments_commit: 1
 
 # mirrorlist plugin
 # list of mirrors
@@ -350,7 +344,7 @@ directive_description_dir: ikiwiki/directive
 
 # aggregate plugin
 # enable aggregation to internal pages?
-#aggregateinternal: 1
+aggregateinternal: 1
 # allow aggregation to be triggered via the web?
 #aggregate_webtrigger: 0
 
@@ -387,7 +381,7 @@ created: 1294480368
 
 # prettydate plugin
 # format to use to display date
-#prettydateformat: '%X, %B %o, %Y'
+prettydateformat: '%X, %B %o, %Y'
 
 # recentchanges plugin
 # name of the recentchanges page