changeset 626:bdb954839363

8133651: replace some <tt> tags (obsolete in html5) in core-libs docs Reviewed-by: martin
author avstepan
date Thu, 24 Sep 2015 18:26:42 +0300
parents d7ee8157f4fe
children 51729143f8fe
files src/java.xml.bind/share/classes/com/sun/xml/internal/bind/CycleRecoverable.java src/java.xml.bind/share/classes/com/sun/xml/internal/bind/IDResolver.java src/java.xml.bind/share/classes/com/sun/xml/internal/bind/annotation/XmlIsSet.java src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/ClassResolver.java src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/JAXBRIContext.java src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/NamespacePrefixMapper.java src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/Adapter.java src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ClassInfo.java src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ElementPropertyInfo.java src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/MapPropertyInfo.java src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeInfoSet.java src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/AnyTypeImpl.java src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeInfoSetImpl.java src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/GenericArrayTypeImpl.java src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/Navigator.java src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/ReflectionNavigator.java src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeArrayInfo.java src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/AnyTypeBeanInfo.java src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationException.java src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/JAXBContextImpl.java src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/JaxBeanInfo.java src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/XMLSerializer.java src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleMapNodeProperty.java src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Accessor.java src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Loader.java src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/MTOMDecorator.java src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallingContext.java src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Form.java src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/XmlSchemaGenerator.java src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/QNameMap.java src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEParsingException.java src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/NamespaceContextEx.java src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/XMLStreamReaderEx.java src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/Document.java src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/TypedXmlWriter.java src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/annotation/XmlAttribute.java src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/annotation/XmlElement.java src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/annotation/XmlValue.java src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/DataWriter.java src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/XMLWriter.java src/java.xml.bind/share/classes/javax/xml/bind/Binder.java src/java.xml.bind/share/classes/javax/xml/bind/DataBindingException.java src/java.xml.bind/share/classes/javax/xml/bind/DatatypeConverter.java src/java.xml.bind/share/classes/javax/xml/bind/DatatypeConverterInterface.java src/java.xml.bind/share/classes/javax/xml/bind/JAXB.java src/java.xml.bind/share/classes/javax/xml/bind/JAXBContextFactory.java src/java.xml.bind/share/classes/javax/xml/bind/JAXBElement.java src/java.xml.bind/share/classes/javax/xml/bind/JAXBException.java src/java.xml.bind/share/classes/javax/xml/bind/JAXBIntrospector.java src/java.xml.bind/share/classes/javax/xml/bind/MarshalException.java src/java.xml.bind/share/classes/javax/xml/bind/Marshaller.java src/java.xml.bind/share/classes/javax/xml/bind/TypeConstraintException.java src/java.xml.bind/share/classes/javax/xml/bind/UnmarshalException.java src/java.xml.bind/share/classes/javax/xml/bind/Unmarshaller.java src/java.xml.bind/share/classes/javax/xml/bind/ValidationEvent.java src/java.xml.bind/share/classes/javax/xml/bind/ValidationEventHandler.java src/java.xml.bind/share/classes/javax/xml/bind/ValidationEventLocator.java src/java.xml.bind/share/classes/javax/xml/bind/ValidationException.java src/java.xml.bind/share/classes/javax/xml/bind/Validator.java src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAccessorOrder.java src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAccessorType.java src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAnyAttribute.java src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAttribute.java src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElement.java src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElementDecl.java src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElementRef.java src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElementWrapper.java src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElements.java src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlEnum.java src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlEnumValue.java src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlID.java src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlIDREF.java src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlInlineBinaryData.java src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlList.java src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlNs.java src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlSchema.java src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlSchemaType.java src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlSchemaTypes.java src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlSeeAlso.java src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlTransient.java src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlType.java src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlValue.java src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/CollapsedStringAdapter.java src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/HexBinaryAdapter.java src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/NormalizedStringAdapter.java src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/XmlAdapter.java src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.java src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapters.java src/java.xml.bind/share/classes/javax/xml/bind/attachment/AttachmentMarshaller.java src/java.xml.bind/share/classes/javax/xml/bind/attachment/AttachmentUnmarshaller.java src/java.xml.bind/share/classes/javax/xml/bind/helpers/AbstractMarshallerImpl.java src/java.xml.bind/share/classes/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java src/java.xml.bind/share/classes/javax/xml/bind/helpers/package.html src/java.xml.bind/share/classes/javax/xml/bind/package.html src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/SOAPExceptionImpl.java src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/WsaPropertyBag.java src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/BindingID.java src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/BindingIDFactory.java src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/Cancelable.java src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/client/ClientPipelineHook.java src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/client/ServiceInterceptor.java src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Header.java src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/HeaderList.java src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Message.java src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Packet.java src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/Parameter.java src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Codec.java src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Fiber.java src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/FiberContextSwitchInterceptor.java src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Pipe.java src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/PipelineAssemblerFactory.java src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Stubs.java src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Tube.java src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/TubelineAssemblerFactory.java src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/Container.java src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/Invoker.java src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/ServerPipelineHook.java src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/WSEndpoint.java src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/WebModule.java src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtension.java src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/RequestContext.java src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/Stub.java src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/WSServiceDelegate.java src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/ValueSetter.java src/java.xml.ws/share/classes/com/sun/xml/internal/ws/commons/xmlutil/Converter.java src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/JAXWSProperties.java src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/AbstractHeaderImpl.java src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/jaxb/JAXBMessage.java src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/ParameterImpl.java src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/PolicyUtils.java src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/ServiceFinder.java src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicySourceModel.java src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/EndpointValueSetter.java src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/BindingContext.java src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/BindingHelper.java src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/WSHTTPConnection.java src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerAdapter.java src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/QNameMap.java src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/ServiceFinder.java src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/pipe/DumpTube.java src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/RuntimeWSDLParser.java src/java.xml.ws/share/classes/javax/xml/soap/SOAPException.java src/java.xml.ws/share/classes/javax/xml/ws/WebServiceException.java src/java.xml.ws/share/classes/javax/xml/ws/spi/http/HttpExchange.java src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JClass.java src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JClassContainer.java src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JCodeModel.java src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JConditional.java src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JExpression.java src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JExpressionImpl.java src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JOp.java src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JPrimitiveType.java src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JType.java src/jdk.xml.bind/share/classes/com/sun/istack/internal/tools/ParallelWorldClassLoader.java src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/SchemaGenerator.java src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCInterleaveFilter.java src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCRuntime.java src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/Options.java src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/JavaCompiler.java src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/S2JJAXBModel.java src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/SchemaCompiler.java src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CPropertyInfo.java src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/TypeUse.java src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/FieldAccessor.java src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/Expression.java src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/ContentHandlerNamespacePrefixAdapter.java src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/SCDBasedBindingSet.java src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassSelector.java src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GWildcardElement.java src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/UnusedCustomizationChecker.java src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIFactoryMethod.java src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIGlobalBinding.java src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/runtime/ZeroOneBooleanAdapter.java src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/SchemaBuilder.java src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/util/CheckingSchemaBuilder.java src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/package.html src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/package.html src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/package.html src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSAnnotation.java src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSComponent.java src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSElementDecl.java src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSType.java src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCInterleaveFilter.java src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCRuntime.java src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/SchemaDocument.java src/jdk.xml.bind/share/classes/org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.java src/jdk.xml.bind/share/classes/org/relaxng/datatype/helpers/StreamingValidatorImpl.java src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/api/WsgenExtension.java
diffstat 188 files changed, 882 insertions(+), 863 deletions(-) [+]
line wrap: on
line diff
--- a/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/CycleRecoverable.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/CycleRecoverable.java	Thu Sep 24 18:26:42 2015 +0300
@@ -55,7 +55,7 @@
      *
      *
      * @return
-     *      the object to be marshalled instead of <tt>this</tt> object.
+     *      the object to be marshalled instead of {@code this} object.
      *      Or return null to indicate that the JAXB RI should behave
      *      just like when your object does not implement {@link CycleRecoverable}
      *      (IOW, cut the cycle arbitrarily and try to go on.)
--- a/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/IDResolver.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/IDResolver.java	Thu Sep 24 18:26:42 2015 +0300
@@ -134,10 +134,10 @@
      * and it is used as the target object.
      *
      * <p>
-     * When a forward-reference happens, the <tt>call</tt> method
+     * When a forward-reference happens, the {@code call} method
      * should return null. In this case the JAXB RI unmarshaller invokes
-     * the <tt>call</tt> method again after all the documents are fully unmarshalled.
-     * If the <tt>call</tt> method still returns null, then the JAXB RI unmarshaller
+     * the {@code call} method again after all the documents are fully unmarshalled.
+     * If the {@code call} method still returns null, then the JAXB RI unmarshaller
      * treats it as an error.
      *
      * <p>
--- a/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/annotation/XmlIsSet.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/annotation/XmlIsSet.java	Thu Sep 24 18:26:42 2015 +0300
@@ -58,9 +58,9 @@
  * marshaller.marshal(new Foo());
  * </pre>
  * and you get:
- * <pre><xmp>
+ * <pre>{@code
  * <foo><x>0</x></foo>
- * </xmp></pre>
+ * }</pre>
  *
  * <p>
  * By creating a side boolean field/property that has this annotation,
@@ -81,14 +81,14 @@
  *
  * marshaller.marshal(f);
  *
- * <xmp>
+ * {@code
  * <foo/>
- * </xmp>
+ * }
  *
  * f.xIsPresent = true;
- * <xmp>
+ * {@code
  * <foo><x>5</x></foo>
- * </xmp>
+ * }
  * </pre>
  *
  * <p>
--- a/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/ClassResolver.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/ClassResolver.java	Thu Sep 24 18:26:42 2015 +0300
@@ -60,7 +60,7 @@
  * <p>
  * When an {@link Unmarshaller} encounters (i) an unknown root element or (ii) unknown
  * elements where unmarshaller is trying to unmarshal into {@link XmlAnyElement} with
- * <tt>lax=true</tt>, unmarshaller calls {@link #resolveElementName(String, String)}
+ * {@code lax=true}, unmarshaller calls {@link #resolveElementName(String, String)}
  * method to see if the application may be able to supply a class that corresponds
  * to that class.
  *
--- a/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/JAXBRIContext.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/JAXBRIContext.java	Thu Sep 24 18:26:42 2015 +0300
@@ -352,7 +352,7 @@
      * Accordingly, this method may return an identifier that collides with reserved words.
      *
      * <p>
-     * Use <tt>JJavaName.isJavaIdentifier(String)</tt> to check for such collision.
+     * Use {@code JJavaName.isJavaIdentifier(String)} to check for such collision.
      *
      * @return
      *      Typically, this method returns "nameLikeThis".
@@ -394,17 +394,17 @@
      *
      * <p>
      * For example, given the following
-     * <pre><xmp>
+     * <pre>{@code
      * interface Foo<T> extends List<List<T>> {}
      * interface Bar extends Foo<String> {}
-     * </xmp></pre>
+     * }</pre>
      * This method works like this:
-     * <pre><xmp>
+     * <pre>{@code
      * getBaseClass( Bar, List ) = List<List<String>
      * getBaseClass( Bar, Foo  ) = Foo<String>
      * getBaseClass( Foo<? extends Number>, Collection ) = Collection<List<? extends Number>>
      * getBaseClass( ArrayList<? extends BigInteger>, List ) = List<? extends BigInteger>
-     * </xmp></pre>
+     * }</pre>
      *
      * @param type
      *      The type that derives from {@code baseType}
@@ -460,7 +460,7 @@
 
     /**
      * The property that you can specify to {@link JAXBContext#newInstance}
-     * to allow unmarshaller to honor <tt>xsi:nil</tt> anywhere, even if they are
+     * to allow unmarshaller to honor {@code xsi:nil} anywhere, even if they are
      * not specifically allowed by the schema.
      *
      * Boolean
--- a/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/NamespacePrefixMapper.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/NamespacePrefixMapper.java	Thu Sep 24 18:26:42 2015 +0300
@@ -125,7 +125,7 @@
      * they are necessary, only at where they are used. Because of this
      * lack of look-ahead, sometimes the marshaller produces a lot of
      * namespace declarations that look redundant to human eyes. For example,
-     * <pre><xmp>
+     * <pre>{@code
      * <?xml version="1.0"?>
      * <root>
      *   <ns1:child xmlns:ns1="urn:foo"> ... </ns1:child>
@@ -133,7 +133,7 @@
      *   <ns3:child xmlns:ns3="urn:foo"> ... </ns3:child>
      *   ...
      * </root>
-     * </xmp></pre>
+     * }</pre>
      *
      * <p>
      * The JAXB RI 2.x mostly doesn't exhibit this behavior any more,
@@ -152,7 +152,7 @@
      * <p>
      * For example, by returning <code>new String[]{"urn:foo"}</code>,
      * the marshaller will produce:
-     * <pre><xmp>
+     * <pre>{@code
      * <?xml version="1.0"?>
      * <root xmlns:ns1="urn:foo">
      *   <ns1:child> ... </ns1:child>
@@ -160,7 +160,7 @@
      *   <ns1:child> ... </ns1:child>
      *   ...
      * </root>
-     * </xmp></pre>
+     * }</pre>
      * <p>
      * To control prefixes assigned to those namespace URIs, use the
      * {@link #getPreferredPrefix(String, String, boolean)} method.
@@ -232,7 +232,7 @@
      * the receiver a conflicting binding information.
      * It's a responsibility of the caller to make sure that this doesn't happen
      * even if the ancestor elements look like:
-     * <pre><xmp>
+     * <pre>{@code
      *   <foo:abc xmlns:foo="abc">
      *     <foo:abc xmlns:foo="def">
      *       <foo:abc xmlns:foo="abc">
@@ -240,7 +240,7 @@
      *       </foo:abc>
      *     </foo:abc>
      *   </foo:abc>
-     * </xmp></pre>
+     * }</pre>
      *
      * @return
      *      always return a non-null (but possibly empty) array. The array stores
--- a/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/Adapter.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/Adapter.java	Thu Sep 24 18:26:42 2015 +0300
@@ -46,7 +46,7 @@
 
     /**
      * The type that the JAXB can handle natively.
-     * The <tt>Default</tt> parameter of <tt>XmlAdapter&lt;Default,Custom></tt>.
+     * The {@code Default} parameter of {@code XmlAdapter<Default,Custom>}.
      *
      * Always non-null.
      */
@@ -54,7 +54,7 @@
 
     /**
      * The type that is stored in memory.
-     * The <tt>Custom</tt> parameter of <tt>XmlAdapter&lt;Default,Custom></tt>.
+     * The {@code Custom} parameter of {@code XmlAdapter<Default,Custom>}.
      */
     public final TypeT customType;
 
--- a/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ClassInfo.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ClassInfo.java	Thu Sep 24 18:26:42 2015 +0300
@@ -143,8 +143,8 @@
      * False if it't not.
      *
      * <p>
-     * In RELAX NG context, ordered properties mean &lt;group> and
-     * unordered properties mean &lt;interleave>.
+     * In RELAX NG context, ordered properties mean {@code <group>} and
+     * unordered properties mean {@code <interleave>}.
      */
     boolean isOrdered();
 
--- a/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ElementPropertyInfo.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ElementPropertyInfo.java	Thu Sep 24 18:26:42 2015 +0300
@@ -56,9 +56,9 @@
      * &#64;XmlElements({
      *   &#64;XmlElement(name="a",type=String.class),
      *   &#64;XmlElement(name="b",type=Integer.class),
-     * })
-     * List&lt;Object> abc;
-     * </pre>
+     * }) {@code
+     * List<Object> abc;
+     * }</pre>
      * <p>
      * In this case this method returns a list of two {@link TypeRef}s.
      *
@@ -107,7 +107,7 @@
      * If {@link #isCollection()}==false, this property is always false.
      *
      * <p>
-     * When this flag is true, <tt>getTypes().size()==1</tt> always holds.
+     * When this flag is true, {@code getTypes().size()==1} always holds.
      */
     boolean isValueList();
 
--- a/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/MapPropertyInfo.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/MapPropertyInfo.java	Thu Sep 24 18:26:42 2015 +0300
@@ -32,7 +32,7 @@
 /**
  * Property that maps to the following schema fragment.
  *
- * <pre><xmp>
+ * <pre>{@code
  * <xs:complexType>
  *   <xs:sequence>
  *     <xs:element name="entry" minOccurs="0" maxOccurs="unbounded">
@@ -45,7 +45,7 @@
  *     </xs:element>
  *   </xs:sequence>
  * </xs:complexType>
- * </xmp></pre>
+ * }</pre>
  *
  * <p>
  * This property is used to represent a default binding of a {@link Map} property.
--- a/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeInfoSet.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeInfoSet.java	Thu Sep 24 18:26:42 2015 +0300
@@ -153,7 +153,7 @@
      *      A map from namespace URI to the value of the location.
      *      If the entry is missing, that means a schema should be generated for that namespace.
      *      If the value is "", that means the schema location is implied
-     *      (&lt;xs:schema namespace="..."/> w/o schemaLocation.)
+     *      ({@code <xs:schema namespace="..."/>} w/o schemaLocation.)
      */
     Map<String,String> getSchemaLocations();
 
--- a/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/AnyTypeImpl.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/AnyTypeImpl.java	Thu Sep 24 18:26:42 2015 +0300
@@ -35,7 +35,7 @@
 import com.sun.xml.internal.bind.v2.model.annotation.Locatable;
 
 /**
- * {@link TypeInfo} implementation for <tt>xs:anyType</tt>.
+ * {@link TypeInfo} implementation for {@code xs:anyType}.
  *
  * @author Kohsuke Kawaguchi
  */
--- a/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeInfoSetImpl.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeInfoSetImpl.java	Thu Sep 24 18:26:42 2015 +0300
@@ -119,7 +119,7 @@
         };
 
     /**
-     * {@link TypeInfo} for <tt>xs:anyType</tt>.
+     * {@link TypeInfo} for {@code xs:anyType}.
      *
      * anyType is the only {@link TypeInfo} that works with an interface,
      * and accordingly it requires a lot of special casing.
--- a/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/GenericArrayTypeImpl.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/GenericArrayTypeImpl.java	Thu Sep 24 18:26:42 2015 +0300
@@ -40,10 +40,10 @@
     }
 
     /**
-     * Returns  a <tt>Type</tt> object representing the component type
+     * Returns  a {@code Type} object representing the component type
      * of this array.
      *
-     * @return a <tt>Type</tt> object representing the component type
+     * @return a {@code Type} object representing the component type
      *         of this array
      * @since 1.5
      */
--- a/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/Navigator.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/Navigator.java	Thu Sep 24 18:26:42 2015 +0300
@@ -70,17 +70,17 @@
      *
      * <p>
      * For example, given the following
-     * <pre><xmp>
+     * <pre>{@code
      * interface Foo<T> extends List<List<T>> {}
      * interface Bar extends Foo<String> {}
-     * </xmp></pre>
+     * }</pre>
      * This method works like this:
-     * <pre><xmp>
-     * getBaseClass( Bar, List ) = List<List<String>
+     * <pre>{@code
+     * getBaseClass( Bar, List ) = List<List<String>>
      * getBaseClass( Bar, Foo  ) = Foo<String>
      * getBaseClass( Foo<? extends Number>, Collection ) = Collection<List<? extends Number>>
      * getBaseClass( ArrayList<? extends BigInteger>, List ) = List<? extends BigInteger>
-     * </xmp></pre>
+     * }</pre>
      *
      * @param type
      *      The type that derives from {@code baseType}
