Merge
authorduke
Thu, 24 Aug 2017 16:28:37 +0200
changeset 45849 82e6e5566ee2
parent 45848 4fafa8900ec9 (diff)
parent 45846 cf9da443c65b (current diff)
child 45856 cf2a977bace1
Merge
jdk/test/java/lang/System/MacEncoding/MacJNUEncoding.sh
--- a/nashorn/.hgtags	Thu Aug 24 16:28:31 2017 +0200
+++ b/nashorn/.hgtags	Thu Aug 24 16:28:37 2017 +0200
@@ -423,3 +423,6 @@
 de571c0a93258599054f18184cbdeae42cd95265 jdk-10+12
 734b3209b6edeb57e482c97793ae9c066af72871 jdk-9+175
 2ab4a2055c2e309872f648fa7ab4daae0bf8994c jdk-10+13
+fed3f329875710c74f3ec1a0c4714046a79af100 jdk-10+14
+3c6fbdf6e785aaf18d35ce9c6684369952fd22ec jdk-9+176
+aa7404e062b95f679018f25eaaf933dcf0cf3f2b jdk-9+177
--- a/nashorn/src/jdk.dynalink/share/classes/module-info.java	Thu Aug 24 16:28:31 2017 +0200
+++ b/nashorn/src/jdk.dynalink/share/classes/module-info.java	Thu Aug 24 16:28:37 2017 +0200
@@ -32,8 +32,8 @@
  * useful for implementing programming languages where at least some expressions
  * have dynamic types (that is, types that can not be decided statically), and
  * the operations on dynamic types are expressed as
- * {@link java.lang.invoke.CallSite call sites}. These call sites will be
- * linked to appropriate target {@link java.lang.invoke.MethodHandle method handles}
+ * {@linkplain java.lang.invoke.CallSite call sites}. These call sites will be
+ * linked to appropriate target {@linkplain java.lang.invoke.MethodHandle method handles}
  * at run time based on actual types of the values the expressions evaluated to.
  * These can change between invocations, necessitating relinking the call site
  * multiple times to accommodate new types; Dynalink handles all that and more.
@@ -205,7 +205,7 @@
  * on how it links the various operations.
  * <h2>Cross-language interoperability</h2>
  * A {@code DynamicLinkerFactory} can be configured with a
- * {@link jdk.dynalink.DynamicLinkerFactory#setClassLoader(ClassLoader) class
+ * {@linkplain jdk.dynalink.DynamicLinkerFactory#setClassLoader(ClassLoader) class
  * loader}. It will try to instantiate all
  * {@link jdk.dynalink.linker.GuardingDynamicLinkerExporter} classes visible to
  * that class loader and compose the linkers they provide into the