Merge

src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/CGLSurfaceData.m

@@ -90,7 +90,6 @@ JNF_COCOA_ENTER(env);
     CGLCtxInfo *ctxinfo = (CGLCtxInfo *)oglc->ctxInfo;
 #if USE_NSVIEW_FOR_SCRATCH
     [ctxinfo->context makeCurrentContext];
-    [ctxinfo->context setView: ctxinfo->scratchSurface];
 #else
     [ctxinfo->context clearDrawable];
     [ctxinfo->context makeCurrentContext];

src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachine.java

@@ -217,6 +217,7 @@ public interface VirtualMachine extends Mirror {
      * is false attempting any of the unsupported class file changes described
      * in <a href="{@docRoot}/../specs/jvmti.html#RedefineClasses">
      * JVM TI RedefineClasses</a> will throw this exception.
+     * </UL>
      *
      * @throws java.lang.NoClassDefFoundError if the bytes
      * don't correspond to the reference type (the names

src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachineManager.java

@@ -185,6 +185,7 @@ import com.sun.jdi.event.VMStartEvent;
  * </UL>
  * </TD>
  * </TR>
+ * </TBODY>
  * </TABLE>
  *
  * <p> Connectors are created at start-up time. That is, they

src/jdk.nio.mapmode/share/classes/jdk/nio/mapmode/ExtendedMapMode.java

@@ -25,6 +25,8 @@
 
 package jdk.nio.mapmode;
 
+import java.nio.MappedByteBuffer;
+import java.nio.channels.FileChannel;
 import java.nio.channels.FileChannel.MapMode;
 
 /**
@@ -52,7 +54,7 @@ public class ExtendedMapMode {
 
     /**
      * File mapping mode for a read-write mapping of a file backed by
-     * non-volatile RAM. {@linkplain MappedByteBufefr#force force}
+     * non-volatile RAM. {@linkplain MappedByteBuffer#force force}
      * operations on a buffer created with this mode will be performed
      * using cache line writeback rather than proceeding via a file
      * device flush.

src/jdk.sctp/share/classes/com/sun/nio/sctp/NotificationHandler.java

@@ -45,7 +45,7 @@ package com.sun.nio.sctp;
  * this handler interface as the type for parameters, return type, etc. rather
  * than the abstract class.
  *
- * @param  T  The type of the object attached to the receive operation
+ * @param  <T>  The type of the object attached to the receive operation
  *
  * @since 1.7
  */