move the release template to the softwaresite example

5 files changed, 16 insertions, 11 deletions

diff --git a/doc/templates/release.mdwn b/doc/examples/softwaresite/templates/release.mdwn
index e9abd1ada..b8b0abffc 100644
--- a/doc/templates/release.mdwn
+++ b/doc/examples/softwaresite/templates/release.mdwn
@@ -1,4 +1,4 @@
-<TMPL_IF news>News for ikiwiki <TMPL_VAR version>:
+<TMPL_IF news>News for FooBar <TMPL_VAR version>:
 
 <TMPL_VAR news>
 
diff --git a/doc/templates/release/discussion.mdwn b/doc/examples/softwaresite/templates/release/discussion.mdwn
index a0fe4aeeb..f1794d8bf 100644
--- a/doc/templates/release/discussion.mdwn
+++ b/doc/examples/softwaresite/templates/release/discussion.mdwn
@@ -10,3 +10,6 @@ I'd rather not use a template for my release announcements, because these announ
 > you have already done so, then could you post a link to them?
 >
 > --[[JoshTriplett]]
+
+>> No problem. My release script is here:
+>> <http://svn.kitenet.net/trunk/bin/wikiannounce> --[[Joey]]
diff --git a/doc/news/version_1.40.mdwn b/doc/news/version_1.40.mdwn
index d595ff7de..c3455c3f2 100644
--- a/doc/news/version_1.40.mdwn
+++ b/doc/news/version_1.40.mdwn
@@ -1,5 +1,5 @@
-[[template id=release version="1.40" changelog="""
+ikiwiki 1.40 released with [[toggle text="these changes"]]
+[[toggleable text="""
    * Fix missing categories in RSS/Atom feeds.
    * Add French translation by Jean-Luc Coulon. Closes: #[406881](http://bugs.debian.org/406881)
-   * Fix bogus use of CDATA in Atom feeds. Closes: #[406898](http://bugs.debian.org/406898)
-"""]]
+   * Fix bogus use of CDATA in atom feeds. Closes: #[406898](http://bugs.debian.org/406898)"""]]
diff --git a/doc/news/version_1.41.mdwn b/doc/news/version_1.41.mdwn
index 25dc574fb..70d1eb533 100644
--- a/doc/news/version_1.41.mdwn
+++ b/doc/news/version_1.41.mdwn
@@ -1,4 +1,5 @@
-[[template id=release version="1.41" changelog="""
+ikiwiki 1.41 released with [[toggle text="these changes"]]
+[[toggleable text="""
    * Gettext 1.04 or up is needed for the OO interface that ikiwiki needs,
      if an older version is installed, just don't gettext strings, instead of
      crashing.
@@ -20,5 +21,4 @@
    * More gettext fun.
    * Fix openid signin secret generation code. This fixes the bug that made
      all openid signins fail the first time, and then succeed the second
-     time.
-"""]]
+     time."""]]
diff --git a/doc/news/version_1.42.mdwn b/doc/news/version_1.42.mdwn
index 7ba2a5172..fcbf117ca 100644
--- a/doc/news/version_1.42.mdwn
+++ b/doc/news/version_1.42.mdwn
@@ -1,4 +1,5 @@
-[[template id=release version="1.42" news="""
+News for ikiwiki 1.42:
+
 The `anonok` setting in config files has been removed. To enable anonymous
 edits on your wiki, you should now enable the [[anonok_plugin|plugins/anonok]]
 instead.
@@ -6,7 +7,9 @@ instead.
 [[Third-party_plugins|plugins/contrib]] that use `pagespec_match()` should be
 updated to pass the new third parameter `from` to that function. This is
 needed for the new relative glob matching to work.
-""" changelog="""
+
+ikiwiki 1.42 released with [[toggle text="these changes"]]
+[[toggleable text="""
    * Fix several more missing translations of Discussion.
    * Fix for missing `backlinks()` in [[pagestats_plugin|plugins/pagestats]].
    * Add `canedit` hook, allowing arbitrary controls over when a page can be
@@ -39,5 +42,4 @@ needed for the new relative glob matching to work.
      to exist in the wiki, and the web user would need to somehow use the web
      based editor to replace it with malicious content.
      (Sorry Josh, this means you can't edit style.css directly anymore,
-     although I do appreciate your fixes, actually..)
-"""]]
+     although I do appreciate your fixes, actually..)"""]]