# HG changeset patch
# User mgronlun
# Date 1568583959 -7200
# Node ID c4ee448c98060dc83885dbc1213b5668913038bb
# Parent  c17888eb0d03ece809ad439c79fdc33e9b6ddf2a# Parent  a6c85c21aa3944b76ca89dd0597bd0d04024d98e
Merge

diff -r c17888eb0d03 -r c4ee448c9806 src/java.compiler/share/classes/javax/lang/model/package-info.java
--- a/src/java.compiler/share/classes/javax/lang/model/package-info.java	Sun Sep 15 22:54:35 2019 +0200
+++ b/src/java.compiler/share/classes/javax/lang/model/package-info.java	Sun Sep 15 23:45:59 2019 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, 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
@@ -24,7 +24,8 @@
  */
 
 /**
- * Classes and hierarchies of packages used to model the Java
+ * Types and hierarchies of packages comprising a {@index "Java language
+ * model"}, a model of the declarations and types of the Java
  * programming language.
  *
  * The members of this package and its subpackages are for use in
@@ -41,14 +42,14 @@
  * Languages and Applications, October 2004.
  * </blockquote>
  *
- * In particular, the model makes a distinction between static
+ * In particular, the model makes a distinction between declared
  * language constructs, like the {@linkplain javax.lang.model.element
  * element} representing {@code java.util.Set}, and the family of
  * {@linkplain javax.lang.model.type types} that may be associated
  * with an element, like the raw type {@code java.util.Set}, {@code
  * java.util.Set<String>}, and {@code java.util.Set<T>}.
  *
- * <p> Unless otherwise specified, methods in this package will throw
+ * <p>Unless otherwise specified, methods in this package will throw
  * a {@code NullPointerException} if given a {@code null} argument.
  *
  * @author Joseph D. Darcy