Merge branch 'master' into next

[git.ikiwiki.info.git] / doc / roadmap.mdwn

diff --git a/doc/roadmap.mdwn b/doc/roadmap.mdwn
index d8c80b234369111dec9a344d3194204bf62686a0..83c654b5e5b8686ea9a4994111de0e6bee1d1318 100644 (file)
--- a/doc/roadmap.mdwn
+++ b/doc/roadmap.mdwn
@@ -51,12 +51,12 @@ The highlights of the changes in version 3.0 include:
   [[plugins/cutpaste]], [[plugins/hnb]], [[plugins/creole]], [[plugins/txt]],
   [[plugins/amazon_s3]], [[plugins/pinger]], [[plugins/pingee]],
   [[plugins/edittemplate]]
+* 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]].
-* The RecentChanges page is compiled statically, not generated the the CGI.
 * A new version (3.00) of the plugin API, exporting additional
-  commonly used functions from IkiWiki.pm. Nearly everything in ikiwiki is
+  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.