changeset 1225:a0c9b0aabc52 nestmates tip

Merge
author dholmes
date Wed, 27 Sep 2017 01:20:56 -0400
parents 45b34575a89c 784201b9cfc4
children
files
diffstat 2 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Sep 20 23:55:35 2017 -0400
+++ b/.hgtags	Wed Sep 27 01:20:56 2017 -0400
@@ -445,3 +445,6 @@
 9934a03646f91ce55f61f53d8448c629828f8088 jdk-9+180
 ea18d767c9ec50ea7f40bbe6cf7379d3538110f1 jdk-9+181
 f7d596aa57aece4e5f473b1ac97e26cd0aebc647 jdk-10+20
+dcd49f380d7504a49769c26d7bd756623cb9b828 jdk-10+21
+47872600e78b509a15490fe009986d4969794f56 jdk-10+22
+7b77f4c26025dc6ec56571e8782a96062fc16424 jdk-10+23
--- a/src/java.xml/share/classes/javax/xml/transform/sax/SAXSource.java	Wed Sep 20 23:55:35 2017 -0400
+++ b/src/java.xml/share/classes/javax/xml/transform/sax/SAXSource.java	Wed Sep 27 01:20:56 2017 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -85,8 +85,7 @@
      * Create a <code>SAXSource</code>, using a SAX <code>InputSource</code>.
      * The {@link javax.xml.transform.Transformer} or
      * {@link javax.xml.transform.sax.SAXTransformerFactory} creates a
-     * reader via {@link org.xml.sax.helpers.XMLReaderFactory}
-     * (if setXMLReader is not used), sets itself as
+     * reader (if setXMLReader is not used), sets itself as
      * the reader's {@link org.xml.sax.ContentHandler}, and calls
      * reader.parse(inputSource).
      *