1.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java Tue May 14 10:14:51 2013 -0700 1.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java Tue May 14 10:14:52 2013 -0700 1.3 @@ -139,9 +139,8 @@ 1.4 * @param dlTree the content tree to which the description will be added 1.5 */ 1.6 protected void addDescription(ClassDoc cd, Content dlTree) { 1.7 - Content link = new RawHtml( 1.8 - getLink(new LinkInfoImpl(configuration, 1.9 - LinkInfoImpl.Kind.INDEX, cd, true))); 1.10 + Content link = getLink(new LinkInfoImpl(configuration, 1.11 + LinkInfoImpl.Kind.INDEX, cd, true)); 1.12 Content dt = HtmlTree.DT(link); 1.13 dt.addContent(" - "); 1.14 addClassInfo(cd, dt); 1.15 @@ -162,7 +161,7 @@ 1.16 contentTree.addContent(getResource("doclet.in", 1.17 Util.getTypeName(configuration, cd, false), 1.18 getPackageLinkString(cd.containingPackage(), 1.19 - Util.getPackageName(cd.containingPackage()), false))); 1.20 + Util.escapeHtmlChars(Util.getPackageName(cd.containingPackage())), false))); 1.21 } 1.22 1.23 /**