changed adminemail to admin@branchable.com, so that emailauth messages sent by branch...

diff --git a/ikiwiki.setup b/ikiwiki.setup
index c0264121ac1ee98fb79f058ad0d6717ee82a08f2..0a3d6f2d6c79f905cb67a18c6eea63c385c5d044 100644 (file)
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -10,7 +10,7 @@
 # name of the wiki
 wikiname: Chez Charles
 # contact email for wiki
-adminemail: webmaster@plessy.org
+adminemail: admin@branchable.com
 # users who are wiki admins
 adminuser:
 - https://launchpad.net/~plessy
@@ -84,7 +84,7 @@ indexpages: 0
 discussion: 0
 # name of Discussion pages
 discussionpage: Discussion
-# generate HTML5?
+# use elements new in HTML5 like <section>?
 html5: 1
 # only send cookies over SSL connections?
 sslcookie: 0
@@ -106,10 +106,12 @@ hardlink: 1
 #umask: public
 # group for wrappers to run in
 #wrappergroup: ikiwiki
-# extra library and plugin directory
+# extra library and plugin directories
+libdirs: []
+# extra library and plugin directory (searched after libdirs)
 libdir: /home/b-charles-plessy-org/.ikiwiki
 # environment variables
-#ENV: ''
+ENV: {}
 # time zone name
 timezone: GMT
 # regexp of normally excluded files to include
@@ -125,6 +127,8 @@ cookiejar:
   file: /home/b-charles-plessy-org/.ikiwiki/cookies
 # set custom user agent string for outbound HTTP requests e.g. when fetching aggregated RSS feeds
 useragent: ikiwiki/3.20141017
+# theme has a responsive layout? (mobile-optimized)
+responsive_layout: 1
 
 ######################################################################
 # core plugins
@@ -175,7 +179,7 @@ urlalias:
 - http://charles-plessy-org.branchable.com/
 - http://charles-plessy-org.branchable.com/
 - http://www.charles.plessy.org/
-# openid of primary site owner
+# openid or email of primary site owner
 owner: https://launchpad.net/~plessy
 # optional hostname of site this one was branched from
 #parent: ''
@@ -187,6 +191,8 @@ created: 1294480368
 #log_period: 7
 # disable IPv6?
 ipv6_disabled: 0
+# redirect from http to https?
+redirect_to_https: 0
 
 # inline plugin
 # enable rss feeds by default?
@@ -202,7 +208,7 @@ pingurl: []
 
 ######################################################################
 # auth plugins
-#   (anonok, blogspam, httpauth, lockedit, moderatedcomments,
+#   (anonok, blogspam, emailauth, httpauth, lockedit, moderatedcomments,
 #    opendiscussion, openid, passwordauth, signinedit)
 ######################################################################
 
@@ -215,7 +221,7 @@ pingurl: []
 #blogspam_pagespec: postcomment(*)
 # options to send to blogspam server
 #blogspam_options: blacklist=1.2.3.4,blacklist=8.7.6.5,max-links=10
-# blogspam server XML-RPC url
+# blogspam server JSON url
 #blogspam_server: ''
 
 # httpauth plugin
@@ -307,8 +313,8 @@ po_link_to: negotiated
 
 ######################################################################
 # web plugins
-#   (404, attachment, comments, editdiff, edittemplate, google, goto,
-#    mirrorlist, remove, rename, repolist, search, theme, userlist,
+#   (404, attachment, comments, editdiff, edittemplate, getsource, google,
+#    goto, mirrorlist, remove, rename, repolist, search, theme, userlist,
 #    websetup, wmd)
 ######################################################################
 
@@ -334,6 +340,10 @@ comments_commit: 1
 # Restrict formats for comments to (no restriction if empty)
 comments_allowformats: ''
 
+# getsource plugin
+# Mime type for returned source.
+#getsource_mimetype: text/plain; charset=utf-8
+
 # mirrorlist plugin
 # list of mirrors
 #mirrorlist: {}
@@ -389,8 +399,12 @@ websetup_show_unsafe: 0
 # calendar plugin
 # base of the archives hierarchy
 #archivebase: archives
-# PageSpec of pages to include in the archives; used by ikiwiki-calendar command
+# PageSpec of pages to include in the archives, if option `calendar_autocreate` is true.
 #archive_pagespec: page(posts/*) and !*/Discussion
+# autocreate new calendar pages?
+#calendar_autocreate: 1
+# if set, when building calendar pages, also build pages of year and month when no pages were published (building empty calendars).
+#calendar_fill_gaps: 1
 
 # listdirectives plugin
 # directory in srcdir that contains directive descriptions
@@ -421,10 +435,11 @@ directive_description_dir: ikiwiki/directive
 ######################################################################
 # other plugins
 #   (aggregate, autoindex, brokenlinks, camelcase, ddate, embed, favicon,
-#    filecheck, flattr, goodstuff, htmlbalance, localstyle, missingsite,
-#    notifyemail, pagetemplate, parked, pingee, pinger, prettydate,
-#    recentchanges, recentchangesdiff, relativedate, rsync, sidebar,
-#    smiley, sortnaturally, tag, testpagespec, trail, transient, typography)
+#    filecheck, flattr, goodstuff, htmlbalance, localstyle, loginselector,
+#    missingsite, notifyemail, pagetemplate, parked, pingee, pinger,
+#    prettydate, recentchanges, recentchangesdiff, relativedate, rsync,
+#    sidebar, smiley, sortnaturally, tag, testpagespec, trail, transient,
+#    typography)
 ######################################################################
 
 # aggregate plugin