Merge branch 'master' of ssh://git.ikiwiki.info

[git.ikiwiki.info.git] / doc / news / ikiwiki_version_3.0.mdwn

diff --git a/doc/news/ikiwiki_version_3.0.mdwn b/doc/news/ikiwiki_version_3.0.mdwn
index 56e0353c379b6f0b258e7be289317dc3a3dd4f5f..7ca636cf2417d5a8d941accb1b72d844e2857143 100644 (file)
--- a/doc/news/ikiwiki_version_3.0.mdwn
+++ b/doc/news/ikiwiki_version_3.0.mdwn
@@ -4,7 +4,7 @@ Ikiwiki has reached version 3.0 and entered a new phase in its
 The 3.0 release of ikiwiki changes several defaults and finishes
 some transitions. You will need to modify your wikis to work with
 ikiwiki 3.0. A document explaining the process is available
-in [[upgrade_to_3.0]].
+in [[tips/upgrade_to_3.0]].
 
 The highlights of the changes in version 3.0 include:
 
@@ -20,10 +20,11 @@ The highlights of the changes in version 3.0 include:
 * The RecentChanges page is compiled statically, not generated from the CGI.
 * Support for additional revision control systems: [[rcs/bzr]],
   [[rcs/monotone]]
-* Support for [[tips/trusted_git_push]].
+* Support for [[tips/untrusted_git_push]].
 * A new version (3.00) of the plugin API, exporting additional
-  commonly used functions from `IkiWiki.pm`. Nearly everything in ikiwiki is
-  now a plugin, from WikiLinks to page editing, to RecentChanges.
+  commonly used functions from `IkiWiki.pm`.
+* Nearly everything in ikiwiki is now a plugin, from WikiLinks to
+  page editing, to RecentChanges.
 * Far too many bug fixes, features, and enhancements to list here.
 
 Thanks to the many contributors to ikiwiki 3.0, including: