--- wikisrc/projects/code-in_2012.mdwn	2013/03/14 23:21:56	1.6
+++ wikisrc/projects/code-in_2012.mdwn	2013/03/22 10:15:40	1.9
@@ -89,11 +89,15 @@ These are the tasks which were completed
 ### Edit, wiki integration
 These tasks created or converted articles for the wiki. We have to edit and commit them to the wiki.
 
- * [Howto: Running a webserver with Apache](http://www.google-melange.com/gci/task/view/google/gci2012/7946208)
+ * *[Howto: Running a webserver with Apache](http://www.google-melange.com/gci/task/view/google/gci2012/7946208) -- committed*
+ * *[Convert articles from the website to wiki articles](http://www.google-melange.com/gci/task/view/google/gci2012/7947209) -- not suitable for integration*
+ * *[Convert the NetBSD Guide from DocBook to Markdown](http://www.google-melange.com/gci/task/view/google/gci2012/7986209) -- committed*
+ * *[Convert the encrypted iscsi article to markdown](http://www.google-melange.com/gci/task/view/google/gci2012/7947237) -- committed*
+ * *[Convert the PUFFS guide to markdown](http://www.google-melange.com/gci/task/view/google/gci2012/7979220) -- committed*
+ * *[Convert internals guide to markdown](http://www.google-melange.com/gci/task/view/google/gci2012/8019214) -- cannot be committed in a sane way*
+ * *[Compare init systems with each other](http://www.google-melange.com/gci/task/view/google/gci2012/8007202) -- not suitable for integration*
  * [Intro: Disk and partition management with NetBSD](http://www.google-melange.com/gci/task/view/google/gci2012/7946209)
- * [Convert articles from the website to wiki articles](http://www.google-melange.com/gci/task/view/google/gci2012/7947209)
  * [Using the framebuffer in NetBSD](http://www.google-melange.com/gci/task/view/google/gci2012/7947210)
- * [Convert the encrypted iscsi article to markdown](http://www.google-melange.com/gci/task/view/google/gci2012/7947237)
  * [Try out RFB/VNC software on NetBSD](http://www.google-melange.com/gci/task/view/google/gci2012/7952236)
  * [Try out VoIP software](http://www.google-melange.com/gci/task/view/google/gci2012/7964205)
  * [Rewrite system configuration in the guide](http://www.google-melange.com/gci/task/view/google/gci2012/7965203)
@@ -104,46 +108,42 @@ These tasks created or converted article
  * [Describe how to run NetBSD headless](http://www.google-melange.com/gci/task/view/google/gci2012/7975213)
  * [Setup single sign-on (SSO) service using LDAP](http://www.google-melange.com/gci/task/view/google/gci2012/7976225)
  * [Create an overview of the NetBSD kernel source layout](http://www.google-melange.com/gci/task/view/google/gci2012/7978214)
- * [Convert the PUFFS guide to markdown](http://www.google-melange.com/gci/task/view/google/gci2012/7979220)
  * [Create an overview of the NetBSD src layout](http://www.google-melange.com/gci/task/view/google/gci2012/7980211)
  * [Try out XMPP software](http://www.google-melange.com/gci/task/view/google/gci2012/7980212)
  * [Describe how to create a NetBSD live flash drive](http://www.google-melange.com/gci/task/view/google/gci2012/7986208)
  * [Howto: Getting in touch with NetBSD](http://www.google-melange.com/gci/task/view/google/gci2012/7985211)
- * *[Convert the NetBSD Guide from DocBook to Markdown](http://www.google-melange.com/gci/task/view/google/gci2012/7986209) -- committed*
  * [Create an overview of the NetBSD releases](http://www.google-melange.com/gci/task/view/google/gci2012/7983208)
  * [Convert the Xen Howto to markdown](http://www.google-melange.com/gci/task/view/google/gci2012/7983229)
  * [Howto: How to get a graphical environment on NetBSD](http://www.google-melange.com/gci/task/view/google/gci2012/7992202)
  * [Howto: Update the system from binaries](http://www.google-melange.com/gci/task/view/google/gci2012/7992203)
  * [Try out VoIP software](http://www.google-melange.com/gci/task/view/google/gci2012/7992205)
  * [Create an overview of the NetBSD server layout](http://www.google-melange.com/gci/task/view/google/gci2012/7993202)
- * ["Convert the CD-ROM creation guide to markdown](http://www.google-melange.com/gci/task/view/google/gci2012/7993220)
+ * [Convert the CD-ROM creation guide to markdown](http://www.google-melange.com/gci/task/view/google/gci2012/7993220)
  * [Howto: Dual-boot NetBSD](http://www.google-melange.com/gci/task/view/google/gci2012/7994202)
  * [Describe how to backup NetBSD](http://www.google-melange.com/gci/task/view/google/gci2012/7996202)
  * [Convert installation notes to markdown](http://www.google-melange.com/gci/task/view/google/gci2012/7997202)
  * [Create list of available VoIP client software](http://www.google-melange.com/gci/task/view/google/gci2012/8001222)
  * [Make NetBSD a music or video player](http://www.google-melange.com/gci/task/view/google/gci2012/8004203)
  * [Convert the Networking FAQ to markdown](http://www.google-melange.com/gci/task/view/google/gci2012/8006218)
- * [Compare init systems with each other](http://www.google-melange.com/gci/task/view/google/gci2012/8007202)
  * [Convert the NetBSD X documentation to markdown](http://www.google-melange.com/gci/task/view/google/gci2012/8019221)
- * [Convert internals guide to markdown](http://www.google-melange.com/gci/task/view/google/gci2012/8019214)
  * [Convert the CD-ROM creation guide to markdown, merge it with other articles](http://www.google-melange.com/gci/task/view/google/gci2012/7993220)
 
 ### Advocational tasks
 These tasks created advocacy material and have to be integrated to the website or to a new wiki page.
 
+ * *[Compare NetBSD with other operating systems of its kind](http://www.google-melange.com/gci/task/view/google/gci2012/7975217) -- not suited for integration*
+ * *[Create smaller NetBSD artworks](http://www.google-melange.com/gci/task/view/google/gci2012/7966207) -- not suited for integration*
+ * *[Create smaller NetBSD artworks](http://www.google-melange.com/gci/task/view/google/gci2012/7994203) -- not suited for integration*
+ * *[Create NetBSD wallpapers](http://www.google-melange.com/gci/task/view/google/gci2012/7969208) -- not suited for integration*
+ * *[Create NetBSD wallpapers](http://www.google-melange.com/gci/task/view/google/gci2012/7992224) -- not suited for integration*
+ * *[Create NetBSD wallpapers](http://www.google-melange.com/gci/task/view/google/gci2012/7995203) -- not suited for integration*
+ * *[Create NetBSD wallpapers](http://www.google-melange.com/gci/task/view/google/gci2012/8019213) -- not suited for integration*
+ * *[Create a NetBSD poster](http://www.google-melange.com/gci/task/view/google/gci2012/7970216) -- not suited for integration*
+ * *[Create a NetBSD poster](http://www.google-melange.com/gci/task/view/google/gci2012/7974206) -- not suited for integration*
+ * *[Create an icon set for NetBSD - research](http://www.google-melange.com/gci/task/view/google/gci2012/7974205) -- not suited for integration*
  * [Create NetBSD slide templates (OpenOffice)](http://www.google-melange.com/gci/task/view/google/gci2012/7949208)
- * [Create NetBSD slide templates (Latex)](http://www.google-melange.com/gci/task/view/google/gci2012/7954213)
- * [Create smaller NetBSD artworks](http://www.google-melange.com/gci/task/view/google/gci2012/7966207)
- * [Create NetBSD wallpapers](http://www.google-melange.com/gci/task/view/google/gci2012/7969208)
- * [Create a NetBSD poster](http://www.google-melange.com/gci/task/view/google/gci2012/7970216)
- * [Create an icon set for NetBSD - research](http://www.google-melange.com/gci/task/view/google/gci2012/7974205)
- * [Create a NetBSD poster](http://www.google-melange.com/gci/task/view/google/gci2012/7974206)
- * [Compare NetBSD with other operating systems of its kind](http://www.google-melange.com/gci/task/view/google/gci2012/7975217)
- * [Create NetBSD wallpapers](http://www.google-melange.com/gci/task/view/google/gci2012/7992224)
- * [Create smaller NetBSD artworks](http://www.google-melange.com/gci/task/view/google/gci2012/7994203)
- * [Create NetBSD wallpapers](http://www.google-melange.com/gci/task/view/google/gci2012/7995203)
+ * [Create NetBSD slide templates (Latex)](http://www.google-melange.com/gci/task/view/google/gci2012/7954213) -- needs some work to integrate the NetBSD logo
  * [Create a NetBSD book layout](http://www.google-melange.com/gci/task/view/google/gci2012/8000202)
- * [Create NetBSD wallpapers](http://www.google-melange.com/gci/task/view/google/gci2012/8019213)
  * [Create and implement an ikiwiki design template](http://www.google-melange.com/gci/task/view/google/gci2012/8074208)
 
 ### Informational and external tasks