--- wikisrc/templates/project.mdwn	2011/11/05 19:08:13	1.1
+++ wikisrc/templates/project.mdwn	2011/11/06 21:08:23	1.5
@@ -1,13 +1,23 @@
 <TMPL_IF NAME="title">
 [[!meta title="<TMPL_VAR NAME=raw_title>"]]
 
-* Contact: <TMPL_VAR NAME="raw_contact">
-<TMPL_IF NAME="mentors">* Mentors: <TMPL_VAR NAME="raw_mentors"></TMPL_IF>
-<TMPL_IF NAME="duration">* Duration estimate: <TMPL_VAR NAME="raw_duration"></TMPL_IF>
+* Contact: <TMPL_VAR NAME="raw_contact"> <TMPL_IF NAME="mentors">
+* Mentors: <TMPL_VAR NAME="raw_mentors"></TMPL_IF> <TMPL_IF NAME="duration">
+* Duration estimate: <TMPL_VAR NAME="raw_duration"></TMPL_IF> <TMPL_IF NAME="funded">
+* Funded by: <TMPL_VAR NAME="funded"></TMPL_IF>
 
 <TMPL_VAR NAME="description">
 
 [[!tag project]]
+<TMPL_IF NAME="category">
+[[!tag category:<TMPL_VAR NAME="raw_category">]]
+</TMPL_IF>
+<TMPL_IF NAME="difficulty">
+[[!tag difficulty:<TMPL_VAR NAME="raw_difficulty">]]
+</TMPL_IF>
+<TMPL_IF NAME="funded">
+[[!tag funded]]
+</TMPL_IF>
 <TMPL_ELSE>
 # Project template description
 
@@ -19,16 +29,19 @@ The following parameters are supported:
 - title (required)
 - contact (required)
 - mentors (optional)
+- category (required): one of "filesystems", "kernel", "misc", "networking",
+  "pkgsrc", "ports" or "userland".
+- difficulty (required): one of "easy", "medium" or "hard".
+- funded (optional): set to the name of the organization or individual that
+  is willing to fund this project.
 - duration (optional)
 - description (required)
 
 The following tags should be set to classify the project into different
 indexes:
 
-- *funded*: Use this tag if the project has been preapproved for funding
-   by The NetBSD Foundation.
 - *gsoc*: Use this tag to denote a project suitable for the Google
-   Summer of Code program.  If you set this tag, the project must
-   provide a set of mentors and its duration has to be 3 months.
+  Summer of Code program.  If you set this tag, the project must
+  provide a set of mentors and its duration has to be 3 months.
 
 </TMPL_IF>