ikiwiki (3.20130711) unstable; urgency=low

  * Deal with git behavior change in 1.7.2 and newer that broke support
    for commits with an empty commit message.
  * Pass --no-edit when used with git 1.7.8 and newer.

# imported from the archive

6 files changed, 20 insertions, 0 deletions

diff --git a/doc/themes/actiontabs_small.png b/doc/themes/actiontabs_small.png
new file mode 100644
index 000000000..4b05ad3dc
--- /dev/null
+++ b/doc/themes/actiontabs_small.png
diff --git a/doc/themes/blueview_small.png b/doc/themes/blueview_small.png
new file mode 100644
index 000000000..74972c4c3
--- /dev/null
+++ b/doc/themes/blueview_small.png
diff --git a/doc/themes/discussion.mdwn b/doc/themes/discussion.mdwn
new file mode 100644
index 000000000..5c0766a06
--- /dev/null
+++ b/doc/themes/discussion.mdwn
@@ -0,0 +1,20 @@
+I would like to contribute a theme I created and posted on github:
+
+[[https://github.com/AntPortal/ikiwiked]]
+
+For an example of the theme in action, see: [[https://antportal.com/wiki/]]
+
+> Shouldn't we just make people post their themes in the [[themes]] page? Or maybe we should make a [[theme market]]? --[[anarcat]]
+
+> I did just that. -- [[anarcat]]
+
+What is the process for merging a theme in Ikiwiki? It seems to me the
+[[Bootstrap theme|http://www2.tblein.eu/posts/How_to_have_a_nice_design_for_ikiwiki/]]
+could improve the options a lot... See the [[theme market]] for the
+links to the actual theme. -- [[anarcat]]
+
+> Step 1 is to not need two versions of page.tmpl to be maintained.
+> This is, unfortunately, the reason why I have not pulled in the bootstrap
+> theme yet. I recently made `<TMPL_IF THEME_$NAME>` be available,
+> so the page.tmpl could use that to do different things if the boostrap
+> theme was enabled. --[[Joey]]
diff --git a/doc/themes/goldtype_small.png b/doc/themes/goldtype_small.png
new file mode 100644
index 000000000..a011bb200
--- /dev/null
+++ b/doc/themes/goldtype_small.png
diff --git a/doc/themes/monochrome_small.png b/doc/themes/monochrome_small.png
new file mode 100644
index 000000000..6c98100a1
--- /dev/null
+++ b/doc/themes/monochrome_small.png
diff --git a/doc/themes/none_small.png b/doc/themes/none_small.png
new file mode 100644
index 000000000..8272ae606
--- /dev/null
+++ b/doc/themes/none_small.png