2 files changed, 5 insertions, 4 deletions
diff --git a/src/compiler/scala/tools/nsc/doc/html/HtmlPage.scala b/src/compiler/scala/tools/nsc/doc/html/HtmlPage.scala
index 31b932ac53..68d17c683f 100644
--- a/src/compiler/scala/tools/nsc/doc/html/HtmlPage.scala
+++ b/src/compiler/scala/tools/nsc/doc/html/HtmlPage.scala
@@ -10,7 +10,7 @@ package html
 import model._
 import comment._
 
-import xml.{Unparsed, XML, NodeSeq}
+import xml.{XML, NodeSeq}
 import xml.dtd.{DocType, PublicID}
 import scala.collection._
 import scala.reflect.NameTransformer
@@ -133,7 +133,7 @@ abstract class HtmlPage { thisPage =>
     case Title(in, 3) => <h3>{ inlineToHtml(in) }</h3>
     case Title(in, _) => <h4>{ inlineToHtml(in) }</h4>
     case Paragraph(in) => <p>{ inlineToHtml(in) }</p>
-    case Code(data) => <pre>{ Unparsed(data) }</pre>
+    case Code(data) => <pre>{ xml.Text(data) }</pre>
     case UnorderedList(items) =>
       <ul>{ listItemsToHtml(items) }</ul>
     case OrderedList(items, listStyle) =>
@@ -165,8 +165,8 @@ abstract class HtmlPage { thisPage =>
     case Subscript(in) => <sub>{ inlineToHtml(in) }</sub>
     case Link(raw, title) => <a href={ raw }>{ inlineToHtml(title) }</a>
     case EntityLink(entity) => templateToHtml(entity)
-    case Monospace(text) => <code>{ Unparsed(text) }</code>
-    case Text(text) => Unparsed(text)
+    case Monospace(text) => <code>{ xml.Text(text) }</code>
+    case Text(text) => xml.Text(text)
     case Summary(in) => inlineToHtml(in)
   }
 
diff --git a/src/compiler/scala/tools/nsc/doc/model/comment/CommentFactory.scala b/src/compiler/scala/tools/nsc/doc/model/comment/CommentFactory.scala
index f067555cc3..63b7b10859 100644
--- a/src/compiler/scala/tools/nsc/doc/model/comment/CommentFactory.scala
+++ b/src/compiler/scala/tools/nsc/doc/model/comment/CommentFactory.scala
@@ -333,6 +333,7 @@ trait CommentFactory { thisFactory: ModelFactory with CommentFactory =>
       val constructor = listStyles(style)
       listLevel(indentStr, style, constructor)
     }
+
     def code(): Block = {
       jumpWhitespace()
       jump("{{{")