move the release template to the softwaresite example

diff --git a/doc/examples/softwaresite/templates/release.mdwn b/doc/examples/softwaresite/templates/release.mdwn
new file mode 100644 (file)
index 0000000..b8b0abf
--- /dev/null
+++ b/doc/examples/softwaresite/templates/release.mdwn
@@ -0,0 +1,7 @@
+<TMPL_IF news>News for FooBar <TMPL_VAR version>:
+
+<TMPL_VAR news>
+
+</TMPL_IF>
+ikiwiki <TMPL_VAR version> released with [[toggle text="these changes" id="changelog"]]
+[[toggleable id="changelog" text="""<TMPL_VAR changelog>"""]]

diff --git a/doc/examples/softwaresite/templates/release/discussion.mdwn b/doc/examples/softwaresite/templates/release/discussion.mdwn
new file mode 100644 (file)
index 0000000..f1794d8
--- /dev/null
+++ b/doc/examples/softwaresite/templates/release/discussion.mdwn
@@ -0,0 +1,15 @@
+I'd rather not use a template for my release announcements, because these announcements are generated by the same script I use to release many other projects, and it already automates things fine. The template would need changes to my script and would only complicate the setup I have now. --[[Joey]]
+
+> No problem; sorry for the inconvenience.
+>
+> Since page moves currently require direct repository access, could you
+> please move this release template to
+> `examples/softwaresite/templates/release`, and s/ikiwiki/FooBar/g?
+>
+> Also, would you consider posting your project release scripts somewhere?  If
+> 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 d595ff7de713b6562cc760e5eba04d3df589a82c..c3455c3f291946929430cfea3076f617162e5f63 100644 (file)
--- 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 25dc574fb21dd3ea72e26c01a5afb8a6a8c57e35..70d1eb53372d66c8b53fea28648170cf2de4e94e 100644 (file)
--- 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 7ba2a51724c693482a0dbf05cea93de541de549b..fcbf117cab4f6c048119c13b4bfa17e9d64c792d 100644 (file)
--- 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..)"""]]

diff --git a/doc/templates/release.mdwn b/doc/templates/release.mdwn
deleted file mode 100644 (file)
index e9abd1a..0000000
--- a/doc/templates/release.mdwn
+++ /dev/null
@@ -1,7 +0,0 @@
-<TMPL_IF news>News for ikiwiki <TMPL_VAR version>:
-
-<TMPL_VAR news>
-
-</TMPL_IF>
-ikiwiki <TMPL_VAR version> released with [[toggle text="these changes" id="changelog"]]
-[[toggleable id="changelog" text="""<TMPL_VAR changelog>"""]]

diff --git a/doc/templates/release/discussion.mdwn b/doc/templates/release/discussion.mdwn
deleted file mode 100644 (file)
index a0fe4ae..0000000
--- a/doc/templates/release/discussion.mdwn
+++ /dev/null
@@ -1,12 +0,0 @@
-I'd rather not use a template for my release announcements, because these announcements are generated by the same script I use to release many other projects, and it already automates things fine. The template would need changes to my script and would only complicate the setup I have now. --[[Joey]]
-
-> No problem; sorry for the inconvenience.
->
-> Since page moves currently require direct repository access, could you
-> please move this release template to
-> `examples/softwaresite/templates/release`, and s/ikiwiki/FooBar/g?
->
-> Also, would you consider posting your project release scripts somewhere?  If
-> you have already done so, then could you post a link to them?
->
-> --[[JoshTriplett]]