changeset 1304:de0f838f3d80

Merge
author alanb
date Fri, 17 Mar 2017 12:58:44 +0000
parents 19ccfbe2bff5 7ddeadd4d7f1
children 58dbf3b0c963
files .hgtags README src/jdk.xml.dom/share/classes/module-info.java
diffstat 3 files changed, 8 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Mar 14 17:03:04 2017 -0700
+++ b/.hgtags	Fri Mar 17 12:58:44 2017 +0000
@@ -405,3 +405,4 @@
 5695854e8831d0c088ab0ecf83b367ec16c9760a jdk-9+159
 fb8f2c8e15295120ff0f281dc057cfffb309e90e jdk-9+160
 c089440c555a5912a3b51da094194c94dcdb41c2 jpms-pr
+51b63f1b8001a48a16805b43babc3af7b314d501 jdk-9+161
--- a/README	Tue Mar 14 17:03:04 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-README:
-  
-  This file should be located at the top of the Mercurial repository.
-
-  See http://openjdk.java.net/ for more information about the OpenJDK.
-
-  See ../README-builds.html for complete details on build machine requirements.
-
-Simple Build Instructions:
-  This repository can be loaded as a NetBeans project, built with ant, or
-  built with GNU make, e.g.
-    ant
-       -OR-
-    cd make && gnumake
-     
-  The built files that will be imported into the jdk build will be in the 
-  "dist" directory.
-  Help information is available by running "ant -projecthelp" or "make help".
-
--- a/src/jdk.xml.dom/share/classes/module-info.java	Tue Mar 14 17:03:04 2017 -0700
+++ b/src/jdk.xml.dom/share/classes/module-info.java	Fri Mar 17 12:58:44 2017 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -23,6 +23,12 @@
  * questions.
  */
 
+/**
+ * Defines the subset of the W3C Document Object Model (DOM) API that is not part
+ * of the Java SE API.
+ *
+ * @since 9
+ */
 module jdk.xml.dom {
     requires transitive java.xml;
     exports org.w3c.dom.css;