From ea15d48c16299405753e455ec704cb2c908ddf1e Mon Sep 17 00:00:00 2001 From: joey Date: Wed, 14 Feb 2007 01:22:32 +0000 Subject: move the release template to the softwaresite example --- doc/examples/softwaresite/templates/release.mdwn | 7 +++++++ .../softwaresite/templates/release/discussion.mdwn | 15 +++++++++++++++ doc/news/version_1.40.mdwn | 6 +++--- doc/news/version_1.41.mdwn | 6 +++--- doc/news/version_1.42.mdwn | 10 ++++++---- doc/templates/release.mdwn | 7 ------- doc/templates/release/discussion.mdwn | 12 ------------ 7 files changed, 34 insertions(+), 29 deletions(-) create mode 100644 doc/examples/softwaresite/templates/release.mdwn create mode 100644 doc/examples/softwaresite/templates/release/discussion.mdwn delete mode 100644 doc/templates/release.mdwn delete mode 100644 doc/templates/release/discussion.mdwn (limited to 'doc') diff --git a/doc/examples/softwaresite/templates/release.mdwn b/doc/examples/softwaresite/templates/release.mdwn new file mode 100644 index 000000000..b8b0abffc --- /dev/null +++ b/doc/examples/softwaresite/templates/release.mdwn @@ -0,0 +1,7 @@ +News for FooBar : + + + + +ikiwiki released with [[toggle text="these changes" id="changelog"]] +[[toggleable id="changelog" text=""""""]] diff --git a/doc/examples/softwaresite/templates/release/discussion.mdwn b/doc/examples/softwaresite/templates/release/discussion.mdwn new file mode 100644 index 000000000..f1794d8bf --- /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: +>> --[[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..)"""]] diff --git a/doc/templates/release.mdwn b/doc/templates/release.mdwn deleted file mode 100644 index e9abd1ada..000000000 --- a/doc/templates/release.mdwn +++ /dev/null @@ -1,7 +0,0 @@ -News for ikiwiki : - - - - -ikiwiki released with [[toggle text="these changes" id="changelog"]] -[[toggleable id="changelog" text=""""""]] diff --git a/doc/templates/release/discussion.mdwn b/doc/templates/release/discussion.mdwn deleted file mode 100644 index a0fe4aeeb..000000000 --- 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]] -- cgit v1.2.3