--- /dev/null
+## Things that need to be done before merging content over:
+- Fix the IE6 rendering issues.
+- Install gitweb, configure ikiwiki to use it to enable to page histories.
+- Edit templates/page.tmpl and templates/misc.tmpl to make the tabs work, and to highlight the correct section name in the header.
+- Devise a way of moving sidebar content out of the templates and into ikiwiki (includes?)
+- Work out how to do page templates for machines, etc