add news item for ikiwiki 2.60

diff --git a/doc/news/version_2.52.mdwn b/doc/news/version_2.52.mdwn
deleted file mode 100644 (file)
index 5c9d799..0000000
--- a/doc/news/version_2.52.mdwn
+++ /dev/null
@@ -1,27 +0,0 @@
-News for ikiwiki 2.52:
-
-   All wikis need to be rebuilt on upgrade to this version. If you listed your
-   wiki in /etc/ikiwiki/wikilist this will be done automatically when the
-   Debian package is upgraded. Or use ikiwiki-mass-rebuild to force a rebuild.
-
-ikiwiki 2.52 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * attachment: New plugin for uploading and managing attachments.
-     This includes a fairly powerful PageSpec based admin pref for deciding
-     whether to accept a given upload, and an attachment management interface
-     on the edit page.
-     (Sponsored by The TOVA Company.)
-   * If attachments are not enabled, configure CGI.pm to disable file
-     uploads by default. (An anti-DOS measure.)
-   * toggle: Add support for toggles that are open by default.
-   * toggle: Fix to work in preview mode.
-   * toggle: Add javascript to top of page, not to end. This avoids flicker
-     since closed toggles will not be displayed as the page is loading.
-   * The editpage form now uses the raw page name, not the page title, in its
-     'page' cgi parameter. Using the title was ambiguous and made it
-     impossible to tell between some pages, like "foo/bar" and "foo\_\_47\_\_bar",
-     sometimes causing the wrong page to be edited.
-   * This change means that some edit links need to be updated.
-     Force a rebuild on upgrade to this version.
-   * Above change also allowed really fixing escaped slashes from the blogpost
-     form."""]]
\ No newline at end of file

diff --git a/doc/news/version_2.60.mdwn b/doc/news/version_2.60.mdwn
new file mode 100644 (file)
index 0000000..ecee9bc
--- /dev/null
+++ b/doc/news/version_2.60.mdwn
@@ -0,0 +1,53 @@
+News for ikiwiki 2.60:
+
+   Admin preferences are moving from the web interface to the setup file.
+   There are three new options in the setup file: `locked\_pages`, `banned\_users`,
+   and `allowed\_attachments`. The admin prefs page can still be used, but
+   that's deprecated, and the prefs will be hidden if a value is not already
+   set. If a value is set in the web interface, you're encouraged to move that
+   setting to your setup file now, since version 3.0 will remove the deprecated
+   admin prefs web interface.
+   Also, the layout of the setup file has changed in a significant way in this
+   release. Old setup files will continue to work, but new features, like the
+   new websetup interface, require a new format setup file. You can convert
+   old setup files into the new format by running
+   `ikiwiki-transition setupformat ikiwiki.setup`
+
+ikiwiki 2.60 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+ * [ Joey Hess ]
+   * Starting with this version, "ikiwiki -setup /etc/ikiwiki/auto.setup"
+     can be used create a new wiki in seconds.
+   * websetup: New plugin providing a setup form on the web.
+   * ikiwiki --dumpsetup can generate a nice setup file snapshotting ikiwiki's
+     current configuration.
+   * The way wrappers are defined in the setup file has changed. Old setup
+     files will continue to work, for now.
+   * ikiwiki-transition setupformat can be used to convert a setup file to the
+     new format.
+   * Version control backends promoted to first-class plugins.
+   * ikiwiki-update-wikilist: Add -r switch to remove. Default behavior is now
+     always to add.
+   * Start moving admin preferences from the web interface to the setup file.
+   * Add getsetup hook, all plugins should use it to record information about
+     themselves and any fields they add to %config
+   * Large amounts of internal config data reorg.
+   * ikiwiki-makerepo: Bail if both srcdir and repository are not specified.
+     Closes: #[493628](http://bugs.debian.org/493628)
+   * Clarify some wording in the setup documentation that could maybe lead
+     users to putting paths with "~/" in the setup file, which doesn't work.
+     Closes: #[493835](http://bugs.debian.org/493835)
+   * autoindex: Ignore internal pages, and take underlay directories into
+     account. Also, avoid making index pages for directories that contain
+     no files.
+   * external: Fix support for hooks called in an array context.
+   * Options set in the setup file are now immediatly loaded by ikiwiki -setup.
+     This allows later switches to override them. Previously, setup file
+     options overrode most command line options.
+   * Added a small icon to the search input box.
+ * [ Josh Triplett ]
+   * Add Suggests on texlive and texlive-science for the teximg plugin
+ * [ Joey Hess ]
+   * inline: Ignore parent dirs when sorting pages by title.
+   * rename: Support changing page extensions. (willu)
+   * Danish update. Closes: #[494632](http://bugs.debian.org/494632)"""]]
\ No newline at end of file