--- a/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/ReflectionNavigator.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/ReflectionNavigator.java	Thu Sep 24 18:26:42 2015 +0300
@@ -418,7 +418,7 @@
     }
 
     /**
-     * Returns the {@link Type} object that represents {@code clazz&lt;T1,T2,T3>}.
+     * Returns the {@link Type} object that represents {@code clazz<T1,T2,T3>}.
      */
     public Type createParameterizedType(Class rawType, Type... arguments) {
         return new ParameterizedTypeImpl(rawType, arguments, null);
--- a/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeArrayInfo.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeArrayInfo.java	Thu Sep 24 18:26:42 2015 +0300
@@ -35,7 +35,7 @@
  */
 public interface RuntimeArrayInfo extends ArrayInfo<Type,Class>, RuntimeNonElement {
     /**
-     * Represents <tt>T[]</tt>.
+     * Represents {@code T[]}.
      *
      * The same as {@link TypeInfo#getType()} but at the runtime, an array
      * is guaranteed to have a {@link Class} representation, not just any {@link Type}.
--- a/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/AnyTypeBeanInfo.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/AnyTypeBeanInfo.java	Thu Sep 24 18:26:42 2015 +0300
@@ -48,7 +48,7 @@
 import org.xml.sax.SAXException;
 
 /**
- * {@link JaxBeanInfo} for handling <tt>xs:anyType</tt>.
+ * {@link JaxBeanInfo} for handling {@code xs:anyType}.
  *
  * @author Kohsuke Kawaguchi
  */
--- a/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationException.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationException.java	Thu Sep 24 18:26:42 2015 +0300
@@ -119,7 +119,7 @@
      * annotation, in which case this method returns a list that
      * contains another list, which in turn contains the location
      * information that leads to the error location
-     * (IOW, <tt>[ [pos1,pos2,...,posN] ]</tt>)
+     * (IOW, {@code [ [pos1,pos2,...,posN] ]})
      *
      * <p>
      * Sometimes, an error could occur because of two or more conflicting
@@ -127,12 +127,12 @@
      * that contains many lists, where each list contains
      * the location information that leads to each of the conflicting
      * annotations
-     * (IOW, <tt>[ [pos11,pos12,...,pos1N],[pos21,pos22,...,pos2M], ... ]</tt>)
+     * (IOW, {@code [ [pos11,pos12,...,pos1N],[pos21,pos22,...,pos2M], ... ]})
      *
      * <p>
      * Yet some other time, the runtime can fail to provide any
      * error location, in which case this method returns an empty list.
-     * (IOW, <tt>[]</tt>). We do try hard to make sure this won't happen,
+     * (IOW, {@code []}). We do try hard to make sure this won't happen,
      * so please <a href="http://jaxb.dev.java.net/">let us know</a>
      * if you see this behavior.
      *
@@ -146,13 +146,13 @@
      * to the first in the list, sort of like a stack trace.
      *
      * <p>
-     * For example, suppose you specify class <tt>Foo</tt> to {@link JAXBContext},
-     * <tt>Foo</tt> derives from <tt>Bar</tt>, <tt>Bar</tt> has a field <tt>pea</tt>
-     * that points to <tt>Zot</tt>, <tt>Zot</tt> contains a <tt>gum</tt>
+     * For example, suppose you specify class {@code Foo} to {@link JAXBContext},
+     * {@code Foo} derives from {@code Bar}, {@code Bar} has a field {@code pea}
+     * that points to {@code Zot}, {@code Zot} contains a {@code gum}
      * property, and this property has an errornous annotation.
      * Then when this exception is thrown, the list of {@link Location}s
      * will look something like
-     * <tt>[ "gum property", "Zot class", "pea property", "Bar class", "Foo class" ]</tt>
+     * {@code [ "gum property", "Zot class", "pea property", "Bar class", "Foo class" ]}
      *
      *
      * @return
--- a/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/JAXBContextImpl.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/JAXBContextImpl.java	Thu Sep 24 18:26:42 2015 +0300
@@ -533,7 +533,7 @@
      * This method traverses the base classes of the given object.
      *
      * @return null
-     *      if <tt>c</tt> isn't a JAXB-bound class and <tt>fatal==false</tt>.
+     *      if {@code c} isn't a JAXB-bound class and {@code fatal==false}.
      */
     public final JaxBeanInfo getBeanInfo(Object o) {
         // don't allow xs:anyType beanInfo to handle all the unbound objects
@@ -577,7 +577,7 @@
      * This method doesn't look for base classes.
      *
      * @return null
-     *      if <tt>c</tt> isn't a JAXB-bound class and <tt>fatal==false</tt>.
+     *      if {@code c} isn't a JAXB-bound class and {@code fatal==false}.
      */
     public final <T> JaxBeanInfo<T> getBeanInfo(Class<T> clazz) {
         return (JaxBeanInfo<T>)beanInfoMap.get(clazz);
--- a/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/JaxBeanInfo.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/JaxBeanInfo.java	Thu Sep 24 18:26:42 2015 +0300
@@ -68,7 +68,7 @@
  * <p>
  * Typically, {@link JaxBeanInfo} implementations should be generated
  * by XJC/JXC. Those impl classes will register themselves to their
- * master <tt>ObjectFactory</tt> class.
+ * master {@code ObjectFactory} class.
  *
  * <p>
  * The type parameter BeanT is the Java class of the bean that this represents.
--- a/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/XMLSerializer.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/XMLSerializer.java	Thu Sep 24 18:26:42 2015 +0300
@@ -378,7 +378,7 @@
      * c.endElement();
      * </pre>
      *
-     * will generate <code>&lt;foo>abc def&lt;bar/>ghi&lt;/foo></code>.
+     * will generate {@code <foo>abc def<bar/>ghi</foo>}.
      */
     public void text( String text, String fieldName ) throws SAXException, IOException, XMLStreamException {
         // If the assertion fails, it must be a bug of xjc.
@@ -492,7 +492,7 @@
      * When a cycle is found, this method tries to recover from it.
      *
      * @return
-     *      the object that should be marshalled instead of the given <tt>obj</tt>,
+     *      the object that should be marshalled instead of the given {@code obj},
      *      or null if the error is found and we need to avoid marshalling this object
      *      to prevent infinite recursion. When this method returns null, the error
      *      has already been reported.
--- a/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleMapNodeProperty.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleMapNodeProperty.java	Thu Sep 24 18:26:42 2015 +0300
@@ -134,7 +134,7 @@
     private Loader valueLoader;
 
     /**
-     * Handles &lt;items> and &lt;/items>.
+     * Handles {@code <items>} and {@code </items>}.
      *
      * The target will be set to a {@link Map}.
      */
@@ -190,7 +190,7 @@
     };
 
     /**
-     * Handles &lt;entry> and &lt;/entry>.
+     * Handles {@code <entry>} and {@code </entry>}.
      *
      * The target will be set to a {@link Map}.
      */
--- a/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Accessor.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Accessor.java	Thu Sep 24 18:26:42 2015 +0300
@@ -87,7 +87,7 @@
      *
      * @param context The {@link JAXBContextImpl} that owns the whole thing.
      *                (See {@link RuntimeModelBuilder#context}.)
-     * @return At least the implementation can return <tt>this</tt>.
+     * @return At least the implementation can return {@code this}.
      */
     public Accessor<BeanT, ValueT> optimize(@Nullable JAXBContextImpl context) {
         return this;
--- a/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Loader.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Loader.java	Thu Sep 24 18:26:42 2015 +0300
@@ -64,7 +64,7 @@
      * and when the parent designated this loader as the child loader.
      *
      * <p>
-     * The callee may change <tt>state.loader</tt> to designate another {@link Loader}
+     * The callee may change {@code state.loader} to designate another {@link Loader}
      * for the processing. It's the responsibility of the callee to forward the startElement
      * event in such a case.
      *
--- a/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/MTOMDecorator.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/MTOMDecorator.java	Thu Sep 24 18:26:42 2015 +0300
@@ -58,9 +58,9 @@
      * UGLY HACK: we need to ignore the whitespace that follows
      * the attached base64 image.
      *
-     * This happens twice; once before &lt;/xop:Include>, another
-     * after &lt;/xop:Include>. The spec guarantees that
-     * no valid pcdata can follow &lt;/xop:Include>.
+     * This happens twice; once before {@code </xop:Include>}, another
+     * after {@code </xop:Include>}. The spec guarantees that
+     * no valid pcdata can follow {@code </xop:Include>}.
      */
     private boolean followXop;
 
--- a/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallingContext.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallingContext.java	Thu Sep 24 18:26:42 2015 +0300
@@ -150,9 +150,9 @@
      *
      * <p>
      * This flag is unused when {@link #assoc}==null.
-     * If it's non-null, then <tt>true</tt> indicates
+     * If it's non-null, then {@code true} indicates
      * that we are doing in-place associative unmarshalling.
-     * If <tt>false</tt>, then we are doing associative unmarshalling
+     * If {@code false}, then we are doing associative unmarshalling
      * without object reuse.
      */
     private boolean isInplaceMode;
--- a/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Form.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Form.java	Thu Sep 24 18:26:42 2015 +0300
@@ -72,7 +72,7 @@
     }
 
     /**
-     * Writes the attribute on the generated &lt;schema> element.
+     * Writes the attribute on the generated {@code <schema>} element.
      */
     abstract void declare(String attName, Schema schema);
 
--- a/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/XmlSchemaGenerator.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/XmlSchemaGenerator.java	Thu Sep 24 18:26:42 2015 +0300
@@ -551,7 +551,7 @@
         /**
          * Process the given PropertyInfo looking for references to namespaces that
          * are foreign to the given namespace.  Any foreign namespace references
-         * found are added to the given namespaces dependency list and an &lt;import>
+         * found are added to the given namespaces dependency list and an {@code <import>}
          * is generated for it.
          *
          * @param p the PropertyInfo
@@ -1140,7 +1140,8 @@
 
         /**
          * Checks if we can collapse
-         * &lt;element name='foo' type='t' /> to &lt;element ref='foo' />.
+         * {@code <element name='foo' type='t' />}
+         * to {@code <element ref='foo' />}.
          *
          * This is possible if we already have such declaration to begin with.
          */
--- a/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/QNameMap.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/QNameMap.java	Thu Sep 24 18:26:42 2015 +0300
@@ -135,12 +135,12 @@
 
     /**
      * Returns the value to which the specified keys are mapped in this QNameMap,
-     * or <tt>null</tt> if the map contains no mapping for this key.
+     * or {@code null} if the map contains no mapping for this key.
      *
      * @param   nsUri the namespaceUri key whose associated value is to be returned.
      * @param   localPart the localPart key whose associated value is to be returned.
      * @return  the value to which this map maps the specified set of keya, or
-     *          <tt>null</tt> if the map contains no mapping for this set of keys.
+     *          {@code null} if the map contains no mapping for this set of keys.
      * @see #put(String,String, Object)
      */
     public V get( String nsUri, String localPart ) {
--- a/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEParsingException.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEParsingException.java	Thu Sep 24 18:26:42 2015 +0300
@@ -71,13 +71,14 @@
 
     /**
      * Constructs a new WebServiceException with the specified cause
-     * and a detail message of <tt>(cause==null ? null :
-     * cause.toString())</tt> (which typically contains the
-     * class and detail message of <tt>cause</tt>).
+     * and a detail message of
+     * {@code (cause==null ? null : cause.toString())}
+     * (which typically contains the
+     * class and detail message of {@code cause}).
      *
      * @param cause The cause which is saved for the later
      *              retrieval throw by the getCause method.
-     *              (A <tt>null</tt> value is permitted, and
+     *              (A {@code null} value is permitted, and
      *              indicates that the cause is nonexistent or
      *              unknown.)
      */
--- a/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/NamespaceContextEx.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/NamespaceContextEx.java	Thu Sep 24 18:26:42 2015 +0300
@@ -42,19 +42,19 @@
      * <p>
      * This method enumerates all the active in-scope namespace bindings.
      * This does not include implicit bindings, such as
-     * <tt>"xml"->"http://www.w3.org/XML/1998/namespace"</tt>
-     * or <tt>""->""</tt> (the implicit default namespace URI.)
+     * {@code "xml"->"http://www.w3.org/XML/1998/namespace"}
+     * or {@code ""->""} (the implicit default namespace URI.)
      *
      * <p>
      * The returned iterator may not include the same prefix more than once.
-     * For example, the returned iterator may only contain <tt>f=ns2</tt>
+     * For example, the returned iterator may only contain {@code f=ns2}
      * if the document is as follows and this method is used at the bar element.
      *
-     * <pre><xmp>
+     * <pre>{@code
      * <foo xmlns:f='ns1'>
      *   <bar xmlns:f='ns2'>
      *     ...
-     * </xmp></pre>
+     * }</pre>
      *
      * <p>
      * The iteration may be done in no particular order.
--- a/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/XMLStreamReaderEx.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/XMLStreamReaderEx.java	Thu Sep 24 18:26:42 2015 +0300
@@ -111,7 +111,7 @@
     // *      if the parser is not pointing at characters infoset item.
     // * @throws XMLStreamException
     // *      if the parser points to text but text is not base64-encoded text,
-    // *      or if some other parsing error occurs (such as if the &lt;xop:Include>
+    // *      or if some other parsing error occurs (such as if the {@code <xop:Include>}
     // *      points to a non-existing attachment.)
     // *
     // *      <p>
--- a/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/Document.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/Document.java	Thu Sep 24 18:26:42 2015 +0300
@@ -286,7 +286,7 @@
      * by using {@link #activeNamespaces}.
      *
      * @return
-     *      the buffer passed as the <tt>buf</tt> parameter.
+     *      the buffer passed as the {@code buf} parameter.
      */
     private StringBuilder fixPrefix(StringBuilder buf) {
         assert activeNamespaces!=null;
--- a/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/TypedXmlWriter.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/TypedXmlWriter.java	Thu Sep 24 18:26:42 2015 +0300
@@ -45,7 +45,7 @@
      * Commits this element (and all its descendants) to the output.
      *
      * <p>
-     * Short for <tt>_commit(true)</tt>.
+     * Short for {@code _commit(true)}.
      */
     void commit();
 
--- a/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/annotation/XmlAttribute.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/annotation/XmlAttribute.java	Thu Sep 24 18:26:42 2015 +0300
@@ -37,12 +37,12 @@
  * Specifies that the invocation of the method will produce an attribute.
  *
  * <p>
- * The method signature has to match the form <tt>R foo(DT1,DT2,..)</tt>
+ * The method signature has to match the form {@code R foo(DT1,DT2,..)}
  *
  * <p>
- * R is either <tt>void</tt> or the type to which the interface that declares
+ * R is either {@code void} or the type to which the interface that declares
  * this method is assignable. In the case of the latter, the method will return
- * <tt>this</tt> object, allowing you to chain the multiple attribute method
+ * {@code this} object, allowing you to chain the multiple attribute method
  * invocations like {@link StringBuffer}.
  *
  * <p>
--- a/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/annotation/XmlElement.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/annotation/XmlElement.java	Thu Sep 24 18:26:42 2015 +0300
@@ -50,13 +50,13 @@
  * The method signature has to match one of the following patterns.
  *
  * <dl>
- *  <dt>Child writer: <tt>TW foo()</tt></dt>
+ *  <dt>Child writer: {@code TW foo()}</dt>
  *  <dd>TW must be an interface derived from {@link TypedXmlWriter}.
  *      When this method is called, a new child element is started,
- *      and its content can be written by using the returned <tt>TW</tt>
+ *      and its content can be written by using the returned {@code TW}
  *      object. This child element will be ended when its _commit method
  *      is called.
- *  <dt>Leaf element: <tt>void foo(DT1,DT2,...)</tt></dt>
+ *  <dt>Leaf element: {@code void foo(DT1,DT2,...)}</dt>
  *  <dd>DTi must be datatype objects.
  *      When this method is called, a new child element is started,
  *      followed by the whitespace-separated text data from each of
--- a/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/annotation/XmlValue.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/annotation/XmlValue.java	Thu Sep 24 18:26:42 2015 +0300
@@ -34,12 +34,12 @@
  * Specifies that the invocation of the method will produce a text
  *
  * <p>
- * The method signature has to match the form <tt>R foo(DT1,DT2,..)</tt>
+ * The method signature has to match the form {@code R foo(DT1,DT2,..)}
  *
  * <p>
- * R is either <tt>void</tt> or the type to which the interface that declares
+ * R is either {@code void} or the type to which the interface that declares
  * this method is assignable. In the case of the latter, the method will return
- * <tt>this</tt> object, allowing you to chain the multiple method
+ * {@code this} object, allowing you to chain the multiple method
  * invocations like {@link StringBuffer}.
  *
  * <p>
--- a/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/DataWriter.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/DataWriter.java	Thu Sep 24 18:26:42 2015 +0300
@@ -77,15 +77,15 @@
  *
  * <p>This code will produce the following document:</p>
  *
- * <pre>
- * &lt;?xml version="1.0" standalone="yes"?>
+ * <pre>{@code
+ * <?xml version="1.0" standalone="yes"?>
  *
- * &lt;Person>
- *   &lt;name>Jane Smith&lt;/name>
- *   &lt;date-of-birth>1965-05-23&lt;/date-of-birth>
- *   &lt;citizenship>US&lt;/citizenship>
- * &lt;/Person>
- * </pre>
+ * <Person>
+ *   <name>Jane Smith</name>
+ *   <date-of-birth>1965-05-23</date-of-birth>
+ *   <citizenship>US</citizenship>
+ * </Person>
+ * }</pre>
  *
  * <p>This class inherits from {@link XMLWriter},
  * and provides all of the same support for Namespaces.</p>
--- a/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/XMLWriter.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/XMLWriter.java	Thu Sep 24 18:26:42 2015 +0300
@@ -93,11 +93,11 @@
  *
  * <p>The resulting document will look like this:</p>
  *
- * <pre>
- * &lt;?xml version="1.0" standalone="yes"?>
+ * <pre>{@code
+ * <?xml version="1.0" standalone="yes"?>
  *
- * &lt;greeting>Hello, world!&lt;/greeting>
- * </pre>
+ * <greeting>Hello, world!</greeting>
+ * }</pre>
  *
  * <p>In fact, there is an even simpler convenience method,
  * <var>dataElement</var>, designed for writing elements that
@@ -127,9 +127,9 @@
  *
  * <p>you will end up with</p>
  *
- * <pre>
- * &lt;item>1&lt;/item>&lt;item>3&lt;/item>&lt;item>3&lt;/item>
- * </pre>
+ * <pre>{@code
+ * <item>1</item><item>3</item><item>3</item>
+ * }</pre>
  *
  * <p>You need to invoke one of the <var>characters</var> methods
  * explicitly to add newlines or indentation.  Alternatively, you
@@ -156,11 +156,11 @@
  *
  * <p>The resulting document will look like this:</p>
  *
- * <pre>
- * &lt;?xml version="1.0" standalone="yes"?>
+ * <pre>{@code
+ * <?xml version="1.0" standalone="yes"?>
  *
- * &lt;_NS1:foo xmlns:_NS1="http://www.foo.com/ns/"/>
- * </pre>
+ * <_NS1:foo xmlns:_NS1="http://www.foo.com/ns/"/>
+ * }</pre>
  *
  * <p>In many cases, document authors will prefer to choose their
  * own prefixes rather than using the (ugly) default names.  The
@@ -188,11 +188,11 @@
  *
  * <p>The resulting document will look like this:</p>
  *
- * <pre>
- * &lt;?xml version="1.0" standalone="yes"?>
+ * <pre>{@code
+ * <?xml version="1.0" standalone="yes"?>
  *
- * &lt;foo:foo xmlns:foo="http://www.foo.com/ns/"/>
- * </pre>
+ * <foo:foo xmlns:foo="http://www.foo.com/ns/"/>
+ * }</pre>
  *
  * <p>The default Namespace simply uses an empty string as the prefix:</p>
  *
@@ -205,28 +205,28 @@
  *
  * <p>The resulting document will look like this:</p>
  *
- * <pre>
- * &lt;?xml version="1.0" standalone="yes"?>
+ * <pre>{@code
+ * <?xml version="1.0" standalone="yes"?>
  *
- * &lt;foo xmlns="http://www.foo.com/ns/"/>
- * </pre>
+ * <foo xmlns="http://www.foo.com/ns/"/>
+ * }</pre>
  *
  * <p>By default, the XML writer will not declare a Namespace until
  * it is actually used.  Sometimes, this approach will create
  * a large number of Namespace declarations, as in the following
  * example:</p>
  *
- * <pre>
- * &lt;xml version="1.0" standalone="yes"?>
+ * <pre>{@code
+ * <xml version="1.0" standalone="yes"?>
  *
- * &lt;rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
- *  &lt;rdf:Description about="http://www.foo.com/ids/books/12345">
- *   &lt;dc:title xmlns:dc="http://www.purl.org/dc/">A Dark Night&lt;/dc:title>
- *   &lt;dc:creator xmlns:dc="http://www.purl.org/dc/">Jane Smith&lt;/dc:title>
- *   &lt;dc:date xmlns:dc="http://www.purl.org/dc/">2000-09-09&lt;/dc:title>
- *  &lt;/rdf:Description>
- * &lt;/rdf:RDF>
- * </pre>
+ * <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ *  <rdf:Description about="http://www.foo.com/ids/books/12345">
+ *   <dc:title xmlns:dc="http://www.purl.org/dc/">A Dark Night</dc:title>
+ *   <dc:creator xmlns:dc="http://www.purl.org/dc/">Jane Smith</dc:title>
+ *   <dc:date xmlns:dc="http://www.purl.org/dc/">2000-09-09</dc:title>
+ *  </rdf:Description>
+ * </rdf:RDF>
+ * }</pre>
  *
  * <p>The "rdf" prefix is declared only once, because the RDF Namespace
  * is used by the root element and can be inherited by all of its
@@ -243,18 +243,18 @@
  * though it's not needed there, and can be inherited by its
  * descendants:</p>
  *
- * <pre>
- * &lt;xml version="1.0" standalone="yes"?>
+ * <pre>{@code
+ * <xml version="1.0" standalone="yes"?>
  *
- * &lt;rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ * <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
  *             xmlns:dc="http://www.purl.org/dc/">
- *  &lt;rdf:Description about="http://www.foo.com/ids/books/12345">
- *   &lt;dc:title>A Dark Night&lt;/dc:title>
- *   &lt;dc:creator>Jane Smith&lt;/dc:title>
- *   &lt;dc:date>2000-09-09&lt;/dc:title>
- *  &lt;/rdf:Description>
- * &lt;/rdf:RDF>
- * </pre>
+ *  <rdf:Description about="http://www.foo.com/ids/books/12345">
+ *   <dc:title>A Dark Night</dc:title>
+ *   <dc:creator>Jane Smith</dc:title>
+ *   <dc:date>2000-09-09</dc:title>
+ *  </rdf:Description>
+ * </rdf:RDF>
+ * }</pre>
  *
  * <p>This approach is also useful for declaring Namespace prefixes
  * that be used by qualified names appearing in attribute values or
@@ -388,7 +388,7 @@
 
     /**
      * Set whether the writer should print out the XML declaration
-     * (&lt;?xml version='1.0' ... ?>).
+     * ({@code <?xml version='1.0' ... ?>}).
      * <p>
      * This option is set to true by default.
      */
--- a/src/java.xml.bind/share/classes/javax/xml/bind/Binder.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/javax/xml/bind/Binder.java	Thu Sep 24 18:26:42 2015 +0300
@@ -95,10 +95,10 @@
      * <p>
      * This method throws {@link UnmarshalException} when the Binder's
      * {@link JAXBContext} does not have a mapping for the XML element name
-     * or the type, specifiable via <tt>@xsi:type</tt>, of <tt>xmlNode</tt>
+     * or the type, specifiable via {@code @xsi:type}, of {@code xmlNode}
      * to a JAXB mapped class. The method {@link #unmarshal(Object, Class)}
      * enables an application to specify the JAXB mapped class that
-     * the <tt>xmlNode</tt> should be mapped to.
+     * the {@code xmlNode} should be mapped to.
      *
      * @param xmlNode
      *      the document/element to unmarshal XML data from.
@@ -110,8 +110,8 @@
      *      If any unexpected errors occur while unmarshalling
      * @throws UnmarshalException
      *     If the {@link ValidationEventHandler ValidationEventHandler}
-     *     returns false from its <tt>handleEvent</tt> method or the
-     *     <tt>Binder</tt> is unable to perform the XML to Java
+     *     returns false from its {@code handleEvent} method or the
+     *     {@code Binder} is unable to perform the XML to Java
      *     binding.
      * @throws IllegalArgumentException
      *      If the node parameter is null
@@ -119,7 +119,7 @@
     public abstract Object unmarshal( XmlNode xmlNode ) throws JAXBException;
 
     /**
-     * Unmarshal XML root element by provided <tt>declaredType</tt>
+     * Unmarshal XML root element by provided {@code declaredType}
      * to a JAXB object tree.
      *
      * <p>
@@ -138,18 +138,18 @@
      * @param xmlNode
      *      the document/element to unmarshal XML data from.
      * @param declaredType
-     *      appropriate JAXB mapped class to hold <tt>node</tt>'s XML data.
+     *      appropriate JAXB mapped class to hold {@code node}'s XML data.
      *
      * @return
      * <a href="JAXBElement.html">JAXB Element</a> representation
-     * of <tt>node</tt>
+     * of {@code node}
      *
      * @throws JAXBException
      *      If any unexpected errors occur while unmarshalling
      * @throws UnmarshalException
      *     If the {@link ValidationEventHandler ValidationEventHandler}
-     *     returns false from its <tt>handleEvent</tt> method or the
-     *     <tt>Binder</tt> is unable to perform the XML to Java
+     *     returns false from its {@code handleEvent} method or the
+     *     {@code Binder} is unable to perform the XML to Java
      *     binding.
      * @throws IllegalArgumentException
      *      If any of the input parameters are null
@@ -182,9 +182,9 @@
      *      If any unexpected problem occurs during the marshalling.
      * @throws MarshalException
      *      If the {@link ValidationEventHandler ValidationEventHandler}
-     *      returns false from its <tt>handleEvent</tt> method or the
-     *      <tt>Binder</tt> is unable to marshal <tt>jaxbObject</tt> (or any
-     *      object reachable from <tt>jaxbObject</tt>).
+     *      returns false from its {@code handleEvent} method or the
+     *      {@code Binder} is unable to marshal {@code jaxbObject} (or any
+     *      object reachable from {@code jaxbObject}).
      *
      * @throws IllegalArgumentException
      *      If any of the method parameters are null
@@ -343,9 +343,9 @@
     public abstract Schema getSchema();
 
     /**
-     * Allow an application to register a <tt>ValidationEventHandler</tt>.
+     * Allow an application to register a {@code ValidationEventHandler}.
      * <p>
-     * The <tt>ValidationEventHandler</tt> will be called by the JAXB Provider
+     * The {@code ValidationEventHandler} will be called by the JAXB Provider
      * if any validation errors are encountered during calls to any of the
      * Binder unmarshal, marshal and update methods.
      *
@@ -373,7 +373,7 @@
     /**
      *
      * Set the particular property in the underlying implementation of
-     * <tt>Binder</tt>.  This method can only be used to set one of
+     * {@code Binder}.  This method can only be used to set one of
      * the standard JAXB defined unmarshal/marshal properties
      * or a provider specific property for binder, unmarshal or marshal.
      * Attempting to set an undefined property will result in
@@ -397,7 +397,7 @@
 
     /**
      * Get the particular property in the underlying implementation of
-     * <tt>Binder</tt>.  This method can only
+     * {@code Binder}.  This method can only
      * be used to get one of
      * the standard JAXB defined unmarshal/marshal properties
      * or a provider specific property for binder, unmarshal or marshal.
--- a/src/java.xml.bind/share/classes/javax/xml/bind/DataBindingException.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/javax/xml/bind/DataBindingException.java	Thu Sep 24 18:26:42 2015 +0300
@@ -30,7 +30,7 @@
  *
  * <p>
  * This exception differs from {@link JAXBException} in that
- * this is an unchecked exception, while <tt>JAXBException</tt>
+ * this is an unchecked exception, while {@code JAXBException}
  * is a checked exception.
  *
  * @see JAXB
--- a/src/java.xml.bind/share/classes/javax/xml/bind/DatatypeConverter.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/javax/xml/bind/DatatypeConverter.java	Thu Sep 24 18:26:42 2015 +0300
@@ -294,7 +294,7 @@
      * Converts the string argument into a byte value.
      *
      * <p>
-     * String parameter <tt>lexicalXSDQname</tt> must conform to lexical value space specifed at
+     * String parameter {@code lexicalXSDQname} must conform to lexical value space specifed at
      * <a href="http://www.w3.org/TR/xmlschema-2/#QName">XML Schema Part 2:Datatypes specification:QNames</a>
      *
      * @param lexicalXSDQName
@@ -304,7 +304,7 @@
      * @return
      *     A QName value represented by the string argument.
      * @throws IllegalArgumentException  if string parameter does not conform to XML Schema Part 2 specification or
-     *      if namespace prefix of <tt>lexicalXSDQname</tt> is not bound to a URI in NamespaceContext <tt>nsc</tt>.
+     *      if namespace prefix of {@code lexicalXSDQname} is not bound to a URI in NamespaceContext {@code nsc}.
      */
     public static javax.xml.namespace.QName parseQName( String lexicalXSDQName,
                                                     NamespaceContext nsc) {
@@ -365,7 +365,7 @@
      *     of xsd:unsignedInt.
      * @return
      *     A long value represented by the string argument.
-     * @throws NumberFormatException if string parameter can not be parsed into a <tt>long</tt> value.
+     * @throws NumberFormatException if string parameter can not be parsed into a {@code long} value.
      */
     public static long parseUnsignedInt( String lexicalXSDUnsignedInt ) {
         if (theConverter == null) initConverter();
@@ -380,7 +380,7 @@
      *     representation of xsd:unsignedShort.
      * @return
      *     An int value represented by the string argument.
-     * @throws NumberFormatException if string parameter can not be parsed into an <tt>int</tt> value.
+     * @throws NumberFormatException if string parameter can not be parsed into an {@code int} value.
      */
     public static int   parseUnsignedShort( String lexicalXSDUnsignedShort ) {
         if (theConverter == null) initConverter();
@@ -454,7 +454,7 @@
      *     A BigInteger value
      * @return
      *     A string containing a lexical representation of xsd:integer
-     * @throws IllegalArgumentException <tt>val</tt> is null.
+     * @throws IllegalArgumentException {@code val} is null.
      */
     public static String printInteger( java.math.BigInteger val ) {
         if (theConverter == null) initConverter();
@@ -507,7 +507,7 @@
      *     A BigDecimal value
      * @return
      *     A string containing a lexical representation of xsd:decimal
-     * @throws IllegalArgumentException <tt>val</tt> is null.
+     * @throws IllegalArgumentException {@code val} is null.
      */
     public static String printDecimal( java.math.BigDecimal val ) {
         if (theConverter == null) initConverter();
@@ -575,8 +575,8 @@
      *     A namespace context for interpreting a prefix within a QName.
      * @return
      *     A string containing a lexical representation of QName
-     * @throws IllegalArgumentException if <tt>val</tt> is null or
-     * if <tt>nsc</tt> is non-null or <tt>nsc.getPrefix(nsprefixFromVal)</tt> is null.
+     * @throws IllegalArgumentException if {@code val} is null or
+     * if {@code nsc} is non-null or {@code nsc.getPrefix(nsprefixFromVal)} is null.
      */
     public static String printQName( javax.xml.namespace.QName val,
                                      NamespaceContext nsc ) {
@@ -591,7 +591,7 @@
      *     A Calendar value
      * @return
      *     A string containing a lexical representation of xsd:dateTime
-     * @throws IllegalArgumentException if <tt>val</tt> is null.
+     * @throws IllegalArgumentException if {@code val} is null.
      */
     public static String printDateTime( java.util.Calendar val ) {
         if (theConverter == null) initConverter();
@@ -605,7 +605,7 @@
      *     An array of bytes
      * @return
      *     A string containing a lexical representation of xsd:base64Binary
-     * @throws IllegalArgumentException if <tt>val</tt> is null.
+     * @throws IllegalArgumentException if {@code val} is null.
      */
     public static String printBase64Binary( byte[] val ) {
         if (theConverter == null) initConverter();
@@ -619,7 +619,7 @@
      *     An array of bytes
      * @return
      *     A string containing a lexical representation of xsd:hexBinary
-     * @throws IllegalArgumentException if <tt>val</tt> is null.
+     * @throws IllegalArgumentException if {@code val} is null.
      */
     public static String printHexBinary( byte[] val ) {
         if (theConverter == null) initConverter();
@@ -659,7 +659,7 @@
      *     A Calendar value
      * @return
      *     A string containing a lexical representation of xsd:time
-     * @throws IllegalArgumentException if <tt>val</tt> is null.
+     * @throws IllegalArgumentException if {@code val} is null.
      */
     public static String printTime( java.util.Calendar val ) {
         if (theConverter == null) initConverter();
@@ -673,7 +673,7 @@
      *     A Calendar value
      * @return
      *     A string containing a lexical representation of xsd:date
-     * @throws IllegalArgumentException if <tt>val</tt> is null.
+     * @throws IllegalArgumentException if {@code val} is null.
      */
     public static String printDate( java.util.Calendar val ) {
         if (theConverter == null) initConverter();
--- a/src/java.xml.bind/share/classes/javax/xml/bind/DatatypeConverterInterface.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/javax/xml/bind/DatatypeConverterInterface.java	Thu Sep 24 18:26:42 2015 +0300
@@ -194,7 +194,7 @@
      * Converts the string argument into a QName value.
      *
      * <p>
-     * String parameter <tt>lexicalXSDQname</tt> must conform to lexical value space specifed at
+     * String parameter {@code lexicalXSDQname} must conform to lexical value space specifed at
      * <a href="http://www.w3.org/TR/xmlschema-2/#QName">XML Schema Part 2:Datatypes specification:QNames</a>
      *
      * @param lexicalXSDQName
@@ -204,7 +204,7 @@
      * @return
      *     A QName value represented by the string argument.
      * @throws IllegalArgumentException  if string parameter does not conform to XML Schema Part 2 specification or
-     *      if namespace prefix of <tt>lexicalXSDQname</tt> is not bound to a URI in NamespaceContext <tt>nsc</tt>.
+     *      if namespace prefix of {@code lexicalXSDQname} is not bound to a URI in NamespaceContext {@code nsc}.
      */
     public javax.xml.namespace.QName parseQName( String lexicalXSDQName,
                                              javax.xml.namespace.NamespaceContext nsc);
@@ -249,7 +249,7 @@
      *     of xsd:unsignedInt.
      * @return
      *     A long value represented by the string argument.
-     * @throws NumberFormatException if string parameter can not be parsed into a <tt>long</tt> value.
+     * @throws NumberFormatException if string parameter can not be parsed into a {@code long} value.
      */
     public long parseUnsignedInt( String lexicalXSDUnsignedInt );
 
@@ -260,7 +260,7 @@
      *     representation of xsd:unsignedShort.
      * @return
      *     An int value represented by the string argument.
-     * @throws NumberFormatException if string parameter can not be parsed into an <tt>int</tt> value.
+     * @throws NumberFormatException if string parameter can not be parsed into an {@code int} value.
      */
     public int parseUnsignedShort( String lexicalXSDUnsignedShort );
 
@@ -313,7 +313,7 @@
      *     A BigInteger value
      * @return
      *     A string containing a lexical representation of xsd:integer
-     * @throws IllegalArgumentException <tt>val</tt> is null.
+     * @throws IllegalArgumentException {@code val} is null.
      */
     public String printInteger( java.math.BigInteger val );
 
@@ -351,7 +351,7 @@
      *     A BigDecimal value
      * @return
      *     A string containing a lexical representation of xsd:decimal
-     * @throws IllegalArgumentException <tt>val</tt> is null.
+     * @throws IllegalArgumentException {@code val} is null.
      */
     public String printDecimal( java.math.BigDecimal val );
 
@@ -399,8 +399,8 @@
      *     A namespace context for interpreting a prefix within a QName.
      * @return
      *     A string containing a lexical representation of QName
-     * @throws IllegalArgumentException if <tt>val</tt> is null or
-     * if <tt>nsc</tt> is non-null or <tt>nsc.getPrefix(nsprefixFromVal)</tt> is null.
+     * @throws IllegalArgumentException if {@code val} is null or
+     * if {@code nsc} is non-null or {@code nsc.getPrefix(nsprefixFromVal)} is null.
      */
     public String printQName( javax.xml.namespace.QName val,
                               javax.xml.namespace.NamespaceContext nsc );
@@ -411,7 +411,7 @@
      *     A Calendar value
      * @return
      *     A string containing a lexical representation of xsd:dateTime
-     * @throws IllegalArgumentException if <tt>val</tt> is null.
+     * @throws IllegalArgumentException if {@code val} is null.
      */
     public String printDateTime( java.util.Calendar val );
 
@@ -421,7 +421,7 @@
      *     an array of bytes
      * @return
      *     A string containing a lexical representation of xsd:base64Binary
-     * @throws IllegalArgumentException if <tt>val</tt> is null.
+     * @throws IllegalArgumentException if {@code val} is null.
      */
     public String printBase64Binary( byte[] val );
 
@@ -431,7 +431,7 @@
      *     an array of bytes
      * @return
      *     A string containing a lexical representation of xsd:hexBinary
-     * @throws IllegalArgumentException if <tt>val</tt> is null.
+     * @throws IllegalArgumentException if {@code val} is null.
      */
     public String printHexBinary( byte[] val );
 
@@ -459,7 +459,7 @@
      *     A Calendar value
      * @return
      *     A string containing a lexical representation of xsd:time
-     * @throws IllegalArgumentException if <tt>val</tt> is null.
+     * @throws IllegalArgumentException if {@code val} is null.
      */
     public String printTime( java.util.Calendar val );
 
@@ -469,7 +469,7 @@
      *     A Calendar value
      * @return
      *     A string containing a lexical representation of xsd:date
-     * @throws IllegalArgumentException if <tt>val</tt> is null.
+     * @throws IllegalArgumentException if {@code val} is null.
      */
     public String printDate( java.util.Calendar val );
 
--- a/src/java.xml.bind/share/classes/javax/xml/bind/JAXB.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/javax/xml/bind/JAXB.java	Thu Sep 24 18:26:42 2015 +0300
@@ -68,7 +68,7 @@
  * </ol>
  *
  * <p>
- * In addition, the <tt>unmarshal</tt> methods have the following characteristic:
+ * In addition, the {@code unmarshal} methods have the following characteristic:
  *
  * <ol>
  *  <li>Schema validation is not performed on the input XML.
@@ -78,7 +78,7 @@
  * </ol>
  *
  * <p>
- * Similarly, the <tt>marshal</tt> methods have the following characteristic:
+ * Similarly, the {@code marshal} methods have the following characteristic:
  * <ol>
  *  <li>The processing will try to continue even if the Java object tree
  *      does not meet the validity requirement. Only as
@@ -88,7 +88,7 @@
  *
  * <p>
  * All the methods on this class require non-null arguments to all parameters.
- * The <tt>unmarshal</tt> methods either fail with an exception or return
+ * The {@code unmarshal} methods either fail with an exception or return
  * a non-null value.
  *
  * @author Kohsuke Kawaguchi
@@ -179,7 +179,7 @@
      *
      * @param xml
      *      The URI is {@link URI#toURL() turned into URL} and then
-     *      follows the handling of <tt>URL</tt>.
+     *      follows the handling of {@code URL}.
      */
     public static <T> T unmarshal( URI xml, Class<T> type ) {
         try {
@@ -196,9 +196,9 @@
      * Reads in a Java object tree from the given XML input.
      *
      * @param xml
-     *      The string is first interpreted as an absolute <tt>URI</tt>.
+     *      The string is first interpreted as an absolute {@code URI}.
      *      If it's not {@link URI#isAbsolute() a valid absolute URI},
-     *      then it's interpreted as a <tt>File</tt>
+     *      then it's interpreted as a {@code File}
      */
     public static <T> T unmarshal( String xml, Class<T> type ) {
         try {
@@ -347,8 +347,8 @@
      *
      * @param xml
      *      The XML will be {@link URLConnection#getOutputStream() sent} to the
-     *      resource pointed by this URL. Note that not all <tt>URL</tt>s support
-     *      such operation, and exact semantics depends on the <tt>URL</tt>
+     *      resource pointed by this URL. Note that not all {@code URL}s support
+     *      such operation, and exact semantics depends on the {@code URL}
      *      implementations. In case of {@link HttpURLConnection HTTP URLs},
      *      this will perform HTTP POST.
      *
@@ -374,7 +374,7 @@
      *
      * @param xml
      *      The URI is {@link URI#toURL() turned into URL} and then
-     *      follows the handling of <tt>URL</tt>. See above.
+     *      follows the handling of {@code URL}. See above.
      *
      * @throws DataBindingException
      *      If the operation fails, such as due to I/O error, unbindable classes.
@@ -397,9 +397,9 @@
      *      This parameter must not be null.
      *
      * @param xml
-     *      The string is first interpreted as an absolute <tt>URI</tt>.
+     *      The string is first interpreted as an absolute {@code URI}.
      *      If it's not {@link URI#isAbsolute() a valid absolute URI},
-     *      then it's interpreted as a <tt>File</tt>
+     *      then it's interpreted as a {@code File}
      *
      * @throws DataBindingException
      *      If the operation fails, such as due to I/O error, unbindable classes.
@@ -522,19 +522,19 @@
      *      </tr><tr>
      *          <td>{@link URL}</td>
      *          <td>The XML will be {@link URLConnection#getOutputStream() sent} to the
-     *              resource pointed by this URL. Note that not all <tt>URL</tt>s support
-     *              such operation, and exact semantics depends on the <tt>URL</tt>
+     *              resource pointed by this URL. Note that not all {@code URL}s support
+     *              such operation, and exact semantics depends on the {@code URL}
      *              implementations. In case of {@link HttpURLConnection HTTP URLs},
      *              this will perform HTTP POST.</td>
      *      </tr><tr>
      *          <td>{@link URI}</td>
      *          <td>The URI is {@link URI#toURL() turned into URL} and then
-     *              follows the handling of <tt>URL</tt>. See above.</td>
+     *              follows the handling of {@code URL}. See above.</td>
      *      </tr><tr>
      *          <td>{@link String}</td>
-     *          <td>The string is first interpreted as an absolute <tt>URI</tt>.
+     *          <td>The string is first interpreted as an absolute {@code URI}.
      *              If it's not {@link URI#isAbsolute() a valid absolute URI},
-     *              then it's interpreted as a <tt>File</tt></td>
+     *              then it's interpreted as a {@code File}</td>
      *      </tr><tr>
      *          <td>{@link OutputStream}</td>
      *          <td>The XML will be sent to the given {@link OutputStream}.
--- a/src/java.xml.bind/share/classes/javax/xml/bind/JAXBContextFactory.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/javax/xml/bind/JAXBContextFactory.java	Thu Sep 24 18:26:42 2015 +0300
@@ -38,7 +38,7 @@
 
     /**
      * <p>
-     * Create a new instance of a <tt>JAXBContext</tt> class.
+     * Create a new instance of a {@code JAXBContext} class.
      *
      * <p>
      * For semantics see {@link javax.xml.bind.JAXBContext#newInstance(Class[], java.util.Map)}
@@ -52,11 +52,11 @@
      *      in an empty map.
      *
      * @return
-     *      A new instance of a <tt>JAXBContext</tt>.
+     *      A new instance of a {@code JAXBContext}.
      *
      * @throws JAXBException
      *      if an error was encountered while creating the
-     *      <tt>JAXBContext</tt>, such as (but not limited to):
+     *      {@code JAXBContext}, such as (but not limited to):
      * <ol>
      *  <li>Classes use JAXB annotations incorrectly
      *  <li>Classes have colliding annotations (i.e., two classes with the same type name)
@@ -75,14 +75,14 @@
 
     /**
      * <p>
-     * Create a new instance of a <tt>JAXBContext</tt> class.
+     * Create a new instance of a {@code JAXBContext} class.
      *
      * <p>
      * For semantics see {@link javax.xml.bind.JAXBContext#newInstance(String, ClassLoader, java.util.Map)}
      *
      * <p>
      * The interpretation of properties is up to implementations. Implementations should
-     * throw <tt>JAXBException</tt> if it finds properties that it doesn't understand.
+     * throw {@code JAXBException} if it finds properties that it doesn't understand.
      *
      * @param contextPath list of java package names that contain schema derived classes
      * @param classLoader
@@ -91,9 +91,9 @@
      *      provider-specific properties. Can be null, which means the same thing as passing
      *      in an empty map.
      *
-     * @return a new instance of a <tt>JAXBContext</tt>
+     * @return a new instance of a {@code JAXBContext}
      * @throws JAXBException if an error was encountered while creating the
-     *                       <tt>JAXBContext</tt> such as
+     *                       {@code JAXBContext} such as
      * <ol>
      *   <li>failure to locate either ObjectFactory.class or jaxb.index in the packages</li>
      *   <li>an ambiguity among global elements contained in the contextPath</li>
--- a/src/java.xml.bind/share/classes/javax/xml/bind/JAXBElement.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/javax/xml/bind/JAXBElement.java	Thu Sep 24 18:26:42 2015 +0300
@@ -35,25 +35,25 @@
  * declaration within a schema and the element instance value within an xml document
  * with the following properties
  * <ul>
- *   <li>element's xml tag <b><tt>name</tt></b></li>
- *   <li><b><tt>value</tt></b> represents the element instance's atttribute(s) and content model</li>
- *   <li>element declaration's <b><tt>declaredType</tt></b> (<tt>xs:element @type</tt> attribute)</li>
- *   <li><b><tt>scope</tt></b> of element declaration</li>
- *   <li>boolean <b><tt>nil</tt></b> property. (element instance's <tt><b>xsi:nil</b></tt> attribute)</li>
+ *   <li>element's xml tag <b>{@code name}</b></li>
+ *   <li><b>{@code value}</b> represents the element instance's atttribute(s) and content model</li>
+ *   <li>element declaration's <b>{@code declaredType}</b> ({@code xs:element @type} attribute)</li>
+ *   <li><b>{@code scope}</b> of element declaration</li>
+ *   <li>boolean <b>{@code nil}</b> property. (element instance's <b>{@code xsi:nil}</b> attribute)</li>
  * </ul>
  *
- * <p>The <tt>declaredType</tt> and <tt>scope</tt> property are the
+ * <p>The {@code declaredType} and {@code scope} property are the
  * JAXB class binding for the xml type definition.
  * </p>
  *
- * <p><b><tt>Scope</tt></b> is either {@link GlobalScope} or the Java class representing the
+ * <p><b>{@code Scope}</b> is either {@link GlobalScope} or the Java class representing the
  * complex type definition containing the schema element declaration.
  * </p>
  *
- * <p>There is a property constraint that if <b><tt>value</tt></b> is <tt>null</tt>,
- * then <tt>nil</tt> must be <tt>true</tt>. The converse is not true to enable
- * representing a nil element with attribute(s). If <tt>nil</tt> is true, it is possible
- * that <tt>value</tt> is non-null so it can hold the value of the attributes
+ * <p>There is a property constraint that if <b>{@code value}</b> is {@code null},
+ * then {@code nil} must be {@code true}. The converse is not true to enable
+ * representing a nil element with attribute(s). If {@code nil} is true, it is possible
+ * that {@code value} is non-null so it can hold the value of the attributes
  * associated with a nil element.
  * </p>
  *
@@ -97,7 +97,7 @@
      * @param declaredType  Java binding of xml element declaration's type
      * @param scope
      *      Java binding of scope of xml element declaration.
-     *      Passing null is the same as passing <tt>GlobalScope.class</tt>
+     *      Passing null is the same as passing {@code GlobalScope.class}
      * @param value
      *      Java instance representing xml element's value.
      * @see #getScope()
@@ -119,7 +119,7 @@
     /**
      * Construct an xml element instance.
      *
-     * This is just a convenience method for <tt>new JAXBElement(name,declaredType,GlobalScope.class,value)</tt>
+     * This is just a convenience method for {@code new JAXBElement(name,declaredType,GlobalScope.class,value)}
      */
     public JAXBElement(QName name, Class<T> declaredType, T value ) {
         this(name,declaredType,GlobalScope.class,value);
@@ -142,7 +142,7 @@
     /**
      * <p>Set the content model and attributes of this xml element.</p>
      *
-     * <p>When this property is set to <tt>null</tt>, <tt>isNil()</tt> must by <tt>true</tt>.
+     * <p>When this property is set to {@code null}, {@code isNil()} must by {@code true}.
      *    Details of constraint are described at {@link #isNil()}.</p>
      *
      * @see #isTypeSubstituted()
@@ -155,7 +155,7 @@
      * <p>Return the content model and attribute values for this element.</p>
      *
      * <p>See {@link #isNil()} for a description of a property constraint when
-     * this value is <tt>null</tt></p>
+     * this value is {@code null}</p>
      */
     public T getValue() {
         return value;
@@ -165,18 +165,18 @@
      * Returns scope of xml element declaration.
      *
      * @see #isGlobalScope()
-     * @return <tt>GlobalScope.class</tt> if this element is of global scope.
+     * @return {@code GlobalScope.class} if this element is of global scope.
      */
     public Class getScope() {
         return scope;
     }
 
     /**
-     * <p>Returns <tt>true</tt> iff this element instance content model
+     * <p>Returns {@code true} iff this element instance content model
      * is nil.</p>
      *
-     * <p>This property always returns <tt>true</tt> when {@link #getValue()} is null.
-     * Note that the converse is not true, when this property is <tt>true</tt>,
+     * <p>This property always returns {@code true} when {@link #getValue()} is null.
+     * Note that the converse is not true, when this property is {@code true},
      * {@link #getValue()} can contain a non-null value for attribute(s). It is
      * valid for a nil xml element to have attribute(s).</p>
      */
--- a/src/java.xml.bind/share/classes/javax/xml/bind/JAXBException.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/javax/xml/bind/JAXBException.java	Thu Sep 24 18:26:42 2015 +0300
@@ -160,7 +160,7 @@
 
     /**
      * Prints this JAXBException and its stack trace (including the stack trace
-     * of the linkedException if it is non-null) to <tt>System.err</tt>.
+     * of the linkedException if it is non-null) to {@code System.err}.
      *
      */
     public void printStackTrace() {
--- a/src/java.xml.bind/share/classes/javax/xml/bind/JAXBIntrospector.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/javax/xml/bind/JAXBIntrospector.java	Thu Sep 24 18:26:42 2015 +0300
@@ -74,7 +74,7 @@
      *
      * <p>Convenience method to abstract whether working with either
      *    a javax.xml.bind.JAXBElement instance or an instance of
-     *    <tt>@XmlRootElement</tt> annotated Java class.</p>
+     *    {@code @XmlRootElement} annotated Java class.</p>
      *
      * @param jaxbElement  object that #isElement(Object) returns true.
      *
--- a/src/java.xml.bind/share/classes/javax/xml/bind/MarshalException.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/javax/xml/bind/MarshalException.java	Thu Sep 24 18:26:42 2015 +0300
@@ -30,7 +30,7 @@
  * a marshal operation that the provider is unable to recover from.
  *
  * <p>
- * The <tt>ValidationEventHandler</tt> can cause this exception to be thrown
+ * The {@code ValidationEventHandler} can cause this exception to be thrown
  * during the marshal operations.  See
  * {@link ValidationEventHandler#handleEvent(ValidationEvent)
  * ValidationEventHandler.handleEvent(ValidationEvent)}.
--- a/src/java.xml.bind/share/classes/javax/xml/bind/Marshaller.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/javax/xml/bind/Marshaller.java	Thu Sep 24 18:26:42 2015 +0300
@@ -33,7 +33,7 @@
 
 /**
  * <p>
- * The <tt>Marshaller</tt> class is responsible for governing the process
+ * The {@code Marshaller} class is responsible for governing the process
  * of serializing Java content trees back into XML data.  It provides the basic
  * marshalling methods:
  *
@@ -153,15 +153,15 @@
  * <b>Marshalling content tree rooted by a JAXB element</b><br>
  * <blockquote>
  * The first parameter of the overloaded
- * <tt>Marshaller.marshal(java.lang.Object, ...)</tt> methods must be a
+ * {@code Marshaller.marshal(java.lang.Object, ...)} methods must be a
  * JAXB element as computed by
  * {@link JAXBIntrospector#isElement(java.lang.Object)};
- * otherwise, a <tt>Marshaller.marshal</tt> method must throw a
+ * otherwise, a {@code Marshaller.marshal} method must throw a
  * {@link MarshalException}. There exist two mechanisms
  * to enable marshalling an instance that is not a JAXB element.
  * One method is to wrap the instance as a value of a {@link JAXBElement},
  * and pass the wrapper element as the first parameter to
- * a <tt>Marshaller.marshal</tt> method. For java to schema binding, it
+ * a {@code Marshaller.marshal} method. For java to schema binding, it
  * is also possible to simply annotate the instance's class with
  * &#64;{@link XmlRootElement}.
  * </blockquote>
@@ -170,7 +170,7 @@
  * <b>Encoding</b><br>
  * <blockquote>
  * By default, the Marshaller will use UTF-8 encoding when generating XML data
- * to a <tt>java.io.OutputStream</tt>, or a <tt>java.io.Writer</tt>.  Use the
+ * to a {@code java.io.OutputStream}, or a {@code java.io.Writer}.  Use the
  * {@link #setProperty(String,Object) setProperty} API to change the output
  * encoding used during these marshal operations.  Client applications are
  * expected to supply a valid character encoding name as defined in the
@@ -188,7 +188,7 @@
  * order to marshal it back into XML data.  Different JAXB Providers will
  * support marshalling invalid Java content trees at varying levels, however
  * all JAXB Providers must be able to marshal a valid content tree back to
- * XML data.  A JAXB Provider must throw a <tt>MarshalException</tt> when it
+ * XML data.  A JAXB Provider must throw a {@code MarshalException} when it
  * is unable to complete the marshal operation due to invalid content.  Some
  * JAXB Providers will fully allow marshalling invalid content, others will fail
  * on the first validation error.
@@ -213,18 +213,18 @@
  * All JAXB Providers are required to support the following set of properties.
  * Some providers may support additional properties.
  * <dl>
- *   <dt><tt>jaxb.encoding</tt> - value must be a java.lang.String</dt>
+ *   <dt>{@code jaxb.encoding} - value must be a java.lang.String</dt>
  *   <dd>The output encoding to use when marshalling the XML data.  The
  *               Marshaller will use "UTF-8" by default if this property is not
  *       specified.</dd>
- *   <dt><tt>jaxb.formatted.output</tt> - value must be a java.lang.Boolean</dt>
+ *   <dt>{@code jaxb.formatted.output} - value must be a java.lang.Boolean</dt>
  *   <dd>This property controls whether or not the Marshaller will format
  *       the resulting XML data with line breaks and indentation.  A
  *       true value for this property indicates human readable indented
  *       xml data, while a false value indicates unformatted xml data.
  *       The Marshaller will default to false (unformatted) if this
  *       property is not specified.</dd>
- *   <dt><tt>jaxb.schemaLocation</tt> - value must be a java.lang.String</dt>
+ *   <dt>{@code jaxb.schemaLocation} - value must be a java.lang.String</dt>
  *   <dd>This property allows the client application to specify an
  *       xsi:schemaLocation attribute in the generated XML data.  The format of
  *       the schemaLocation attribute value is discussed in an easy to
@@ -233,7 +233,7 @@
  *       of the W3C XML Schema Part 0: Primer</a> and specified in
  *       <a href="http://www.w3.org/TR/xmlschema-1/#Instance_Document_Constructions">
  *       Section 2.6 of the W3C XML Schema Part 1: Structures</a>.</dd>
- *   <dt><tt>jaxb.noNamespaceSchemaLocation</tt> - value must be a java.lang.String</dt>
+ *   <dt>{@code jaxb.noNamespaceSchemaLocation} - value must be a java.lang.String</dt>
  *   <dd>This property allows the client application to specify an
  *       xsi:noNamespaceSchemaLocation attribute in the generated XML
  *       data.  The format of the schemaLocation attribute value is discussed in
@@ -242,10 +242,10 @@
  *       of the W3C XML Schema Part 0: Primer</a> and specified in
  *       <a href="http://www.w3.org/TR/xmlschema-1/#Instance_Document_Constructions">
  *       Section 2.6 of the W3C XML Schema Part 1: Structures</a>.</dd>
- *   <dt><tt>jaxb.fragment</tt> - value must be a java.lang.Boolean</dt>
+ *   <dt>{@code jaxb.fragment} - value must be a java.lang.Boolean</dt>
  *   <dd>This property determines whether or not document level events will be
  *       generated by the Marshaller.  If the property is not specified, the
- *       default is <tt>false</tt>. This property has different implications depending
+ *       default is {@code false}. This property has different implications depending
  *       on which marshal api you are using - when this property is set to true:<br>
  *       <ul>
  *         <li>{@link #marshal(Object,org.xml.sax.ContentHandler) marshal(Object,ContentHandler)} - the Marshaller won't
@@ -352,15 +352,15 @@
         "jaxb.fragment";
 
     /**
-     * Marshal the content tree rooted at <tt>jaxbElement</tt> into the specified
-     * <tt>javax.xml.transform.Result</tt>.
+     * Marshal the content tree rooted at {@code jaxbElement} into the specified
+     * {@code javax.xml.transform.Result}.
      *
      * <p>
      * All JAXB Providers must at least support
      * {@link javax.xml.transform.dom.DOMResult},
      * {@link javax.xml.transform.sax.SAXResult}, and
      * {@link javax.xml.transform.stream.StreamResult}. It can
-     * support other derived classes of <tt>Result</tt> as well.
+     * support other derived classes of {@code Result} as well.
      *
      * @param jaxbElement
      *      The root of content tree to be marshalled.
@@ -371,9 +371,9 @@
      *      If any unexpected problem occurs during the marshalling.
      * @throws MarshalException
      *      If the {@link ValidationEventHandler ValidationEventHandler}
-     *      returns false from its <tt>handleEvent</tt> method or the
-     *      <tt>Marshaller</tt> is unable to marshal <tt>obj</tt> (or any
-     *      object reachable from <tt>obj</tt>).  See <a href="#elementMarshalling">
+     *      returns false from its {@code handleEvent} method or the
+     *      {@code Marshaller} is unable to marshal {@code obj} (or any
+     *      object reachable from {@code obj}).  See <a href="#elementMarshalling">
      *      Marshalling a JAXB element</a>.
      * @throws IllegalArgumentException
      *      If any of the method parameters are null
@@ -382,7 +382,7 @@
         throws JAXBException;
 
     /**
-     * Marshal the content tree rooted at <tt>jaxbElement</tt> into an output stream.
+     * Marshal the content tree rooted at {@code jaxbElement} into an output stream.
      *
      * @param jaxbElement
      *      The root of content tree to be marshalled.
@@ -393,9 +393,9 @@
      *      If any unexpected problem occurs during the marshalling.
      * @throws MarshalException
      *      If the {@link ValidationEventHandler ValidationEventHandler}
-     *      returns false from its <tt>handleEvent</tt> method or the
-     *      <tt>Marshaller</tt> is unable to marshal <tt>obj</tt> (or any
-     *      object reachable from <tt>obj</tt>).  See <a href="#elementMarshalling">
+     *      returns false from its {@code handleEvent} method or the
+     *      {@code Marshaller} is unable to marshal {@code obj} (or any
+     *      object reachable from {@code obj}).  See <a href="#elementMarshalling">
      *      Marshalling a JAXB element</a>.
      * @throws IllegalArgumentException
      *      If any of the method parameters are null
@@ -404,7 +404,7 @@
         throws JAXBException;
 
     /**
-     * Marshal the content tree rooted at <tt>jaxbElement</tt> into a file.
+     * Marshal the content tree rooted at {@code jaxbElement} into a file.
      *
      * @param jaxbElement
      *      The root of content tree to be marshalled.
@@ -415,9 +415,9 @@
      *      If any unexpected problem occurs during the marshalling.
      * @throws MarshalException
      *      If the {@link ValidationEventHandler ValidationEventHandler}
-     *      returns false from its <tt>handleEvent</tt> method or the
-     *      <tt>Marshaller</tt> is unable to marshal <tt>obj</tt> (or any
-     *      object reachable from <tt>obj</tt>).  See <a href="#elementMarshalling">
+     *      returns false from its {@code handleEvent} method or the
+     *      {@code Marshaller} is unable to marshal {@code obj} (or any
+     *      object reachable from {@code obj}).  See <a href="#elementMarshalling">
      *      Marshalling a JAXB element</a>.
      * @throws IllegalArgumentException
      *      If any of the method parameters are null
@@ -427,7 +427,7 @@
         throws JAXBException;
 
     /**
-     * Marshal the content tree rooted at <tt>jaxbElement</tt> into a Writer.
+     * Marshal the content tree rooted at {@code jaxbElement} into a Writer.
      *
      * @param jaxbElement
      *      The root of content tree to be marshalled.
@@ -438,9 +438,9 @@
      *      If any unexpected problem occurs during the marshalling.
      * @throws MarshalException
      *      If the {@link ValidationEventHandler ValidationEventHandler}
-     *      returns false from its <tt>handleEvent</tt> method or the
-     *      <tt>Marshaller</tt> is unable to marshal <tt>obj</tt> (or any
-     *      object reachable from <tt>obj</tt>).  See <a href="#elementMarshalling">
+     *      returns false from its {@code handleEvent} method or the
+     *      {@code Marshaller} is unable to marshal {@code obj} (or any
+     *      object reachable from {@code obj}).  See <a href="#elementMarshalling">
      *      Marshalling a JAXB element</a>.
      * @throws IllegalArgumentException
      *      If any of the method parameters are null
@@ -449,7 +449,7 @@
         throws JAXBException;
 
     /**
-     * Marshal the content tree rooted at <tt>jaxbElement</tt> into SAX2 events.
+     * Marshal the content tree rooted at {@code jaxbElement} into SAX2 events.
      *
      * @param jaxbElement
      *      The root of content tree to be marshalled.
@@ -460,9 +460,9 @@
      *      If any unexpected problem occurs during the marshalling.
      * @throws MarshalException
      *      If the {@link ValidationEventHandler ValidationEventHandler}
-     *      returns false from its <tt>handleEvent</tt> method or the
-     *      <tt>Marshaller</tt> is unable to marshal <tt>obj</tt> (or any
-     *      object reachable from <tt>obj</tt>).  See <a href="#elementMarshalling">
+     *      returns false from its {@code handleEvent} method or the
+     *      {@code Marshaller} is unable to marshal {@code obj} (or any
+     *      object reachable from {@code obj}).  See <a href="#elementMarshalling">
      *      Marshalling a JAXB element</a>.
      * @throws IllegalArgumentException
      *      If any of the method parameters are null
@@ -471,7 +471,7 @@
         throws JAXBException;
 
     /**
-     * Marshal the content tree rooted at <tt>jaxbElement</tt> into a DOM tree.
+     * Marshal the content tree rooted at {@code jaxbElement} into a DOM tree.
      *
      * @param jaxbElement
      *      The content tree to be marshalled.
@@ -486,9 +486,9 @@
      *      If any unexpected problem occurs during the marshalling.
      * @throws MarshalException
      *      If the {@link ValidationEventHandler ValidationEventHandler}
-     *      returns false from its <tt>handleEvent</tt> method or the
-     *      <tt>Marshaller</tt> is unable to marshal <tt>jaxbElement</tt> (or any
-     *      object reachable from <tt>jaxbElement</tt>).  See <a href="#elementMarshalling">
+     *      returns false from its {@code handleEvent} method or the
+     *      {@code Marshaller} is unable to marshal {@code jaxbElement} (or any
+     *      object reachable from {@code jaxbElement}).  See <a href="#elementMarshalling">
      *      Marshalling a JAXB element</a>.
      * @throws IllegalArgumentException
      *      If any of the method parameters are null
@@ -497,7 +497,7 @@
         throws JAXBException;
 
     /**
-     * Marshal the content tree rooted at <tt>jaxbElement</tt> into a
+     * Marshal the content tree rooted at {@code jaxbElement} into a
      * {@link javax.xml.stream.XMLStreamWriter}.
      *
      * @param jaxbElement
@@ -509,9 +509,9 @@
      *      If any unexpected problem occurs during the marshalling.
      * @throws MarshalException
      *      If the {@link ValidationEventHandler ValidationEventHandler}
-     *      returns false from its <tt>handleEvent</tt> method or the
-     *      <tt>Marshaller</tt> is unable to marshal <tt>obj</tt> (or any
-     *      object reachable from <tt>obj</tt>).  See <a href="#elementMarshalling">
+     *      returns false from its {@code handleEvent} method or the
+     *      {@code Marshaller} is unable to marshal {@code obj} (or any
+     *      object reachable from {@code obj}).  See <a href="#elementMarshalling">
      *      Marshalling a JAXB element</a>.
      * @throws IllegalArgumentException
      *      If any of the method parameters are null
@@ -521,7 +521,7 @@
         throws JAXBException;
 
     /**
-     * Marshal the content tree rooted at <tt>jaxbElement</tt> into a
+     * Marshal the content tree rooted at {@code jaxbElement} into a
      * {@link javax.xml.stream.XMLEventWriter}.
      *
      * @param jaxbElement
@@ -533,9 +533,9 @@
      *      If any unexpected problem occurs during the marshalling.
      * @throws MarshalException
      *      If the {@link ValidationEventHandler ValidationEventHandler}
-     *      returns false from its <tt>handleEvent</tt> method or the
-     *      <tt>Marshaller</tt> is unable to marshal <tt>obj</tt> (or any
-     *      object reachable from <tt>obj</tt>).  See <a href="#elementMarshalling">
+     *      returns false from its {@code handleEvent} method or the
+     *      {@code Marshaller} is unable to marshal {@code obj} (or any
+     *      object reachable from {@code obj}).  See <a href="#elementMarshalling">
      *      Marshalling a JAXB element</a>.
      * @throws IllegalArgumentException
      *      If any of the method parameters are null
@@ -572,7 +572,7 @@
 
     /**
      * Set the particular property in the underlying implementation of
-     * <tt>Marshaller</tt>.  This method can only be used to set one of
+     * {@code Marshaller}.  This method can only be used to set one of
      * the standard JAXB defined properties above or a provider specific
      * property.  Attempting to set an undefined property will result in
      * a PropertyException being thrown.  See <a href="#supportedProps">
@@ -593,7 +593,7 @@
 
     /**
      * Get the particular property in the underlying implementation of
-     * <tt>Marshaller</tt>.  This method can only be used to get one of
+     * {@code Marshaller}.  This method can only be used to get one of
      * the standard JAXB defined properties above or a provider specific
      * property.  Attempting to get an undefined property will result in
      * a PropertyException being thrown.  See <a href="#supportedProps">
@@ -648,7 +648,7 @@
      * Associates a configured instance of {@link XmlAdapter} with this marshaller.
      *
      * <p>
-     * This is a convenience method that invokes <code>setAdapter(adapter.getClass(),adapter);</code>.
+     * This is a convenience method that invokes {@code setAdapter(adapter.getClass(),adapter);}.
      *
      * @see #setAdapter(Class,XmlAdapter)
      * @throws IllegalArgumentException
@@ -724,7 +724,7 @@
      * This method allows the caller to validate the marshalled XML as it's marshalled.
      *
      * <p>
-     * Initially this property is set to <tt>null</tt>.
+     * Initially this property is set to {@code null}.
      *
      * @param schema Schema object to validate marshal operations against or null to disable validation
      * @throws UnsupportedOperationException could be thrown if this method is
@@ -771,11 +771,11 @@
     public static abstract class Listener {
         /**
          * <p>
-         * Callback method invoked before marshalling from <tt>source</tt> to XML.
+         * Callback method invoked before marshalling from {@code source} to XML.
          * </p>
          * <p>
-         * This method is invoked just before marshalling process starts to marshal <tt>source</tt>.
-         * Note that if the class of <tt>source</tt> defines its own <tt>beforeMarshal</tt> method,
+         * This method is invoked just before marshalling process starts to marshal {@code source}.
+         * Note that if the class of {@code source} defines its own {@code beforeMarshal} method,
          * the class specific callback method is invoked just before this method is invoked.
          *
          * @param source instance of JAXB mapped class prior to marshalling from it.
@@ -785,11 +785,11 @@
 
         /**
          * <p>
-         * Callback method invoked after marshalling <tt>source</tt> to XML.
+         * Callback method invoked after marshalling {@code source} to XML.
          * </p>
          * <p>
-         * This method is invoked after <tt>source</tt> and all its descendants have been marshalled.
-         * Note that if the class of <tt>source</tt> defines its own <tt>afterMarshal</tt> method,
+         * This method is invoked after {@code source} and all its descendants have been marshalled.
+         * Note that if the class of {@code source} defines its own {@code afterMarshal} method,
          * the class specific callback method is invoked just before this method is invoked.
          *
          * @param source instance of JAXB mapped class after marshalling it.
@@ -804,7 +804,7 @@
      *
      * <p>
      * There is only one Listener per Marshaller. Setting a Listener replaces the previous set Listener.
-     * One can unregister current Listener by setting listener to <tt>null</tt>.
+     * One can unregister current Listener by setting listener to {@code null}.
      *
      * @param listener an instance of a class that implements {@link Listener}
      * @since 1.6, JAXB 2.0
@@ -814,7 +814,8 @@
     /**
      * <p>Return {@link Listener} registered with this {@link Marshaller}.
      *
-     * @return registered {@link Listener} or <code>null</code> if no Listener is registered with this Marshaller.
+     * @return registered {@link Listener} or {@code null}
+     *         if no Listener is registered with this Marshaller.
      * @since 1.6, JAXB 2.0
      */
     public Listener getListener();
--- a/src/java.xml.bind/share/classes/javax/xml/bind/TypeConstraintException.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/javax/xml/bind/TypeConstraintException.java	Thu Sep 24 18:26:42 2015 +0300
@@ -174,7 +174,7 @@
 
     /**
      * Prints this TypeConstraintException and its stack trace (including the stack trace
-     * of the linkedException if it is non-null) to <tt>System.err</tt>.
+     * of the linkedException if it is non-null) to {@code System.err}.
      *
      */
     public void printStackTrace() {
--- a/src/java.xml.bind/share/classes/javax/xml/bind/UnmarshalException.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/javax/xml/bind/UnmarshalException.java	Thu Sep 24 18:26:42 2015 +0300
@@ -31,7 +31,7 @@
  * the operation.
  *
  * <p>
- * The <tt>ValidationEventHandler</tt> can cause this exception to be thrown
+ * The {@code ValidationEventHandler} can cause this exception to be thrown
  * during the unmarshal operations.  See
  * {@link ValidationEventHandler#handleEvent(ValidationEvent)
  * ValidationEventHandler.handleEvent(ValidationEvent)}.
--- a/src/java.xml.bind/share/classes/javax/xml/bind/Unmarshaller.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/javax/xml/bind/Unmarshaller.java	Thu Sep 24 18:26:42 2015 +0300
@@ -31,7 +31,7 @@
 import java.io.Reader;
 
 /**
- * The <tt>Unmarshaller</tt> class governs the process of deserializing XML
+ * The {@code Unmarshaller} class governs the process of deserializing XML
  * data into newly created Java content trees, optionally validating the XML
  * data as it is unmarshalled.  It provides an overloading of unmarshal methods
  * for many different input kinds.
@@ -71,7 +71,7 @@
  *
  * <p>
  * Unmarshalling from a StringBuffer using a
- * <tt>javax.xml.transform.stream.StreamSource</tt>:
+ * {@code javax.xml.transform.stream.StreamSource}:
  * <blockquote>
  *    <pre>{@code
  *       JAXBContext jc = JAXBContext.newInstance( "com.acme.foo" );
@@ -82,7 +82,7 @@
  * </blockquote>
  *
  * <p>
- * Unmarshalling from a <tt>org.w3c.dom.Node</tt>:
+ * Unmarshalling from a {@code org.w3c.dom.Node}:
  * <blockquote>
  *    <pre>
  *       JAXBContext jc = JAXBContext.newInstance( "com.acme.foo" );
@@ -98,7 +98,7 @@
  * </blockquote>
  *
  * <p>
- * Unmarshalling from a <tt>javax.xml.transform.sax.SAXSource</tt> using a
+ * Unmarshalling from a {@code javax.xml.transform.sax.SAXSource} using a
  * client specified validating SAX2.0 parser:
  * <blockquote>
  *    <pre>
@@ -205,17 +205,17 @@
  * <a name="unmarshalGlobal"></a>
  * <b>Unmarshal a root element that is globally declared</b><br>
  * <blockquote>
- * The unmarshal methods that do not have an <tt>declaredType</tt> parameter use
+ * The unmarshal methods that do not have an {@code declaredType} parameter use
  * {@link JAXBContext} to unmarshal the root element of an XML data. The {@link JAXBContext}
- * instance is the one that was used to create this <tt>Unmarshaller</tt>. The {@link JAXBContext}
+ * instance is the one that was used to create this {@code Unmarshaller}. The {@link JAXBContext}
  * instance maintains a mapping of globally declared XML element and type definition names to
  * JAXB mapped classes. The unmarshal method checks if {@link JAXBContext} has a mapping
- * from the root element's XML name and/or <tt>@xsi:type</tt> to a JAXB mapped class.  If it does, it umarshalls the
+ * from the root element's XML name and/or {@code @xsi:type} to a JAXB mapped class.  If it does, it umarshalls the
  * XML data using the appropriate JAXB mapped class. Note that when the root element name is unknown and the root
- * element has an <tt>@xsi:type</tt>, the XML data is unmarshalled
+ * element has an {@code @xsi:type}, the XML data is unmarshalled
  * using that JAXB mapped class as the value of a {@link JAXBElement}.
  * When the {@link JAXBContext} object does not have a mapping for the root element's name
- * nor its <tt>@xsi:type</tt>, if it exists,
+ * nor its {@code @xsi:type}, if it exists,
  * then the unmarshal operation will abort immediately by throwing a {@link UnmarshalException
  * UnmarshalException}. This exception scenario can be worked around by using the unmarshal by
  * declaredType methods described in the next subsection.
@@ -225,20 +225,20 @@
  * <a name="unmarshalByDeclaredType"></a>
  * <b>Unmarshal by Declared Type</b><br>
  * <blockquote>
- * The unmarshal methods with a <code>declaredType</code> parameter enable an
+ * The unmarshal methods with a {@code declaredType} parameter enable an
  * application to deserialize a root element of XML data, even when
  * there is no mapping in {@link JAXBContext} of the root element's XML name.
  * The unmarshaller unmarshals the root element using the application provided
- * mapping specified as the <tt>declaredType</tt> parameter.
+ * mapping specified as the {@code declaredType} parameter.
  * Note that even when the root element's element name is mapped by {@link JAXBContext},
- * the <code>declaredType</code> parameter overrides that mapping for
+ * the {@code declaredType} parameter overrides that mapping for
  * deserializing the root element when using these unmarshal methods.
- * Additionally, when the root element of XML data has an <tt>xsi:type</tt> attribute and
+ * Additionally, when the root element of XML data has an {@code xsi:type} attribute and
  * that attribute's value references a type definition that is mapped
  * to a JAXB mapped class by {@link JAXBContext}, that the root
- * element's <tt>xsi:type</tt> attribute takes
- * precedence over the unmarshal methods <tt>declaredType</tt> parameter.
- * These methods always return a <tt>{@literal JAXBElement<declaredType>}</tt>
+ * element's {@code xsi:type} attribute takes
+ * precedence over the unmarshal methods {@code declaredType} parameter.
+ * These methods always return a {@code JAXBElement<declaredType>}
  * instance. The table below shows how the properties of the returned JAXBElement
  * instance are set.
  *
@@ -255,21 +255,21 @@
  *     </tr>
  *     <tr>
  *       <td>name</td>
- *       <td><code>xml element name</code></td>
+ *       <td>{@code xml element name}</td>
  *     </tr>
  *   </thead>
  *   <tbody>
  *     <tr>
  *       <td>value</td>
- *       <td><code>instanceof declaredType</code></td>
+ *       <td>{@code instanceof declaredType}</td>
  *     </tr>
  *     <tr>
  *       <td>declaredType</td>
- *       <td>unmarshal method <code>declaredType</code> parameter</td>
+ *       <td>unmarshal method {@code declaredType} parameter</td>
  *     </tr>
  *     <tr>
  *       <td>scope</td>
- *       <td><code>null</code> <i>(actual scope is unknown)</i></td>
+ *       <td>{@code null} <i>(actual scope is unknown)</i></td>
  *     </tr>
  *   </tbody>
  *  </table>
@@ -279,7 +279,7 @@
  * The following is an example of
  * <a href="#unmarshalByDeclaredType">unmarshal by declaredType method</a>.
  * <p>
- * Unmarshal by declaredType from a <tt>org.w3c.dom.Node</tt>:
+ * Unmarshal by declaredType from a {@code org.w3c.dom.Node}:
  * <blockquote>
  *    <pre>{@code
  *       Schema fragment for example
@@ -330,7 +330,7 @@
  * <blockquote>
  * <p>
  * A client application can enable or disable JAXP 1.3 validation
- * mechanism via the <tt>setSchema(javax.xml.validation.Schema)</tt> API.
+ * mechanism via the {@code setSchema(javax.xml.validation.Schema)} API.
  * Sophisticated clients can specify their own validating SAX 2.0 compliant
  * parser and bypass the JAXP 1.3 validation mechanism using the
  * {@link #unmarshal(javax.xml.transform.Source) unmarshal(Source)}  API.
@@ -421,8 +421,8 @@
      *     If any unexpected errors occur while unmarshalling
      * @throws UnmarshalException
      *     If the {@link ValidationEventHandler ValidationEventHandler}
-     *     returns false from its <tt>handleEvent</tt> method or the
-     *     <tt>Unmarshaller</tt> is unable to perform the XML to Java
+     *     returns false from its {@code handleEvent} method or the
+     *     {@code Unmarshaller} is unable to perform the XML to Java
      *     binding.  See <a href="#unmarshalEx">Unmarshalling XML Data</a>
      * @throws IllegalArgumentException
      *      If the file parameter is null
@@ -444,8 +444,8 @@
      *     If any unexpected errors occur while unmarshalling
      * @throws UnmarshalException
      *     If the {@link ValidationEventHandler ValidationEventHandler}
-     *     returns false from its <tt>handleEvent</tt> method or the
-     *     <tt>Unmarshaller</tt> is unable to perform the XML to Java
+     *     returns false from its {@code handleEvent} method or the
+     *     {@code Unmarshaller} is unable to perform the XML to Java
      *     binding.  See <a href="#unmarshalEx">Unmarshalling XML Data</a>
      * @throws IllegalArgumentException
      *      If the InputStream parameter is null
@@ -468,8 +468,8 @@
      *     If any unexpected errors occur while unmarshalling
      * @throws UnmarshalException
      *     If the {@link ValidationEventHandler ValidationEventHandler}
-     *     returns false from its <tt>handleEvent</tt> method or the
-     *     <tt>Unmarshaller</tt> is unable to perform the XML to Java
+     *     returns false from its {@code handleEvent} method or the
+     *     {@code Unmarshaller} is unable to perform the XML to Java
      *     binding.  See <a href="#unmarshalEx">Unmarshalling XML Data</a>
      * @throws IllegalArgumentException
      *      If the InputStream parameter is null
@@ -491,8 +491,8 @@
      *     If any unexpected errors occur while unmarshalling
      * @throws UnmarshalException
      *     If the {@link ValidationEventHandler ValidationEventHandler}
-     *     returns false from its <tt>handleEvent</tt> method or the
-     *     <tt>Unmarshaller</tt> is unable to perform the XML to Java
+     *     returns false from its {@code handleEvent} method or the
+     *     {@code Unmarshaller} is unable to perform the XML to Java
      *     binding.  See <a href="#unmarshalEx">Unmarshalling XML Data</a>
      * @throws IllegalArgumentException
      *      If the URL parameter is null
@@ -513,8 +513,8 @@
      *     If any unexpected errors occur while unmarshalling
      * @throws UnmarshalException
      *     If the {@link ValidationEventHandler ValidationEventHandler}
-     *     returns false from its <tt>handleEvent</tt> method or the
-     *     <tt>Unmarshaller</tt> is unable to perform the XML to Java
+     *     returns false from its {@code handleEvent} method or the
+     *     {@code Unmarshaller} is unable to perform the XML to Java
      *     binding.  See <a href="#unmarshalEx">Unmarshalling XML Data</a>
      * @throws IllegalArgumentException
      *      If the InputSource parameter is null
@@ -537,8 +537,8 @@
      *     If any unexpected errors occur while unmarshalling
      * @throws UnmarshalException
      *     If the {@link ValidationEventHandler ValidationEventHandler}
-     *     returns false from its <tt>handleEvent</tt> method or the
-     *     <tt>Unmarshaller</tt> is unable to perform the XML to Java
+     *     returns false from its {@code handleEvent} method or the
+     *     {@code Unmarshaller} is unable to perform the XML to Java
      *     binding.  See <a href="#unmarshalEx">Unmarshalling XML Data</a>
      * @throws IllegalArgumentException
      *      If the Node parameter is null
@@ -547,7 +547,7 @@
     public Object unmarshal( org.w3c.dom.Node node ) throws JAXBException;
 
     /**
-     * Unmarshal XML data by JAXB mapped <tt>declaredType</tt>
+     * Unmarshal XML data by JAXB mapped {@code declaredType}
      * and return the resulting content tree.
      *
      * <p>
@@ -557,16 +557,16 @@
      *      the document/element to unmarshal XML data from.
      *      The caller must support at least Document and Element.
      * @param declaredType
-     *      appropriate JAXB mapped class to hold <tt>node</tt>'s XML data.
+     *      appropriate JAXB mapped class to hold {@code node}'s XML data.
      *
-     * @return <a href="#unmarshalDeclaredTypeReturn">JAXB Element</a> representation of <tt>node</tt>
+     * @return <a href="#unmarshalDeclaredTypeReturn">JAXB Element</a> representation of {@code node}
      *
      * @throws JAXBException
      *     If any unexpected errors occur while unmarshalling
      * @throws UnmarshalException
      *     If the {@link ValidationEventHandler ValidationEventHandler}
-     *     returns false from its <tt>handleEvent</tt> method or the
-     *     <tt>Unmarshaller</tt> is unable to perform the XML to Java
+     *     returns false from its {@code handleEvent} method or the
+     *     {@code Unmarshaller} is unable to perform the XML to Java
      *     binding.  See <a href="#unmarshalEx">Unmarshalling XML Data</a>
      * @throws IllegalArgumentException
      *      If any parameter is null
@@ -588,30 +588,30 @@
      * A client application can choose not to use the default parser mechanism
      * supplied with their JAXB provider.  Any SAX 2.0 compliant parser can be
      * substituted for the JAXB provider's default mechanism.  To do so, the
-     * client application must properly configure a <tt>SAXSource</tt> containing
-     * an <tt>XMLReader</tt> implemented by the SAX 2.0 parser provider.  If the
-     * <tt>XMLReader</tt> has an <tt>org.xml.sax.ErrorHandler</tt> registered
+     * client application must properly configure a {@code SAXSource} containing
+     * an {@code XMLReader} implemented by the SAX 2.0 parser provider.  If the
+     * {@code XMLReader} has an {@code org.xml.sax.ErrorHandler} registered
      * on it, it will be replaced by the JAXB Provider so that validation errors
-     * can be reported via the <tt>ValidationEventHandler</tt> mechanism of
-     * JAXB.  If the <tt>SAXSource</tt> does not contain an <tt>XMLReader</tt>,
+     * can be reported via the {@code ValidationEventHandler} mechanism of
+     * JAXB.  If the {@code SAXSource} does not contain an {@code XMLReader},
      * then the JAXB provider's default parser mechanism will be used.
      * <p>
      * This parser replacement mechanism can also be used to replace the JAXB
      * provider's unmarshal-time validation engine.  The client application
      * must properly configure their SAX 2.0 compliant parser to perform
-     * validation (as shown in the example above).  Any <tt>SAXParserExceptions
-     * </tt> encountered by the parser during the unmarshal operation will be
+     * validation (as shown in the example above).  Any {@code SAXParserExceptions}
+     * encountered by the parser during the unmarshal operation will be
      * processed by the JAXB provider and converted into JAXB
-     * <tt>ValidationEvent</tt> objects which will be reported back to the
-     * client via the <tt>ValidationEventHandler</tt> registered with the
-     * <tt>Unmarshaller</tt>.  <i>Note:</i> specifying a substitute validating
+     * {@code ValidationEvent} objects which will be reported back to the
+     * client via the {@code ValidationEventHandler} registered with the
+     * {@code Unmarshaller}.  <i>Note:</i> specifying a substitute validating
      * SAX 2.0 parser for unmarshalling does not necessarily replace the
      * validation engine used by the JAXB provider for performing on-demand
      * validation.
      * <p>
      * The only way for a client application to specify an alternate parser
      * mechanism to be used during unmarshal is via the
-     * <tt>unmarshal(SAXSource)</tt> API.  All other forms of the unmarshal
+     * {@code unmarshal(SAXSource)} API.  All other forms of the unmarshal
      * method (File, URL, Node, etc) will use the JAXB provider's default
      * parser and validator mechanisms.
      *
@@ -623,8 +623,8 @@
      *     If any unexpected errors occur while unmarshalling
      * @throws UnmarshalException
      *     If the {@link ValidationEventHandler ValidationEventHandler}
-     *     returns false from its <tt>handleEvent</tt> method or the
-     *     <tt>Unmarshaller</tt> is unable to perform the XML to Java
+     *     returns false from its {@code handleEvent} method or the
+     *     {@code Unmarshaller} is unable to perform the XML to Java
      *     binding.  See <a href="#unmarshalEx">Unmarshalling XML Data</a>
      * @throws IllegalArgumentException
      *      If the Source parameter is null
@@ -635,7 +635,7 @@
 
 
     /**
-     * Unmarshal XML data from the specified XML Source by <tt>declaredType</tt> and return the
+     * Unmarshal XML data from the specified XML Source by {@code declaredType} and return the
      * resulting content tree.
      *
      * <p>
@@ -647,15 +647,15 @@
      * @param source the XML Source to unmarshal XML data from (providers are
      *        only required to support SAXSource, DOMSource, and StreamSource)
      * @param declaredType
-     *      appropriate JAXB mapped class to hold <tt>source</tt>'s xml root element
+     *      appropriate JAXB mapped class to hold {@code source}'s xml root element
      * @return Java content rooted by <a href="#unmarshalDeclaredTypeReturn">JAXB Element</a>
      *
      * @throws JAXBException
      *     If any unexpected errors occur while unmarshalling
      * @throws UnmarshalException
      *     If the {@link ValidationEventHandler ValidationEventHandler}
-     *     returns false from its <tt>handleEvent</tt> method or the
-     *     <tt>Unmarshaller</tt> is unable to perform the XML to Java
+     *     returns false from its {@code handleEvent} method or the
+     *     {@code Unmarshaller} is unable to perform the XML to Java
      *     binding.  See <a href="#unmarshalEx">Unmarshalling XML Data</a>
      * @throws IllegalArgumentException
      *      If any parameter is null
@@ -675,7 +675,7 @@
      * This method assumes that the parser is on a START_DOCUMENT or
      * START_ELEMENT event.  Unmarshalling will be done from this
      * start event to the corresponding end event.  If this method
-     * returns successfully, the <tt>reader</tt> will be pointing at
+     * returns successfully, the {@code reader} will be pointing at
      * the token right after the end event.
      *
      * @param reader
@@ -687,13 +687,13 @@
      *     If any unexpected errors occur while unmarshalling
      * @throws UnmarshalException
      *     If the {@link ValidationEventHandler ValidationEventHandler}
-     *     returns false from its <tt>handleEvent</tt> method or the
-     *     <tt>Unmarshaller</tt> is unable to perform the XML to Java
+     *     returns false from its {@code handleEvent} method or the
+     *     {@code Unmarshaller} is unable to perform the XML to Java
      *     binding.  See <a href="#unmarshalEx">Unmarshalling XML Data</a>
      * @throws IllegalArgumentException
-     *      If the <tt>reader</tt> parameter is null
+     *      If the {@code reader} parameter is null
      * @throws IllegalStateException
-     *      If <tt>reader</tt> is not pointing to a START_DOCUMENT or
+     *      If {@code reader} is not pointing to a START_DOCUMENT or
      *      START_ELEMENT  event.
      * @since 1.6, JAXB 2.0
      * @see #unmarshal(javax.xml.stream.XMLStreamReader, Class)
@@ -702,7 +702,7 @@
         throws JAXBException;
 
     /**
-     * Unmarshal root element to JAXB mapped <tt>declaredType</tt>
+     * Unmarshal root element to JAXB mapped {@code declaredType}
      * and return the resulting content tree.
      *
      * <p>
@@ -711,13 +711,13 @@
      * This method assumes that the parser is on a START_DOCUMENT or
      * START_ELEMENT event. Unmarshalling will be done from this
      * start event to the corresponding end event.  If this method
-     * returns successfully, the <tt>reader</tt> will be pointing at
+     * returns successfully, the {@code reader} will be pointing at
      * the token right after the end event.
      *
      * @param reader
      *      The parser to be read.
      * @param declaredType
-     *      appropriate JAXB mapped class to hold <tt>reader</tt>'s START_ELEMENT XML data.
+     *      appropriate JAXB mapped class to hold {@code reader}'s START_ELEMENT XML data.
      *
      * @return   content tree rooted by <a href="#unmarshalDeclaredTypeReturn">JAXB Element representation</a>
      *
@@ -725,8 +725,8 @@
      *     If any unexpected errors occur while unmarshalling
      * @throws UnmarshalException
      *     If the {@link ValidationEventHandler ValidationEventHandler}
-     *     returns false from its <tt>handleEvent</tt> method or the
-     *     <tt>Unmarshaller</tt> is unable to perform the XML to Java
+     *     returns false from its {@code handleEvent} method or the
+     *     {@code Unmarshaller} is unable to perform the XML to Java
      *     binding.  See <a href="#unmarshalEx">Unmarshalling XML Data</a>
      * @throws IllegalArgumentException
      *      If any parameter is null
@@ -745,7 +745,7 @@
      * This method assumes that the parser is on a START_DOCUMENT or
      * START_ELEMENT event.  Unmarshalling will be done from this
      * start event to the corresponding end event.  If this method
-     * returns successfully, the <tt>reader</tt> will be pointing at
+     * returns successfully, the {@code reader} will be pointing at
      * the token right after the end event.
      *
      * @param reader
@@ -757,13 +757,13 @@
      *     If any unexpected errors occur while unmarshalling
      * @throws UnmarshalException
      *     If the {@link ValidationEventHandler ValidationEventHandler}
-     *     returns false from its <tt>handleEvent</tt> method or the
-     *     <tt>Unmarshaller</tt> is unable to perform the XML to Java
+     *     returns false from its {@code handleEvent} method or the
+     *     {@code Unmarshaller} is unable to perform the XML to Java
      *     binding.  See <a href="#unmarshalEx">Unmarshalling XML Data</a>
      * @throws IllegalArgumentException
-     *      If the <tt>reader</tt> parameter is null
+     *      If the {@code reader} parameter is null
      * @throws IllegalStateException
-     *      If <tt>reader</tt> is not pointing to a START_DOCUMENT or
+     *      If {@code reader} is not pointing to a START_DOCUMENT or
      *      START_ELEMENT event.
      * @since 1.6, JAXB 2.0
      * @see #unmarshal(javax.xml.stream.XMLEventReader, Class)
@@ -772,7 +772,7 @@
         throws JAXBException;
 
     /**
-     * Unmarshal root element to JAXB mapped <tt>declaredType</tt>
+     * Unmarshal root element to JAXB mapped {@code declaredType}
      * and return the resulting content tree.
      *
      * <p>
@@ -782,13 +782,13 @@
      * This method assumes that the parser is on a START_DOCUMENT or
      * START_ELEMENT event. Unmarshalling will be done from this
      * start event to the corresponding end event.  If this method
-     * returns successfully, the <tt>reader</tt> will be pointing at
+     * returns successfully, the {@code reader} will be pointing at
      * the token right after the end event.
      *
      * @param reader
      *      The parser to be read.
      * @param declaredType
-     *      appropriate JAXB mapped class to hold <tt>reader</tt>'s START_ELEMENT XML data.
+     *      appropriate JAXB mapped class to hold {@code reader}'s START_ELEMENT XML data.
      *
      * @return   content tree rooted by <a href="#unmarshalDeclaredTypeReturn">JAXB Element representation</a>
      *
@@ -796,8 +796,8 @@
      *     If any unexpected errors occur while unmarshalling
      * @throws UnmarshalException
      *     If the {@link ValidationEventHandler ValidationEventHandler}
-     *     returns false from its <tt>handleEvent</tt> method or the
-     *     <tt>Unmarshaller</tt> is unable to perform the XML to Java
+     *     returns false from its {@code handleEvent} method or the
+     *     {@code Unmarshaller} is unable to perform the XML to Java
      *     binding.  See <a href="#unmarshalEx">Unmarshalling XML Data</a>
      * @throws IllegalArgumentException
      *      If any parameter is null
@@ -812,9 +812,9 @@
      * <p>
      * The JAXB Provider can return the same handler object for multiple
      * invocations of this method. In other words, this method does not
-     * necessarily create a new instance of <tt>UnmarshallerHandler</tt>. If the
-     * application needs to use more than one <tt>UnmarshallerHandler</tt>, it
-     * should create more than one <tt>Unmarshaller</tt>.
+     * necessarily create a new instance of {@code UnmarshallerHandler}. If the
+     * application needs to use more than one {@code UnmarshallerHandler}, it
+     * should create more than one {@code Unmarshaller}.
      *
      * @return the unmarshaller handler object
      * @see UnmarshallerHandler
@@ -823,8 +823,8 @@
 
     /**
      * Specifies whether or not the default validation mechanism of the
-     * <tt>Unmarshaller</tt> should validate during unmarshal operations.
-     * By default, the <tt>Unmarshaller</tt> does not validate.
+     * {@code Unmarshaller} should validate during unmarshal operations.
+     * By default, the {@code Unmarshaller} does not validate.
      * <p>
      * This method may only be invoked before or after calling one of the
      * unmarshal methods.
@@ -852,7 +852,7 @@
         throws JAXBException;
 
     /**
-     * Indicates whether or not the <tt>Unmarshaller</tt> is configured to
+     * Indicates whether or not the {@code Unmarshaller} is configured to
      * validate during unmarshal operations.
      * <p>
      * This API returns the state of the JAXB Provider's default unmarshal-time
@@ -874,13 +874,13 @@
         throws JAXBException;
 
     /**
-     * Allow an application to register a <tt>ValidationEventHandler</tt>.
+     * Allow an application to register a {@code ValidationEventHandler}.
      * <p>
-     * The <tt>ValidationEventHandler</tt> will be called by the JAXB Provider
+     * The {@code ValidationEventHandler} will be called by the JAXB Provider
      * if any validation errors are encountered during calls to any of the
      * unmarshal methods.  If the client application does not register a
-     * <tt>ValidationEventHandler</tt> before invoking the unmarshal methods,
-     * then <tt>ValidationEvents</tt> will be handled by the default event
+     * {@code ValidationEventHandler} before invoking the unmarshal methods,
+     * then {@code ValidationEvents} will be handled by the default event
      * handler which will terminate the unmarshal operation after the first
      * error or fatal error is encountered.
      * <p>
@@ -908,7 +908,7 @@
 
     /**
      * Set the particular property in the underlying implementation of
-     * <tt>Unmarshaller</tt>.  This method can only be used to set one of
+     * {@code Unmarshaller}.  This method can only be used to set one of
      * the standard JAXB defined properties above or a provider specific
      * property.  Attempting to set an undefined property will result in
      * a PropertyException being thrown.  See <a href="#supportedProps">
@@ -929,7 +929,7 @@
 
     /**
      * Get the particular property in the underlying implementation of
-     * <tt>Unmarshaller</tt>.  This method can only be used to get one of
+     * {@code Unmarshaller}.  This method can only be used to get one of
      * the standard JAXB defined properties above or a provider specific
      * property.  Attempting to get an undefined property will result in
      * a PropertyException being thrown.  See <a href="#supportedProps">
@@ -955,7 +955,7 @@
      * API.
      *
      * <p>
-     * Initially this property is set to <tt>null</tt>.
+     * Initially this property is set to {@code null}.
      *
      * @param schema Schema object to validate unmarshal operations against or null to disable validation
      * @throws UnsupportedOperationException could be thrown if this method is
@@ -976,9 +976,9 @@
      * To determine if the Unmarshaller has validation enabled, simply
      * test the return type for null:
      * <p>
-     * <code>
+     * <pre>{@code
      *   boolean isValidating = u.getSchema()!=null;
-     * </code>
+     * }</pre>
      *
      * @return the Schema object being used to perform unmarshal-time
      *      validation or null if not present
@@ -993,7 +993,7 @@
      * Associates a configured instance of {@link XmlAdapter} with this unmarshaller.
      *
      * <p>
-     * This is a convenience method that invokes <code>setAdapter(adapter.getClass(),adapter);</code>.
+     * This is a convenience method that invokes {@code setAdapter(adapter.getClass(),adapter);}.
      *
      * @see #setAdapter(Class,XmlAdapter)
      * @throws IllegalArgumentException
@@ -1084,34 +1084,35 @@
     public static abstract class Listener {
         /**
          * <p>
-         * Callback method invoked before unmarshalling into <tt>target</tt>.
+         * Callback method invoked before unmarshalling into {@code target}.
          * </p>
          * <p>
-         * This method is invoked immediately after <tt>target</tt> was created and
+         * This method is invoked immediately after {@code target} was created and
          * before the unmarshalling of this object begins. Note that
-         * if the class of <tt>target</tt> defines its own <tt>beforeUnmarshal</tt> method,
+         * if the class of {@code target} defines its own {@code beforeUnmarshal} method,
          * the class specific callback method is invoked before this method is invoked.
          *
          * @param target non-null instance of JAXB mapped class prior to unmarshalling into it.
-         * @param parent instance of JAXB mapped class that will eventually reference <tt>target</tt>.
-         *               <tt>null</tt> when <tt>target</tt> is root element.
+         * @param parent instance of JAXB mapped class that will eventually reference {@code target}.
+         *               {@code null} when {@code target} is root element.
          */
         public void beforeUnmarshal(Object target, Object parent) {
         }
 
         /**
          * <p>
-         * Callback method invoked after unmarshalling XML data into <tt>target</tt>.
+         * Callback method invoked after unmarshalling XML data into {@code target}.
          * </p>
          * <p>
-         * This method is invoked after all the properties (except IDREF) are unmarshalled into <tt>target</tt>,
-         * but before <tt>target</tt> is set into its <tt>parent</tt> object.
-         * Note that if the class of <tt>target</tt> defines its own <tt>afterUnmarshal</tt> method,
+         * This method is invoked after all the properties (except IDREF)
+         * are unmarshalled into {@code target},
+         * but before {@code target} is set into its {@code parent} object.
+         * Note that if the class of {@code target} defines its own {@code afterUnmarshal} method,
          * the class specific callback method is invoked before this method is invoked.
          *
          * @param target non-null instance of JAXB mapped class prior to unmarshalling into it.
-         * @param parent instance of JAXB mapped class that will reference <tt>target</tt>.
-         *               <tt>null</tt> when <tt>target</tt> is root element.
+         * @param parent instance of JAXB mapped class that will reference {@code target}.
+         *               {@code null} when {@code target} is root element.
          */
         public void afterUnmarshal(Object target, Object parent) {
         }
@@ -1123,7 +1124,7 @@
      *
      * <p>
      * There is only one Listener per Unmarshaller. Setting a Listener replaces the previous set Listener.
-     * One can unregister current Listener by setting listener to <tt>null</tt>.
+     * One can unregister current Listener by setting listener to {@code null}.
      *
      * @param listener  provides unmarshal event callbacks for this {@link Unmarshaller}
      * @since 1.6, JAXB 2.0
@@ -1133,7 +1134,8 @@
     /**
      * <p>Return {@link Listener} registered with this {@link Unmarshaller}.
      *
-     * @return registered {@link Listener} or <code>null</code> if no Listener is registered with this Unmarshaller.
+     * @return registered {@link Listener} or {@code null}
+     *         if no Listener is registered with this Unmarshaller.
      * @since 1.6, JAXB 2.0
      */
     public Listener getListener();
--- a/src/java.xml.bind/share/classes/javax/xml/bind/ValidationEvent.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/javax/xml/bind/ValidationEvent.java	Thu Sep 24 18:26:42 2015 +0300
@@ -60,8 +60,8 @@
      * Retrieve the severity code for this warning/error.
      *
      * <p>
-     * Must be one of <tt>ValidationError.WARNING</tt>,
-     * <tt>ValidationError.ERROR</tt>, or <tt>ValidationError.FATAL_ERROR</tt>.
+     * Must be one of {@code ValidationError.WARNING},
+     * {@code ValidationError.ERROR}, or {@code ValidationError.FATAL_ERROR}.
      *
      * @return the severity code for this warning/error
      */
--- a/src/java.xml.bind/share/classes/javax/xml/bind/ValidationEventHandler.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/javax/xml/bind/ValidationEventHandler.java	Thu Sep 24 18:26:42 2015 +0300
@@ -39,7 +39,7 @@
  * handlers.
  *
  * <p>
- * If the <tt>handleEvent</tt> method throws an unchecked runtime exception,
+ * If the {@code handleEvent} method throws an unchecked runtime exception,
  * the JAXB Provider must treat that as if the method returned false, effectively
  * terminating whatever operation was in progress at the time (unmarshal,
  * validate, or marshal).
@@ -49,7 +49,7 @@
  * by the specification and may result in unexpected behaviour.
  *
  * <p>
- * Failing to return false from the <tt>handleEvent</tt> method after
+ * Failing to return false from the {@code handleEvent} method after
  * encountering a fatal error is undefined by the specification and may result
  * in unexpected behavior.
  *
@@ -59,7 +59,9 @@
  *    See: <a href="Validator.html#defaulthandler">Validator javadocs</a>
  * </blockquote>
  *
- * @author <ul><li>Ryan Shoemaker, Sun Microsystems, Inc.</li><li>Kohsuke Kawaguchi, Sun Microsystems, Inc.</li><li>Joe Fialli, Sun Microsystems, Inc.</li></ul>
+ * @author <ul><li>Ryan Shoemaker, Sun Microsystems, Inc.</li>
+ *             <li>Kohsuke Kawaguchi, Sun Microsystems, Inc.</li>
+ *             <li>Joe Fialli, Sun Microsystems, Inc.</li></ul>
  * @see Unmarshaller
  * @see Validator
  * @see Marshaller
@@ -85,8 +87,8 @@
      * @return true if the JAXB Provider should attempt to continue the current
      *         unmarshal, validate, or marshal operation after handling this
      *         warning/error, false if the provider should terminate the current
-     *         operation with the appropriate <tt>UnmarshalException</tt>,
-     *         <tt>ValidationException</tt>, or <tt>MarshalException</tt>.
+     *         operation with the appropriate {@code UnmarshalException},
+     *         {@code ValidationException}, or {@code MarshalException}.
      * @throws IllegalArgumentException if the event object is null.
      */
     public boolean handleEvent( ValidationEvent event );
--- a/src/java.xml.bind/share/classes/javax/xml/bind/ValidationEventLocator.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/javax/xml/bind/ValidationEventLocator.java	Thu Sep 24 18:26:42 2015 +0300
@@ -29,15 +29,17 @@
  * Encapsulate the location of a ValidationEvent.
  *
  * <p>
- * The <tt>ValidationEventLocator</tt> indicates where the <tt>ValidationEvent
- * </tt> occurred.  Different fields will be set depending on the type of
+ * The {@code ValidationEventLocator} indicates where the {@code ValidationEvent}
+ * occurred.  Different fields will be set depending on the type of
  * validation that was being performed when the error or warning was detected.
  * For example, on-demand validation would produce locators that contained
  * references to objects in the Java content tree while unmarshal-time
  * validation would produce locators containing information appropriate to the
  * source of the XML data (file, url, Node, etc).
  *
- * @author <ul><li>Ryan Shoemaker, Sun Microsystems, Inc.</li><li>Kohsuke Kawaguchi, Sun Microsystems, Inc.</li><li>Joe Fialli, Sun Microsystems, Inc.</li></ul>
+ * @author <ul><li>Ryan Shoemaker, Sun Microsystems, Inc.</li>
+ *             <li>Kohsuke Kawaguchi, Sun Microsystems, Inc.</li>
+ *             <li>Joe Fialli, Sun Microsystems, Inc.</li></ul>
  * @see Validator
  * @see ValidationEvent
  * @since 1.6, JAXB 1.0
--- a/src/java.xml.bind/share/classes/javax/xml/bind/ValidationException.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/javax/xml/bind/ValidationException.java	Thu Sep 24 18:26:42 2015 +0300
@@ -30,7 +30,7 @@
  * a validate operation.
  *
  * <p>
- * The <tt>ValidationEventHandler</tt> can cause this exception to be thrown
+ * The {@code ValidationEventHandler} can cause this exception to be thrown
  * during the validate operations.  See
  * {@link ValidationEventHandler#handleEvent(ValidationEvent)
  * ValidationEventHandler.handleEvent(ValidationEvent)}.
--- a/src/java.xml.bind/share/classes/javax/xml/bind/Validator.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/javax/xml/bind/Validator.java	Thu Sep 24 18:26:42 2015 +0300
@@ -28,7 +28,7 @@
 /**
  * As of JAXB 2.0, this class is deprecated and optional.
  * <p>
- * The <tt>Validator</tt> class is responsible for controlling the validation
+ * The {@code Validator} class is responsible for controlling the validation
  * of content trees during runtime.
  *
  * <p>
@@ -69,19 +69,19 @@
  * </blockquote>
  *
  * <p>
- * The <tt>Validator</tt> class is responsible for managing On-Demand Validation.
- * The <tt>Unmarshaller</tt> class is responsible for managing Unmarshal-Time
+ * The {@code Validator} class is responsible for managing On-Demand Validation.
+ * The {@code Unmarshaller} class is responsible for managing Unmarshal-Time
  * Validation during the unmarshal operations.  Although there is no formal
  * method of enabling validation during the marshal operations, the
- * <tt>Marshaller</tt> may detect errors, which will be reported to the
- * <tt>ValidationEventHandler</tt> registered on it.
+ * {@code Marshaller} may detect errors, which will be reported to the
+ * {@code ValidationEventHandler} registered on it.
  *
  * <p>
  * <a name="defaulthandler"></a>
  * <b>Using the Default EventHandler</b><br>
  * <blockquote>
  *   If the client application does not set an event handler on their
- *   <tt>Validator</tt>, <tt>Unmarshaller</tt>, or <tt>Marshaller</tt> prior to
+ *   {@code Validator}, {@code Unmarshaller}, or {@code Marshaller} prior to
  *   calling the validate, unmarshal, or marshal methods, then a default event
  *   handler will receive notification of any errors or warnings encountered.
  *   The default event handler will cause the current operation to halt after
@@ -98,24 +98,24 @@
  *    <dl>
  *        <dt>Use the default event handler</dt>
  *        <dd>The default event handler will be used if you do not specify one
- *            via the <tt>setEventHandler</tt> API's on <tt>Validator</tt>,
- *            <tt>Unmarshaller</tt>, or <tt>Marshaller</tt>.
+ *            via the {@code setEventHandler} API's on {@code Validator},
+ *            {@code Unmarshaller}, or {@code Marshaller}.
  *        </dd>
  *
  *        <dt>Implement and register a custom event handler</dt>
  *        <dd>Client applications that require sophisticated event processing
- *            can implement the <tt>ValidationEventHandler</tt> interface and
- *            register it with the <tt>Unmarshaller</tt> and/or
- *            <tt>Validator</tt>.
+ *            can implement the {@code ValidationEventHandler} interface and
+ *            register it with the {@code Unmarshaller} and/or
+ *            {@code Validator}.
  *        </dd>
  *
  *        <dt>Use the {@link javax.xml.bind.util.ValidationEventCollector ValidationEventCollector}
  *            utility</dt>
  *        <dd>For convenience, a specialized event handler is provided that
- *            simply collects any <tt>ValidationEvent</tt> objects created
+ *            simply collects any {@code ValidationEvent} objects created
  *            during the unmarshal, validate, and marshal operations and
  *            returns them to the client application as a
- *            <tt>java.util.Collection</tt>.
+ *            {@code java.util.Collection}.
  *        </dd>
  *    </dl>
  * </blockquote>
@@ -131,9 +131,9 @@
  * cases, the JAXB Provider will set the severity of the ValidationEvent to
  * FATAL_ERROR to indicate that the unmarshal, validate, or marshal operations
  * should be terminated.  The default event handler and
- * <tt>ValidationEventCollector</tt> utility class must terminate processing
+ * {@code ValidationEventCollector} utility class must terminate processing
  * after being notified of a fatal error.  Client applications that supply their
- * own <tt>ValidationEventHandler</tt> should also terminate processing after
+ * own {@code ValidationEventHandler} should also terminate processing after
  * being notified of a fatal error.  If not, unexpected behaviour may occur.
  * </blockquote>
  *
@@ -195,7 +195,7 @@
         throws JAXBException;
 
     /**
-     * Validate the Java content tree starting at <tt>subrootObj</tt>.
+     * Validate the Java content tree starting at {@code subrootObj}.
      * <p>
      * Client applications can use this method to validate Java content trees
      * on-demand at runtime.  This method can be used to validate any arbitrary
@@ -206,19 +206,19 @@
      * @throws JAXBException if any unexpected problem occurs during validation
      * @throws ValidationException
      *     If the {@link ValidationEventHandler ValidationEventHandler}
-     *     returns false from its <tt>handleEvent</tt> method or the
-     *     <tt>Validator</tt> is unable to validate the content tree rooted
-     *     at <tt>subrootObj</tt>
+     *     returns false from its {@code handleEvent} method or the
+     *     {@code Validator} is unable to validate the content tree rooted
+     *     at {@code subrootObj}
      * @throws IllegalArgumentException
      *      If the subrootObj parameter is null
-     * @return true if the subtree rooted at <tt>subrootObj</tt> is valid, false
+     * @return true if the subtree rooted at {@code subrootObj} is valid, false
      *         otherwise
      * @deprecated since JAXB2.0
      */
     public boolean validate( Object subrootObj ) throws JAXBException;
 
     /**
-     * Validate the Java content tree rooted at <tt>rootObj</tt>.
+     * Validate the Java content tree rooted at {@code rootObj}.
      * <p>
      * Client applications can use this method to validate Java content trees
      * on-demand at runtime.  This method is used to validate an entire Java
@@ -229,12 +229,12 @@
      * @throws JAXBException if any unexpected problem occurs during validation
      * @throws ValidationException
      *     If the {@link ValidationEventHandler ValidationEventHandler}
-     *     returns false from its <tt>handleEvent</tt> method or the
-     *     <tt>Validator</tt> is unable to validate the content tree rooted
-     *     at <tt>rootObj</tt>
+     *     returns false from its {@code handleEvent} method or the
+     *     {@code Validator} is unable to validate the content tree rooted
+     *     at {@code rootObj}
      * @throws IllegalArgumentException
      *      If the rootObj parameter is null
-     * @return true if the tree rooted at <tt>rootObj</tt> is valid, false
+     * @return true if the tree rooted at {@code rootObj} is valid, false
      *         otherwise
      * @deprecated since JAXB2.0
      */
@@ -242,7 +242,7 @@
 
     /**
      * Set the particular property in the underlying implementation of
-     * <tt>Validator</tt>.  This method can only be used to set one of
+     * {@code Validator}.  This method can only be used to set one of
      * the standard JAXB defined properties above or a provider specific
      * property.  Attempting to set an undefined property will result in
      * a PropertyException being thrown.  See <a href="#supportedProps">
@@ -264,7 +264,7 @@
 
     /**
      * Get the particular property in the underlying implementation of
-     * <tt>Validator</tt>.  This method can only be used to get one of
+     * {@code Validator}.  This method can only be used to get one of
      * the standard JAXB defined properties above or a provider specific
      * property.  Attempting to get an undefined property will result in
      * a PropertyException being thrown.  See <a href="#supportedProps">
--- a/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAccessorOrder.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAccessorOrder.java	Thu Sep 24 18:26:42 2015 +0300
@@ -38,7 +38,7 @@
  *
  * <h3>Usage </h3>
  *
- * <p> <tt> @XmlAccessorOrder </tt> annotation can be used with the following
+ * <p> {@code @XmlAccessorOrder} annotation can be used with the following
  * program elements:</p>
  *
  * <ul>
@@ -46,19 +46,19 @@
  *   <li> a top level class </li>
  * </ul>
  *
- * <p> See "Package Specification" in <tt>javax.xml.bind</tt> package javadoc for
+ * <p> See "Package Specification" in {@code javax.xml.bind} package javadoc for
  * additional common information.</p>
  *
  * <p>The effective {@link XmlAccessOrder} on a class is determined
  * as follows:
  *
  * <ul>
- *   <li> If there is a <tt>@XmlAccessorOrder</tt> on a class, then
+ *   <li> If there is a {@code @XmlAccessorOrder} on a class, then
  *        it is used. </li>
- *   <li> Otherwise, if a <tt>@XmlAccessorOrder </tt> exists on one of
+ *   <li> Otherwise, if a {@code @XmlAccessorOrder} exists on one of
  *        its super classes, then it is inherited (by the virtue of
  *        {@link Inherited})
- *   <li> Otherwise, the <tt>@XmlAccessorOrder</tt> on the package
+ *   <li> Otherwise, the {@code @XmlAccessorOrder} on the package
  *        of the class is used, if it's there.
  *   <li> Otherwise {@link XmlAccessOrder#UNDEFINED}.
  * </ul>
--- a/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAccessorType.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAccessorType.java	Thu Sep 24 18:26:42 2015 +0300
@@ -38,7 +38,7 @@
  *
  * <p> <b> Usage </b> </p>
  *
- * <p> <tt>@XmlAccessorType</tt> annotation can be used with the following program elements:</p>
+ * <p> {@code @XmlAccessorType} annotation can be used with the following program elements:</p>
  *
  * <ul>
  *   <li> package</li>
@@ -51,28 +51,28 @@
  * <p>This annotation provides control over the default serialization
  * of properties and fields in a class.
  *
- * <p>The annotation <tt> @XmlAccessorType </tt> on a package applies to
+ * <p>The annotation {@code @XmlAccessorType} on a package applies to
  * all classes in the package. The following inheritance
  * semantics apply:
  *
  * <ul>
- *   <li> If there is a <tt>@XmlAccessorType</tt> on a class, then it
+ *   <li> If there is a {@code @XmlAccessorType} on a class, then it
  *        is used. </li>
- *   <li> Otherwise, if a <tt>@XmlAccessorType</tt> exists on one of
+ *   <li> Otherwise, if a {@code @XmlAccessorType} exists on one of
  *        its super classes, then it is inherited.
- *   <li> Otherwise, the <tt>@XmlAccessorType </tt> on a package is
+ *   <li> Otherwise, the {@code @XmlAccessorType} on a package is
  *        inherited.
  * </ul>
  * <p> <b> Defaulting Rules: </b> </p>
  *
- * <p>By default, if <tt>@XmlAccessorType </tt> on a package is absent,
+ * <p>By default, if {@code @XmlAccessorType} on a package is absent,
  * then the following package level annotation is assumed.</p>
  * <pre>
  *   &#64;XmlAccessorType(XmlAccessType.PUBLIC_MEMBER)
  * </pre>
- * <p> By default, if <tt>@XmlAccessorType</tt> on a class is absent,
+ * <p> By default, if {@code @XmlAccessorType} on a class is absent,
  * and none of its super classes is annotated with
- * <tt>@XmlAccessorType</tt>, then the following default on the class
+ * {@code @XmlAccessorType}, then the following default on the class
  * is assumed: </p>
  * <pre>
  *   &#64;XmlAccessorType(XmlAccessType.PUBLIC_MEMBER)
--- a/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAnyAttribute.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAnyAttribute.java	Thu Sep 24 18:26:42 2015 +0300
@@ -40,7 +40,7 @@
  *
  * <p> <b>Usage</b> </p>
  * <p>
- * The <tt>&#64;XmlAnyAttribute</tt> annotation can be used with the
+ * The {@code @XmlAnyAttribute} annotation can be used with the
  * following program elements:
  * <ul>
  *   <li> JavaBean property </li>
@@ -53,8 +53,8 @@
  * The usage is subject to the following constraints:
  * <ul>
  *   <li> At most one field or property in a class can be annotated
- *        with <tt>&#64;XmlAnyAttribute</tt>.  </li>
- *   <li> The type of the property or the field must <tt>java.util.Map</tt> </li>
+ *        with {@code @XmlAnyAttribute}.  </li>
+ *   <li> The type of the property or the field must {@code java.util.Map} </li>
  * </ul>
  *
  * <p>
--- a/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAttribute.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAttribute.java	Thu Sep 24 18:26:42 2015 +0300
@@ -37,7 +37,7 @@
  *
  * <p> <b>Usage</b> </p>
  * <p>
- * The <tt>@XmlAttribute</tt> annotation can be used with the
+ * The {@code @XmlAttribute} annotation can be used with the
  * following program elements:
  * <ul>
  *   <li> JavaBean property </li>
--- a/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElement.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElement.java	Thu Sep 24 18:26:42 2015 +0300
@@ -38,7 +38,7 @@
  *
  * <p> <b>Usage</b>
  * <p>
- * <tt>@XmlElement</tt> annotation can be used with the following program
+ * {@code @XmlElement} annotation can be used with the following program
  * elements:
  * <ul>
  *   <li> a JavaBean property </li>
@@ -62,7 +62,7 @@
  *   <li> if the type of JavaBean property is a collection type of
  *        array, an indexed property, or a parameterized list, and
  *        this annotation is used with {@link XmlElements} then,
- *        <tt>@XmlElement.type()</tt> must be DEFAULT.class since the
+ *        {@code @XmlElement.type()} must be DEFAULT.class since the
  *        collection item type is already known. </li>
  * </ul>
  *
--- a/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElementDecl.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElementDecl.java	Thu Sep 24 18:26:42 2015 +0300
@@ -170,19 +170,19 @@
      * namespace name of a substitution group's head XML element.
      * <p>
      * This specifies the namespace name of the XML element whose local
-     * name is specified by <tt>substitutionHeadName()</tt>.
+     * name is specified by {@code substitutionHeadName()}.
      * <p>
-     * If <tt>susbtitutionHeadName()</tt> is "", then this
+     * If {@code susbtitutionHeadName()} is "", then this
      * value can only be "##default". But the value is ignored since
      * since this element is not part of susbtitution group when the
-     * value of <tt>susbstitutionHeadName()</tt> is "".
+     * value of {@code susbstitutionHeadName()} is "".
      * <p>
-     * If <tt>susbtitutionHeadName()</tt> is not "" and the value is
+     * If {@code susbtitutionHeadName()} is not "" and the value is
      * "##default", then the namespace name is the namespace name to
      * which the package of the containing class, marked with {@link
      * XmlRegistry }, is mapped.
      * <p>
-     * If <tt>susbtitutionHeadName()</tt> is not "" and the value is
+     * If {@code susbtitutionHeadName()} is not "" and the value is
      * not "##default", then the value is the namespace name.
      *
      * @see #substitutionHeadName()
--- a/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElementRef.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElementRef.java	Thu Sep 24 18:26:42 2015 +0300
@@ -39,7 +39,7 @@
  * <p>
  * <b>Usage</b>
  * <p>
- * <tt>&#64;XmlElementRef</tt> annotation can be used with a
+ * {@code @XmlElementRef} annotation can be used with a
  * JavaBean property or from within {@link XmlElementRefs}
  * <p>
  * This annotation dynamically associates an XML element name with the JavaBean
@@ -62,9 +62,9 @@
  * }</pre>
  * <p>
  * An element factory method annotated with  {@link XmlElementDecl} is
- * used to create a <tt>JAXBElement</tt> instance, containing an XML
- * element name. The presence of &#64;XmlElementRef annotation on an
- * element property indicates that the element name from <tt>JAXBElement</tt>
+ * used to create a {@code JAXBElement} instance, containing an XML
+ * element name. The presence of {@code @XmlElementRef} annotation on an
+ * element property indicates that the element name from {@code JAXBElement}
  * instance be used instead of deriving an XML element name from the
  * JavaBean property name.
  *
@@ -74,7 +74,7 @@
  *   <li> If the collection item type (for collection property) or
  *        property type (for single valued property) is
  *        {@link javax.xml.bind.JAXBElement}, then
- *        <tt>&#64;XmlElementRef}.name()</tt> and <tt>&#64;XmlElementRef.namespace()</tt> must
+ *        {@code @XmlElementRef.name()} and {@code @XmlElementRef.namespace()} must
  *        point an element factory method  with an @XmlElementDecl
  *        annotation in a class annotated  with @XmlRegistry (usually
  *        ObjectFactory class generated by  the schema compiler) :
@@ -155,7 +155,7 @@
  *     </target>
  * }</pre>
  * <p>
- * It is not an error to have a class that extends <tt>Task</tt>
+ * It is not an error to have a class that extends {@code Task}
  * that doesn't have {@link XmlRootElement}. But they can't show up in an
  * XML instance (because they don't have XML element names).
  *
@@ -234,8 +234,8 @@
      * This parameter and {@link #name()} are used to determine the
      * XML element for the JavaBean property.
      *
-     * <p> If <tt>type()</tt> is <tt>JAXBElement.class</tt> , then
-     * <tt>namespace()</tt> and <tt>name()</tt>
+     * <p> If {@code type()} is {@code JAXBElement.class} , then
+     * {@code namespace()} and {@code name()}
      * point to a factory method with {@link XmlElementDecl}. The XML
      * element name is the element name from the factory method's
      * {@link XmlElementDecl} annotation or if an element from its
@@ -243,13 +243,13 @@
      * substituted in the XML document, then the element name is from the
      * {@link XmlElementDecl} on the substituted element.
      *
-     * <p> If {@link #type()} is not <tt>JAXBElement.class</tt>, then
+     * <p> If {@link #type()} is not {@code JAXBElement.class}, then
      * the XML element name is the XML element name statically
      * associated with the type using the annotation {@link
      * XmlRootElement} on the type. If the type is not annotated with
      * an {@link XmlElementDecl}, then it is an error.
      *
-     * <p> If <tt>type()</tt> is not <tt>JAXBElement.class</tt>, then
+     * <p> If {@code type()} is not {@code JAXBElement.class}, then
      * this value must be "".
      *
      */
@@ -282,7 +282,7 @@
      * for a multivalued property.
      *
      * <p>
-     * For compatibility with JAXB 2.1, this property defaults to <tt>true</tt>,
+     * For compatibility with JAXB 2.1, this property defaults to {@code true},
      * despite the fact that {@link XmlElement#required()} defaults to false.
      *
      * @since 1.7, JAXB 2.2
--- a/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElementWrapper.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElementWrapper.java	Thu Sep 24 18:26:42 2015 +0300
@@ -61,7 +61,7 @@
  *
  * <p> <b>Usage</b> </p>
  * <p>
- * The <tt>@XmlElementWrapper</tt> annotation can be used with the
+ * The {@code @XmlElementWrapper} annotation can be used with the
  * following program elements:
  * <ul>
  *   <li> JavaBean property </li>
@@ -120,7 +120,7 @@
 
     /**
      * If true, the absence of the collection is represented by
-     * using <tt>xsi:nil='true'</tt>. Otherwise, it is represented by
+     * using {@code xsi:nil='true'}. Otherwise, it is represented by
      * the absence of the element.
      */
     boolean nillable() default false;
@@ -130,7 +130,7 @@
      *
      * <p>
      * If required() is true, then the corresponding generated
-     * XML schema element declaration will have <tt>minOccurs="1"</tt>,
+     * XML schema element declaration will have {@code minOccurs="1"},
      * to indicate that the wrapper element is always expected.
      *
      * <p>
--- a/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElements.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElements.java	Thu Sep 24 18:26:42 2015 +0300
@@ -44,7 +44,7 @@
  * &#64;XmlElements({ @XmlElement(...),@XmlElement(...) })
  * </pre>
  *
- * <p>The <tt>@XmlElements</tt> annotation can be used with the
+ * <p>The {@code @XmlElements} annotation can be used with the
  * following program elements: </p>
  * <ul>
  *   <li> a JavaBean property </li>
@@ -62,7 +62,7 @@
  *        annotations: @{@link XmlIDREF}, @{@link XmlElementWrapper}. </li>
  *   <li> If @XmlIDREF is also specified on the JavaBean property,
  *        then each &#64;XmlElement.type() must contain a JavaBean
- *        property annotated with <tt>&#64;XmlID</tt>.</li>
+ *        property annotated with {@code @XmlID}.</li>
  * </ul>
  *
  * <p>See "Package Specification" in javax.xml.bind.package javadoc for
--- a/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlEnum.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlEnum.java	Thu Sep 24 18:26:42 2015 +0300
@@ -39,7 +39,7 @@
  *
  * <p> <b>Usage</b> </p>
  * <p>
- * The <tt>@XmlEnum</tt> annotation can be used with the
+ * The {@code @XmlEnum} annotation can be used with the
  * following program elements:
  * <ul>
  *   <li>enum type</li>
@@ -56,9 +56,9 @@
  *
  * <p>An enum type is mapped to a schema simple type with enumeration
  * facets. The schema type is derived from the Java type to which
- * <tt>@XmlEnum.value()</tt>. Each enum constant <tt>@XmlEnumValue</tt>
+ * {@code @XmlEnum.value()}. Each enum constant {@code @XmlEnumValue}
  * must have a valid lexical representation for the type
- * <tt>@XmlEnum.value()</tt> .
+ * {@code @XmlEnum.value()}.
  *
  * <p><b>Examples:</b> See examples in {@link XmlEnumValue}
  *
--- a/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlEnumValue.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlEnumValue.java	Thu Sep 24 18:26:42 2015 +0300
@@ -35,7 +35,7 @@
  *
  * <p> <b>Usage</b> </p>
  *
- * <p> The <tt>@XmlEnumValue</tt> annotation can be used with the
+ * <p> The {@code @XmlEnumValue} annotation can be used with the
  *     following program elements:
  * <ul>
  *   <li>enum constant</li>
@@ -49,9 +49,9 @@
  *
  * <p>An enum type is mapped to a schema simple type with enumeration
  * facets. The schema type is derived from the Java type specified in
- * <tt>@XmlEnum.value()</tt>. Each enum constant <tt>@XmlEnumValue</tt>
+ * {@code @XmlEnum.value()}. Each enum constant {@code @XmlEnumValue}
  * must have a valid lexical representation for the type
- * <tt>@XmlEnum.value()</tt>
+ * {@code @XmlEnum.value()}
  *
  * <p> In the absence of this annotation, {@link Enum#name()} is used
  * as the XML representation.
--- a/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlID.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlID.java	Thu Sep 24 18:26:42 2015 +0300
@@ -38,12 +38,12 @@
  * To preserve referential integrity of an object graph across XML
  * serialization followed by a XML deserialization, requires an object
  * reference to be marshalled by reference or containment
- * appropriately. Annotations <tt>&#64;XmlID</tt> and <tt>&#64;XmlIDREF</tt>
+ * appropriately. Annotations {@code @XmlID} and {@code @XmlIDREF}
  * together allow a customized mapping of a JavaBean property's
  * type by containment or reference.
  *
  * <p><b>Usage</b> </p>
- * The <tt>&#64;XmlID</tt> annotation can be used with the following
+ * The {@code @XmlID} annotation can be used with the following
  * program elements:
  * <ul>
  *   <li> a JavaBean property </li>
@@ -56,14 +56,14 @@
  * The usage is subject to the following constraints:
  * <ul>
  *   <li> At most one field or property in a class can be annotated
- *        with <tt>&#64;XmlID</tt>.  </li>
- *   <li> The JavaBean property's type must be <tt>java.lang.String</tt>.</li>
+ *        with {@code @XmlID}.  </li>
+ *   <li> The JavaBean property's type must be {@code java.lang.String}.</li>
  *   <li> The only other mapping annotations that can be used
- *        with <tt>&#64;XmlID</tt>
- *        are:<tt>&#64;XmlElement</tt> and <tt>&#64;XmlAttribute</tt>.</li>
+ *        with {@code @XmlID}
+ *        are: {@code @XmlElement} and {@code @XmlAttribute}.</li>
  * </ul>
  *
- * <p><b>Example</b>: Map a JavaBean property's type to <tt>xs:ID</tt></p>
+ * <p><b>Example</b>: Map a JavaBean property's type to {@code xs:ID}</p>
  * <pre>
  *    // Example: code fragment
  *    public class Customer {
--- a/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlIDREF.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlIDREF.java	Thu Sep 24 18:26:42 2015 +0300
@@ -38,12 +38,12 @@
  * To preserve referential integrity of an object graph across XML
  * serialization followed by a XML deserialization, requires an object
  * reference to be marshaled by reference or containment
- * appropriately. Annotations <tt>&#64;XmlID</tt> and <tt>&#64;XmlIDREF</tt>
+ * appropriately. Annotations {@code @XmlID} and {@code @XmlIDREF}
  * together allow a customized mapping of a JavaBean property's
  * type by containment or reference.
  *
  * <p><b>Usage</b> </p>
- * The <tt>&#64;XmlIDREF</tt> annotation can be used with the following
+ * The {@code @XmlIDREF} annotation can be used with the following
  * program elements:
  * <ul>
  *   <li> a JavaBean property </li>
@@ -58,21 +58,21 @@
  *
  *   <li> If the type of the field or property is a collection type,
  *        then the collection item type must contain a property or
- *        field annotated with <tt>&#64;XmlID</tt>.  </li>
+ *        field annotated with {@code @XmlID}.  </li>
  *   <li> If the field or property is single valued, then the type of
  *        the property or field must contain a property or field
- *        annotated with <tt>&#64;XmlID</tt>.
+ *        annotated with {@code @XmlID}.
  *        <p>Note: If the collection item type or the type of the
  *        property (for non collection type) is java.lang.Object, then
  *        the instance must contain a property/field annotated with
- *        <tt>&#64;XmlID</tt> attribute.
+ *        {@code @XmlID} attribute.
  *        </li>
  *   <li> This annotation can be used with the following annotations:
  *        {@link XmlElement}, {@link XmlAttribute}, {@link XmlList},
  *        and {@link XmlElements}.</li>
  *
  * </ul>
- * <p><b>Example:</b> Map a JavaBean property to <tt>xs:IDREF</tt>
+ * <p><b>Example:</b> Map a JavaBean property to {@code xs:IDREF}
  *   (i.e. by reference rather than by containment)</p>
  * <pre>
  *
@@ -101,10 +101,10 @@
  * containment versus reference.
  *
  * <pre>
- *    // By default, Customer maps to complex type <tt>xs:Customer</tt>
+ *    // By default, Customer maps to complex type {@code xs:Customer}
  *    public class Customer {
  *
- *        // map JavaBean property type to <tt>xs:ID</tt>
+ *        // map JavaBean property type to {@code xs:ID}
  *        &#64;XmlID public String getCustomerID();
  *        public void setCustomerID(String id);
  *
@@ -112,7 +112,7 @@
  *    }
  *
  *
- *   // By default, Invoice maps to a complex type <tt>xs:Invoice</tt>
+ *   // By default, Invoice maps to a complex type {@code xs:Invoice}
  *   public class Invoice {
  *
  *       // map by reference
@@ -122,7 +122,7 @@
  *      // .... other properties not shown here
  *   }
  *
- *   // By default, Shipping maps to complex type <tt>xs:Shipping</tt>
+ *   // By default, Shipping maps to complex type {@code xs:Shipping}
  *   public class Shipping {
  *
  *       // map by reference
--- a/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlInlineBinaryData.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlInlineBinaryData.java	Thu Sep 24 18:26:42 2015 +0300
@@ -41,7 +41,9 @@
  * base64-encoded binary data in XML.
  *
  * <p>
- * When XOP encoding is enabled as described in {@link AttachmentMarshaller#isXOPPackage()}, this annotation disables datatypes such as {@link java.awt.Image} or {@link Source} or <tt>byte[]</tt> that are bound to base64-encoded binary from being considered for
+ * When XOP encoding is enabled as described in {@link AttachmentMarshaller#isXOPPackage()},
+ * this annotation disables datatypes such as {@link java.awt.Image} or {@link Source}
+ * or {@code byte[]} that are bound to base64-encoded binary from being considered for
  * XOP encoding. If a JAXB property is annotated with this annotation or if
  * the JAXB property's base type is annotated with this annotation,
  * neither
--- a/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlList.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlList.java	Thu Sep 24 18:26:42 2015 +0300
@@ -37,7 +37,7 @@
  *
  * <p><b>Usage</b> </p>
  * <p>
- * The <tt>@XmlList</tt> annotation can be used with the
+ * The {@code @XmlList} annotation can be used with the
  * following program elements:
  * <ul>
  *   <li> JavaBean property </li>
@@ -92,12 +92,12 @@
  *        {@link XmlValue},
  *        {@link XmlIDREF}.
  *  <ul>
- *    <li> The use of <tt>@XmlList</tt> with {@link XmlValue} while
+ *    <li> The use of {@code @XmlList} with {@link XmlValue} while
  *         allowed, is redundant since  {@link XmlList} maps a
  *         collection type to a simple schema type that derives by
  *         list just as {@link XmlValue} would. </li>
  *
- *    <li> The use of <tt>@XmlList</tt> with {@link XmlAttribute} while
+ *    <li> The use of {@code @XmlList} with {@link XmlAttribute} while
  *         allowed, is redundant since  {@link XmlList} maps a
  *         collection type to a simple schema type that derives by
  *         list just as {@link XmlAttribute} would. </li>
--- a/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlNs.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlNs.java	Thu Sep 24 18:26:42 2015 +0300
@@ -34,13 +34,13 @@
  * Associates a namespace prefix with a XML namespace URI.
  *
  * <p><b>Usage</b></p>
- * <p><tt>@XmlNs</tt> annotation is intended for use from other
+ * <p>{@code @XmlNs} annotation is intended for use from other
  * program annotations.
  *
  * <p>See "Package Specification" in javax.xml.bind.package javadoc for
  * additional common information.</p>
  *
- * <p><b>Example:</b>See <tt>XmlSchema</tt> annotation type for an example.
+ * <p><b>Example:</b>See {@code XmlSchema} annotation type for an example.
  * @author Sekhar Vajjhala, Sun Microsystems, Inc.
  * @since 1.6, JAXB 2.0
  */
--- a/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlSchema.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlSchema.java	Thu Sep 24 18:26:42 2015 +0300
@@ -163,12 +163,12 @@
      * manually.
      *
      * <p>
-     * Value could be any absolute URI, like <tt>http://example.org/some.xsd</tt>.
+     * Value could be any absolute URI, like {@code http://example.org/some.xsd}.
      * It is also possible to specify the empty string, to indicate
      * that the schema is externally available but the location is
      * unspecified (and thus it's the responsibility of the reader of the generate
      * schema to locate it.) Finally, the default value of this property
-     * <tt>"##generate"</tt> indicates that the schema generator is going
+     * {@code "##generate"} indicates that the schema generator is going
      * to generate components for this namespace (as it did in JAXB 2.0.)
      *
      * <p>
@@ -179,17 +179,17 @@
      *
      * <h3>Note to implementor</h3>
      * <p>
-     * More precisely, the value must be either <tt>""</tt>, <tt>"##generate"</tt>, or
+     * More precisely, the value must be either {@code ""}, {@code "##generate"}, or
      * <a href="http://www.w3.org/TR/xmlschema-2/#anyURI">
-     * a valid lexical representation of <tt>xs:anyURI</tt></a> that begins
-     * with <tt>&lt;scheme&gt;:</tt>.
+     * a valid lexical representation of {@code xs:anyURI}</a> that begins
+     * with {@code <scheme>:}.
      *
      * <p>
      * A schema generator is expected to generate a corresponding
-     * <tt>&lt;xs:import namespace="..." schemaLocation="..."/&gt;</tt> (or
-     * no <tt>schemaLocation</tt> attribute at all if the empty string is specified.)
+     * {@code <xs:import namespace="..." schemaLocation="..."/>} (or
+     * no {@code schemaLocation} attribute at all if the empty string is specified.)
      * However, the schema generator is allowed to use a different value in
-     * the <tt>schemaLocation</tt> attribute (including not generating
+     * the {@code schemaLocation} attribute (including not generating
      * such attribute), for example so that the user can specify a local
      * copy of the resource through the command line interface.
      *
--- a/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlSchemaType.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlSchemaType.java	Thu Sep 24 18:26:42 2015 +0300
@@ -38,7 +38,7 @@
  *
  * <p> <b>Usage</b> </p>
  * <p>
- * <tt>@XmlSchemaType</tt> annotation can be used with the following program
+ * {@code @XmlSchemaType} annotation can be used with the following program
  * elements:
  * <ul>
  *   <li> a JavaBean property </li>
@@ -46,10 +46,10 @@
  *   <li> package</li>
  * </ul>
  *
- * <p> <tt>@XmlSchemaType</tt> annotation defined for Java type
+ * <p> {@code @XmlSchemaType} annotation defined for Java type
  * applies to all references to the Java type from a property/field.
- * A <tt>@XmlSchemaType</tt> annotation specified on the
- * property/field overrides the <tt>@XmlSchemaType</tt> annotation
+ * A {@code @XmlSchemaType} annotation specified on the
+ * property/field overrides the {@code @XmlSchemaType} annotation
  * specified at the package level.
  *
  * <p> This annotation can be used with the following annotations:
--- a/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlSchemaTypes.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlSchemaTypes.java	Thu Sep 24 18:26:42 2015 +0300
@@ -41,7 +41,7 @@
  * <pre>
  * &#64;XmlSchemaTypes({ @XmlSchemaType(...), @XmlSchemaType(...) })
  * </pre>
- * <p>The <tt>@XmlSchemaTypes</tt> annnotation can be used to
+ * <p>The {@code @XmlSchemaTypes} annnotation can be used to
  * define {@link XmlSchemaType} for different types at the
  * package level.
  *
--- a/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlSeeAlso.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlSeeAlso.java	Thu Sep 24 18:26:42 2015 +0300
@@ -51,9 +51,9 @@
  *
  * <p>
  * The user would be required to create {@link JAXBContext} as
- * <tt>JAXBContext.newInstance(Dog.class,Cat.class)</tt>
- * (<tt>Animal</tt> will be automatically picked up since <tt>Dog</tt>
- * and <tt>Cat</tt> refers to it.)
+ * {@code JAXBContext.newInstance(Dog.class,Cat.class)}
+ * ({@code Animal} will be automatically picked up since {@code Dog}
+ * and {@code Cat} refers to it.)
  *
  * <p>
  * {@link XmlSeeAlso} annotation would allow you to write:
@@ -65,9 +65,9 @@
  * </pre>
  *
  * <p>
- * This would allow you to do <tt>JAXBContext.newInstance(Animal.class)</tt>.
+ * This would allow you to do {@code JAXBContext.newInstance(Animal.class)}.
  * By the help of this annotation, JAXB implementations will be able to
- * correctly bind <tt>Dog</tt> and <tt>Cat</tt>.
+ * correctly bind {@code Dog} and {@code Cat}.
  *
  * @author Kohsuke Kawaguchi
  * @since 1.6, JAXB 2.1
--- a/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlTransient.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlTransient.java	Thu Sep 24 18:26:42 2015 +0300
@@ -34,14 +34,14 @@
  * <p>
  * Prevents the mapping of a JavaBean property/type to XML representation.
  * <p>
- * The <tt>@XmlTransient</tt> annotation is useful for resolving name
+ * The {@code @XmlTransient} annotation is useful for resolving name
  * collisions between a JavaBean property name and a field name or
  * preventing the mapping of a field/property. A name collision can
  * occur when the decapitalized JavaBean property name and a field
  * name are the same. If the JavaBean property refers to the field,
  * then the name collision can be resolved by preventing the
  * mapping of either the field or the JavaBean property using the
- * <tt>@XmlTransient</tt> annotation.
+ * {@code @XmlTransient} annotation.
  *
  * <p>
  * When placed on a class, it indicates that the class shouldn't be mapped
@@ -49,7 +49,7 @@
  * with its derived classes, as if the class is inlined.
  *
  * <p><b>Usage</b></p>
- * <p> The <tt>@XmlTransient</tt> annotation can be used with the following
+ * <p> The {@code @XmlTransient} annotation can be used with the following
  *     program elements:
  * <ul>
  *   <li> a JavaBean property </li>
@@ -57,7 +57,7 @@
  *   <li> class </li>
  * </ul>
  *
- * <p><tt>@XmlTransient</tt>is mutually exclusive with all other
+ * <p>{@code @XmlTransient} is mutually exclusive with all other
  * JAXB defined annotations. </p>
  *
  * <p>See "Package Specification" in javax.xml.bind.package javadoc for
--- a/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlType.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlType.java	Thu Sep 24 18:26:42 2015 +0300
@@ -35,7 +35,7 @@
  * Maps a class or an enum type to a XML Schema type.
  *
  * <p><b>Usage</b></p>
- * <p> The <tt>@XmlType</tt> annnotation can be used with the following program
+ * <p> The {@code @XmlType} annnotation can be used with the following program
  * elements:
  * <ul>
  *   <li> a top level class </li>
@@ -53,8 +53,8 @@
  * schema type's content model (e.g. model groups, attributes etc).
  * <p> To be mapped, a class must either have a public no-arg
  * constructor or a static no-arg factory method. The static factory
- * method can be specified in <tt>factoryMethod()</tt> and
- * <tt>factoryClass()</tt> annotation elements. The static factory
+ * method can be specified in {@code factoryMethod()} and
+ * {@code factoryClass()} annotation elements. The static factory
  * method or the no-arg constructor is used during unmarshalling to
  * create an instance of this class. If both are present, the static
  * factory method overrides the no-arg constructor.
@@ -64,7 +64,7 @@
  * mapping of JavaBean properties and fields contained within the
  * class. The schema type to which the class is mapped can either be
  * named or anonymous. A class can be mapped to an anonymous schema
- * type by annotating the class with <tt>&#64;XmlType(name="")</tt>.
+ * type by annotating the class with {@code @XmlType(name="")}.
  * <p>
  * Either a global element, local element or a local attribute can be
  * associated with an anonymous type as follows:
@@ -84,29 +84,29 @@
  * </ul>
  * <b> Mapping to XML Schema Complex Type </b>
  * <ul>
- *   <li>If class is annotated with <tt>@XmlType(name="") </tt>, it
+ *   <li>If class is annotated with {@code @XmlType(name="") }, it
  *   is mapped to an anonymous type otherwise, the class name maps
- *   to a complex type name. The <tt>XmlName()</tt> annotation element
+ *   to a complex type name. The {@code XmlName()} annotation element
  *   can be used to customize the name.</li>
  *
  *   <li> Properties and fields that are mapped to elements are mapped to a
  *   content model within a complex type. The annotation element
- *   <tt>propOrder()</tt> can be used to customize the content model to be
- *   <tt>xs:all</tt> or <tt>xs:sequence</tt>.  It is used for specifying
- *   the order of XML elements in <tt>xs:sequence</tt>. </li>
+ *   {@code propOrder()} can be used to customize the content model to be
+ *   {@code xs:all} or {@code xs:sequence}.  It is used for specifying
+ *   the order of XML elements in {@code xs:sequence}. </li>
  *
  *   <li> Properties and fields can be mapped to attributes within the
  *        complex type.  </li>
  *
  *   <li> The targetnamespace of the XML Schema type can be customized
- *        using the annotation element <tt>namespace()</tt>. </li>
+ *        using the annotation element {@code namespace()}. </li>
  * </ul>
  *
  * <p>
  * <b> Mapping class to XML Schema simple type </b>
  * <p>
  * A class can be mapped to a XML Schema simple type using the
- * <tt>@XmlValue</tt> annotation. For additional details and examples,
+ * {@code @XmlValue} annotation. For additional details and examples,
  * see @{@link XmlValue} annotation type.
  * <p>
  * The following table shows the mapping of the class to a XML Schema
@@ -114,8 +114,8 @@
  * <ul>
  *   <li> {@literal ->}    : represents a mapping </li>
  *   <li> [x]+  : one or more occurances of x </li>
- *   <li> [ <tt>@XmlValue</tt> property ]: JavaBean property annotated with
- *         <tt>@XmlValue</tt></li>
+ *   <li> [ {@code @XmlValue} property ]: JavaBean property annotated with
+ *         {@code @XmlValue}</li>
  *   <li> X     : don't care
  * </ul>
  * <blockquote>
@@ -156,7 +156,7 @@
  *       <tr valign="top">
  *         <td>Class</td>
  *         <td>X</td>
- *         <td>1 [<tt>@XmlValue</tt> property] {@literal &&} <br> [property]+ {@literal ->} attributes</td>
+ *         <td>1 [{@code @XmlValue} property] {@literal &&} <br> [property]+ {@literal ->} attributes</td>
  *         <td>simplecontent</td>
  *         <td> </td>
  *       </tr>
@@ -164,7 +164,7 @@
  *       <tr valign="top">
  *         <td>Class</td>
  *         <td>X</td>
- *         <td>1 [<tt>@XmlValue</tt> property] {@literal &&} <br> no properties {@literal ->} attribute</td>
+ *         <td>1 [{@code @XmlValue} property] {@literal &&} <br> no properties {@literal ->} attribute</td>
  *         <td> </td>
  *         <td>simpletype</td>
  *       </tr>
@@ -176,8 +176,8 @@
  *
  * An enum type maps to a XML schema simple type with enumeration
  * facets. The following annotation elements are ignored since they
- * are not meaningful: <tt>propOrder()</tt> , <tt>factoryMethod()</tt> ,
- * <tt>factoryClass()</tt> .
+ * are not meaningful: {@code propOrder()} , {@code factoryMethod()} ,
+ * {@code factoryClass()} .
  *
  *  <h3> Usage with other annotations </h3>
  * <p> This annotation can be used with the following annotations:
@@ -406,7 +406,7 @@
      * <p> All of the JavaBean properties being mapped to XML Schema elements
      *     must be listed.
      * <p> A JavaBean property or field listed in propOrder must not
-     *     be transient or annotated with <tt>@XmlTransient</tt>.
+     *     be transient or annotated with {@code @XmlTransient}.
      * <p> The default ordering of JavaBean properties is determined
      *     by @{@link XmlAccessorOrder}.
      */
@@ -423,18 +423,18 @@
      * Class containing a no-arg factory method for creating an
      * instance of this class. The default is this class.
      *
-     * <p>If <tt>factoryClass</tt> is DEFAULT.class and
-     * <tt>factoryMethod</tt> is "", then there is no static factory
+     * <p>If {@code factoryClass} is DEFAULT.class and
+     * {@code factoryMethod} is "", then there is no static factory
      * method.
      *
-     * <p>If <tt>factoryClass</tt> is DEFAULT.class and
-     * <tt>factoryMethod</tt> is not "", then
-     * <tt>factoryMethod</tt> is the name of a static factory method
+     * <p>If {@code factoryClass} is DEFAULT.class and
+     * {@code factoryMethod} is not "", then
+     * {@code factoryMethod} is the name of a static factory method
      * in this class.
      *
-     * <p>If <tt>factoryClass</tt> is not DEFAULT.class, then
-     * <tt>factoryMethod</tt> must not be "" and must be the name of
-     * a static factory method specified in <tt>factoryClass</tt>.
+     * <p>If {@code factoryClass} is not DEFAULT.class, then
+     * {@code factoryMethod} must not be "" and must be the name of
+     * a static factory method specified in {@code factoryClass}.
      */
     Class factoryClass() default DEFAULT.class;
 
@@ -447,7 +447,7 @@
 
     /**
      * Name of a no-arg factory method in the class specified in
-     * <tt>factoryClass</tt> factoryClass().
+     * {@code factoryClass} factoryClass().
      *
      */
     String factoryMethod() default "";
--- a/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlValue.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlValue.java	Thu Sep 24 18:26:42 2015 +0300
@@ -39,7 +39,7 @@
  * <p>
  * <b> Usage: </b>
  * <p>
- * The <tt>@XmlValue</tt> annotation can be used with the following program
+ * The {@code @XmlValue} annotation can be used with the following program
  * elements:
  * <ul>
  *   <li> a JavaBean property.</li>
@@ -52,9 +52,9 @@
  * The usage is subject to the following usage constraints:
  * <ul>
  *   <li>At most one field or property can be annotated with the
- *       <tt>@XmlValue</tt> annotation. </li>
+ *       {@code @XmlValue} annotation. </li>
  *
- *   <li><tt>@XmlValue</tt> can be used with the following
+ *   <li>{@code @XmlValue} can be used with the following
  *   annotations: {@link XmlList}. However this is redundant since
  *   {@link XmlList} maps a type to a simple schema type that derives by
  *   list just as {@link XmlValue} would. </li>
@@ -73,7 +73,7 @@
  * simple type.
  *
  * If there are additional JavaBean properties (other than the
- * JavaBean property annotated with <tt>@XmlValue</tt> annotation)
+ * JavaBean property annotated with {@code @XmlValue} annotation)
  * that are mapped to XML attributes, then the class is mapped to a
  * complex type with simpleContent.
  * </p>
--- a/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/CollapsedStringAdapter.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/CollapsedStringAdapter.java	Thu Sep 24 18:26:42 2015 +0300
@@ -28,7 +28,7 @@
 
 
 /**
- * Built-in {@link XmlAdapter} to handle <tt>xs:token</tt> and its derived types.
+ * Built-in {@link XmlAdapter} to handle {@code xs:token} and its derived types.
  *
  * <p>
  * This adapter removes leading and trailing whitespaces, then truncate any
--- a/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/HexBinaryAdapter.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/HexBinaryAdapter.java	Thu Sep 24 18:26:42 2015 +0300
@@ -28,10 +28,10 @@
 import javax.xml.bind.DatatypeConverter;
 
 /**
- * {@link XmlAdapter} for <tt>xs:hexBinary</tt>.
+ * {@link XmlAdapter} for {@code xs:hexBinary}.
  *
  * <p>
- * This {@link XmlAdapter} binds <tt>byte[]</tt> to the hexBinary representation in XML.
+ * This {@link XmlAdapter} binds {@code byte[]} to the hexBinary representation in XML.
  *
  * @author Kohsuke Kawaguchi
  * @since 1.6, JAXB 2.0
--- a/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/NormalizedStringAdapter.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/NormalizedStringAdapter.java	Thu Sep 24 18:26:42 2015 +0300
@@ -28,7 +28,7 @@
 
 
 /**
- * {@link XmlAdapter} to handle <tt>xs:normalizedString</tt>.
+ * {@link XmlAdapter} to handle {@code xs:normalizedString}.
  *
  * <p>
  * Replaces any tab, CR, and LF by a whitespace character ' ',
--- a/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/XmlAdapter.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/XmlAdapter.java	Thu Sep 24 18:26:42 2015 +0300
@@ -32,7 +32,7 @@
  *
  * <p>
  * Some Java types do not map naturally to a XML representation, for
- * example <tt>HashMap</tt> or other non JavaBean classes. Conversely,
+ * example {@code HashMap} or other non JavaBean classes. Conversely,
  * a XML repsentation may map to a Java type but an application may
  * choose to accesss the XML representation using another Java
  * type. For example, the schema to Java binding rules bind
@@ -68,10 +68,10 @@
  *        XmlJavaTypeAdapter} </li>
  * </ul>
  *
- * <p><b>Example:</b> Customized mapping of <tt>HashMap</tt></p>
+ * <p><b>Example:</b> Customized mapping of {@code HashMap}</p>
  * <p> The following example illustrates the use of
- * <tt>&#64;XmlAdapter</tt> and <tt>&#64;XmlJavaTypeAdapter</tt> to
- * customize the mapping of a <tt>HashMap</tt>.
+ * {@code @XmlAdapter} and {@code @XmlJavaTypeAdapter} to
+ * customize the mapping of a {@code HashMap}.
  *
  * <p> <b> Step 1: </b> Determine the desired XML representation for HashMap.
  *
@@ -154,7 +154,7 @@
  * @param <BoundType>
  *      The type that JAXB doesn't know how to handle. An adapter is written
  *      to allow this type to be used as an in-memory representation through
- *      the <tt>ValueType</tt>.
+ *      the {@code ValueType}.
  * @param <ValueType>
  *      The type that JAXB knows how to handle out of the box.
  *
--- a/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.java	Thu Sep 24 18:26:42 2015 +0300
@@ -50,7 +50,7 @@
  *
  * <p> <b> Usage: </b> </p>
  *
- * <p> The <tt>@XmlJavaTypeAdapter</tt> annotation can be used with the
+ * <p> The {@code @XmlJavaTypeAdapter} annotation can be used with the
  * following program elements:
  * <ul>
  *   <li> a JavaBean property </li>
@@ -60,20 +60,20 @@
  *   <li> from within {@link XmlJavaTypeAdapters} </li>
  * </ul>
  *
- * <p> When <tt>@XmlJavaTypeAdapter</tt> annotation is defined on a
+ * <p> When {@code @XmlJavaTypeAdapter} annotation is defined on a
  * class, it applies to all references to the class.
- * <p> When <tt>@XmlJavaTypeAdapter</tt> annotation is defined at the
+ * <p> When {@code @XmlJavaTypeAdapter} annotation is defined at the
  * package level it applies to all references from within the package
- * to <tt>@XmlJavaTypeAdapter.type()</tt>.
- * <p> When <tt>@XmlJavaTypeAdapter</tt> annotation is defined on the
+ * to {@code @XmlJavaTypeAdapter.type()}.
+ * <p> When {@code @XmlJavaTypeAdapter} annotation is defined on the
  * field, property or parameter, then the annotation applies to the
  * field, property or the parameter only.
- * <p> A <tt>@XmlJavaTypeAdapter</tt> annotation on a field, property
- * or parameter overrides the <tt>@XmlJavaTypeAdapter</tt> annotation
+ * <p> A {@code @XmlJavaTypeAdapter} annotation on a field, property
+ * or parameter overrides the {@code @XmlJavaTypeAdapter} annotation
  * associated with the class being referenced by the field, property
  * or parameter.
- * <p> A <tt>@XmlJavaTypeAdapter</tt> annotation on a class overrides
- * the <tt>@XmlJavaTypeAdapter</tt> annotation specified at the
+ * <p> A {@code @XmlJavaTypeAdapter} annotation on a class overrides
+ * the {@code @XmlJavaTypeAdapter} annotation specified at the
  * package level for that class.
  *
  * <p>This annotation can be used with the following other annotations:
--- a/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapters.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapters.java	Thu Sep 24 18:26:42 2015 +0300
@@ -42,7 +42,7 @@
  * &#64;XmlJavaTypeAdapters ({ @XmlJavaTypeAdapter(...),@XmlJavaTypeAdapter(...) })
  * </pre>
  *
- * <p>The <tt>@XmlJavaTypeAdapters</tt> annotation is useful for
+ * <p>The {@code @XmlJavaTypeAdapters} annotation is useful for
  * defining {@link XmlJavaTypeAdapter} annotations for different types
  * at the package level.
  *
--- a/src/java.xml.bind/share/classes/javax/xml/bind/attachment/AttachmentMarshaller.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/javax/xml/bind/attachment/AttachmentMarshaller.java	Thu Sep 24 18:26:42 2015 +0300
@@ -123,7 +123,7 @@
      *
      * @param data
      *      represents the data to be attached. Must be non-null. The actual data region is
-     *      specified by <tt>(data,offset,length)</tt> tuple.
+     *      specified by {@code (data,offset,length)} tuple.
      *
      * @param offset
      *       The offset within the array of the first byte to be read;
--- a/src/java.xml.bind/share/classes/javax/xml/bind/attachment/AttachmentUnmarshaller.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/javax/xml/bind/attachment/AttachmentUnmarshaller.java	Thu Sep 24 18:26:42 2015 +0300
@@ -36,9 +36,10 @@
  * understanding of the packaging format being used to a MIME-based
  * package processor that implements this abstract class.</p>
  *
- * <p>This abstract class identifies if a package requires XOP processing, {@link #isXOPPackage()} and provides retrieval of binary content stored as attachments by content-id.</p>
+ * <p>This abstract class identifies if a package requires XOP processing, {@link #isXOPPackage()}
+ * and provides retrieval of binary content stored as attachments by content-id.</p>
  *
- * <h2>Identifying the content-id, cid, to pass to <code>getAttachment*(String cid)</code></h2>
+ * <h2>Identifying the content-id, cid, to pass to {@code getAttachment*(String cid)}</h2>
  * <ul>
  * <li>
  * For XOP processing, the infoset representation of the cid is described
@@ -47,8 +48,9 @@
  * </li>
  * <li>
  * For WS-I AP 1.0, the cid is identified as an element or attribute of
- * type <code>ref:swaRef </code> specified in
- * <a href="http://www.ws-i.org/Profiles/AttachmentsProfile-1.0-2004-08-24.html#Referencing_Attachments_from_the_SOAP_Envelope">Section 4.4 Referencing Attachments from the SOAP Envelope</a>
+ * type {@code ref:swaRef} specified in
+ * <a href="http://www.ws-i.org/Profiles/AttachmentsProfile-1.0-2004-08-24.html#Referencing_Attachments_from_the_SOAP_Envelope">
+ * Section 4.4 Referencing Attachments from the SOAP Envelope</a>
  * </li>
  * </ul>
  *
@@ -66,9 +68,9 @@
  */
 public abstract class AttachmentUnmarshaller {
    /**
-    * <p>Lookup MIME content by content-id, <code>cid</code>, and return as a {@link DataHandler}.</p>
+    * <p>Lookup MIME content by content-id, {@code cid}, and return as a {@link DataHandler}.</p>
     *
-    * <p>The returned <code>DataHandler</code> instance must be configured
+    * <p>The returned {@code DataHandler} instance must be configured
     * to meet the following required mapping constaint.
     * <table summary="" border="2" rules="all" cellpadding="4">
     *   <thead>
@@ -81,8 +83,8 @@
     *       <th>Java Type</th>
     *     </tr>
     *     <tr>
-    *       <th><code>DataHandler.getContentType()</code></th>
-    *       <th><code>instanceof DataHandler.getContent()</code></th>
+    *       <th>{@code DataHandler.getContentType()}</th>
+    *       <th>{@code instanceof DataHandler.getContent()}</th>
     *     </tr>
     *   </thead>
     *   <tbody>
@@ -103,8 +105,8 @@
     * Note that it is allowable to support additional mappings.
     *
     * @param cid It is expected to be a valid lexical form of the XML Schema
-    * <code>xs:anyURI</code> datatype. If <code>{@link #isXOPPackage()}
-    * ==true</code>, it must be a valid URI per the <code>cid:</code> URI scheme (see <a href="http://www.ietf.org/rfc/rfc2387.txt">RFC 2387</a>)
+    * {@code xs:anyURI} datatype. If {@link #isXOPPackage()}{@code ==true},
+    * it must be a valid URI per the {@code cid:} URI scheme (see <a href="http://www.ietf.org/rfc/rfc2387.txt">RFC 2387</a>)
     *
     * @return
     *       a {@link DataHandler} that represents the MIME attachment.
@@ -114,11 +116,11 @@
    public abstract DataHandler getAttachmentAsDataHandler(String cid);
 
     /**
-     * <p>Retrieve the attachment identified by content-id, <code>cid</code>,  as a <tt>byte[]</tt></p>.
+     * <p>Retrieve the attachment identified by content-id, {@code cid}, as a {@code byte[]}.
      *
      * @param cid It is expected to be a valid lexical form of the XML Schema
-     * <code>xs:anyURI</code> datatype. If <code>{@link #isXOPPackage()}
-     * ==true</code>, it must be a valid URI per the <code>cid:</code> URI scheme (see <a href="http://www.ietf.org/rfc/rfc2387.txt">RFC 2387</a>)
+     * {@code xs:anyURI} datatype. If {@link #isXOPPackage()}{@code ==true},
+     * it must be a valid URI per the {@code cid:} URI scheme (see <a href="http://www.ietf.org/rfc/rfc2387.txt">RFC 2387</a>)
      *
      * @return byte[] representation of attachment identified by cid.
      *
@@ -129,7 +131,7 @@
     /**
      * <p>Read-only property that returns true if JAXB unmarshaller needs to perform XOP processing.</p>
      *
-     * <p>This method returns <code>true</code> when the constraints specified
+     * <p>This method returns {@code true} when the constraints specified
      * in  <a href="http://www.w3.org/TR/2005/REC-xop10-20050125/#identifying_xop_documents">Identifying XOP Documents</a> are met.
      * This value must not change during the unmarshalling process.</p>
      *
--- a/src/java.xml.bind/share/classes/javax/xml/bind/helpers/AbstractMarshallerImpl.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/javax/xml/bind/helpers/AbstractMarshallerImpl.java	Thu Sep 24 18:26:42 2015 +0300
@@ -48,7 +48,7 @@
 // import java.nio.charset.UnsupportedCharsetException;
 
 /**
- * Partial default <tt>Marshaller</tt> implementation.
+ * Partial default {@code Marshaller} implementation.
  *
  * <p>
  * This class provides a partial default implementation for the
--- a/src/java.xml.bind/share/classes/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java	Thu Sep 24 18:26:42 2015 +0300
@@ -53,7 +53,7 @@
 import java.net.URL;
 
 /**
- * Partial default <tt>Unmarshaller</tt> implementation.
+ * Partial default {@code Unmarshaller} implementation.
  *
  * <p>
  * This class provides a partial default implementation for the
@@ -246,7 +246,7 @@
      * <p>
      * The validation event handler will be called by the JAXB Provider if any
      * validation errors are encountered during calls to any of the
-     * <tt>unmarshal</tt> methods.  If the client application does not register
+     * {@code unmarshal} methods.  If the client application does not register
      * a validation event handler before invoking the unmarshal methods, then
      * all validation events will be silently ignored and may result in
      * unexpected behaviour.
@@ -267,7 +267,7 @@
 
     /**
      * Specifies whether or not the Unmarshaller should validate during
-     * unmarshal operations.  By default, the <tt>Unmarshaller</tt> does
+     * unmarshal operations. By default, the {@code Unmarshaller} does
      * not validate.
      * <p>
      * This method may only be invoked before or after calling one of the
--- a/src/java.xml.bind/share/classes/javax/xml/bind/helpers/package.html	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/javax/xml/bind/helpers/package.html	Thu Sep 24 18:26:42 2015 +0300
@@ -34,7 +34,7 @@
 
         <p>
         <B>JAXB Provider Use Only:</b> Provides partial default implementations for 
-        some of the <tt>javax.xml.bind</tt> interfaces.
+        some of the <code>javax.xml.bind</code> interfaces.
 
         <p>
         JAXB Providers can extend these classes and implement the abstract 
--- a/src/java.xml.bind/share/classes/javax/xml/bind/package.html	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.bind/share/classes/javax/xml/bind/package.html	Thu Sep 24 18:26:42 2015 +0300
@@ -37,7 +37,7 @@
         unmarshalling, marshalling, and validation capabilities.
 
         <p>
-        <tt>JAXBContext</tt> is the client-entry point to the runtime binding
+        <code>JAXBContext</code> is the client-entry point to the runtime binding
         framework.
 
 
--- a/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/SOAPExceptionImpl.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/SOAPExceptionImpl.java	Thu Sep 24 18:26:42 2015 +0300
@@ -144,7 +144,7 @@
      * @param  cause the <code>Throwable</code> object that caused this
      *         <code>SOAPExceptionImpl</code> object to be thrown.  The value of this
      *         parameter is saved for later retrieval by the
-     *         {@link #getCause()} method.  A <tt>null</tt> value is
+     *         {@link #getCause()} method.  A {@code null} value is
      *         permitted and indicates that the cause is nonexistent or
      *         unknown.
      * @return  a reference to this <code>SOAPExceptionImpl</code> instance
--- a/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/WsaPropertyBag.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/WsaPropertyBag.java	Thu Sep 24 18:26:42 2015 +0300
@@ -69,7 +69,7 @@
     }
 
     /**
-     * Gets the <tt>wsa:To</tt> header.
+     * Gets the {@code wsa:To} header.
      *
      * @return
      *      null if the incoming SOAP message didn't have the header.
@@ -85,7 +85,7 @@
     }
 
     /**
-     * Gets the <tt>wsa:To</tt> header.
+     * Gets the {@code wsa:To} header.
      *
      * @return
      *      null if the incoming SOAP message didn't have the header.
@@ -101,7 +101,7 @@
     }
 
     /**
-     * Gets the <tt>wsa:From</tt> header.
+     * Gets the {@code wsa:From} header.
      *
      * @return
      *      null if the incoming SOAP message didn't have the header.
@@ -112,7 +112,7 @@
     }
 
     /**
-     * Gets the <tt>wsa:Action</tt> header content as String.
+     * Gets the {@code wsa:Action} header content as String.
      *
      * @return
      *      null if the incoming SOAP message didn't have the header.
@@ -128,7 +128,7 @@
     }
 
     /**
-     * Gets the <tt>wsa:MessageID</tt> header content as String.
+     * Gets the {@code wsa:MessageID} header content as String.
      *
      * @return
      *      null if the incoming SOAP message didn't have the header.
--- a/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/BindingID.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/BindingID.java	Thu Sep 24 18:26:42 2015 +0300
@@ -164,7 +164,7 @@
      *
      * <p>
      * For example, {@link BindingID} for
-     * <tt>"{@value SOAPBinding#SOAP11HTTP_MTOM_BINDING}"</tt>
+     * {@code "{@value SOAPBinding#SOAP11HTTP_MTOM_BINDING}"}
      * would always return a list that has {@link MTOMFeature} enabled.
      */
     public WebServiceFeatureList createBuiltinFeatureList() {
@@ -189,7 +189,7 @@
      *
      * <p>
      * Some binding ID, such as those for SOAP/HTTP, uses the URL
-     * query syntax (like <tt>?mtom=true</tt>) to control
+     * query syntax (like {@code ?mtom=true}) to control
      * the optional part of the binding. This method obtains
      * the value for such optional parts.
      *
--- a/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/BindingIDFactory.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/BindingIDFactory.java	Thu Sep 24 18:26:42 2015 +0300
@@ -36,7 +36,7 @@
  * <p>
  * When the JAX-WS RI is asked to parse a binding ID string into a {@link BindingID}
  * object, it uses service idiom to look for the implementations of this class
- * in the <tt>META-INF/services/...</tt>.
+ * in the {@code META-INF/services/...}.
  *
  * @since JAX-WS 2.0.next
  * @author Kohsuke Kawaguchi
--- a/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/Cancelable.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/Cancelable.java	Thu Sep 24 18:26:42 2015 +0300
@@ -35,18 +35,18 @@
      * Attempts to cancel execution of this task.  This attempt will
      * fail if the task has already completed, has already been cancelled,
      * or could not be cancelled for some other reason. If successful,
-     * and this task has not started when <tt>cancel</tt> is called,
+     * and this task has not started when {@code cancel} is called,
      * this task should never run.  If the task has already started,
-     * then the <tt>mayInterruptIfRunning</tt> parameter determines
+     * then the {@code mayInterruptIfRunning} parameter determines
      * whether the thread executing this task should be interrupted in
      * an attempt to stop the task.
      *
-     * @param mayInterruptIfRunning <tt>true</tt> if the thread executing this
+     * @param mayInterruptIfRunning {@code true} if the thread executing this
      * task should be interrupted; otherwise, in-progress tasks are allowed
      * to complete
-     * @return <tt>false</tt> if the task could not be cancelled,
+     * @return {@code false} if the task could not be cancelled,
      * typically because it has already completed normally;
-     * <tt>true</tt> otherwise
+     * {@code true} otherwise
      */
         public void cancel(boolean mayInterruptIfRunning);
 }
--- a/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/client/ClientPipelineHook.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/client/ClientPipelineHook.java	Thu Sep 24 18:26:42 2015 +0300
@@ -63,7 +63,7 @@
      *      eventually processes messages.
      *
      * @return
-     *      The default implementation just returns <tt>tail</tt>, which means
+     *      The default implementation just returns {@code tail}, which means
      *      no additional pipe is inserted. If the implementation adds
      *      new pipes, return the new head pipe.
      */
--- a/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/client/ServiceInterceptor.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/client/ServiceInterceptor.java	Thu Sep 24 18:26:42 2015 +0300
@@ -68,7 +68,7 @@
      * @return
      *      A set of features to be added to the newly created {@link WSBinding}.
      *      Can be empty but never null.
-     *      <tt>defaultFeatures</tt> will take precedence over what this method
+     *      {@code defaultFeatures} will take precedence over what this method
      *      would return (because it includes user-specified ones which will
      *      take the at-most priority), but features you return from this method
      *      will take precedence over {@link BindingID}'s
--- a/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Header.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Header.java	Thu Sep 24 18:26:42 2015 +0300
@@ -101,7 +101,7 @@
      * specifically, this method has to perform the following tasks:
      *
      * <ul>
-     *  <li>If this header does not have <tt>mustUnderstand</tt> as "1" nor "true",
+     *  <li>If this header does not have {@code mustUnderstand} as "1" nor "true",
      *      then this method must return true.
      *  <li>Otherwise, check the role attribute (for SOAP 1.2) or the actor attribute (for SOAP 1.1).
      *      When those attributes are absent, the default values have to be assumed.
@@ -300,7 +300,7 @@
      *
      * <p>
      * A header is responsible for producing the SAX events for its part,
-     * including <tt>startPrefixMapping</tt> and <tt>endPrefixMapping</tt>,
+     * including {@code startPrefixMapping} and {@code endPrefixMapping},
      * but not startDocument/endDocument.
      *
      * <p>
--- a/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/HeaderList.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/HeaderList.java	Thu Sep 24 18:26:42 2015 +0300
@@ -87,13 +87,13 @@
  * There are two ways to mark a header as understood:
  *
  * <ol>
- *  <li>Use one of the <tt>getXXX</tt> methods that take a
- *      boolean <tt>markAsUnderstood</tt> parameter.
+ *  <li>Use one of the {@code getXXX} methods that take a
+ *      boolean {@code markAsUnderstood} parameter.
  *      Most often, a {@link Pipe} knows it's going to understand a header
  *      as long as it's present, so this is the easiest and thus the preferred way.
  *
  *      For example, if JAX-WSA looks for &lt;wsa:To>, then it can set
- *      <tt>markAsUnderstand</tt> to true, to do the obtaining of a header
+ *      {@code markAsUnderstand} to true, to do the obtaining of a header
  *      and marking at the same time.
  *
  *  <li>Call {@link #understood(int)}.
@@ -489,14 +489,14 @@
     }
 
     /**
-     * Returns the value of WS-Addressing <code>To</code> header. The <code>version</code>
+     * Returns the value of WS-Addressing {@code To} header. The {@code version}
      * identifies the WS-Addressing version and the header returned is targeted at
      * the current implicit role. Caches the value for subsequent invocation.
-     * Duplicate <code>To</code> headers are detected earlier.
+     * Duplicate {@code To} headers are detected earlier.
      *
      * @param av WS-Addressing version
      * @param sv SOAP version
-     * @throws IllegalArgumentException if either <code>av</code> or <code>sv</code> is null.
+     * @throws IllegalArgumentException if either {@code av} or {@code sv} is null.
      * @return Value of WS-Addressing To header, anonymous URI if no header is present
      */
     public String getTo(AddressingVersion av, SOAPVersion sv) {
@@ -504,14 +504,14 @@
     }
 
     /**
-     * Returns the value of WS-Addressing <code>Action</code> header. The <code>version</code>
+     * Returns the value of WS-Addressing {@code Action} header. The {@code version}
      * identifies the WS-Addressing version and the header returned is targeted at
      * the current implicit role. Caches the value for subsequent invocation.
-     * Duplicate <code>Action</code> headers are detected earlier.
+     * Duplicate {@code Action} headers are detected earlier.
      *
      * @param av WS-Addressing version
      * @param sv SOAP version
-     * @throws IllegalArgumentException if either <code>av</code> or <code>sv</code> is null.
+     * @throws IllegalArgumentException if either {@code av} or {@code sv} is null.
      * @return Value of WS-Addressing Action header, null if no header is present
      */
     public String getAction(@NotNull AddressingVersion av, @NotNull SOAPVersion sv) {
@@ -519,14 +519,14 @@
     }
 
     /**
-     * Returns the value of WS-Addressing <code>ReplyTo</code> header. The <code>version</code>
+     * Returns the value of WS-Addressing {@code ReplyTo} header. The {@code version}
      * identifies the WS-Addressing version and the header returned is targeted at
      * the current implicit role. Caches the value for subsequent invocation.
-     * Duplicate <code>ReplyTo</code> headers are detected earlier.
+     * Duplicate {@code ReplyTo} headers are detected earlier.
      *
      * @param av WS-Addressing version
      * @param sv SOAP version
-     * @throws IllegalArgumentException if either <code>av</code> or <code>sv</code> is null.
+     * @throws IllegalArgumentException if either {@code av} or {@code sv} is null.
      * @return Value of WS-Addressing ReplyTo header, null if no header is present
      */
     public WSEndpointReference getReplyTo(@NotNull AddressingVersion av, @NotNull SOAPVersion sv) {
@@ -534,14 +534,14 @@
     }
 
     /**
-     * Returns the value of WS-Addressing <code>FaultTo</code> header. The <code>version</code>
+     * Returns the value of WS-Addressing {@code FaultTo} header. The {@code version}
      * identifies the WS-Addressing version and the header returned is targeted at
      * the current implicit role. Caches the value for subsequent invocation.
-     * Duplicate <code>FaultTo</code> headers are detected earlier.
+     * Duplicate {@code FaultTo} headers are detected earlier.
      *
      * @param av WS-Addressing version
      * @param sv SOAP version
-     * @throws IllegalArgumentException if either <code>av</code> or <code>sv</code> is null.
+     * @throws IllegalArgumentException if either {@code av} or {@code sv} is null.
      * @return Value of WS-Addressing FaultTo header, null if no header is present
      */
     public WSEndpointReference getFaultTo(@NotNull AddressingVersion av, @NotNull SOAPVersion sv) {
@@ -549,14 +549,14 @@
     }
 
     /**
-     * Returns the value of WS-Addressing <code>MessageID</code> header. The <code>version</code>
+     * Returns the value of WS-Addressing {@code MessageID} header. The {@code version}
      * identifies the WS-Addressing version and the header returned is targeted at
      * the current implicit role. Caches the value for subsequent invocation.
-     * Duplicate <code>MessageID</code> headers are detected earlier.
+     * Duplicate {@code MessageID} headers are detected earlier.
      *
      * @param av WS-Addressing version
      * @param sv SOAP version
-     * @throws WebServiceException if either <code>av</code> or <code>sv</code> is null.
+     * @throws WebServiceException if either {@code av} or {@code sv} is null.
      * @return Value of WS-Addressing MessageID header, null if no header is present
      */
     public String getMessageID(@NotNull AddressingVersion av, @NotNull SOAPVersion sv) {
@@ -564,14 +564,14 @@
     }
 
     /**
-     * Returns the value of WS-Addressing <code>RelatesTo</code> header. The <code>version</code>
+     * Returns the value of WS-Addressing {@code RelatesTo} header. The {@code version}
      * identifies the WS-Addressing version and the header returned is targeted at
      * the current implicit role. Caches the value for subsequent invocation.
-     * Duplicate <code>RelatesTo</code> headers are detected earlier.
+     * Duplicate {@code RelatesTo} headers are detected earlier.
      *
      * @param av WS-Addressing version
      * @param sv SOAP version
-     * @throws WebServiceException if either <code>av</code> or <code>sv</code> is null.
+     * @throws WebServiceException if either {@code av} or {@code sv} is null.
      * @return Value of WS-Addressing RelatesTo header, null if no header is present
      */
     public String getRelatesTo(@NotNull AddressingVersion av, @NotNull SOAPVersion sv) {
@@ -803,14 +803,15 @@
     /**
      * Removes a single instance of the specified element from this
      * header list, if it is present.  More formally,
-     * removes a header <tt>h</tt> such that <tt>(o==null ? h==null :
-     * o.equals(h))</tt>, if the header list contains one or more such
-     * headers.  Returns <tt>true</tt> if the list contained the
+     * removes a header {@code h} such that
+     * {@code (o==null ? h==null : o.equals(h))},
+     * if the header list contains one or more such
+     * headers.  Returns {@code true} if the list contained the
      * specified element (or equivalently, if the list changed as a
      * result of the call).<p>
      *
      * @param o element to be removed from this list, if present.
-     * @return <tt>true</tt> if the list contained the specified element.
+     * @return {@code true} if the list contained the specified element.
      * @see #remove(javax.xml.namespace.QName)
      */
     @Override
--- a/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Message.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Message.java	Thu Sep 24 18:26:42 2015 +0300
@@ -446,14 +446,14 @@
      *
      * <p>
      * A message without a payload is a SOAP message that looks like:
-     * <pre><xmp>
+     * <pre>{@code
      * <S:Envelope>
      *   <S:Header>
      *     ...
      *   </S:Header>
      *   <S:Body />
      * </S:Envelope>
-     * </xmp></pre>
+     * }</pre>
      */
     public abstract boolean hasPayload();
 
--- a/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Packet.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Packet.java	Thu Sep 24 18:26:42 2015 +0300
@@ -347,7 +347,7 @@
      * <p>
      * Transports may choose to ignore certain headers that interfere with
      * its correct operation, such as
-     * <tt>Content-Type</tt> and <tt>Content-Length</tt>.
+     * {@code Content-Type} and {@code Content-Length}.
      */
     public static final String OUTBOUND_TRANSPORT_HEADERS = "com.sun.xml.internal.ws.api.message.packet.outbound.transport.headers";
 
@@ -588,7 +588,7 @@
      *
      * <p>
      * For outgoing messages, the transport may sends out this value.
-     * If this field is null, the transport may choose to send <tt>""</tt>
+     * If this field is null, the transport may choose to send {@code ""}
      * (quoted empty string.)
      *
      * For incoming messages, the transport will set this field.
--- a/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/Parameter.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/Parameter.java	Thu Sep 24 18:26:42 2015 +0300
@@ -81,7 +81,7 @@
     int getIndex();
 
     /**
-     * @return true if <tt>this instanceof {@link com.sun.xml.internal.ws.model.WrapperParameter}</tt>.
+     * @return true if {@code this instanceof} {@link com.sun.xml.internal.ws.model.WrapperParameter}.
      */
     boolean isWrapperStyle();
 
@@ -89,7 +89,7 @@
      * Returns true if this parameter is bound to the return value from the {@link JavaMethod}.
      *
      * <p>
-     * Just the convenience method for <tt>getIndex()==-1</tt>
+     * Just the convenience method for {@code getIndex()==-1}
      */
     boolean isReturnValue();
 
@@ -138,7 +138,7 @@
      * <p>
      * {@link JavaMethod#getResponseParameters()} is guaranteed to have
      * at most one such {@link Parameter}. Note that there coule be none,
-     * in which case the method returns <tt>void</tt>.
+     * in which case the method returns {@code void}.
      *
      * <p>
      * Other response parameters are bound to {@link Holder}.
--- a/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Codec.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Codec.java	Thu Sep 24 18:26:42 2015 +0300
@@ -179,7 +179,7 @@
      *      <p>
      *      If the {@link Codec} implementation is already
      *      re-entrant and multi-thread safe to begin with,
-     *      then this method may simply return <tt>this</tt>.
+     *      then this method may simply return {@code this}.
      */
     Codec copy();
 
@@ -208,7 +208,7 @@
      *      The MIME content type (like "application/xml") of this byte stream.
      *      Thie text includes all the sub-headers of the content-type header. Therefore,
      *      in more complex case, this could be something like
-     *      <tt>multipart/related; boundary="--=_outer_boundary"; type="multipart/alternative"</tt>.
+     *      {@code multipart/related; boundary="--=_outer_boundary"; type="multipart/alternative"}.
      *      This parameter must not be null.
      *
      * @param response
--- a/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Fiber.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Fiber.java	Thu Sep 24 18:26:42 2015 +0300
@@ -319,7 +319,7 @@
      * This method works like {@link Thread#start()}.
      *
      * @param tubeline           The first tube of the tubeline that will act on the packet.
-     * @param request            The request packet to be passed to <tt>startPoint.processRequest()</tt>.
+     * @param request            The request packet to be passed to {@code startPoint.processRequest()}.
      * @param completionCallback The callback to be invoked when the processing is finished and the
      *                           final response packet is available.
      * @see #runSync(Tube, Packet)
@@ -385,7 +385,7 @@
      * @param tubeline
      *      The first tube of the tubeline that will act on the packet.
      * @param request
-     *      The request packet to be passed to <tt>startPoint.processRequest()</tt>.
+     *      The request packet to be passed to {@code startPoint.processRequest()}.
      * @param completionCallback
      *      The callback to be invoked when the processing is finished and the
      *      final response packet is available.
@@ -835,8 +835,8 @@
      * </pre>
      *
      * @param tubeline The first tube of the tubeline that will act on the packet.
-     * @param request  The request packet to be passed to <tt>startPoint.processRequest()</tt>.
-     * @return The response packet to the <tt>request</tt>.
+     * @param request  The request packet to be passed to {@code startPoint.processRequest()}.
+     * @return The response packet to the {@code request}.
      * @see #start(Tube, Packet, CompletionCallback)
      */
     public
--- a/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/FiberContextSwitchInterceptor.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/FiberContextSwitchInterceptor.java	Thu Sep 24 18:26:42 2015 +0300
@@ -44,7 +44,7 @@
  * <p>
  * The design also encapsulates the entire fiber execution in a single
  * opaque method invocation {@link Work#execute}, allowing the use of
- * <tt>finally</tt> block.
+ * {@code finally} block.
  *
  *
  * @author Kohsuke Kawaguchi
--- a/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Pipe.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Pipe.java	Thu Sep 24 18:26:42 2015 +0300
@@ -177,7 +177,7 @@
  *
  * <h3>VM-wide state</h3>
  * <p>
- * <tt>static</tt> is always there for you to use.
+ * {@code static} is always there for you to use.
  *
  *
  *
@@ -323,7 +323,7 @@
      * that you delegate to.
      * <p>
      * For limited number of {@link Pipe}s that do not maintain any
-     * thread unsafe resource, it is allowed to simply return <tt>this</tt>
+     * thread unsafe resource, it is allowed to simply return {@code this}
      * from this method (notice that even if you are stateless, if you
      * got a delegating {@link Pipe} and that one isn't stateless, you
      * still have to copy yourself.)
--- a/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/PipelineAssemblerFactory.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/PipelineAssemblerFactory.java	Thu Sep 24 18:26:42 2015 +0300
@@ -37,7 +37,7 @@
  * <p>
  * To create a pipeline,
  * the JAX-WS runtime locates {@link PipelineAssemblerFactory}s through
- * the <tt>META-INF/services/com.sun.xml.internal.ws.api.pipe.PipelineAssemblerFactory</tt> files.
+ * the {@code META-INF/services/com.sun.xml.internal.ws.api.pipe.PipelineAssemblerFactory} files.
  * Factories found are checked to see if it supports the given binding ID one by one,
  * and the first valid {@link PipelineAssembler} returned will be used to create
  * a pipeline.
--- a/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Stubs.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Stubs.java	Thu Sep 24 18:26:42 2015 +0300
@@ -75,9 +75,9 @@
  * <h3>Pipe next</h3>
  * <p>
  * Stubs turn a method invocation into a {@link Pipe#process(com.sun.xml.internal.ws.api.message.Packet)} invocation,
- * and this pipe passed in as the <tt>next</tt> parameter will receive a {@link Message}
+ * and this pipe passed in as the {@code next} parameter will receive a {@link Message}
  * from newly created stub. All the methods taking Tube <<next>> parameter are deprecated. JAX-WS Runtime takes care of
- * creating the tubeline when the <tt>next</tt> parameter is not passed. This gives flexibility for the JAX-WS Runtime
+ * creating the tubeline when the {@code next} parameter is not passed. This gives flexibility for the JAX-WS Runtime
  * to pass extra information during the tube line creation via {@link ClientTubeAssemblerContext}.
  *
  * <h3>WSPortInfo portInfo</h3>
@@ -87,7 +87,7 @@
  * <h3>BindingImpl binding</h3>
  * <p>
  * Stubs implement {@link BindingProvider}, and its {@link BindingProvider#getBinding()}
- * will return this <tt>binding</tt> object. Stubs often also use this information
+ * will return this {@code binding} object. Stubs often also use this information
  * to decide which SOAP version a {@link Message} should be created in.
  *
  * <h3>{@link WSService} service</h3>
@@ -98,7 +98,7 @@
  * <h3>{@link WSEndpointReference} epr</h3>
  * <p>
  * If you want the created {@link Dispatch} to talk to the given EPR, specify the parameter.
- * Otherwise leave it <tt>null</tt>. Note that the addressing needs to be enabled separately
+ * Otherwise leave it {@code null}. Note that the addressing needs to be enabled separately
  * for this to take effect.
  *
  * @author Kohsuke Kawaguchi
--- a/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Tube.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Tube.java	Thu Sep 24 18:26:42 2015 +0300
@@ -203,7 +203,7 @@
  *
  * <h3>VM-wide state</h3>
  * <p>
- * <tt>static</tt> is always there for you to use.
+ * {@code static} is always there for you to use.
  *
  *
  *
@@ -373,7 +373,7 @@
      * that you delegate to.
      * <p>
      * For limited number of {@link Tube}s that do not maintain any
-     * thread unsafe resource, it is allowed to simply return <tt>this</tt>
+     * thread unsafe resource, it is allowed to simply return {@code this}
      * from this method (notice that even if you are stateless, if you
      * got a delegating {@link Tube} and that one isn't stateless, you
      * still have to copy yourself.)
--- a/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/TubelineAssemblerFactory.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/TubelineAssemblerFactory.java	Thu Sep 24 18:26:42 2015 +0300
@@ -42,7 +42,7 @@
  * <p/>
  * To create a tubeline,
  * the JAX-WS runtime locates {@link TubelineAssemblerFactory}s through
- * the <tt>META-INF/services/com.sun.xml.internal.ws.api.pipe.TubelineAssemblerFactory</tt> files.
+ * the {@code META-INF/services/com.sun.xml.internal.ws.api.pipe.TubelineAssemblerFactory} files.
  * Factories found are checked to see if it supports the given binding ID one by one,
  * and the first valid {@link TubelineAssembler} returned will be used to create
  * a tubeline.
--- a/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/Container.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/Container.java	Thu Sep 24 18:26:42 2015 +0300
@@ -50,12 +50,12 @@
  * from a container, they can do the following:
  * <ol>
  *  <li>Negotiate an interface with the container and define it.
- *      (let's call it <tt>ContainerSecuritySPI</tt>.)
- *  <li>The container will implement <tt>ContainerSecuritySPI</tt>.
+ *      (let's call it {@code ContainerSecuritySPI}.)
+ *  <li>The container will implement {@code ContainerSecuritySPI}.
  *  <li>At the runtime, a security pipe gets
  *      {@link WSEndpoint} and then to {@link Container}.
- *  <li>It calls <tt>container.getSPI(ContainerSecuritySPI.class)</tt>
- *  <li>The container returns an instance of <tt>ContainerSecuritySPI</tt>.
+ *  <li>It calls {@code container.getSPI(ContainerSecuritySPI.class)}
+ *  <li>The container returns an instance of {@code ContainerSecuritySPI}.
  *  <li>The security pipe talks to the container through this SPI.
  * </ol>
  *
--- a/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/Invoker.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/Invoker.java	Thu Sep 24 18:26:42 2015 +0300
@@ -39,7 +39,7 @@
  * <p>
  * Typical host of the JAX-WS RI would want to use
  * {@link InstanceResolver#createDefault(Class)} and then
- * use <tt>{@link InstanceResolver#createInvoker()} to obtain
+ * use {@link InstanceResolver#createInvoker()} to obtain
  * the default invoker implementation.
  *
  *
--- a/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/ServerPipelineHook.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/ServerPipelineHook.java	Thu Sep 24 18:26:42 2015 +0300
@@ -63,7 +63,7 @@
      *      eventually processes messages.
      *
      * @return
-     *      The default implementation just returns <tt>tail</tt>, which means
+     *      The default implementation just returns {@code tail}, which means
      *      no additional pipe is inserted. If the implementation adds
      *      new pipes, return the new head pipe.
      */
@@ -89,7 +89,7 @@
      *      eventually processes messages.
      *
      * @return
-     *      The default implementation just returns <tt>tail</tt>, which means
+     *      The default implementation just returns {@code tail}, which means
      *      no additional pipe is inserted. If the implementation adds
      *      new pipes, return the new head pipe.
      */
--- a/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/WSEndpoint.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/WSEndpoint.java	Thu Sep 24 18:26:42 2015 +0300
@@ -473,7 +473,7 @@
      * This method works like the following:
      * <ol>
      * <li>{@link ServiceDefinition} is modeleed from the given SEI type.
-     * <li>{@link Invoker} that always serves <tt>implementationObject</tt> will be used.
+     * <li>{@link Invoker} that always serves {@code implementationObject} will be used.
      * </ol>
      * @param implType
      *      Endpoint class(not SEI). Enpoint class must have @WebService or @WebServiceProvider
@@ -521,7 +521,7 @@
      *      WSDL. Must be null if the {@code url} is null.
      * @param isTransportSynchronous
      *      If the caller knows that the returned {@link WSEndpoint} is going to be
-     *      used by a synchronous-only transport, then it may pass in <tt>true</tt>
+     *      used by a synchronous-only transport, then it may pass in {@code true}
      *      to allow the callee to perform an optimization based on that knowledge
      *      (since often synchronous version is cheaper than an asynchronous version.)
      *      This value is visible from {@link ServerTubeAssemblerContext#isSynchronous()}.
@@ -583,7 +583,7 @@
     }
 
     /**
-     * Deprecated version that assumes <tt>isTransportSynchronous==false</tt>
+     * Deprecated version that assumes {@code isTransportSynchronous==false}
      */
     @Deprecated
     public static <T> WSEndpoint<T> create(
@@ -604,7 +604,7 @@
     /**
      * The same as
      * {@link #create(Class, boolean, Invoker, QName, QName, Container, WSBinding, SDDocumentSource, Collection, EntityResolver)}
-     * except that this version takes an url of the <tt>jax-ws-catalog.xml</tt>.
+     * except that this version takes an url of the {@code jax-ws-catalog.xml}.
      *
      * @param catalogUrl
      *      if not null, an {@link EntityResolver} is created from it and used.
--- a/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/WebModule.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/WebModule.java	Thu Sep 24 18:26:42 2015 +0300
@@ -43,7 +43,7 @@
      * this URI.
      *
      * <p>
-     * This method follows the convention of the <tt>HttpServletRequest.getContextPath()</tt>,
+     * This method follows the convention of the {@code HttpServletRequest.getContextPath()},
      * and accepts strings like "http://myhost" (for web applications that are deployed
      * to the root context path), or "http://myhost/foobar" (for web applications
      * that are deployed to context path "/foobar")
--- a/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtension.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtension.java	Thu Sep 24 18:26:42 2015 +0300
@@ -135,7 +135,7 @@
  * <p>
  * The JAX-WS RI locates the implementation of {@link WSDLParserExtension}s
  * by using the standard service look up mechanism, in particular looking for
- * <tt>META-INF/services/com.sun.xml.internal.ws.api.wsdl.parser.WSDLParserExtension</tt>
+ * {@code META-INF/services/com.sun.xml.internal.ws.api.wsdl.parser.WSDLParserExtension}
  *
  *
  * <h2>TODO</h2>
--- a/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/RequestContext.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/RequestContext.java	Thu Sep 24 18:26:42 2015 +0300
@@ -169,7 +169,7 @@
      *
      * <p>
      * For outgoing messages, the transport may sends out this value.
-     * If this field is null, the transport may choose to send <tt>""</tt>
+     * If this field is null, the transport may choose to send {@code ""}
      * (quoted empty string.)
      *
      * For incoming messages, the transport will set this field.
--- a/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/Stub.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/Stub.java	Thu Sep 24 18:26:42 2015 +0300
@@ -188,7 +188,7 @@
      * @param epr                    To create a stub that sends out reference parameters
      *                               of a specific EPR, give that instance. Otherwise null.
      *                               Its address field will not be used, and that should be given
-     *                               separately as the <tt>defaultEndPointAddress</tt>.
+     *                               separately as the {@code defaultEndPointAddress}.
      */
     @Deprecated
     protected Stub(WSServiceDelegate owner, Tube master, BindingImpl binding, WSDLPort wsdlPort, EndpointAddress defaultEndPointAddress, @Nullable WSEndpointReference epr) {
@@ -205,7 +205,7 @@
      * @param epr                    To create a stub that sends out reference parameters
      *                               of a specific EPR, give that instance. Otherwise null.
      *                               Its address field will not be used, and that should be given
-     *                               separately as the <tt>defaultEndPointAddress</tt>.
+     *                               separately as the {@code defaultEndPointAddress}.
      */
     @Deprecated
     protected Stub(QName portname, WSServiceDelegate owner, Tube master, BindingImpl binding, WSDLPort wsdlPort, EndpointAddress defaultEndPointAddress, @Nullable WSEndpointReference epr) {
@@ -222,7 +222,7 @@
      * @param epr                    To create a stub that sends out reference parameters
      *                               of a specific EPR, give that instance. Otherwise null.
      *                               Its address field will not be used, and that should be given
-     *                               separately as the <tt>defaultEndPointAddress</tt>.
+     *                               separately as the {@code defaultEndPointAddress}.
      */
     protected Stub(WSPortInfo portInfo, BindingImpl binding, Tube master,EndpointAddress defaultEndPointAddress, @Nullable WSEndpointReference epr) {
          this((WSServiceDelegate) portInfo.getOwner(), master, portInfo, null, binding,portInfo.getPort(), defaultEndPointAddress, epr);
@@ -237,7 +237,7 @@
    * @param epr                    To create a stub that sends out reference parameters
    *                               of a specific EPR, give that instance. Otherwise null.
    *                               Its address field will not be used, and that should be given
-   *                               separately as the <tt>defaultEndPointAddress</tt>.
+   *                               separately as the {@code defaultEndPointAddress}.
    */
   protected Stub(WSPortInfo portInfo, BindingImpl binding, EndpointAddress defaultEndPointAddress, @Nullable WSEndpointReference epr) {
        this(portInfo,binding,null, defaultEndPointAddress,epr);
--- a/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/WSServiceDelegate.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/WSServiceDelegate.java	Thu Sep 24 18:26:42 2015 +0300
@@ -341,8 +341,8 @@
     /**
      * Parses the WSDL and builds {@link com.sun.xml.internal.ws.api.model.wsdl.WSDLModel}.
      * @param wsdlDocumentLocation
-     *      Either this or <tt>wsdl</tt> parameter must be given.
-     *      Null location means the system won't be able to resolve relative references in the WSDL,
+     *      Either this or {@code wsdl} parameter must be given.
+     *      Null location means the system won't be able to resolve relative references in the WSDL.
      */
     private WSDLModel parseWSDL(URL wsdlDocumentLocation, Source wsdlSource, Class serviceClass) {
         try {
--- a/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/ValueSetter.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/ValueSetter.java	Thu Sep 24 18:26:42 2015 +0300
@@ -57,14 +57,14 @@
      * @param obj
      *      The unmarshalled object.
      * @param args
-     *      The arguments given to the Java method invocation. If <tt>obj</tt>
+     *      The arguments given to the Java method invocation. If {@code obj}
      *      is supposed to be returned as a {@link Holder} value, a suitable
-     *      {@link Holder} is obtained from this argument list and <tt>obj</tt>
+     *      {@link Holder} is obtained from this argument list and {@code obj}
      *      is set.
      *
      * @return
-     *      if <tt>obj</tt> is supposed to be returned as a return value
-     *      from the method, this method returns <tt>obj</tt>. Otherwise null.
+     *      if {@code obj} is supposed to be returned as a return value
+     *      from the method, this method returns {@code obj}. Otherwise null.
      */
     abstract Object put(Object obj, Object[] args);
 
--- a/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/commons/xmlutil/Converter.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/commons/xmlutil/Converter.java	Thu Sep 24 18:26:42 2015 +0300
@@ -198,7 +198,7 @@
      * Wraps {@link javax.xml.stream.XMLStreamWriter} by an indentation engine if possible.
      *
      * <p>
-     * We can do this only when we have <tt>stax-utils.jar</tt> in the class path.
+     * We can do this only when we have {@code stax-utils.jar} in the class path.
      */
     private static XMLStreamWriter createIndenter(XMLStreamWriter writer) {
         try {
--- a/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/JAXWSProperties.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/JAXWSProperties.java	Thu Sep 24 18:26:42 2015 +0300
@@ -148,7 +148,7 @@
     public static final String WSENDPOINT = "com.sun.xml.internal.ws.api.server.WSEndpoint";
 
     /**
-     * Gets the <tt>wsa:To</tt> header.
+     * Gets the {@code wsa:To} header.
      *
      * The propery value is available on incoming SOAP message. The type of the value
      * is {@link WSEndpointReference}.
@@ -160,7 +160,7 @@
     public static final String ADDRESSING_TO = "com.sun.xml.internal.ws.api.addressing.to";
 
     /**
-     * Gets the <tt>wsa:From</tt> header.
+     * Gets the {@code wsa:From} header.
      *
      * The propery value is available on incoming SOAP message. The type of the value
      * is {@link WSEndpointReference}.
@@ -172,7 +172,7 @@
     public static final String ADDRESSING_FROM = "com.sun.xml.internal.ws.api.addressing.from";
 
     /**
-     * Gets the <tt>wsa:Action</tt> header value.
+     * Gets the {@code wsa:Action} header value.
      *
      * The propery value is available on incoming SOAP message. The type of the value
      * is {@link String}.
@@ -184,7 +184,7 @@
     public static final String ADDRESSING_ACTION = "com.sun.xml.internal.ws.api.addressing.action";
 
     /**
-     * Gets the <tt>wsa:MessageID</tt> header value.
+     * Gets the {@code wsa:MessageID} header value.
      *
      * The propery value is available on incoming SOAP message. The type of the value
      * is {@link String}.
--- a/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/AbstractHeaderImpl.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/AbstractHeaderImpl.java	Thu Sep 24 18:26:42 2015 +0300
@@ -128,7 +128,7 @@
     }
 
     /**
-     * Parses a string that looks like <tt>xs:boolean</tt> into boolean.
+     * Parses a string that looks like {@code xs:boolean} into boolean.
      *
      * This method assumes that the whilespace normalization has already taken place.
      */
--- a/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/jaxb/JAXBMessage.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/jaxb/JAXBMessage.java	Thu Sep 24 18:26:42 2015 +0300
@@ -186,7 +186,7 @@
      * Creates a {@link Message} backed by a JAXB bean.
      *
      * @param bridge
-     *      Specify the payload tag name and how <tt>jaxbObject</tt> is bound.
+     *      Specify the payload tag name and how {@code jaxbObject} is bound.
      * @param jaxbObject
      */
     public static Message create(XMLBridge bridge, Object jaxbObject, SOAPVersion soapVer) {
--- a/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/ParameterImpl.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/ParameterImpl.java	Thu Sep 24 18:26:42 2015 +0300
@@ -161,7 +161,7 @@
     }
 
     /**
-     * @return true if <tt>this instanceof {@link WrapperParameter}</tt>.
+     * @return true if {@code this instanceof} {@link WrapperParameter}.
      */
     public boolean isWrapperStyle() {
         return false;
@@ -223,7 +223,7 @@
      * <p>
      * {@link JavaMethodImpl#getResponseParameters()} is guaranteed to have
      * at most one such {@link ParameterImpl}. Note that there coule be none,
-     * in which case the method returns <tt>void</tt>.
+     * in which case the method returns {@code void}.
      */
     public boolean isResponse() {
         return index == -1;
--- a/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/PolicyUtils.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/PolicyUtils.java	Thu Sep 24 18:26:42 2015 +0300
@@ -401,7 +401,7 @@
          * <p/>
          * <p> This method transforms the name of the given service class into a
          * provider-configuration filename as described above and then uses the
-         * <tt>getResources</tt> method of the given class loader to find all
+         * {@code getResources} method of the given class loader to find all
          * available files with that name.  These files are then read and parsed to
          * produce a list of provider-class names. Eventually each provider class is
          * instantiated and array of those instances is returned.
@@ -412,7 +412,7 @@
          *
          * @param serviceClass The service's abstract service class. Must not be {@code null}.
          * @param loader  The class loader to be used to load provider-configuration files
-         *                and instantiate provider classes, or <tt>null</tt> if the system
+         *                and instantiate provider classes, or {@code null} if the system
          *                class loader (or, failing that the bootstrap class loader) is to
          *                be used
          * @throws NullPointerException in case {@code service} input parameter is {@code null}.
--- a/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/ServiceFinder.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/ServiceFinder.java	Thu Sep 24 18:26:42 2015 +0300
@@ -66,12 +66,12 @@
  * zero-argument constructor so that they may be instantiated during lookup.
  * <p/>
  * <p> A service provider identifies itself by placing a provider-configuration
- * file in the resource directory <tt>META-INF/services</tt>.  The file's name
+ * file in the resource directory {@code META-INF/services}.  The file's name
  * should consist of the fully-qualified name of the abstract service class.
  * The file should contain a list of fully-qualified concrete provider-class
  * names, one per line.  Space and tab characters surrounding each name, as
- * well as blank lines, are ignored.  The comment character is <tt>'#'</tt>
- * (<tt>0x23</tt>); on each line all characters following the first comment
+ * well as blank lines, are ignored.  The comment character is {@code '#'}
+ * ({@code 0x23}); on each line all characters following the first comment
  * character are ignored.  The file must be encoded in UTF-8.
  * <p/>
  * <p> If a particular concrete provider class is named in more than one
@@ -83,20 +83,20 @@
  * note that this is not necessarily the class loader that found the file.
  * <p/>
  * <p> <b>Example:</b> Suppose we have a service class named
- * <tt>java.io.spi.CharCodec</tt>.  It has two abstract methods:
+ * {@code java.io.spi.CharCodec}.  It has two abstract methods:
  * <p/>
  * <pre>
  *   public abstract CharEncoder getEncoder(String encodingName);
  *   public abstract CharDecoder getDecoder(String encodingName);
  * </pre>
  * <p/>
- * Each method returns an appropriate object or <tt>null</tt> if it cannot
- * translate the given encoding.  Typical <tt>CharCodec</tt> providers will
+ * Each method returns an appropriate object or {@code null} if it cannot
+ * translate the given encoding.  Typical {@code CharCodec} providers will
  * support more than one encoding.
  * <p/>
- * <p> If <tt>sun.io.StandardCodec</tt> is a provider of the <tt>CharCodec</tt>
+ * <p> If {@code sun.io.StandardCodec} is a provider of the {@code CharCodec}
  * service then its jar file would contain the file
- * <tt>META-INF/services/java.io.spi.CharCodec</tt>.  This file would contain
+ * {@code META-INF/services/java.io.spi.CharCodec}.  This file would contain
  * the single line:
  * <p/>
  * <pre>
@@ -139,7 +139,7 @@
      * <p/>
      * <p> This method transforms the name of the given service class into a
      * provider-configuration filename as described above and then uses the
-     * <tt>getResources</tt> method of the given class loader to find all
+     * {@code getResources} method of the given class loader to find all
      * available files with that name.  These files are then read and parsed to
      * produce a list of provider-class names.  The iterator that is returned
      * uses the given class loader to lookup and then instantiate each element
@@ -151,7 +151,7 @@
      *
      * @param service The service's abstract service class
      * @param loader  The class loader to be used to load provider-configuration files
-     *                and instantiate provider classes, or <tt>null</tt> if the system
+     *                and instantiate provider classes, or {@code null} if the system
      *                class loader (or, failing that the bootstrap class loader) is to
      *                be used
      * @throws ServiceConfigurationError If a provider-configuration file violates the specified format
@@ -193,9 +193,9 @@
     /**
      * Returns discovered objects incrementally.
      *
-     * @return An <tt>Iterator</tt> that yields provider objects for the given
+     * @return An {@code Iterator} that yields provider objects for the given
      *         service, in some arbitrary order.  The iterator will throw a
-     *         <tt>ServiceConfigurationError</tt> if a provider-configuration
+     *         {@code ServiceConfigurationError} if a provider-configuration
      *         file violates the specified format or if a provider class cannot
      *         be found and instantiated.
      */
@@ -284,8 +284,8 @@
      * @param u        The URL naming the configuration file to be parsed
      * @param returned A Set containing the names of provider classes that have already
      *                 been returned.  This set will be updated to contain the names
-     *                 that will be yielded from the returned <tt>Iterator</tt>.
-     * @return A (possibly empty) <tt>Iterator</tt> that will yield the
+     *                 that will be yielded from the returned {@code Iterator}.
+     * @return A (possibly empty) {@code Iterator} that will yield the
      *         provider-class names in the given configuration file that are
      *         not yet members of the returned set
      * @throws ServiceConfigurationError If an I/O error occurs while reading from the given URL, or
--- a/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicySourceModel.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicySourceModel.java	Thu Sep 24 18:26:42 2015 +0300
@@ -299,7 +299,7 @@
      * Every source model that references other policies must be expanded before it can be translated into a Policy objects. See
      * {@link #expand(PolicySourceModelContext)} and {@link #isExpanded()} for more details.
      *
-     * @return {@code true} or {code false} depending on whether this policy source model contains references to another policy source models.
+     * @return {@code true} or {@code false} depending on whether this policy source model contains references to another policy source models.
      */
     public boolean containsPolicyReferences() {
         return !references.isEmpty();
--- a/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/EndpointValueSetter.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/EndpointValueSetter.java	Thu Sep 24 18:26:42 2015 +0300
@@ -53,10 +53,10 @@
      * @param obj
      *      The unmarshalled object.
      * @param args
-     *      The arguments that need to be given to the Java method invocation. If <tt>obj</tt>
-     *      is supposed to be returned as a {@link Holder} value, a suitable
-     *      {@link Holder} is obtained from this argument list and <tt>obj</tt>
-     *      is set.
+     *      The arguments that need to be given to the Java method invocation.
+     *      If {@code obj} is supposed to be returned as a {@link Holder}
+     *      value, a suitable {@link Holder} is obtained from
+     *      this argument list and {@code obj} is set.
      *
      */
     abstract void put(Object obj, Object[] args);
--- a/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/BindingContext.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/BindingContext.java	Thu Sep 24 18:26:42 2015 +0300
@@ -257,7 +257,7 @@
 
     /**
      * The property that you can specify to {@link JAXBContext#newInstance}
-     * to allow unmarshaller to honor <tt>xsi:nil</tt> anywhere, even if they are
+     * to allow unmarshaller to honor {@code xsi:nil} anywhere, even if they are
      * not specifically allowed by the schema.
      *
      * @since 2.1.3
--- a/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/BindingHelper.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/BindingHelper.java	Thu Sep 24 18:26:42 2015 +0300
@@ -69,7 +69,7 @@
      * Accordingly, this method may return an identifier that collides with reserved words.
      *
      * <p>
-     * Use <tt>JJavaName.isJavaIdentifier(String)</tt> to check for such collision.
+     * Use {@code JJavaName.isJavaIdentifier(String)} to check for such collision.
      *
      * @return
      *      Typically, this method returns "nameLikeThis".
@@ -111,17 +111,17 @@
      *
      * <p>
      * For example, given the following
-     * <pre><xmp>
+     * <pre>{@code
      * interface Foo<T> extends List<List<T>> {}
      * interface Bar extends Foo<String> {}
-     * </xmp></pre>
+     * }</pre>
      * This method works like this:
-     * <pre><xmp>
+     * <pre>{@code
      * getBaseClass( Bar, List ) = List<List<String>
      * getBaseClass( Bar, Foo  ) = Foo<String>
      * getBaseClass( Foo<? extends Number>, Collection ) = Collection<List<? extends Number>>
      * getBaseClass( ArrayList<? extends BigInteger>, List ) = List<? extends BigInteger>
-     * </xmp></pre>
+     * }</pre>
      *
      * @param type
      *      The type that derives from {@code baseType}
--- a/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/WSHTTPConnection.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/WSHTTPConnection.java	Thu Sep 24 18:26:42 2015 +0300
@@ -87,7 +87,7 @@
      * <p>
      * This parameter is usually exposed to {@link WebServiceContext}
      * as {@link Packet#OUTBOUND_TRANSPORT_HEADERS}, and thus it
-     * should ignore <tt>Content-Type</tt> and <tt>Content-Length</tt> headers.
+     * should ignore {@code Content-Type} and {@code Content-Length} headers.
      *
      * @param headers
      *      See {@link HttpURLConnection#getHeaderFields()} for the format.
@@ -105,7 +105,7 @@
     public abstract void setResponseHeader(String key, List<String> value);
 
     /**
-     * Sets the <tt>"Content-Type"</tt> header.
+     * Sets the {@code "Content-Type"} header.
      *
      * <p>
      * If the Content-Type header has already been set, this method will overwrite
@@ -116,8 +116,8 @@
      * may be invoked in any arbitrary order.
      *
      * @param value
-     *      strings like <tt>"application/xml; charset=UTF-8"</tt> or
-     *      <tt>"image/jpeg"</tt>.
+     *      strings like {@code "application/xml; charset=UTF-8"} or
+     *      {@code "image/jpeg"}.
      */
     public abstract void setContentTypeResponseHeader(@NotNull String value);
 
--- a/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerAdapter.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerAdapter.java	Thu Sep 24 18:26:42 2015 +0300
@@ -69,7 +69,7 @@
     }
 
     /**
-     * Gets the name of the endpoint as given in the <tt>sun-jaxws.xml</tt>
+     * Gets the name of the endpoint as given in the {@code sun-jaxws.xml}
      * deployment descriptor.
      */
     public String getName() {
--- a/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/QNameMap.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/QNameMap.java	Thu Sep 24 18:26:42 2015 +0300
@@ -128,12 +128,12 @@
 
     /**
      * Returns the value to which the specified keys are mapped in this QNameMap,
-     * or <tt>null</tt> if the map contains no mapping for this key.
+     * or {@code null} if the map contains no mapping for this key.
      *
      * @param   nsUri the namespaceUri key whose associated value is to be returned.
      * @param   localPart the localPart key whose associated value is to be returned.
      * @return  the value to which this map maps the specified set of keya, or
-     *          <tt>null</tt> if the map contains no mapping for this set of keys.
+     *          {@code null} if the map contains no mapping for this set of keys.
      * @see #put(String,String, Object)
      */
     public V get( @NotNull String nsUri, String localPart ) {
--- a/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/ServiceFinder.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/ServiceFinder.java	Thu Sep 24 18:26:42 2015 +0300
@@ -76,12 +76,12 @@
  * zero-argument constructor so that they may be instantiated during lookup.
  * <p/>
  * <p> A service provider identifies itself by placing a provider-configuration
- * file in the resource directory <tt>META-INF/services</tt>.  The file's name
+ * file in the resource directory {@code META-INF/services}.  The file's name
  * should consist of the fully-qualified name of the abstract service class.
  * The file should contain a list of fully-qualified concrete provider-class
  * names, one per line.  Space and tab characters surrounding each name, as
- * well as blank lines, are ignored.  The comment character is <tt>'#'</tt>
- * (<tt>0x23</tt>); on each line all characters following the first comment
+ * well as blank lines, are ignored.  The comment character is {@code '#'}
+ * ({@code 0x23}); on each line all characters following the first comment
  * character are ignored.  The file must be encoded in UTF-8.
  * <p/>
  * <p> If a particular concrete provider class is named in more than one
@@ -93,20 +93,20 @@
  * note that this is not necessarily the class loader that found the file.
  * <p/>
  * <p> <b>Example:</b> Suppose we have a service class named
- * <tt>java.io.spi.CharCodec</tt>.  It has two abstract methods:
+ * {@code java.io.spi.CharCodec}.  It has two abstract methods:
  * <p/>
  * <pre>
  *   public abstract CharEncoder getEncoder(String encodingName);
  *   public abstract CharDecoder getDecoder(String encodingName);
  * </pre>
  * <p/>
- * Each method returns an appropriate object or <tt>null</tt> if it cannot
- * translate the given encoding.  Typical <tt>CharCodec</tt> providers will
+ * Each method returns an appropriate object or {@code null} if it cannot
+ * translate the given encoding.  Typical {@code CharCodec} providers will
  * support more than one encoding.
  * <p/>
- * <p> If <tt>sun.io.StandardCodec</tt> is a provider of the <tt>CharCodec</tt>
+ * <p> If {@code sun.io.StandardCodec} is a provider of the {@code CharCodec}
  * service then its jar file would contain the file
- * <tt>META-INF/services/java.io.spi.CharCodec</tt>.  This file would contain
+ * {@code META-INF/services/java.io.spi.CharCodec}.  This file would contain
  * the single line:
  * <p/>
  * <pre>
@@ -169,7 +169,7 @@
      * <p/>
      * <p> This method transforms the name of the given service class into a
      * provider-configuration filename as described above and then uses the
-     * <tt>getResources</tt> method of the given class loader to find all
+     * {@code getResources} method of the given class loader to find all
      * available files with that name.  These files are then read and parsed to
      * produce a list of provider-class names.  The iterator that is returned
      * uses the given class loader to lookup and then instantiate each element
@@ -181,7 +181,7 @@
      *
      * @param service The service's abstract service class
      * @param loader  The class loader to be used to load provider-configuration files
-     *                and instantiate provider classes, or <tt>null</tt> if the system
+     *                and instantiate provider classes, or {@code null} if the system
      *                class loader (or, failing that the bootstrap class loader) is to
      *                be used
      * @throws ServiceConfigurationError If a provider-configuration file violates the specified format
@@ -227,9 +227,9 @@
     /**
      * Returns discovered objects incrementally.
      *
-     * @return An <tt>Iterator</tt> that yields provider objects for the given
+     * @return An {@code Iterator} that yields provider objects for the given
      *         service, in some arbitrary order.  The iterator will throw a
-     *         <tt>ServiceConfigurationError</tt> if a provider-configuration
+     *         {@code ServiceConfigurationError} if a provider-configuration
      *         file violates the specified format or if a provider class cannot
      *         be found and instantiated.
      */
@@ -319,8 +319,8 @@
      * @param u        The URL naming the configuration file to be parsed
      * @param returned A Set containing the names of provider classes that have already
      *                 been returned.  This set will be updated to contain the names
-     *                 that will be yielded from the returned <tt>Iterator</tt>.
-     * @return A (possibly empty) <tt>Iterator</tt> that will yield the
+     *                 that will be yielded from the returned {@code Iterator}.
+     * @return A (possibly empty) {@code Iterator} that will yield the
      *         provider-class names in the given configuration file that are
      *         not yet members of the returned set
      * @throws ServiceConfigurationError If an I/O error occurs while reading from the given URL, or
--- a/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/pipe/DumpTube.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/pipe/DumpTube.java	Thu Sep 24 18:26:42 2015 +0300
@@ -119,7 +119,7 @@
      * Wraps {@link XMLStreamWriter} by an indentation engine if possible.
      *
      * <p>
-     * We can do this only when we have <tt>stax-utils.jar</tt> in the classpath.
+     * We can do this only when we have {@code stax-utils.jar} in the classpath.
      */
     private XMLStreamWriter createIndenter(XMLStreamWriter writer) {
         try {
--- a/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/RuntimeWSDLParser.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/RuntimeWSDLParser.java	Thu Sep 24 18:26:42 2015 +0300
@@ -139,7 +139,7 @@
      * then as last option, if the wsdlLoc has no '?wsdl' as query parameter then it is tried by appending '?wsdl'.
      *
      * @param wsdlLoc
-     *      Either this or <tt>wsdl</tt> parameter must be given.
+     *      Either this or {@code wsdl} parameter must be given.
      *      Null location means the system won't be able to resolve relative references in the WSDL,
      */
     public static WSDLModel parse(@Nullable URL wsdlLoc, @NotNull Source wsdlSource, @NotNull EntityResolver resolver,
@@ -154,7 +154,7 @@
      * then as last option, if the wsdlLoc has no '?wsdl' as query parameter then it is tried by appending '?wsdl'.
      *
      * @param wsdlLoc
-     *      Either this or <tt>wsdl</tt> parameter must be given.
+     *      Either this or {@code wsdl} parameter must be given.
      *      Null location means the system won't be able to resolve relative references in the WSDL,
      */
     public static WSDLModel parse(@Nullable URL wsdlLoc, @NotNull Source wsdlSource, @NotNull EntityResolver resolver,
@@ -169,7 +169,7 @@
      * then as last option, if the wsdlLoc has no '?wsdl' as query parameter then it is tried by appending '?wsdl'.
      *
      * @param wsdlLoc
-     *      Either this or <tt>wsdl</tt> parameter must be given.
+     *      Either this or {@code wsdl} parameter must be given.
      *      Null location means the system won't be able to resolve relative references in the WSDL,
      */
     public static WSDLModel parse(@Nullable URL wsdlLoc, @NotNull Source wsdlSource, @NotNull EntityResolver resolver,
@@ -184,7 +184,7 @@
      * then as last option, if the wsdlLoc has no '?wsdl' as query parameter then it is tried by appending '?wsdl'.
      *
      * @param wsdlLoc
-     *      Either this or <tt>wsdl</tt> parameter must be given.
+     *      Either this or {@code wsdl} parameter must be given.
      *      Null location means the system won't be able to resolve relative references in the WSDL,
      */
     public static WSDLModel parse(@Nullable URL wsdlLoc, @NotNull Source wsdlSource, @NotNull EntityResolver resolver,
@@ -200,7 +200,7 @@
      * then as last option, if the wsdlLoc has no '?wsdl' as query parameter then it is tried by appending '?wsdl'.
      *
      * @param wsdlLoc
-     *      Either this or <tt>wsdl</tt> parameter must be given.
+     *      Either this or {@code wsdl} parameter must be given.
      *      Null location means the system won't be able to resolve relative references in the WSDL,
      */
     public static WSDLModel parse(@Nullable URL wsdlLoc, @NotNull Source wsdlSource, @NotNull EntityResolver resolver,
--- a/src/java.xml.ws/share/classes/javax/xml/soap/SOAPException.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.ws/share/classes/javax/xml/soap/SOAPException.java	Thu Sep 24 18:26:42 2015 +0300
@@ -141,7 +141,7 @@
      * @param  cause the {@code Throwable} object that caused this
      *         {@code SOAPException} object to be thrown.  The value of this
      *         parameter is saved for later retrieval by the
-     *         {@link #getCause()} method.  A <tt>null</tt> value is
+     *         {@link #getCause()} method.  A {@code null} value is
      *         permitted and indicates that the cause is nonexistent or
      *         unknown.
      * @return  a reference to this {@code SOAPException} instance
--- a/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceException.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceException.java	Thu Sep 24 18:26:42 2015 +0300
@@ -62,13 +62,14 @@
   }
 
   /** Constructs a new WebServiceException with the specified cause
-   *  and a detail message of <tt>(cause==null ? null :
-   *  cause.toString())</tt> (which typically contains the
-   *  class and detail message of <tt>cause</tt>).
+   *  and a detail message of
+   *  {@code (cause==null ? null : cause.toString())}
+   *  (which typically contains the
+   *  class and detail message of {@code cause}).
    *
    *  @param cause   The cause which is saved for the later
    *                 retrieval throw by the getCause method.
-   *                 (A <tt>null</tt> value is permitted, and
+   *                 (A {@code null} value is permitted, and
    *                 indicates that the cause is nonexistent or
      *               unknown.)
   **/
--- a/src/java.xml.ws/share/classes/javax/xml/ws/spi/http/HttpExchange.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/java.xml.ws/share/classes/javax/xml/ws/spi/http/HttpExchange.java	Thu Sep 24 18:26:42 2015 +0300
@@ -259,7 +259,7 @@
      *         It is the path that comes
      *         after the web service path but before the query string in the
      *         request URI
-     *         <tt>null</tt> if there is no extra path in the request URI
+     *         {@code null} if there is no extra path in the request URI
      */
     public abstract String getPathInfo();
 
@@ -271,7 +271,7 @@
      * This can be used for {@link MessageContext#QUERY_STRING}
      *
      * @return undecoded query string of request URI, or
-     *         <tt>null</tt> if the request URI doesn't have one
+     *         {@code null} if the request URI doesn't have one
      */
     public abstract String getQueryString();
 
@@ -292,7 +292,7 @@
      * be exposed using {@link #REQUEST_X509CERTIFICATE}
      *
      * @param name attribute name
-     * @return the attribute value, or <tt>null</tt> if the attribute doesn't
+     * @return the attribute value, or {@code null} if the attribute doesn't
      *         exist
      */
     public abstract Object getAttribute(String name);
@@ -311,7 +311,7 @@
      * user for this {@code HttpExchange}.
      *
      * @return Principal for an authenticated user, or
-     *         <tt>null</tt> if not authenticated
+     *         {@code null} if not authenticated
      */
     public abstract Principal getUserPrincipal();
 
@@ -320,7 +320,7 @@
      * logical "role".
      *
      * @param role specifies the name of the role
-     * @return <tt>true</tt> if the user making this request belongs to a
+     * @return {@code true} if the user making this request belongs to a
      *         given role
      */
     public abstract boolean isUserInRole(String role);
--- a/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JClass.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JClass.java	Thu Sep 24 18:26:42 2015 +0300
@@ -51,7 +51,7 @@
      * @return
      *  name of this class, without any qualification.
      *  For example, this method returns "String" for
-     *  <code>java.lang.String</code>.
+     *  {@code java.lang.String}.
      */
     abstract public String name();
 
@@ -62,7 +62,7 @@
     abstract public JPackage _package();
 
     /**
-     * Returns the class in which this class is nested, or <tt>null</tt> if
+     * Returns the class in which this class is nested, or {@code null} if
      * this is a top-level class.
      */
     public JClass outer() {
@@ -102,7 +102,7 @@
      *
      * <p>
      * For example, if this {@link JClass} represents
-     * <code>Set&lt;T></code>, this method returns an array
+     * {@code Set<T>}, this method returns an array
      * that contains single {@link JTypeVar} for 'T'.
      */
     public JTypeVar[] typeParams() {
@@ -134,7 +134,7 @@
     /**
      * @deprecated calling this method from {@link JClass}
      * would be meaningless, since it's always guaranteed to
-     * return <tt>this</tt>.
+     * return {@code this}.
      */
     public JClass boxify() { return this; }
 
@@ -184,17 +184,17 @@
      *
      * <p>
      * For example, given the following
-     * <pre><xmp>
+     * <pre>{@code
      * interface Foo<T> extends List<List<T>> {}
      * interface Bar extends Foo<String> {}
-     * </xmp></pre>
+     * }</pre>
      * This method works like this:
-     * <pre><xmp>
+     * <pre>{@code
      * getBaseClass( Bar, List ) = List<List<String>
      * getBaseClass( Bar, Foo  ) = Foo<String>
      * getBaseClass( Foo<? extends Number>, Collection ) = Collection<List<? extends Number>>
      * getBaseClass( ArrayList<? extends BigInteger>, List ) = List<? extends BigInteger>
-     * </xmp></pre>
+     * }</pre>
      *
      * @param baseType
      *      The class whose parameterization we are interested in.
@@ -241,7 +241,7 @@
      * a type argument.
      *
      * <p>
-     * <code>.narrow(X)</code> builds <code>Set&lt;X></code> from <code>Set</code>.
+     * {@code .narrow(X)} builds {@code Set<X>} from {@code Set}.
      */
     public JClass narrow( Class<?> clazz ) {
         return narrow(owner().ref(clazz));
@@ -259,7 +259,7 @@
      * a type argument.
      *
      * <p>
-     * <code>.narrow(X)</code> builds <code>Set&lt;X></code> from <code>Set</code>.
+     * {@code .narrow(X)} builds {@code Set<X>} from {@code Set}.
      */
     public JClass narrow( JClass clazz ) {
         return new JNarrowedClass(this,clazz);
@@ -307,7 +307,7 @@
      * For example, when this class is Map&lt;String,Map&lt;V>>,
      * (where V then doing
      * substituteParams( V, Integer ) returns a {@link JClass}
-     * for <code>Map&lt;String,Map&lt;Integer>></code>.
+     * for {@code Map<String,Map<Integer>>}.
      *
      * <p>
      * This method needs to work recursively.
--- a/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JClassContainer.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JClassContainer.java	Thu Sep 24 18:26:42 2015 +0300
@@ -129,7 +129,7 @@
      * Gets the nearest package parent.
      *
      * <p>
-     * If <tt>this.isPackage()</tt>, then return <tt>this</tt>.
+     * If {@code this.isPackage()}, then return {@code this}.
      */
     public JPackage getPackage();
 
--- a/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JCodeModel.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JCodeModel.java	Thu Sep 24 18:26:42 2015 +0300
@@ -59,7 +59,7 @@
  *
  * <p>
  * Every CodeModel node is always owned by one {@link JCodeModel} object
- * at any given time (which can be often accesesd by the <tt>owner()</tt> method.)
+ * at any given time (which can be often accesesd by the {@code owner()} method.)
  *
  * As such, when you generate Java code, most of the operation works
  * in a top-down fashion. For example, you create a class from {@link JCodeModel},
@@ -635,7 +635,7 @@
 
     /**
      * Conversion from primitive type {@link Class} (such as {@link Integer#TYPE}
-     * to its boxed type (such as <tt>Integer.class</tt>)
+     * to its boxed type (such as {@code Integer.class})
      */
     public static final Map<Class<?>,Class<?>> primitiveToBox;
     /**
--- a/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JConditional.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JConditional.java	Thu Sep 24 18:26:42 2015 +0300
@@ -76,7 +76,7 @@
     }
 
     /**
-     * Creates <tt>... else if(...) ...</tt> code.
+     * Creates {@code ... else if(...) ...} code.
      */
     public JConditional _elseif(JExpression boolExp) {
         return _else()._if(boolExp);
--- a/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JExpression.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JExpression.java	Thu Sep 24 18:26:42 2015 +0300
@@ -39,7 +39,7 @@
  * which returns a complicated expression (by often taking other {@link JExpression}s
  * as parameters.
  * For example, you can build "5+2" by
- * <tt>JExpr.lit(5).add(JExpr.lit(2))</tt>
+ * {@code JExpr.lit(5).add(JExpr.lit(2))}
  */
 public interface JExpression extends JGenerable {
     /**
--- a/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JExpressionImpl.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JExpressionImpl.java	Thu Sep 24 18:26:42 2015 +0300
@@ -40,7 +40,7 @@
     }
 
     /**
-     * Logical not <tt>'!x'</tt>.
+     * Logical not {@code '!x'}.
      */
     public final JExpression not() {
         return JOp.not(this);
--- a/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JOp.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JOp.java	Thu Sep 24 18:26:42 2015 +0300
@@ -77,7 +77,7 @@
     }
 
     /**
-     * Logical not <tt>'!x'</tt>.
+     * Logical not {@code '!x'}.
      */
     public static JExpression not(JExpression e) {
         if (e == JExpr.TRUE) return JExpr.FALSE;
--- a/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JPrimitiveType.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JPrimitiveType.java	Thu Sep 24 18:26:42 2015 +0300
@@ -81,7 +81,7 @@
     /**
      * @deprecated calling this method from {@link JPrimitiveType}
      * would be meaningless, since it's always guaranteed to
-     * return <tt>this</tt>.
+     * return {@code this}.
      */
     public JType unboxify() {
         return this;
--- a/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JType.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JType.java	Thu Sep 24 18:26:42 2015 +0300
@@ -116,7 +116,8 @@
     }
 
     /**
-     * If this class is a primitive type, return the boxed class. Otherwise return <tt>this</tt>.
+     * If this class is a primitive type, return the boxed class.
+     * Otherwise return {@code this}.
      *
      * <p>
      * For example, for "int", this method returns "java.lang.Integer".
@@ -125,7 +126,7 @@
 
     /**
      * If this class is a wrapper type for a primitive, return the primitive type.
-     * Otherwise return <tt>this</tt>.
+     * Otherwise return {@code this}.
      *
      * <p>
      * For example, for "java.lang.Integer", this method returns "int".
--- a/src/jdk.xml.bind/share/classes/com/sun/istack/internal/tools/ParallelWorldClassLoader.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/jdk.xml.bind/share/classes/com/sun/istack/internal/tools/ParallelWorldClassLoader.java	Thu Sep 24 18:26:42 2015 +0300
@@ -57,9 +57,9 @@
  *     +- X.class
  * </pre>
  * <p>
- * {@link ParallelWorldClassLoader}("foo/") would load <tt>X.class<tt> from
- * <tt>/foo/X.class</tt> (note that X is defined in the root package, not
- * <tt>foo.X</tt>.
+ * {@link ParallelWorldClassLoader}("foo/") would load {@code X.class} from
+ * {@code /foo/X.class} (note that X is defined in the root package, not
+ * {@code foo.X}.
  *
  * <p>
  * This can be combined with  {@link MaskingClassLoader} to mask classes which are loaded by the parent
@@ -77,11 +77,13 @@
  *        +- X.class
  * </pre>
  * <p>
- * {@link ParallelWorldClassLoader}(MaskingClassLoader.class.getClassLoader()) would load <tt>foo.X.class<tt> from
- * <tt>/bar/foo.X.class</tt> not the <tt>foo.X.class<tt> in the publicly visible place in the jar file, thus
- * masking the parent classLoader from loading the class from  <tt>foo.X.class<tt>
+ * {@link ParallelWorldClassLoader}(MaskingClassLoader.class.getClassLoader())
+ * would load {@code foo.X.class}  from
+ * {@code /bar/foo.X.class} not the {@code foo.X.class}
+ * in the publicly visible place in the jar file, thus
+ * masking the parent classLoader from loading the class from {@code foo.X.class}
  * (note that X is defined in the  package foo, not
- * <tt>bar.foo.X</tt>.
+ * {@code bar.foo.X}.
  *
  * @author Kohsuke Kawaguchi
  */
--- a/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/SchemaGenerator.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/SchemaGenerator.java	Thu Sep 24 18:26:42 2015 +0300
@@ -182,8 +182,8 @@
     }
 
     /**
-     * Computes the file system path of <tt>jaxb-api.jar</tt> so that
-     * Annotation Processing will see them in the <tt>-cp</tt> option.
+     * Computes the file system path of {@code jaxb-api.jar} so that
+     * Annotation Processing will see them in the {@code -cp} option.
      *
      * <p>
      * In Java, you can't do this reliably (for that matter there's no guarantee
--- a/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCInterleaveFilter.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCInterleaveFilter.java	Thu Sep 24 18:26:42 2015 +0300
@@ -74,14 +74,14 @@
 //
     /**
      * Receiver that is being locked and therefore receives all the events.
-     * <pre><xmp>
+     * <pre>{@code
      * <interleave>
      *   <element name="foo"/>
      *   <element name="bar">
      *     <element name="foo"/>
      *   </element>
      * </interlaeve>
-     * </xmp></pre>
+     * }</pre>
      * When processing inside the bar element, this receiver is
      * "locked" so that it can correctly receive its child foo element.
      */
--- a/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCRuntime.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCRuntime.java	Thu Sep 24 18:26:42 2015 +0300
@@ -165,28 +165,28 @@
      * Whitespace handling is a tricky business. Consider the following
      * schema fragment:
      *
-     * <xmp>
+     * <pre>{@code
      * <element name="foo">
      *   <choice>
      *     <element name="bar"><empty/></element>
      *     <text/>
      *   </choice>
      * </element>
-     * </xmp>
+     * }</pre>
      *
      * Assume we hit the following instance:
-     * <xmp>
+     * <pre>{@code
      * <foo> <bar/></foo>
-     * </xmp>
+     * }</pre>
      *
      * Then this first space needs to be ignored (for otherwise, we will
      * end up treating this space as the match to &lt;text/> and won't
      * be able to process &lt;bar>.)
      *
      * Now assume the following instance:
-     * <xmp>
+     * <pre>{@code
      * <foo/>
-     * </xmp>
+     * }</pre>
      *
      * This time, we need to treat this empty string as a text, for
      * otherwise we won't be able to accept this instance.
@@ -483,16 +483,16 @@
      * the top of the effective bindings. Because of the
      * timing difference between the startPrefixMapping method
      * and the execution of the corresponding actions,
-     * this value can be different from <code>namespaces.size()</code>.
+     * this value can be different from {@code namespaces.size()}.
      * <p>
      * For example, consider the following schema:
-     * <pre><xmp>
+     * <pre>{@code
      *  <oneOrMore>
      *   <element name="foo"><empty/></element>
      *  </oneOrMore>
      *  code fragment X
      *  <element name="bob"/>
-     * </xmp></pre>
+     * }</pre>
      * Code fragment X is executed after we see a startElement event,
      * but at this time the namespaces variable already include new
      * namespace bindings declared on "bob".
--- a/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/Options.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/Options.java	Thu Sep 24 18:26:42 2015 +0300
@@ -145,8 +145,8 @@
 
     /**
      * this switch determines how carefully the compiler will follow
-     * the compatibility rules in the spec. Either <code>STRICT</code>
-     * or <code>EXTENSION</code>.
+     * the compatibility rules in the spec. Either {@code STRICT}
+     * or {@code EXTENSION}.
      */
     public int compatibilityMode = STRICT;
 
@@ -187,7 +187,7 @@
     public EntityResolver entityResolver = null;
 
     /**
-     * Type of input schema language. One of the <code>SCHEMA_XXX</code>
+     * Type of input schema language. One of the {@code SCHEMA_XXX}
      * constants.
      */
     private Language schemaLanguage = null;
@@ -466,7 +466,7 @@
 
 
     /**
-     * Parses an option <code>args[i]</code> and return
+     * Parses an option {@code args[i]} and return
      * the number of tokens consumed.
      *
      * @return
@@ -842,7 +842,7 @@
     }
 
     /**
-     * Finds the <tt>META-INF/sun-jaxb.episode</tt> file to add as a binding customization.
+     * Finds the {@code META-INF/sun-jaxb.episode} file to add as a binding customization.
      */
     public void scanEpisodeFile(File jar) throws BadCommandLineException {
         try {
--- a/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/JavaCompiler.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/JavaCompiler.java	Thu Sep 24 18:26:42 2015 +0300
@@ -59,10 +59,10 @@
      * @param additionalElementDecls
      *      Add element declarations for the specified element names to
      *      the XML types mapped from the corresponding {@link Reference}s.
-     *      Those {@link Reference}s must be included in the <tt>rootTypes</tt> parameter.
+     *      Those {@link Reference}s must be included in the {@code rootTypes} parameter.
      *      In this map, a {@link Reference} can be null, in which case the element name is
      *      declared to have an empty complex type.
-     *      (&lt;xs:element name='foo'>&lt;xs:complexType/>&lt;/xs:element>)
+     *      ({@code <xs:element name='foo'><xs:complexType/></xs:element>})
      *      This parameter can be null, in which case the method behaves as if the empty map is given.
      *
      * @param defaultNamespaceRemap
--- a/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/S2JJAXBModel.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/S2JJAXBModel.java	Thu Sep 24 18:26:42 2015 +0300
@@ -54,7 +54,7 @@
     Mapping get( QName elementName );
 
     /**
-     * Gets all the <tt>ObjectFactory</tt> classes generated by the compilation.
+     * Gets all the {@code ObjectFactory} classes generated by the compilation.
      *
      * <p>
      * This should be used for generating {@link XmlSeeAlso} on the SEI.
--- a/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/SchemaCompiler.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/SchemaCompiler.java	Thu Sep 24 18:26:42 2015 +0300
@@ -57,7 +57,7 @@
  * <p>
  * The caller can feed the following synthesized schema
  * to achive the namespace URI -> Java package customization:
- * <pre><xmp>
+ * <pre>{@code
  * <schema targetNamespace="xml.namespace.uri"
  *   xmlns="http://www.w3.org/2001/XMLSchema"
  *   xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
@@ -68,7 +68,7 @@
  *     </jaxb:schemaBindings>
  *   </appinfo></annotation>
  * </schema>
- * </xmp></pre>
+ * }</pre>
  * Feed this synthesized schema document for each namespace URI
  * you need to map.
  *
--- a/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CPropertyInfo.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CPropertyInfo.java	Thu Sep 24 18:26:42 2015 +0300
@@ -234,8 +234,8 @@
      * <p>
      * In general, a property often has to be capable of representing null
      * to indicate the absence of the value. This requires properties
-     * to be generated as <tt>@XmlElement Float f</tt>, not as
-     * <tt>@XmlElement float f;</tt>. But this is slow.
+     * to be generated as {@code @XmlElement Float f}, not as
+     * {@code @XmlElement float f;}. But this is slow.
      *
      * <p>
      * Fortunately, there are cases where we know that the property can
--- a/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/TypeUse.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/TypeUse.java	Thu Sep 24 18:26:42 2015 +0300
@@ -88,7 +88,7 @@
      * Creates a constant for the given lexical value.
      *
      * <p>
-     * For example, to create a constant 1 for <tt>xs:int</tt>, you'd do:
+     * For example, to create a constant 1 for {@code xs:int}, you'd do:
      * <pre>
      * CBuiltinLeafInfo.INT.createConstant( codeModel, "1", null );
      * </pre>
--- a/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/FieldAccessor.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/FieldAccessor.java	Thu Sep 24 18:26:42 2015 +0300
@@ -98,7 +98,7 @@
     FieldOutline owner();
 
     /**
-     * Short for <tt>owner().getPropertyInfo()</tt>
+     * Short for {@code owner().getPropertyInfo()}
      */
     CPropertyInfo getPropertyInfo();
 }
--- a/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/Expression.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/Expression.java	Thu Sep 24 18:26:42 2015 +0300
@@ -35,12 +35,12 @@
 public abstract class Expression {
 
     /**
-     * Computes <tt>LAST(exp)</tt>
+     * Computes {@code LAST(exp)}
      */
     abstract ElementSet lastSet();
 
     /**
-     * True of <tt>\epsilon \in L(exp)</tt>
+     * True of {@code \epsilon \in L(exp)}
      */
     abstract boolean isNullable();
 
--- a/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/ContentHandlerNamespacePrefixAdapter.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/ContentHandlerNamespacePrefixAdapter.java	Thu Sep 24 18:26:42 2015 +0300
@@ -37,13 +37,13 @@
 
 /**
  * {@link XMLReader} filter for supporting
- * <tt>http://xml.org/sax/features/namespace-prefixes</tt> feature.
+ * {@code http://xml.org/sax/features/namespace-prefixes} feature.
  *
  * @author Kohsuke Kawaguchi
  */
 final class ContentHandlerNamespacePrefixAdapter extends XMLFilterImpl {
     /**
-     * True if <tt>http://xml.org/sax/features/namespace-prefixes</tt> is set to true.
+     * True if {@code http://xml.org/sax/features/namespace-prefixes} is set to true.
      */
     private boolean namespacePrefixes = false;
 
--- a/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/SCDBasedBindingSet.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/SCDBasedBindingSet.java	Thu Sep 24 18:26:42 2015 +0300
@@ -72,10 +72,10 @@
         /**
          * SCDs can be specified via multiple steps, like:
          *
-         * <xmp>
+         * <pre>{@code
          * <bindings scd="foo/bar">
          *   <bindings scd="zot/xyz">
-         * </xmp>
+         * }</pre>
          *
          * This field and {@link #nextSibling} form a single-linked list that
          * represent the children that shall be evaluated within this target.
--- a/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassSelector.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassSelector.java	Thu Sep 24 18:26:42 2015 +0300
@@ -281,7 +281,7 @@
      *      the binding of the body will be done later, to avoid
      *      cyclic binding problem.
      * @param referer
-     *      The component that refers to <tt>sc</tt>. This can be null,
+     *      The component that refers to {@code sc}. This can be null,
      *      if figuring out the referer is too hard, in which case
      *      the error message might be less user friendly.
      */
@@ -423,7 +423,7 @@
 
 
     /**
-     * Set of package names that are tested (set of <code>String</code>s.)
+     * Set of package names that are tested (set of {@code String}s.)
      *
      * This set is used to avoid duplicating "incorrect package name"
      * errors.
--- a/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GWildcardElement.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GWildcardElement.java	Thu Sep 24 18:26:42 2015 +0300
@@ -36,7 +36,7 @@
 final class GWildcardElement extends GElement {
 
     /**
-     * If true, bind to <tt>Object</tt> for eager JAXB unmarshalling.
+     * If true, bind to {@code Object} for eager JAXB unmarshalling.
      * Otherwise bind to DOM (I hate "you can put both" semantics,
      * so I'm not going to do that in this binding mode.)
      */
--- a/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/UnusedCustomizationChecker.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/UnusedCustomizationChecker.java	Thu Sep 24 18:26:42 2015 +0300
@@ -65,7 +65,8 @@
  *
  * <p>
  * Since we scan the whole content tree, we use this to check for unused
- * <tt>xmime:expectedContentTypes</tt> attributes. TODO: if we find this kind of error checks more
+ * {@code xmime:expectedContentTypes} attributes.
+ * TODO: if we find this kind of error checks more
  * common, use the visitors so that we don't have to mix everything in one class.
  *
  * @author
--- a/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIFactoryMethod.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIFactoryMethod.java	Thu Sep 24 18:26:42 2015 +0300
@@ -36,7 +36,7 @@
 import com.sun.tools.internal.xjc.reader.xmlschema.BGMBuilder;
 
 /**
- * Controls the <tt>ObjectFactory</tt> method name.
+ * Controls the {@code ObjectFactory} method name.
  *
  * @author Kohsuke Kawaguchi
  */
--- a/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIGlobalBinding.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIGlobalBinding.java	Thu Sep 24 18:26:42 2015 +0300
@@ -454,9 +454,9 @@
 
     /**
      * Used to unmarshal
-     * <xmp>
+     * <pre>{@code
      * <[element] name="className" />
-     * </xmp>
+     * }</pre>
      */
     static final class ClassNameBean {
         @XmlAttribute(required=true)
--- a/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/runtime/ZeroOneBooleanAdapter.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/runtime/ZeroOneBooleanAdapter.java	Thu Sep 24 18:26:42 2015 +0300
@@ -29,7 +29,7 @@
 import javax.xml.bind.annotation.adapters.XmlAdapter;
 
 /**
- * Serializes <tt>boolean</tt> as 0 or 1.
+ * Serializes {@code boolean} as 0 or 1.
  *
  * @author Kohsuke Kawaguchi
  * @since 2.0
--- a/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/SchemaBuilder.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/SchemaBuilder.java	Thu Sep 24 18:26:42 2015 +0300
@@ -111,13 +111,13 @@
      * @param parent
      *      The parent scope. null if there's no parent scope.
      *      For example, if the complete document looks like the following:
-     *      <pre><xmp>
+     *      <pre>{@code
      *      <grammar>
      *        <start><element name="root"><empty/></element></start>
      *      </grammar>
-     *      </xmp></pre>
+     *      }</pre>
      *      Then when the outer-most {@link Grammar} is created, it will
-     *      receive the <tt>null</tt> parent.
+     *      receive the {@code null} parent.
      */
     Grammar<P,E,L,A,CL> makeGrammar(Scope<P,E,L,A,CL> parent);
 
@@ -126,12 +126,12 @@
      *
      * such as,
      *
-     * <pre><xmp>
+     * <pre>{@code
      * <element name="foo">     <!-- this becomes 'P' -->
      *   <foreign:annotation /> <!-- this becomes 'A' -->
      *   ...
      * </element>
-     * </xmp></pre>
+     * }</pre>
      */
     P annotate(P p, A anno) throws BuildException;
 
@@ -140,12 +140,12 @@
      *
      * such as,
      *
-     * <pre><xmp>
+     * <pre>{@code
      * <element name="foo">
      *   <empty />              <!-- this becomes 'P' -->
      *   <foreign:annotation /> <!-- this becomes 'E' -->
      * </element>
-     * </xmp></pre>
+     * }</pre>
      */
     P annotateAfter(P p, E e) throws BuildException;
 
--- a/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/util/CheckingSchemaBuilder.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/util/CheckingSchemaBuilder.java	Thu Sep 24 18:26:42 2015 +0300
@@ -72,7 +72,7 @@
  * </pre>
  *
  * <p>
- * The checking is done by using the <tt>rngom.binary</tt> package, so if you are using
+ * The checking is done by using the {@code rngom.binary} package, so if you are using
  * that package for parsing schemas, then there's no need to use this.
  *
  * @author
--- a/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/package.html	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/package.html	Thu Sep 24 18:26:42 2015 +0300
@@ -45,6 +45,6 @@
 -->
 <html>
   <body>
-    Minimal binarized pattern object model (one example of <tt>ast.om</tt> implementation).
+    Minimal binarized pattern object model (one example of <code>ast.om</code> implementation).
   </body>
 </html>
--- a/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/package.html	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/package.html	Thu Sep 24 18:26:42 2015 +0300
@@ -45,6 +45,6 @@
 -->
 <html>
   <body>
-    Default Name Class Object Model (one example of <tt>ast.om</tt> implementation).
+    Default Name Class Object Model (one example of <code>ast.om</code> implementation).
   </body>
 </html>
--- a/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/package.html	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/package.html	Thu Sep 24 18:26:42 2015 +0300
@@ -43,5 +43,5 @@
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  THE SOFTWARE.
 -->
-<html><body>Implementation of the <tt>asm.builder</tt> package that uses two
+<html><body>Implementation of the <code>asm.builder</code> package that uses two
 other builds simultaneously.</body></html>
--- a/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSAnnotation.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSAnnotation.java	Thu Sep 24 18:26:42 2015 +0300
@@ -52,7 +52,7 @@
      * @param o
      *      can be null.
      * @return
-     *      old value that was replaced by the <tt>o</tt>.
+     *      old value that was replaced by the {@code o}.
      */
     Object setAnnotation(Object o);
 
--- a/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSComponent.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSComponent.java	Thu Sep 24 18:26:42 2015 +0300
@@ -54,7 +54,7 @@
      *      false to make this method behavel like {@link #getAnnotation()}.
      *
      * @return
-     *      null if <tt>createIfNotExist==false</tt> and annotation didn't exist.
+     *      null if {@code createIfNotExist==false} and annotation didn't exist.
      *      Otherwise non-null.
      */
     XSAnnotation getAnnotation(boolean createIfNotExist);
--- a/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSElementDecl.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSElementDecl.java	Thu Sep 24 18:26:42 2015 +0300
@@ -132,7 +132,7 @@
      * by the given declaration.
      *
      * <p>
-     * Just a short cut of <tt>getSubstitutables().contain(e);</tt>
+     * Just a short cut of {@code getSubstitutables().contain(e);}
      */
     boolean canBeSubstitutedBy(XSElementDecl e);
 
--- a/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSType.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSType.java	Thu Sep 24 18:26:42 2015 +0300
@@ -35,7 +35,7 @@
     /**
      * Returns the base type of this type.
      *
-     * Note that if this type represents <tt>xs:anyType</tt>, this method returns itself.
+     * Note that if this type represents {@code xs:anyType}, this method returns itself.
      * This is awkward as an API, but it follows the schema specification.
      *
      * @return  always non-null.
@@ -48,9 +48,9 @@
 
     int getDerivationMethod();
 
-    /** Returns true if <code>this instanceof XSSimpleType</code>. */
+    /** Returns true if {@code this instanceof XSSimpleType}. */
     boolean isSimpleType();
-    /** Returns true if <code>this instanceof XSComplexType</code>. */
+    /** Returns true if {@code this instanceof XSComplexType}. */
     boolean isComplexType();
 
     /**
@@ -90,7 +90,7 @@
      * Returns true if this type is derived from the specified type.
      *
      * <p>
-     * Note that <tt>t.isDerivedFrom(t)</tt> returns true.
+     * Note that {@code t.isDerivedFrom(t)} returns true.
      */
     boolean isDerivedFrom( XSType t );
 }
--- a/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCInterleaveFilter.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCInterleaveFilter.java	Thu Sep 24 18:26:42 2015 +0300
@@ -71,14 +71,14 @@
 //
     /**
      * Receiver that is being locked and therefore receives all the events.
-     * <pre><xmp>
+     * <pre>{@code
      * <interleave>
      *   <element name="foo"/>
      *   <element name="bar">
      *     <element name="foo"/>
      *   </element>
      * </interlaeve>
-     * </xmp></pre>
+     * }</pre>
      * When processing inside the bar element, this receiver is
      * "locked" so that it can correctly receive its child foo element.
      */
--- a/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCRuntime.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCRuntime.java	Thu Sep 24 18:26:42 2015 +0300
@@ -163,28 +163,28 @@
      * Whitespace handling is a tricky business. Consider the following
      * schema fragment:
      *
-     * <xmp>
+     * <pre>{@code
      * <element name="foo">
      *   <choice>
      *     <element name="bar"><empty/></element>
      *     <text/>
      *   </choice>
      * </element>
-     * </xmp>
+     * }</pre>
      *
      * Assume we hit the following instance:
-     * <xmp>
+     * <pre>{@code
      * <foo> <bar/></foo>
-     * </xmp>
+     * }</pre>
      *
      * Then this first space needs to be ignored (for otherwise, we will
      * end up treating this space as the match to &lt;text/> and won't
      * be able to process &lt;bar>.)
      *
      * Now assume the following instance:
-     * <xmp>
+     * <pre>{@code
      * <foo/>
-     * </xmp>
+     * }</pre>
      *
      * This time, we need to treat this empty string as a text, for
      * otherwise we won't be able to accept this instance.
@@ -481,16 +481,16 @@
      * the top of the effective bindings. Because of the
      * timing difference between the startPrefixMapping method
      * and the execution of the corresponding actions,
-     * this value can be different from <code>namespaces.size()</code>.
+     * this value can be different from {@code namespaces.size()}.
      * <p>
      * For example, consider the following schema:
-     * <pre><xmp>
+     * <pre>{@code
      *  <oneOrMore>
      *   <element name="foo"><empty/></element>
      *  </oneOrMore>
      *  code fragment X
      *  <element name="bob"/>
-     * </xmp></pre>
+     * }</pre>
      * Code fragment X is executed after we see a startElement event,
      * but at this time the namespaces variable already include new
      * namespace bindings declared on "bob".
--- a/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/SchemaDocument.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/SchemaDocument.java	Thu Sep 24 18:26:42 2015 +0300
@@ -33,7 +33,7 @@
  * Represents a parsed XML schema document.
  *
  * <p>
- * Unlike schema components defined in <tt>XS****</tt> interfaces,
+ * Unlike schema components defined in {@code XS****} interfaces,
  * which are inherently de-coupled from where it was loaded from,
  * {@link SchemaDocument} represents a single XML infoset that
  * is a schema document.
@@ -58,7 +58,7 @@
      * The namespace that this schema defines.
      *
      * <p>
-     * More precisely, this method simply returns the <tt>targetNamespace</tt> attribute
+     * More precisely, this method simply returns the {@code targetNamespace} attribute
      * of the schema document. When schemas are referenced in certain ways
      * (AKA chameleon schema), schema components in this schema document
      * may end up defining components in other namespaces.
--- a/src/jdk.xml.bind/share/classes/org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/jdk.xml.bind/share/classes/org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.java	Thu Sep 24 18:26:42 2015 +0300
@@ -43,7 +43,7 @@
  *
  * <p>
  * Typical usage would be:
- * <PRE><XMP>
+ * <PRE>{@code
  * class MyDatatypeLibrary implements DatatypeLibrary {
  *     ....
  *     DatatypeBuilder createDatatypeBuilder( String typeName ) {
@@ -51,7 +51,7 @@
  *     }
  *     ....
  * }
- * </XMP></PRE>
+ * }</PRE>
  *
  * @author <a href="mailto:kohsuke.kawaguchi@sun.com">Kohsuke KAWAGUCHI</a>
  */
--- a/src/jdk.xml.bind/share/classes/org/relaxng/datatype/helpers/StreamingValidatorImpl.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/jdk.xml.bind/share/classes/org/relaxng/datatype/helpers/StreamingValidatorImpl.java	Thu Sep 24 18:26:42 2015 +0300
@@ -45,7 +45,7 @@
  *
  * <p>
  * Typical usage would be:
- * <PRE><XMP>
+ * <PRE>{@code
  * class MyDatatype implements Datatype {
  *     ....
  *     public DatatypeStreamingValidator createStreamingValidator( ValidationContext context ) {
@@ -53,7 +53,7 @@
  *     }
  *     ....
  * }
- * </XMP></PRE>
+ * }</PRE>
  *
  * @author <a href="mailto:kohsuke.kawaguchi@sun.com">Kohsuke KAWAGUCHI</a>
  */
--- a/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/api/WsgenExtension.java	Fri Sep 18 14:21:34 2015 -0700
+++ b/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/api/WsgenExtension.java	Thu Sep 24 18:26:42 2015 +0300
@@ -30,7 +30,7 @@
  * The extension implementations are found using service
  * discovery mechanism i.e. JAX-WS tooltime locates
  * {@link WsgenExtension}s through the
- * <tt>META-INF/services/com.sun.tools.internal.ws.api.WsgenExtension</tt>
+ * {@code META-INF/services/com.sun.tools.internal.ws.api.WsgenExtension}
  * files.
  *
  * {@link WsgenProtocol} annotation can be specified on the