--- old/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclet.xml	Fri Jan 22 12:19:49 2016
+++ /dev/null	Fri Jan 22 12:19:49 2016
@@ -1,205 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-
-<!--
- Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.  Oracle designates this
- particular file as subject to the "Classpath" exception as provided
- by Oracle in the LICENSE file that accompanied this code.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
-
-
-<Doclet>
-
-    <ProfileDoc>
-        <Content>
-            <Summary>
-                <PackageSummary>
-                    <InterfaceSummary/>
-                    <ClassSummary/>
-                    <EnumSummary/>
-                    <ExceptionSummary/>
-                    <ErrorSummary/>
-                    <AnnotationTypeSummary/>
-                </PackageSummary>
-            </Summary>
-        </Content>
-    </ProfileDoc>
-
-    <PackageDoc>
-        <Content>
-            <Summary>
-                <InterfaceSummary/>
-                <ClassSummary/>
-                <EnumSummary/>
-                <ExceptionSummary/>
-                <ErrorSummary/>
-                <AnnotationTypeSummary/>
-            </Summary>
-            <PackageDescription/>
-            <PackageTags/>
-        </Content>
-    </PackageDoc>
-
-    <AnnotationTypeDoc>
-        <AnnotationTypeInfo>
-            <DeprecationInfo/>
-            <AnnotationTypeSignature/>
-            <AnnotationTypeDescription/>
-            <AnnotationTypeTagInfo/>
-        </AnnotationTypeInfo>
-        <MemberSummary>
-            <AnnotationTypeFieldsSummary/>
-            <AnnotationTypeRequiredMemberSummary/>
-            <AnnotationTypeOptionalMemberSummary/>
-        </MemberSummary>
-        <AnnotationTypeMemberDetails>
-            <AnnotationTypeFieldDetails>
-                <AnnotationTypeField>
-                    <Signature/>
-                    <DeprecationInfo/>
-                    <MemberComments/>
-                    <TagInfo/>
-                </AnnotationTypeField>
-            </AnnotationTypeFieldDetails>
-            <AnnotationTypeRequiredMemberDetails>
-                <AnnotationTypeRequiredMember>
-                    <Signature/>
-                    <DeprecationInfo/>
-                    <MemberComments/>
-                    <TagInfo/>
-                </AnnotationTypeRequiredMember>
-            </AnnotationTypeRequiredMemberDetails>
-            <AnnotationTypeOptionalMemberDetails>
-                <AnnotationTypeOptionalMember>
-                    <Signature/>
-                    <DeprecationInfo/>
-                    <MemberComments/>
-                    <TagInfo/>
-                    <DefaultValueInfo/>
-                </AnnotationTypeOptionalMember>
-            </AnnotationTypeOptionalMemberDetails>
-        </AnnotationTypeMemberDetails>
-    </AnnotationTypeDoc>
-
-    <ClassDoc>
-        <ClassTree/>
-        <ClassInfo>
-            <TypeParamInfo/>
-            <SuperInterfacesInfo/>
-            <ImplementedInterfacesInfo/>
-            <SubClassInfo/>
-            <SubInterfacesInfo/>
-            <InterfaceUsageInfo/>
-            <NestedClassInfo/>
-            <FunctionalInterfaceInfo/>
-            <DeprecationInfo/>
-            <ClassSignature/>
-            <ClassDescription/>
-            <ClassTagInfo/>
-        </ClassInfo>
-        <MemberSummary>
-            <PropertiesSummary/>
-            <NestedClassesSummary/>
-            <EnumConstantsSummary/>
-            <FieldsSummary/>
-            <ConstructorsSummary/>
-            <MethodsSummary/>
-        </MemberSummary>
-        <MemberDetails>
-            <EnumConstantsDetails>
-                <EnumConstant>
-                    <Signature/>
-                    <DeprecationInfo/>
-                    <EnumConstantComments/>
-                    <TagInfo/>
-                </EnumConstant>
-            </EnumConstantsDetails>
-            <PropertyDetails>
-                <PropertyDoc>
-                    <Signature/>
-                    <PropertyComments/>
-                    <TagInfo/>
-                </PropertyDoc>
-            </PropertyDetails>
-            <FieldDetails>
-                <FieldDoc>
-                    <Signature/>
-                    <DeprecationInfo/>
-                    <FieldComments/>
-                    <TagInfo/>
-                </FieldDoc>
-            </FieldDetails>
-            <ConstructorDetails>
-                <ConstructorDoc>
-                    <Signature/>
-                    <DeprecationInfo/>
-                    <ConstructorComments/>
-                    <TagInfo/>
-                </ConstructorDoc>
-            </ConstructorDetails>
-            <MethodDetails>
-                <MethodDoc>
-                    <Signature/>
-                    <DeprecationInfo/>
-                    <MethodComments/>
-                    <TagInfo/>
-                </MethodDoc>
-            </MethodDetails>
-        </MemberDetails>
-    </ClassDoc>
-
-    <ConstantSummary>
-        <Contents/>
-        <ConstantSummaries>
-            <PackageHeader/>
-            <ClassConstantSummary>
-                <ConstantMembers/>
-            </ClassConstantSummary>
-        </ConstantSummaries>
-    </ConstantSummary>
-
-    <SerializedForm>
-        <SerializedFormSummaries>
-            <PackageSerializedForm>
-                <PackageHeader/>
-                <ClassSerializedForm>
-                    <SerialUIDInfo/>
-                    <ClassContent>
-                        <SerializableMethods>
-                            <MethodSubHeader/>
-                            <DeprecatedMethodInfo/>
-                            <MethodInfo>
-                                <MethodDescription/>
-                                <MethodTags/>
-                            </MethodInfo>
-                        </SerializableMethods>
-                        <FieldHeader/>
-                        <SerializableFields>
-                            <FieldSubHeader/>
-                            <FieldDeprecationInfo/>
-                            <FieldInfo/>
-                        </SerializableFields>
-                    </ClassContent>
-                </ClassSerializedForm>
-            </PackageSerializedForm>
-        </SerializedFormSummaries>
-    </SerializedForm>
-</Doclet>
--- /dev/null	Fri Jan 22 12:19:49 2016
+++ new/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclet.xml	Fri Jan 22 12:19:49 2016
@@ -0,0 +1,190 @@
+<?xml version='1.0' encoding='utf-8'?>
+
+<!--
+ Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+
+ This code is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 2 only, as
+ published by the Free Software Foundation.  Oracle designates this
+ particular file as subject to the "Classpath" exception as provided
+ by Oracle in the LICENSE file that accompanied this code.
+
+ This code is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ version 2 for more details (a copy is included in the LICENSE file that
+ accompanied this code).
+
+ You should have received a copy of the GNU General Public License version
+ 2 along with this work; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+
+ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ or visit www.oracle.com if you need additional information or have any
+ questions.
+-->
+
+
+<Doclet>
+
+    <PackageDoc>
+        <Content>
+            <Summary>
+                <InterfaceSummary/>
+                <ClassSummary/>
+                <EnumSummary/>
+                <ExceptionSummary/>
+                <ErrorSummary/>
+                <AnnotationTypeSummary/>
+            </Summary>
+            <PackageDescription/>
+            <PackageTags/>
+        </Content>
+    </PackageDoc>
+
+    <AnnotationTypeDoc>
+        <AnnotationTypeInfo>
+            <DeprecationInfo/>
+            <AnnotationTypeSignature/>
+            <AnnotationTypeDescription/>
+            <AnnotationTypeTagInfo/>
+        </AnnotationTypeInfo>
+        <MemberSummary>
+            <AnnotationTypeFieldsSummary/>
+            <AnnotationTypeRequiredMemberSummary/>
+            <AnnotationTypeOptionalMemberSummary/>
+        </MemberSummary>
+        <AnnotationTypeMemberDetails>
+            <AnnotationTypeFieldDetails>
+                <AnnotationTypeField>
+                    <Signature/>
+                    <DeprecationInfo/>
+                    <MemberComments/>
+                    <TagInfo/>
+                </AnnotationTypeField>
+            </AnnotationTypeFieldDetails>
+            <AnnotationTypeRequiredMemberDetails>
+                <AnnotationTypeRequiredMember>
+                    <Signature/>
+                    <DeprecationInfo/>
+                    <MemberComments/>
+                    <TagInfo/>
+                </AnnotationTypeRequiredMember>
+            </AnnotationTypeRequiredMemberDetails>
+            <AnnotationTypeOptionalMemberDetails>
+                <AnnotationTypeOptionalMember>
+                    <Signature/>
+                    <DeprecationInfo/>
+                    <MemberComments/>
+                    <TagInfo/>
+                    <DefaultValueInfo/>
+                </AnnotationTypeOptionalMember>
+            </AnnotationTypeOptionalMemberDetails>
+        </AnnotationTypeMemberDetails>
+    </AnnotationTypeDoc>
+
+    <ClassDoc>
+        <ClassTree/>
+        <ClassInfo>
+            <TypeParamInfo/>
+            <SuperInterfacesInfo/>
+            <ImplementedInterfacesInfo/>
+            <SubClassInfo/>
+            <SubInterfacesInfo/>
+            <InterfaceUsageInfo/>
+            <NestedClassInfo/>
+            <FunctionalInterfaceInfo/>
+            <DeprecationInfo/>
+            <ClassSignature/>
+            <ClassDescription/>
+            <ClassTagInfo/>
+        </ClassInfo>
+        <MemberSummary>
+            <PropertiesSummary/>
+            <NestedClassesSummary/>
+            <EnumConstantsSummary/>
+            <FieldsSummary/>
+            <ConstructorsSummary/>
+            <MethodsSummary/>
+        </MemberSummary>
+        <MemberDetails>
+            <EnumConstantsDetails>
+                <EnumConstant>
+                    <Signature/>
+                    <DeprecationInfo/>
+                    <EnumConstantComments/>
+                    <TagInfo/>
+                </EnumConstant>
+            </EnumConstantsDetails>
+            <PropertyDetails>
+                <PropertyDoc>
+                    <Signature/>
+                    <PropertyComments/>
+                    <TagInfo/>
+                </PropertyDoc>
+            </PropertyDetails>
+            <FieldDetails>
+                <FieldDoc>
+                    <Signature/>
+                    <DeprecationInfo/>
+                    <FieldComments/>
+                    <TagInfo/>
+                </FieldDoc>
+            </FieldDetails>
+            <ConstructorDetails>
+                <ConstructorDoc>
+                    <Signature/>
+                    <DeprecationInfo/>
+                    <ConstructorComments/>
+                    <TagInfo/>
+                </ConstructorDoc>
+            </ConstructorDetails>
+            <MethodDetails>
+                <MethodDoc>
+                    <Signature/>
+                    <DeprecationInfo/>
+                    <MethodComments/>
+                    <TagInfo/>
+                </MethodDoc>
+            </MethodDetails>
+        </MemberDetails>
+    </ClassDoc>
+
+    <ConstantSummary>
+        <Contents/>
+        <ConstantSummaries>
+            <PackageHeader/>
+            <ClassConstantSummary>
+                <ConstantMembers/>
+            </ClassConstantSummary>
+        </ConstantSummaries>
+    </ConstantSummary>
+
+    <SerializedForm>
+        <SerializedFormSummaries>
+            <PackageSerializedForm>
+                <PackageHeader/>
+                <ClassSerializedForm>
+                    <SerialUIDInfo/>
+                    <ClassContent>
+                        <SerializableMethods>
+                            <MethodSubHeader/>
+                            <DeprecatedMethodInfo/>
+                            <MethodInfo>
+                                <MethodDescription/>
+                                <MethodTags/>
+                            </MethodInfo>
+                        </SerializableMethods>
+                        <FieldHeader/>
+                        <SerializableFields>
+                            <FieldSubHeader/>
+                            <FieldDeprecationInfo/>
+                            <FieldInfo/>
+                        </SerializableFields>
+                    </ClassContent>
+                </ClassSerializedForm>
+            </PackageSerializedForm>
+        </SerializedFormSummaries>
+    </SerializedForm>
+</Doclet>