1 files changed, 10 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/doc/html/page/Template.scala b/src/compiler/scala/tools/nsc/doc/html/page/Template.scala
index 2dd597eec8..5617113ce3 100644
--- a/src/compiler/scala/tools/nsc/doc/html/page/Template.scala
+++ b/src/compiler/scala/tools/nsc/doc/html/page/Template.scala
@@ -435,7 +435,16 @@ class Template(tpl: DocTemplateEntity) extends HtmlPage {
             }</dd>
           } else NodeSeq.Empty
 
-        example ++ version ++ sinceVersion ++ exceptions ++ note ++ seeAlso
+        val todo: Seq[scala.xml.Node] =
+          if(!comment.todo.isEmpty) {
+            <dt>To do</dt>
+            <dd>{
+              val todoXml: List[scala.xml.NodeSeq] = (for(todo <- comment.todo ) yield <span class="cmt">{bodyToHtml(todo)}</span> )
+              todoXml.reduceLeft(_ ++ Text(", ") ++ _)
+            }</dd>
+          } else NodeSeq.Empty
+
+        example ++ version ++ sinceVersion ++ exceptions ++ todo ++ note ++ seeAlso
 
       case _ => NodeSeq.Empty
     }