summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2017-03-20 13:07:52 +0100
committerJonas Smedegaard <dr@jones.dk>2017-03-20 13:07:52 +0100
commit840fa58a31c6492130b4e19e049bd4be1a1e7d3d (patch)
tree945b38ba1db8ca410ae583ef6c912fd154676145
parentd7c73b19202e77f22b20ffaa0c12a3b6356a8a20 (diff)
parent8678cdc4d0478cc4ea86bbb4737f2a8393d8c2ae (diff)
Merge remote-tracking branch 'ikiwiki/plaintitle'
-rw-r--r--config/ikiwiki.setup.in10
m---------shared0
2 files changed, 10 insertions, 0 deletions
diff --git a/config/ikiwiki.setup.in b/config/ikiwiki.setup.in
index ca1ebd0..7ee92fc 100644
--- a/config/ikiwiki.setup.in
+++ b/config/ikiwiki.setup.in
@@ -1,4 +1,14 @@
# IkiWiki::Setup::Yaml - YAML formatted setup file
+#
+# Seed info for creating ikiwiki setup file.
+#
+# Passing this to ikiwiki --setup ... --dumpsetup will make ikiwiki
+# generate its setup file.
+#
+# Remember to remove ikiwiki.setup and re-run make init any time you
+# edit this file.
+#
+# name of the wiki
wikiname: Omnipresence
adminemail: webmaster@couchdesign.dk
url: http://omni.kassandra-production.dk/
diff --git a/shared b/shared
-Subproject 15cba4b6b8888557b868db8008f8137e6f65093
+Subproject ee913a2cf511574090f1faffe2e27fe0c28e09d