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

[ikiwiki.git] / doc / roadmap.mdwn

diff --git a/doc/roadmap.mdwn b/doc/roadmap.mdwn
index 7a03776faac55bb87f6a9f764f8f2d86e638fee1..f924a1bc97ee6f6fd7a0beffb00c482fc7a822bd 100644 (file)
--- a/doc/roadmap.mdwn
+++ b/doc/roadmap.mdwn
@@ -54,10 +54,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.
 
 Released 31 December, 2008.
@@ -75,3 +76,6 @@ backwards compatability.
   and Jamey Sharp; support for other wikis should fit into the same
   framework.)
 * [[TODO]], [[bugs]], ...
+
+
+Click the link to get additional information for <a href="http://www.besttermpaper.com">research</a> paper writing.