3 files changed, 2054 insertions, 1767 deletions

diff --git a/java/openjdk7/Makefile b/java/openjdk7/Makefile
index 096e3a39f170..05e1079f7829 100644
--- a/java/openjdk7/Makefile
+++ b/java/openjdk7/Makefile
@@ -3,7 +3,6 @@
 
 PORTNAME=	openjdk
 PORTVERSION=	${JDK_MAJOR_VERSION}.${PORT_MINOR_VERSION}.${PORT_BUILD_NUMBER}
-PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	java devel
 MASTER_SITES=	http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}u${JDK_MINOR_VERSION}/promoted/b${JDK_BUILD_NUMBER}/ \
@@ -30,7 +29,8 @@ PATCHFILES=	patch-7u45-b30.xz \
 		patch-7u85-b02.xz \
 		patch-7u91-b02.xz \
 		patch-7u95-b00.xz \
-		patch-7u101-b00.xz
+		patch-7u101-b00.xz \
+		patch-7u111-b01.xz
 
 MAINTAINER?=	glewis@FreeBSD.org
 COMMENT?=	Java Development Kit 7
@@ -59,8 +59,8 @@ JAVAVMS_COMMENT+=	JRE
 INSTALLDIR=	${PREFIX}/${PORTNAME}${JDK_MAJOR_VERSION}-jre
 .endif
 
-PORT_MINOR_VERSION=	101
-PORT_BUILD_NUMBER=	00
+PORT_MINOR_VERSION=	111
+PORT_BUILD_NUMBER=	01
 JDK_MAJOR_VERSION=	7
 JDK_MINOR_VERSION=	40
 JDK_BUILD_NUMBER=	43
diff --git a/java/openjdk7/distinfo b/java/openjdk7/distinfo
index c34809611bd9..160a61d7052c 100644
--- a/java/openjdk7/distinfo
+++ b/java/openjdk7/distinfo
@@ -27,3 +27,5 @@ SHA256 (patch-7u95-b00.xz) = bb522469cedcd31ff15fde745ab5717bd012c52ce2e25d1180b
 SIZE (patch-7u95-b00.xz) = 91612
 SHA256 (patch-7u101-b00.xz) = 8406d9f453b91c4e31e5a6a0a1769c3da87e3e3bf7a4c567024f7f929f555702
 SIZE (patch-7u101-b00.xz) = 121752
+SHA256 (patch-7u111-b01.xz) = d46ffd30a6fa6d8ce40231e6dadcabf491a347e2afea87302f38bab5e2bee523
+SIZE (patch-7u111-b01.xz) = 273552
diff --git a/java/openjdk7/files/patch-bsd b/java/openjdk7/files/patch-bsd
index 81c20bf88937..2a74d70e9628 100644
--- a/java/openjdk7/files/patch-bsd
+++ b/java/openjdk7/files/patch-bsd
@@ -1,5 +1,5 @@
---- ./.hgtags	Wed Mar 23 21:08:19 2016 +0000
-+++ ./.hgtags	Sun May 01 16:41:46 2016 -0700
+--- ./.hgtags	Wed Jul 20 04:05:01 2016 +0100
++++ ./.hgtags	Sat Aug 20 11:56:17 2016 -0700
 @@ -123,6 +123,7 @@
  2d38c2a79c144c30cd04d143d83ee7ec6af40771 jdk7-b146
  3ac30b3852876ccad6bd61697b5f9efa91ca7bc6 jdk7u1-b01
@@ -8,13 +8,13 @@
  34451dc0580d5c95d97b95a564e6198f36545d68 jdk7u1-b02
  bf735d852f79bdbb3373c777eec3ff27e035e7ba jdk7u1-b03
  f66a2bada589f4157789e6f66472954d2f1c114e jdk7u1-b04
-@@ -603,3 +604,4 @@
- 2be0ab1a24b2b6910d8f31e3314ffa48f30f21df jdk7u91-b02
- a28bc539342e4ca724a5abd2521c6a58f04c2113 jdk7u95-b00
+@@ -605,3 +606,4 @@
  251bb2a6d5cfbb76c0f4bdfecea4ca9c8af21558 jdk7u99-b00
-+12491db47c7ccffcc3e881df68f4c2f727b44e5d jdk7u101-b00
---- ./corba/.hgtags	Fri Apr 15 03:57:30 2016 +0100
-+++ ./corba/.hgtags	Sun May 01 16:42:06 2016 -0700
+ 12491db47c7ccffcc3e881df68f4c2f727b44e5d jdk7u101-b00
+ bade1889699bab14082e84de3b40901964b52483 jdk7u111-b00
++9b95c1ef81fe7bb010a6938d1cb97843b9a1fc68 jdk7u111-b01
+--- ./corba/.hgtags	Wed Jul 20 04:05:02 2016 +0100
++++ ./corba/.hgtags	Sat Aug 20 11:56:18 2016 -0700
 @@ -123,6 +123,7 @@
  770227a4087e4e401fe87ccd19738440111c3948 jdk7-b146
  36f0efbc66ef8ace3cca8aa8d0c88f3334080f8a jdk7u1-b01
@@ -23,13 +23,13 @@
  9515a2d034b4727c11aeea36354a549fbc469c4f jdk7u1-b02
  dd71cb354c573c1addcda269a7dd9144bfce9587 jdk7u1-b03
  eaee830124aa453627591d8f9eccb39d7e040876 jdk7u1-b04
-@@ -605,3 +606,4 @@
- e3a6331d136ecac575730b498501f5b0dc4302e2 jdk7u91-b02
- 96b735f85c61ad721113713551271106a5070742 jdk7u95-b00
+@@ -607,3 +608,4 @@
  adda687205a9a40573fdb538240a5699fdc7dbd6 jdk7u99-b00
-+9c164195bcc97da6c6567e6e6d55ea349f1c583d jdk7u101-b00
---- ./hotspot/.hgtags	Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/.hgtags	Sun May 01 16:42:53 2016 -0700
+ 9c164195bcc97da6c6567e6e6d55ea349f1c583d jdk7u101-b00
+ c1def4cc27fb92914168a5f65658eba4a1754dfe jdk7u111-b00
++36715cc029596f86e977d486e547f62bb07eed74 jdk7u111-b01
+--- ./hotspot/.hgtags	Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/.hgtags	Sat Aug 20 11:56:24 2016 -0700
 @@ -182,6 +182,7 @@
  38fa55e5e79232d48f1bb8cf27d88bc094c9375a hs21-b16
  81d815b05abb564aa1f4100ae13491c949b9a07e jdk7-b147
@@ -38,13 +38,13 @@
  9b0ca45cd756d538c4c30afab280a91868eee1a5 jdk7u2-b01
  0cc8a70952c368e06de2adab1f2649a408f5e577 jdk8-b01
  31e253c1da429124bb87570ab095d9bc89850d0a jdk8-b02
-@@ -837,3 +838,4 @@
- 2f2d431ace967c9a71194e1bb46f38b35ea43512 jdk7u91-b02
- b3c5ff648bcad305163b323ad15dde1b6234d501 jdk7u95-b00
+@@ -839,3 +840,4 @@
  631da593499ee184ea8efb2bc5491e0d99ac636d jdk7u99-b00
-+6e42747134be8a4a366d337da1fc84a847ad8381 jdk7u101-b00
---- ./hotspot/agent/src/os/bsd/ps_proc.c	Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/agent/src/os/bsd/ps_proc.c	Sun May 01 16:42:53 2016 -0700
+ 6e42747134be8a4a366d337da1fc84a847ad8381 jdk7u101-b00
+ 14d0f4da4a74897fc3274f8f549f41544bb4625a jdk7u111-b00
++9efa3fae3c278a7f48badec775d7f9b2d5320b6d jdk7u111-b01
+--- ./hotspot/agent/src/os/bsd/ps_proc.c	Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/agent/src/os/bsd/ps_proc.c	Sat Aug 20 11:56:24 2016 -0700
 @@ -131,7 +131,7 @@
  
  static bool ptrace_continue(pid_t pid, int signal) {
@@ -54,8 +54,8 @@
      print_debug("ptrace(PTRACE_CONT, ..) failed for %d\n", pid);
      return false;
    }
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java	Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java	Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java	Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java	Sat Aug 20 11:56:24 2016 -0700
 @@ -33,6 +33,7 @@
  import sun.jvm.hotspot.debugger.remote.*;
  import sun.jvm.hotspot.debugger.windbg.*;
@@ -64,8 +64,8 @@
  import sun.jvm.hotspot.memory.*;
  import sun.jvm.hotspot.oops.*;
  import sun.jvm.hotspot.runtime.*;
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java	Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java	Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java	Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java	Sat Aug 20 11:56:24 2016 -0700
 @@ -35,6 +35,7 @@
  import sun.jvm.hotspot.debugger.windbg.*;
  import sun.jvm.hotspot.debugger.linux.*;
@@ -74,8 +74,8 @@
  import sun.jvm.hotspot.debugger.remote.*;
  import sun.jvm.hotspot.livejvm.*;
  import sun.jvm.hotspot.memory.*;
---- ./hotspot/make/bsd/Makefile	Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/make/bsd/Makefile	Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/make/bsd/Makefile	Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/make/bsd/Makefile	Sat Aug 20 11:56:24 2016 -0700
 @@ -1,5 +1,5 @@
  #
 -# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -105,8 +105,8 @@
  
  # Synonyms for win32-like targets.
  compiler2:  jvmg product
---- ./hotspot/make/bsd/makefiles/build_vm_def.sh	Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/make/bsd/makefiles/build_vm_def.sh	Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/make/bsd/makefiles/build_vm_def.sh	Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/make/bsd/makefiles/build_vm_def.sh	Sat Aug 20 11:56:24 2016 -0700
 @@ -1,12 +1,28 @@
  #!/bin/sh
  
@@ -142,8 +142,8 @@
 +        if ($3 ~ /^_ZN9Arguments17SharedArchivePathE$/) print "\t" $3 ";"
 +    }' | sort -u ;;
 +esac
---- ./hotspot/make/bsd/makefiles/buildtree.make	Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/make/bsd/makefiles/buildtree.make	Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/make/bsd/makefiles/buildtree.make	Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/make/bsd/makefiles/buildtree.make	Sat Aug 20 11:56:24 2016 -0700
 @@ -255,6 +255,16 @@
  	echo "$(call gamma-path,commonsrc,os/posix/vm)"; \
  	[ -n "$(CFLAGS_BROWSE)" ] && \
@@ -170,8 +170,8 @@
  
  .dbxrc:  $(BUILDTREE_MAKE)
  	@echo Creating $@ ...
---- ./hotspot/make/bsd/makefiles/gcc.make	Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/make/bsd/makefiles/gcc.make	Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/make/bsd/makefiles/gcc.make	Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/make/bsd/makefiles/gcc.make	Sat Aug 20 11:56:24 2016 -0700
 @@ -117,7 +117,10 @@
  CFLAGS += -fno-rtti
  CFLAGS += -fno-exceptions
@@ -197,8 +197,8 @@
  endif
  
  # -DDONT_USE_PRECOMPILED_HEADER will exclude all includes in precompiled.hpp.
---- ./hotspot/make/bsd/makefiles/jsig.make	Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/make/bsd/makefiles/jsig.make	Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/make/bsd/makefiles/jsig.make	Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/make/bsd/makefiles/jsig.make	Sat Aug 20 11:56:24 2016 -0700
 @@ -36,9 +36,16 @@
    LIBJSIG_G = lib$(JSIG_G).so
  endif
@@ -251,8 +251,8 @@
  	$(QUIETLY) cp -f $(LIBJSIG) $(DEST_JSIG) && echo "Done"
  
  .PHONY: install_jsig
---- ./hotspot/make/bsd/makefiles/launcher.make	Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/make/bsd/makefiles/launcher.make	Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/make/bsd/makefiles/launcher.make	Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/make/bsd/makefiles/launcher.make	Sat Aug 20 11:56:24 2016 -0700
 @@ -50,7 +50,7 @@
    LIBS_LAUNCHER             += $(STATIC_STDCXX) $(LIBS)
  else
@@ -262,8 +262,8 @@
  
    # The gamma launcher runs the JDK from $JAVA_HOME, overriding the JVM with a
    # freshly built JVM at ./libjvm.{so|dylib}.  This is accomplished by setting 
---- ./hotspot/make/bsd/makefiles/mapfile-vers-product	Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/make/bsd/makefiles/mapfile-vers-product	Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/make/bsd/makefiles/mapfile-vers-product	Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/make/bsd/makefiles/mapfile-vers-product	Sat Aug 20 11:56:24 2016 -0700
 @@ -19,237 +19,248 @@
  # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  # or visit www.oracle.com if you need additional information or have any
@@ -737,8 +737,8 @@
 +        local:
 +                *;
 +};
---- ./hotspot/make/bsd/makefiles/ppc.make	Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/make/bsd/makefiles/ppc.make	Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/make/bsd/makefiles/ppc.make	Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/make/bsd/makefiles/ppc.make	Sat Aug 20 11:56:24 2016 -0700
 @@ -28,3 +28,6 @@
  # Must also specify if CPU is big endian
  CFLAGS += -DVM_BIG_ENDIAN
@@ -746,8 +746,8 @@
 +ifdef E500V2
 +ASFLAGS += -Wa,-mspe -Wa,--defsym -Wa,E500V2=1 
 +endif
---- ./hotspot/make/bsd/makefiles/saproc.make	Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/make/bsd/makefiles/saproc.make	Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/make/bsd/makefiles/saproc.make	Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/make/bsd/makefiles/saproc.make	Sat Aug 20 11:56:24 2016 -0700
 @@ -36,6 +36,11 @@
    LIBSAPROC_G = lib$(SAPROC_G).so
  endif
@@ -804,8 +804,8 @@
  	  cp -f $(LIBSAPROC) $(DEST_SAPROC) && echo "Done";  \
  	fi
  
---- ./hotspot/make/solaris/makefiles/defs.make	Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/make/solaris/makefiles/defs.make	Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/make/solaris/makefiles/defs.make	Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/make/solaris/makefiles/defs.make	Sat Aug 20 11:56:24 2016 -0700
 @@ -221,8 +221,8 @@
  endif
  ifeq ($(JVM_VARIANT_CLIENT),true)
@@ -817,8 +817,8 @@
    EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_dtrace.$(LIBRARY_SUFFIX)
    ifeq ($(ARCH_DATA_MODEL),32)
      EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.$(LIBRARY_SUFFIX)
---- ./hotspot/src/cpu/sparc/vm/globals_sparc.hpp	Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/src/cpu/sparc/vm/globals_sparc.hpp	Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/src/cpu/sparc/vm/globals_sparc.hpp	Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/src/cpu/sparc/vm/globals_sparc.hpp	Sat Aug 20 11:56:24 2016 -0700
 @@ -71,7 +71,11 @@
  define_pd_global(bool, RewriteBytecodes,     true);
  define_pd_global(bool, RewriteFrequentPairs, true);
@@ -832,7 +832,7 @@
  // GC Ergo Flags
  define_pd_global(intx, CMSYoungGenPerWorker, 16*M);  // default max size of CMS young gen, per GC worker thread
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/src/os/bsd/vm/decoder_bsd.cpp	Sun May 01 16:42:53 2016 -0700
++++ ./hotspot/src/os/bsd/vm/decoder_bsd.cpp	Sat Aug 20 11:56:24 2016 -0700
 @@ -0,0 +1,46 @@
 +/*
 + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -880,8 +880,8 @@
 +  return false;
 +}
 +
---- ./hotspot/src/os/bsd/vm/os_bsd.cpp	Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/src/os/bsd/vm/os_bsd.cpp	Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/src/os/bsd/vm/os_bsd.cpp	Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/src/os/bsd/vm/os_bsd.cpp	Sat Aug 20 11:56:24 2016 -0700
 @@ -187,6 +187,8 @@
  static int SR_signum = SIGUSR2;
  sigset_t SR_sigset;
@@ -1059,8 +1059,8 @@
  #elif defined(__APPLE__) || defined(__NetBSD__)
    struct sched_param sp;
    int policy;
---- ./hotspot/src/os/bsd/vm/os_bsd.hpp	Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/src/os/bsd/vm/os_bsd.hpp	Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/src/os/bsd/vm/os_bsd.hpp	Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/src/os/bsd/vm/os_bsd.hpp	Sat Aug 20 11:56:24 2016 -0700
 @@ -103,6 +103,12 @@
  
    static bool hugetlbfs_sanity_check(bool warn, size_t page_size);
@@ -1074,8 +1074,8 @@
   public:
  
    static void init_thread_fpu_state();
---- ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp	Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp	Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp	Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp	Sat Aug 20 11:56:24 2016 -0700
 @@ -31,10 +31,22 @@
  # include "atomic_bsd_x86.inline.hpp"
  # include "orderAccess_bsd_x86.inline.hpp"
@@ -1099,8 +1099,8 @@
  
  // System includes
  
---- ./hotspot/src/os/bsd/vm/thread_bsd.inline.hpp	Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/src/os/bsd/vm/thread_bsd.inline.hpp	Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/src/os/bsd/vm/thread_bsd.inline.hpp	Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/src/os/bsd/vm/thread_bsd.inline.hpp	Sat Aug 20 11:56:24 2016 -0700
 @@ -34,11 +34,26 @@
  # include "orderAccess_bsd_x86.inline.hpp"
  # include "prefetch_bsd_x86.inline.hpp"
@@ -1128,8 +1128,8 @@
  
  // Contains inlined functions for class Thread and ThreadLocalStorage
  
---- ./hotspot/src/os/posix/vm/os_posix.cpp	Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/src/os/posix/vm/os_posix.cpp	Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/src/os/posix/vm/os_posix.cpp	Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/src/os/posix/vm/os_posix.cpp	Sat Aug 20 11:56:24 2016 -0700
 @@ -175,11 +175,19 @@
    if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity");
    else st->print("%d", rlim.rlim_cur);
@@ -1150,8 +1150,8 @@
  }
  
  void os::Posix::print_uname_info(outputStream* st) {
---- ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp	Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp	Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp	Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp	Sat Aug 20 11:56:24 2016 -0700
 @@ -945,7 +945,7 @@
    if (rslt != 0)
      fatal(err_msg("pthread_stackseg_np failed with err = %d", rslt));
@@ -1161,8 +1161,8 @@
    *size   = ss.ss_size;
  #elif defined(_ALLBSD_SOURCE)
    pthread_attr_t attr;
---- ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp	Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp	Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp	Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp	Sat Aug 20 11:56:24 2016 -0700
 @@ -24,7 +24,7 @@
   */
  
@@ -1172,8 +1172,8 @@
  # include <pthread_np.h> /* For pthread_attr_get_np */
  #endif
  
---- ./hotspot/src/share/vm/code/relocInfo.hpp	Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/src/share/vm/code/relocInfo.hpp	Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/src/share/vm/code/relocInfo.hpp	Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/src/share/vm/code/relocInfo.hpp	Sat Aug 20 11:56:24 2016 -0700
 @@ -371,7 +371,7 @@
    // "immediate" in the prefix header word itself.  This optimization
    // is invisible outside this module.)
@@ -1192,8 +1192,8 @@
    assert(relocInfo::fits_into_immediate(datalen), "datalen in limits");
    return relocInfo(relocInfo::data_prefix_tag, relocInfo::RAW_BITS, relocInfo::datalen_tag | datalen);
  }
---- ./hotspot/src/share/vm/gc_implementation/shared/gcTraceSend.cpp	Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/src/share/vm/gc_implementation/shared/gcTraceSend.cpp	Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/src/share/vm/gc_implementation/shared/gcTraceSend.cpp	Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/src/share/vm/gc_implementation/shared/gcTraceSend.cpp	Sat Aug 20 11:56:24 2016 -0700
 @@ -111,7 +111,7 @@
    if (e.should_commit()) {
      e.set_gcId(_shared_gc_info.id());
@@ -1203,8 +1203,8 @@
      e.commit();
    }
  }
---- ./hotspot/src/share/vm/runtime/atomic.cpp	Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/src/share/vm/runtime/atomic.cpp	Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/src/share/vm/runtime/atomic.cpp	Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/src/share/vm/runtime/atomic.cpp	Sat Aug 20 11:56:24 2016 -0700
 @@ -54,6 +54,12 @@
  #ifdef TARGET_OS_ARCH_windows_x86
  # include "atomic_windows_x86.inline.hpp"
@@ -1218,8 +1218,8 @@
  #ifdef TARGET_OS_ARCH_linux_arm
  # include "atomic_linux_arm.inline.hpp"
  #endif
---- ./hotspot/src/share/vm/runtime/objectMonitor.cpp	Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/src/share/vm/runtime/objectMonitor.cpp	Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/src/share/vm/runtime/objectMonitor.cpp	Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/src/share/vm/runtime/objectMonitor.cpp	Sat Aug 20 11:56:24 2016 -0700
 @@ -1744,7 +1744,7 @@
       }
       iterator->_notified = 1 ;
@@ -1238,8 +1238,8 @@
       if (Policy != 4) {
          iterator->TState = ObjectWaiter::TS_ENTER ;
       }
---- ./hotspot/src/share/vm/runtime/os.cpp	Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/src/share/vm/runtime/os.cpp	Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/src/share/vm/runtime/os.cpp	Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/src/share/vm/runtime/os.cpp	Sat Aug 20 11:56:24 2016 -0700
 @@ -399,13 +399,6 @@
      if (_native_java_library == NULL) {
        vm_exit_during_initialization("Unable to load native library", ebuf);
@@ -1254,8 +1254,8 @@
    }
    static jboolean onLoaded = JNI_FALSE;
    if (onLoaded) {
---- ./hotspot/src/share/vm/runtime/os.hpp	Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/src/share/vm/runtime/os.hpp	Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/src/share/vm/runtime/os.hpp	Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/src/share/vm/runtime/os.hpp	Sat Aug 20 11:56:24 2016 -0700
 @@ -30,6 +30,9 @@
  #include "runtime/extendedPC.hpp"
  #include "runtime/handles.hpp"
@@ -1276,8 +1276,8 @@
  #endif
  #ifdef TARGET_OS_ARCH_linux_x86
  # include "os_linux_x86.hpp"
---- ./hotspot/src/share/vm/runtime/vmThread.cpp	Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/src/share/vm/runtime/vmThread.cpp	Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/src/share/vm/runtime/vmThread.cpp	Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/src/share/vm/runtime/vmThread.cpp	Sat Aug 20 11:56:24 2016 -0700
 @@ -393,7 +393,7 @@
        // Only write caller thread information for non-concurrent vm operations.
        // For concurrent vm operations, the thread id is set to 0 indicating thread is unknown.
@@ -1287,8 +1287,8 @@
        event.commit();
      }
  
---- ./hotspot/src/share/vm/trace/tracetypes.xml	Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/src/share/vm/trace/tracetypes.xml	Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/src/share/vm/trace/tracetypes.xml	Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/src/share/vm/trace/tracetypes.xml	Sat Aug 20 11:56:24 2016 -0700
 @@ -60,7 +60,7 @@
   <types>
    <content_types>
@@ -1309,8 +1309,8 @@
  
      <!-- VM Thread ID Note: changed from U2 to U8 for hotspot -->
      <primary_type symbol="VMTHREAD" datatype="U8" contenttype="VMTHREAD"
---- ./hotspot/test/compiler/5091921/Test7005594.sh	Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/test/compiler/5091921/Test7005594.sh	Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/test/compiler/5091921/Test7005594.sh	Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/test/compiler/5091921/Test7005594.sh	Sat Aug 20 11:56:24 2016 -0700
 @@ -60,6 +60,9 @@
    # Windows/MKS
    MEM=`"$ROOTDIR/mksnt/sysinf" memory -v | grep "Total Physical Memory: " | sed 's/Total Physical Memory: *//g'`
@@ -1321,8 +1321,8 @@
  else
    echo "Unable to determine amount of physical memory on the machine"
  fi
---- ./hotspot/test/runtime/7110720/Test7110720.sh	Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/test/runtime/7110720/Test7110720.sh	Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/test/runtime/7110720/Test7110720.sh	Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/test/runtime/7110720/Test7110720.sh	Sat Aug 20 11:56:24 2016 -0700
 @@ -28,7 +28,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -1333,7 +1333,7 @@
      RM=/bin/rm
      CP=/bin/cp
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/test/runtime/7158800/Test7158800.sh	Sun May 01 16:42:53 2016 -0700
++++ ./hotspot/test/runtime/7158800/Test7158800.sh	Sat Aug 20 11:56:24 2016 -0700
 @@ -0,0 +1,91 @@
 +#!/bin/sh
 +# 
@@ -1426,8 +1426,8 @@
 +    echo "Test Passed"
 +    exit 0
 +fi
---- ./hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java	Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java	Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java	Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java	Sat Aug 20 11:56:24 2016 -0700
 @@ -36,8 +36,8 @@
      public static void main(String args[]) throws Throwable {
  
@@ -1439,8 +1439,8 @@
              return;
          }
  
---- ./jaxp/.hgtags	Fri Apr 15 04:34:37 2016 +0100
-+++ ./jaxp/.hgtags	Sun May 01 16:42:15 2016 -0700
+--- ./jaxp/.hgtags	Wed Jul 20 04:05:04 2016 +0100
++++ ./jaxp/.hgtags	Sat Aug 20 11:56:20 2016 -0700
 @@ -123,6 +123,7 @@
  bcd31fa1e3c6f51b4fdd427ef905188cdac57164 jdk7-b146
  067fb18071e3872698f6218724958bd0cebf30a3 jdk7u1-b01
@@ -1449,13 +1449,13 @@
  104ca42e1e7ca66b074a4619ce6420f15d8f454d jdk7u1-b02
  64e323faadf65018c1ffc8bb9c97f7b664e87347 jdk7u1-b03
  2256c20e66857f80cacda14ffdbc0979c929d7f8 jdk7u1-b04
-@@ -606,3 +607,4 @@
- 6d9a192976332443bb3be46d49d5b255d9781fe9 jdk7u91-b02
- 7c422316234f10b327fdbc181aedd5e74f31fd38 jdk7u95-b00
+@@ -608,3 +609,4 @@
  c029d7572a67cb2fb3f9f2d8e91cbdda3beab95e jdk7u99-b00
-+dcdbebfaf4b42da4927d3d0c682205a23cd7cdb8 jdk7u101-b00
---- ./jaxws/.hgtags	Wed Mar 23 21:08:23 2016 +0000
-+++ ./jaxws/.hgtags	Sun May 01 16:42:25 2016 -0700
+ dcdbebfaf4b42da4927d3d0c682205a23cd7cdb8 jdk7u101-b00
+ be2127cf0435d141d8072a94dbe75a527ceda453 jdk7u111-b00
++cd13b280e8247904509c28ee8aa9b45326185dd7 jdk7u111-b01
+--- ./jaxws/.hgtags	Wed Jul 20 04:05:05 2016 +0100
++++ ./jaxws/.hgtags	Sat Aug 20 11:56:21 2016 -0700
 @@ -123,6 +123,7 @@
  05469dd4c3662c454f8a019e492543add60795cc jdk7-b146
  c01bfd68d0528bc88348813c4d75d7f5c62bc4e2 jdk7u1-b01
@@ -1464,13 +1464,13 @@
  4c24f7019ce939a452154a83151294ad7da66a9d jdk7u1-b02
  272778f529d11081f548f37fcd6a7aec0b11a8dd jdk7u1-b03
  48b06a6e6f46e5bcd610f4bed57cd5067cf31f8c jdk7u1-b04
-@@ -605,3 +606,4 @@
- 2230b8f8e03a8eaefc83acb577f30c4de88c45a7 jdk7u91-b02
- 3427b35ce5a1a0143b4aedf3f5e0a1953ad7fd7f jdk7u95-b00
+@@ -607,3 +608,4 @@
  e0764f20b2894c5de39f1e235171d42d5f2703eb jdk7u99-b00
-+36ee37eedf25da13abde1c0b8974fb3b95c59c7c jdk7u101-b00
---- ./jdk/.hgtags	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/.hgtags	Sun May 01 21:26:40 2016 -0700
+ 36ee37eedf25da13abde1c0b8974fb3b95c59c7c jdk7u101-b00
+ 8fd4ada6c5d5c3f71cc52cc2af97c971a58c6b53 jdk7u111-b00
++18074c212a8997055baa9aca9e9ae0dbbe90e1f4 jdk7u111-b01
+--- ./jdk/.hgtags	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/.hgtags	Sat Aug 20 12:04:16 2016 -0700
 @@ -123,6 +123,7 @@
  539e576793a8e64aaf160e0d6ab0b9723cd0bef0 jdk7-b146
  69e973991866c948cf1808b06884ef2d28b64fcb jdk7u1-b01
@@ -1479,13 +1479,13 @@
  2baf612764d215e6f3a5b48533f74c6924ac98d7 jdk7u1-b02
  a4781b6d9cfb6901452579adee17c9a17c1b584c jdk7u1-b03
  b223ed9a5fdf8ce3af42adfa8815975811d70eae jdk7u1-b04
-@@ -592,3 +593,4 @@
- c434c67b8189677dec0a0034a109fb261497cd92 jdk7u91-b02
- 3a74fee9ba00da3bd3a22492e1b069430a82574d jdk7u95-b00
+@@ -594,3 +595,4 @@
  0b89eea70cf4952b22dfe10ea8611ddb852d73d6 jdk7u99-b00
-+bdcfc4d9ab9f52fbf37db876c08a1846765627c4 jdk7u101-b00
---- ./jdk/make/com/sun/nio/sctp/Exportedfiles.gmk	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/com/sun/nio/sctp/Exportedfiles.gmk	Sun May 01 21:26:40 2016 -0700
+ bdcfc4d9ab9f52fbf37db876c08a1846765627c4 jdk7u101-b00
+ a7267e8244b9418af15b1103b4d906e8c6a61bc0 jdk7u111-b00
++cc1ed9a351886645eb729144696e41d187564ec2 jdk7u111-b01
+--- ./jdk/make/com/sun/nio/sctp/Exportedfiles.gmk	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/com/sun/nio/sctp/Exportedfiles.gmk	Sat Aug 20 12:04:16 2016 -0700
 @@ -29,6 +29,7 @@
  
  ifneq ($(PLATFORM), windows)
@@ -1499,8 +1499,8 @@
  endif
  endif
 +endif
---- ./jdk/make/com/sun/nio/sctp/FILES_c.gmk	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/com/sun/nio/sctp/FILES_c.gmk	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/com/sun/nio/sctp/FILES_c.gmk	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/com/sun/nio/sctp/FILES_c.gmk	Sat Aug 20 12:04:16 2016 -0700
 @@ -25,9 +25,13 @@
  
  ifneq ($(PLATFORM),windows)
@@ -1515,8 +1515,8 @@
  endif	
 +endif
 +endif
---- ./jdk/make/com/sun/nio/sctp/FILES_java.gmk	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/com/sun/nio/sctp/FILES_java.gmk	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/com/sun/nio/sctp/FILES_java.gmk	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/com/sun/nio/sctp/FILES_java.gmk	Sat Aug 20 12:04:16 2016 -0700
 @@ -50,6 +50,8 @@
  
  ifneq ($(PLATFORM), windows)
@@ -1532,8 +1532,8 @@
  endif
 +endif
 +endif
---- ./jdk/make/com/sun/nio/sctp/Makefile	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/com/sun/nio/sctp/Makefile	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/com/sun/nio/sctp/Makefile	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/com/sun/nio/sctp/Makefile	Sat Aug 20 12:04:16 2016 -0700
 @@ -47,9 +47,13 @@
  ifeq ($(PLATFORM), macosx)
  include $(BUILDDIR)/common/Classes.gmk
@@ -1556,8 +1556,8 @@
  endif # macosx
  endif # windows
  
---- ./jdk/make/com/sun/security/auth/module/Makefile	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/com/sun/security/auth/module/Makefile	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/com/sun/security/auth/module/Makefile	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/com/sun/security/auth/module/Makefile	Sat Aug 20 12:04:16 2016 -0700
 @@ -67,7 +67,7 @@
    include FILES_c_solaris.gmk
  endif # solaris
@@ -1567,8 +1567,8 @@
    LIBRARY = jaas_unix
    include FILES_export_unix.gmk
    include FILES_c_unix.gmk
---- ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk	Sat Aug 20 12:04:16 2016 -0700
 @@ -43,7 +43,7 @@
  	sun/tools/attach/LinuxVirtualMachine.java
  endif
@@ -1578,8 +1578,8 @@
  FILES_export = \
  	sun/tools/attach/BsdVirtualMachine.java
  endif
---- ./jdk/make/com/sun/tools/attach/FILES_c.gmk	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/com/sun/tools/attach/FILES_c.gmk	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/com/sun/tools/attach/FILES_c.gmk	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/com/sun/tools/attach/FILES_c.gmk	Sat Aug 20 12:04:16 2016 -0700
 @@ -39,7 +39,7 @@
  	LinuxVirtualMachine.c
  endif
@@ -1589,8 +1589,8 @@
  FILES_c = \
  	BsdVirtualMachine.c
  endif
---- ./jdk/make/com/sun/tools/attach/FILES_java.gmk	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/com/sun/tools/attach/FILES_java.gmk	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/com/sun/tools/attach/FILES_java.gmk	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/com/sun/tools/attach/FILES_java.gmk	Sat Aug 20 12:04:16 2016 -0700
 @@ -43,7 +43,7 @@
  	sun/tools/attach/LinuxAttachProvider.java
  endif
@@ -1600,8 +1600,8 @@
  FILES_java += \
  	sun/tools/attach/BsdAttachProvider.java
  endif
---- ./jdk/make/com/sun/tools/attach/Makefile	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/com/sun/tools/attach/Makefile	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/com/sun/tools/attach/Makefile	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/com/sun/tools/attach/Makefile	Sat Aug 20 12:04:16 2016 -0700
 @@ -38,7 +38,7 @@
  ifeq ($(PLATFORM), linux)
  FILES_m = mapfile-linux
@@ -1620,8 +1620,8 @@
    vpath %.c $(call NativeSrcDirList,,native/sun/tools/attach)
  else
    vpath %.c $(PLATFORM_SRC)/native/sun/tools/attach
---- ./jdk/make/com/sun/tools/attach/mapfile-bsd	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/com/sun/tools/attach/mapfile-bsd	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/com/sun/tools/attach/mapfile-bsd	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/com/sun/tools/attach/mapfile-bsd	Sat Aug 20 12:04:16 2016 -0700
 @@ -30,6 +30,7 @@
  	    Java_sun_tools_attach_BsdVirtualMachine_checkPermissions;
  	    Java_sun_tools_attach_BsdVirtualMachine_close;
@@ -1631,7 +1631,7 @@
  	    Java_sun_tools_attach_BsdVirtualMachine_sendQuitTo;
  	    Java_sun_tools_attach_BsdVirtualMachine_socket;
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/make/common/Defs-bsd.gmk	Sun May 01 21:26:40 2016 -0700
++++ ./jdk/make/common/Defs-bsd.gmk	Sat Aug 20 12:04:16 2016 -0700
 @@ -0,0 +1,482 @@
 +#
 +# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
@@ -2115,9 +2115,9 @@
 +  OTHER_CXXFLAGS += -I$(OPENWIN_HOME)/include
 +  OTHER_CPPFLAGS += -I$(OPENWIN_HOME)/include
 +endif
---- ./jdk/make/common/Defs-linux.gmk	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/common/Defs-linux.gmk	Sun May 01 21:26:40 2016 -0700
-@@ -426,6 +426,7 @@
+--- ./jdk/make/common/Defs-linux.gmk	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/common/Defs-linux.gmk	Sat Aug 20 12:04:16 2016 -0700
+@@ -432,6 +432,7 @@
  override LIBDL                   = -ldl
  override MOOT_PRIORITIES         = true
  override NO_INTERRUPTIBLE_IO     = true
@@ -2125,8 +2125,8 @@
  ifeq ($(ARCH), amd64)
  override OPENWIN_LIB             = $(OPENWIN_HOME)/lib64
  else
---- ./jdk/make/common/Defs-solaris.gmk	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/common/Defs-solaris.gmk	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/common/Defs-solaris.gmk	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/common/Defs-solaris.gmk	Sat Aug 20 12:04:16 2016 -0700
 @@ -753,6 +753,9 @@
  # Network Services library
  LIBNSL = -lnsl
@@ -2137,8 +2137,8 @@
  # service configuration facility library
  LIBSCF = -lscf
  
---- ./jdk/make/common/Defs.gmk	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/common/Defs.gmk	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/common/Defs.gmk	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/common/Defs.gmk	Sat Aug 20 12:04:16 2016 -0700
 @@ -179,15 +179,15 @@
  
    ifdef ALT_FREETYPE_LIB_PATH
@@ -2189,8 +2189,8 @@
    VPATH0.java = $(subst $(ONESPACE),:,$(GENSRCDIR) $(call JavaSrcDirList,,classes))
  else
    VPATH0.java = $(GENSRCDIR)$(CLASSPATH_SEPARATOR)$(PLATFORM_SRC)/classes$(CLASSPATH_SEPARATOR)$(SHARE_SRC)/classes
---- ./jdk/make/common/Library.gmk	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/common/Library.gmk	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/common/Library.gmk	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/common/Library.gmk	Sat Aug 20 12:04:16 2016 -0700
 @@ -299,8 +299,12 @@
              ifeq ($(PLATFORM), solaris)
  	      $(STRIP) -x $@
@@ -2206,8 +2206,8 @@
              endif
            # implied else here is no stripping at all
            endif
---- ./jdk/make/common/Mapfile-vers.gmk	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/common/Mapfile-vers.gmk	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/common/Mapfile-vers.gmk	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/common/Mapfile-vers.gmk	Sat Aug 20 12:04:16 2016 -0700
 @@ -76,7 +76,7 @@
  
  endif # PLATFORM
@@ -2217,8 +2217,8 @@
  
  ifeq ($(VARIANT), OPT)
    # OPT build MUST have a mapfile?
---- ./jdk/make/common/Program.gmk	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/common/Program.gmk	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/common/Program.gmk	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/common/Program.gmk	Sat Aug 20 12:04:16 2016 -0700
 @@ -95,6 +95,17 @@
    endif # SYSTEM_ZLIB
  endif # PLATFORM
@@ -2291,8 +2291,8 @@
  
  OTHER_CPPFLAGS  += -DPROGNAME='"$(PROGRAM)"'
  VERSION_DEFINES += -DFULL_VERSION='"$(FULL_VERSION)"'
---- ./jdk/make/common/Release.gmk	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/common/Release.gmk	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/common/Release.gmk	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/common/Release.gmk	Sat Aug 20 12:04:16 2016 -0700
 @@ -180,6 +180,12 @@
    JA_DIRNAME=ja_JP.UTF-8
  endif # linux
@@ -2337,8 +2337,8 @@
  	       | ($(CD) $(JDK_IMAGE_DIR)/src && $(TAR) xf -); \
  	  fi; \
  	done
---- ./jdk/make/common/Rules.gmk	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/common/Rules.gmk	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/common/Rules.gmk	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/common/Rules.gmk	Sat Aug 20 12:04:16 2016 -0700
 @@ -51,7 +51,7 @@
  #
  # All source tree areas for java/properties files (a few may be closed)
@@ -2357,8 +2357,8 @@
  # TODO(cpc): need to document why this is necessary...
  $(CLASSDESTDIR)/%.class: $(JDK_TOPDIR)/src/macosx/classes/%.java
  	@$(add-java-file)
---- ./jdk/make/common/shared/Compiler-gcc.gmk	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/common/shared/Compiler-gcc.gmk	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/common/shared/Compiler-gcc.gmk	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/common/shared/Compiler-gcc.gmk	Sat Aug 20 12:04:16 2016 -0700
 @@ -72,6 +72,21 @@
  
  endif
@@ -2382,7 +2382,7 @@
  
    # Settings specific to Solaris
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/make/common/shared/Defs-bsd.gmk	Sun May 01 21:26:40 2016 -0700
++++ ./jdk/make/common/shared/Defs-bsd.gmk	Sat Aug 20 12:04:16 2016 -0700
 @@ -0,0 +1,267 @@
 +#
 +# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -2651,8 +2651,8 @@
 +endef
 +endif
 +
---- ./jdk/make/common/shared/Defs-utils.gmk	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/common/shared/Defs-utils.gmk	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/common/shared/Defs-utils.gmk	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/common/shared/Defs-utils.gmk	Sat Aug 20 12:04:16 2016 -0700
 @@ -74,6 +74,13 @@
    UTILS_DEVTOOL_PATH=$(DEVTOOLS_PATH)
  endif
@@ -2703,8 +2703,8 @@
 +    UNZIP      = $(UTILS_DEVTOOL_PATH)unzip
 +  endif
 +endif
---- ./jdk/make/common/shared/Defs-versions.gmk	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/common/shared/Defs-versions.gmk	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/common/shared/Defs-versions.gmk	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/common/shared/Defs-versions.gmk	Sat Aug 20 12:04:16 2016 -0700
 @@ -44,6 +44,11 @@
    override CC_VERSION = gcc
  endif
@@ -2731,8 +2731,8 @@
  # Mac specific
  ifeq ($(PLATFORM), macosx)
    REQUIRED_OS_NAME            = Darwin
---- ./jdk/make/common/shared/Defs.gmk	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/common/shared/Defs.gmk	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/common/shared/Defs.gmk	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/common/shared/Defs.gmk	Sat Aug 20 12:04:16 2016 -0700
 @@ -181,7 +181,7 @@
  # platform and shared sources/headers.  This is mainly useful for the
  # Mac OS X build, which pulls its platform sources from the solaris and/or
@@ -2742,8 +2742,8 @@
    define JavaSrcDirList
    $(JAVA_SRCDIR_LIST:%=$1$(JDK_TOPDIR)/%/$2)
    endef
---- ./jdk/make/common/shared/Platform.gmk	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/common/shared/Platform.gmk	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/common/shared/Platform.gmk	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/common/shared/Platform.gmk	Sat Aug 20 12:04:16 2016 -0700
 @@ -298,6 +298,85 @@
    # How much RAM does this machine have:
  endif
@@ -2830,8 +2830,8 @@
  # Windows with and without CYGWIN will be slightly different
  ifeq ($(SYSTEM_UNAME), Windows_NT)
    PLATFORM = windows
---- ./jdk/make/java/Makefile	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/java/Makefile	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/java/Makefile	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/java/Makefile	Sat Aug 20 12:04:16 2016 -0700
 @@ -53,7 +53,7 @@
    endif
  endif # PLATFORM
@@ -2841,8 +2841,8 @@
    SUBDIRS += jexec
  endif # PLATFORM
  
---- ./jdk/make/java/instrument/Makefile	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/java/instrument/Makefile	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/java/instrument/Makefile	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/java/instrument/Makefile	Sat Aug 20 12:04:16 2016 -0700
 @@ -104,12 +104,24 @@
    # equivalent of strcasecmp is stricmp on Windows
    CPPFLAGS_COMMON += -Dstrcasecmp=stricmp
@@ -2873,8 +2873,8 @@
    ifeq ($(SYSTEM_ZLIB), true)
      OTHER_LDLIBS += -lz
    endif
---- ./jdk/make/java/java/Makefile	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/java/java/Makefile	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/java/java/Makefile	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/java/java/Makefile	Sat Aug 20 12:04:16 2016 -0700
 @@ -177,9 +177,11 @@
  #
  ifneq ($(PLATFORM), windows)
@@ -2897,8 +2897,8 @@
  
  ARCHFLAG = 
  ifeq ($(ARCH_DATA_MODEL), 64)
---- ./jdk/make/java/java/genlocales.gmk	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/java/java/genlocales.gmk	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/java/java/genlocales.gmk	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/java/java/genlocales.gmk	Sat Aug 20 12:04:16 2016 -0700
 @@ -93,17 +93,65 @@
  
  else
@@ -2969,8 +2969,8 @@
  endif
  	
  genlocales : $(LocaleDataMetaInfo_Dest)  
---- ./jdk/make/java/jli/Makefile	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/java/jli/Makefile	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/java/jli/Makefile	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/java/jli/Makefile	Sat Aug 20 12:04:16 2016 -0700
 @@ -119,9 +119,9 @@
    LIBARCH_DEFINES += -DLIBARCH64NAME='"$(LIBARCH64)"'
  endif # PLATFORM
@@ -2992,8 +2992,8 @@
      ifeq ($(USE_PTHREADS),true)
        LDLIBS += -lpthread
      endif # USE_PTHREADS 
---- ./jdk/make/java/net/FILES_c.gmk	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/java/net/FILES_c.gmk	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/java/net/FILES_c.gmk	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/java/net/FILES_c.gmk	Sat Aug 20 12:04:16 2016 -0700
 @@ -50,6 +50,10 @@
      FILES_c += bsd_close.c
  endif
@@ -3005,8 +3005,8 @@
  ifeq ($(PLATFORM), windows)
      FILES_c += TwoStacksPlainSocketImpl.c
      FILES_c += DualStackPlainSocketImpl.c
---- ./jdk/make/java/net/Makefile	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/java/net/Makefile	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/java/net/Makefile	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/java/net/Makefile	Sat Aug 20 12:04:16 2016 -0700
 @@ -93,7 +93,7 @@
  
  include $(BUILDDIR)/common/Library.gmk
@@ -3016,8 +3016,8 @@
  ifdef DONT_ENABLE_IPV6
    OTHER_CFLAGS += -DDONT_ENABLE_IPV6
  endif
---- ./jdk/make/java/nio/Makefile	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/java/nio/Makefile	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/java/nio/Makefile	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/java/nio/Makefile	Sat Aug 20 12:04:16 2016 -0700
 @@ -263,13 +263,89 @@
  	sun/nio/fs/UnixConstants.java
  endif # PLATFORM = linux
@@ -3158,8 +3158,8 @@
  FILES_m = mapfile-bsd
  endif
  include $(BUILDDIR)/common/Mapfile-vers.gmk
---- ./jdk/make/java/nio/mapfile-bsd	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/java/nio/mapfile-bsd	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/java/nio/mapfile-bsd	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/java/nio/mapfile-bsd	Sat Aug 20 12:04:16 2016 -0700
 @@ -70,6 +70,7 @@
                  Java_sun_nio_ch_IOUtil_drain;
                  Java_sun_nio_ch_IOUtil_fdVal;
@@ -3180,8 +3180,8 @@
  		Java_sun_nio_ch_KQueuePort_socketpair;
  		Java_sun_nio_ch_KQueuePort_interrupt;
  		Java_sun_nio_ch_KQueuePort_drain1;
---- ./jdk/make/java/npt/Makefile	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/java/npt/Makefile	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/java/npt/Makefile	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/java/npt/Makefile	Sat Aug 20 12:04:16 2016 -0700
 @@ -74,6 +74,14 @@
    OTHER_LDLIBS += -liconv
  endif
@@ -3197,8 +3197,8 @@
  #
  # Add to ambient vpath so we pick up the library files
  #
---- ./jdk/make/java/redist/fonts/Makefile	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/java/redist/fonts/Makefile	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/java/redist/fonts/Makefile	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/java/redist/fonts/Makefile	Sat Aug 20 12:04:16 2016 -0700
 @@ -42,7 +42,7 @@
  	$(LIBDIR)/fonts/LucidaSansRegular.ttf       	\
  	$(LIBDIR)/fonts/LucidaSansDemiBold.ttf       	\
@@ -3226,8 +3226,8 @@
  
  all build : $(INTERNAL_IMPORT_LIST)
  
---- ./jdk/make/javax/sound/Makefile	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/javax/sound/Makefile	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/javax/sound/Makefile	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/javax/sound/Makefile	Sat Aug 20 12:04:16 2016 -0700
 @@ -111,6 +111,21 @@
    #MXSPP_ADD = $(PLATFORM)-$(ARCH)/
  endif # PLATFORM linux
@@ -3250,8 +3250,8 @@
  ifeq ($(PLATFORM), macosx)
    CPPFLAGS += -DUSE_PORTS=TRUE \
                -DUSE_DAUDIO=TRUE \
---- ./jdk/make/javax/sound/SoundDefs.gmk	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/javax/sound/SoundDefs.gmk	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/javax/sound/SoundDefs.gmk	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/javax/sound/SoundDefs.gmk	Sat Aug 20 12:04:16 2016 -0700
 @@ -40,6 +40,10 @@
    CPPFLAGS += -DX_PLATFORM=X_LINUX
  endif # PLATFORM linux
@@ -3263,8 +3263,8 @@
  ifeq ($(PLATFORM), macosx)
    CPPFLAGS += -DX_PLATFORM=X_MACOSX
  endif # PLATFORM macosx
---- ./jdk/make/javax/sound/jsoundalsa/Makefile	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/javax/sound/jsoundalsa/Makefile	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/javax/sound/jsoundalsa/Makefile	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/javax/sound/jsoundalsa/Makefile	Sat Aug 20 12:04:16 2016 -0700
 @@ -51,6 +51,7 @@
  	$(PORTFILES_c)
  
@@ -3315,8 +3315,8 @@
  
  #
  # Add to the ambient VPATH.
---- ./jdk/make/jpda/transport/socket/Makefile	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/jpda/transport/socket/Makefile	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/jpda/transport/socket/Makefile	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/jpda/transport/socket/Makefile	Sat Aug 20 12:04:16 2016 -0700
 @@ -38,6 +38,11 @@
  
  include $(BUILDDIR)/common/Defs.gmk
@@ -3329,8 +3329,8 @@
  ifeq ($(PLATFORM), linux)
    OTHER_LDLIBS += $(LIBNSL) $(LIBSOCKET) -lpthread
  endif
---- ./jdk/make/sun/awt/Makefile	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/sun/awt/Makefile	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/sun/awt/Makefile	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/sun/awt/Makefile	Sat Aug 20 12:04:16 2016 -0700
 @@ -127,7 +127,12 @@
  OTHER_LDLIBS = $(JVMLIB) $(LIBM) $(LIBDL)
  endif
@@ -3397,8 +3397,8 @@
  LDFLAGS += -L$(OPENWIN_LIB)
  endif
  
---- ./jdk/make/sun/awt/mawt.gmk	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/sun/awt/mawt.gmk	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/sun/awt/mawt.gmk	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/sun/awt/mawt.gmk	Sat Aug 20 12:04:16 2016 -0700
 @@ -169,7 +169,7 @@
  OTHER_LDLIBS = -lXt -lXext $(LIBXTST) $(LIBXMU) -lX11 -lXi
  endif
@@ -3455,18 +3455,18 @@
  ifeq ($(PLATFORM), macosx))
    CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \
                -I$(OPENWIN_HOME)/include 
---- ./jdk/make/sun/font/Makefile	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/sun/font/Makefile	Sun May 01 21:26:40 2016 -0700
-@@ -96,7 +96,7 @@
- 
- # Turn off aliasing with GCC for ExtensionSubtables.cpp
- # Turn off strict overflow with GCC for IndicRearrangementProcessor.cpp
+--- ./jdk/make/sun/font/Makefile	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/sun/font/Makefile	Sat Aug 20 12:04:16 2016 -0700
+@@ -97,7 +97,7 @@
+ # Turn off aliasing with GCC for ExtensionSubtables.cpp (and others on GCC < 4.3)
+ # Turn off strict overflow with GCC for IndicRearrangementProcessor.cpp on GCC >= 4.3
+ # Ensure signed integers wrap with GCC for IndicRearrangementProcessor.cpp on GCC < 4.3
 -ifeq ($(PLATFORM), linux)
 +ifneq (,$(findstring $(PLATFORM), bsd linux))
    CXXFLAGS += $(CXXFLAGS_$(@F))
    CXXFLAGS_ExtensionSubtables.o = -fno-strict-aliasing
-   CXXFLAGS_IndicRearrangementProcessor.o := -fno-strict-overflow
-@@ -185,7 +185,7 @@
+ ifeq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 3 \) \))" "0"
+@@ -194,7 +194,7 @@
  # Libraries to link, and other C flags.
  #
  
@@ -3475,8 +3475,8 @@
  OTHER_INCLUDES += -I$(X11_PATH)/include
  OTHER_LDLIBS  += -lawt $(LIBM) $(LIBCXX)
   ifeq ($(OS_VENDOR),Apple)
---- ./jdk/make/sun/jawt/Makefile	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/sun/jawt/Makefile	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/sun/jawt/Makefile	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/sun/jawt/Makefile	Sat Aug 20 12:04:16 2016 -0700
 @@ -99,8 +99,7 @@
  #
  # Other extra flags needed for compiling.
@@ -3504,9 +3504,9 @@
    ifndef BUILD_HEADLESS_ONLY
      OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -lawt -L$(LIBDIR)/$(LIBARCH)/xawt -lmawt
    else
---- ./jdk/make/sun/rmi/rmi/Makefile	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/sun/rmi/rmi/Makefile	Sun May 01 21:26:40 2016 -0700
-@@ -71,6 +71,9 @@
+--- ./jdk/make/sun/rmi/rmi/Makefile	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/sun/rmi/rmi/Makefile	Sat Aug 20 12:04:16 2016 -0700
+@@ -70,6 +70,9 @@
      BUILD_TARGETS += bin
    endif
  endif
@@ -3516,8 +3516,8 @@
  
  build: $(BUILD_TARGETS)
  
---- ./jdk/make/sun/splashscreen/Makefile	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/sun/splashscreen/Makefile	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/sun/splashscreen/Makefile	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/sun/splashscreen/Makefile	Sat Aug 20 12:04:16 2016 -0700
 @@ -61,6 +61,12 @@
  
  CFLAGS += -DSPLASHSCREEN
@@ -3569,8 +3569,8 @@
    OTHER_CFLAGS += $(ZLIB_CFLAGS)
    OTHER_LDLIBS += $(ZLIB_LIBS)
  endif
---- ./jdk/make/sun/xawt/Makefile	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/sun/xawt/Makefile	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/sun/xawt/Makefile	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/sun/xawt/Makefile	Sat Aug 20 12:04:16 2016 -0700
 @@ -52,6 +52,9 @@
  AUTO_JAVA_PRUNE = WrapperGenerator.java
  
@@ -3623,8 +3623,8 @@
  ifeq ($(PLATFORM), macosx)
    CPPFLAGS += -DX11_PATH=\"$(X11_PATH)\" -DPACKAGE_PATH=\"$(PACKAGE_PATH)\"
  endif
---- ./jdk/make/tools/freetypecheck/Makefile	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/tools/freetypecheck/Makefile	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/tools/freetypecheck/Makefile	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/tools/freetypecheck/Makefile	Sat Aug 20 12:04:16 2016 -0700
 @@ -52,8 +52,15 @@
    else 
      ifeq ($(PLATFORM), macosx)
@@ -3644,7 +3644,7 @@
    endif
  endif
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/make/tools/sharing/classlist.bsd	Sun May 01 21:26:40 2016 -0700
++++ ./jdk/make/tools/sharing/classlist.bsd	Sat Aug 20 12:04:16 2016 -0700
 @@ -0,0 +1,2327 @@
 +java/lang/Object
 +java/lang/String
@@ -5973,8 +5973,8 @@
 +sun/applet/AppletPanel$6
 +javax/swing/BufferStrategyPaintManager$1
 +# f3ac8b467e7f8c49
---- ./jdk/src/bsd/doc/man/appletviewer.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/appletviewer.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/appletviewer.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/appletviewer.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -6027,8 +6027,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/apt.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/apt.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/apt.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/apt.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -6076,41 +6076,44 @@
  .TP 3
 -\-s dir
 -Specify the directory root under which processor\-generated source files will be placed; files are placed in subdirectories based on package namespace.
-+\-s dir 
-+Specify the directory root under which processor\-generated source files will be placed; files are placed in subdirectories based on package namespace. 
- .TP 3
+-.TP 3
 -\-nocompile
 -Do not compile source files to class files.
-+\-nocompile 
-+Do not compile source files to class files. 
- .TP 3
+-.TP 3
 -\-print
 -Print out textual representation of specified types; perform no annotation processing or compilation.
-+\-print 
-+Print out textual representation of specified types; perform no annotation processing or compilation. 
++\-s dir 
++Specify the directory root under which processor\-generated source files will be placed; files are placed in subdirectories based on package namespace. 
  .TP 3
 -\-A[key[=val]]
 -Options to pass to annotation processors \-\- these are not interpreted by \f2apt\fP directly, but are made available for use by individual processors
-+\-A[key[=val]] 
-+Options to pass to annotation processors \-\- these are not interpreted by \f2apt\fP directly, but are made available for use by individual processors 
- .TP 3
+-.TP 3
 -\-factorypath path
 -Specify where to find annotation processor factories; if this option is used, the classpath is \f2not\fP searched for factories.
-+\-factorypath path 
-+Specify where to find annotation processor factories; if this option is used, the classpath is \f2not\fP searched for factories. 
++\-nocompile 
++Do not compile source files to class files. 
  .TP 3
 -\-factory classname
 -Name of annotation processor factory to use; bypasses default discovery process
-+\-factory classname 
-+Name of annotation processor factory to use; bypasses default discovery process 
++\-print 
++Print out textual representation of specified types; perform no annotation processing or compilation. 
  .TP 3
 -\-version
 -Print version information.
-+\-version 
-+Print version information. 
++\-A[key[=val]] 
++Options to pass to annotation processors \-\- these are not interpreted by \f2apt\fP directly, but are made available for use by individual processors 
  .TP 3
 -\-X
 -Display information about non\-standard options.
++\-factorypath path 
++Specify where to find annotation processor factories; if this option is used, the classpath is \f2not\fP searched for factories. 
++.TP 3
++\-factory classname 
++Name of annotation processor factory to use; bypasses default discovery process 
++.TP 3
++\-version 
++Print version information. 
++.TP 3
 +\-X 
 +Display information about non\-standard options. 
  .RE
@@ -6145,26 +6148,27 @@
  .TP 3
 -\-XListAnnotationTypes
 -List found annotation types.
-+\-XListAnnotationTypes 
-+List found annotation types. 
- .TP 3
+-.TP 3
 -\-XListDeclarations
 -List specified and included declarations.
-+\-XListDeclarations 
-+List specified and included declarations. 
++\-XListAnnotationTypes 
++List found annotation types. 
  .TP 3
 -\-XPrintAptRounds
 -Print information about initial and recursive \f2apt\fP rounds.
-+\-XPrintAptRounds 
-+Print information about initial and recursive \f2apt\fP rounds. 
++\-XListDeclarations 
++List specified and included declarations. 
  .TP 3
 -\-XPrintFactoryInfo
 -Print information about which annotations a factory is asked to process.
-+\-XPrintFactoryInfo 
-+Print information about which annotations a factory is asked to process. 
++\-XPrintAptRounds 
++Print information about initial and recursive \f2apt\fP rounds. 
  .TP 3
 -\-XclassesAsDecls
 -Treat both class and source files as declarations to process.
++\-XPrintFactoryInfo 
++Print information about which annotations a factory is asked to process. 
++.TP 3
 +\-XclassesAsDecls 
 +Treat both class and source files as declarations to process. 
  .RE
@@ -6181,8 +6185,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/extcheck.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/extcheck.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/extcheck.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/extcheck.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -6214,8 +6218,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/idlj.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/idlj.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/idlj.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/idlj.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,13 +19,13 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -6396,40 +6400,43 @@
  .TP 3
 -\-emitAll
 -Emit all types, including those found in \f2#include\fP files.
+-.TP 3
+-\-fside
+-Defines what bindings to emit. \f2side\fP is one of \f2client\fP, \f2server\fP, \f2serverTIE\fP, \f2all\fP, or \f2allTIE\fP. The \f2\-fserverTIE\fP and \f2\-fallTIE\fP options cause delegate model skeletons to be emitted. Assumes \f2\-fclient\fP if the flag is not specified.
+-.TP 3
+-\-i include\-path
+-By default, the current directory is scanned for included files. This option adds another directory.
 +\-emitAll 
 +Emit all types, including those found in \f2#include\fP files. 
  .TP 3
--\-fside
--Defines what bindings to emit. \f2side\fP is one of \f2client\fP, \f2server\fP, \f2serverTIE\fP, \f2all\fP, or \f2allTIE\fP. The \f2\-fserverTIE\fP and \f2\-fallTIE\fP options cause delegate model skeletons to be emitted. Assumes \f2\-fclient\fP if the flag is not specified.
+-\-keep
+-If a file to be generated already exists, do not overwrite it. By default it is overwritten.
+-.TP 3
+-\-noWarn
+-Suppresses warning messages.
 +\-fside 
 +Defines what bindings to emit. \f2side\fP is one of \f2client\fP, \f2server\fP, \f2serverTIE\fP, \f2all\fP, or \f2allTIE\fP. The \f2\-fserverTIE\fP and \f2\-fallTIE\fP options cause delegate model skeletons to be emitted. Assumes \f2\-fclient\fP if the flag is not specified. 
  .TP 3
--\-i include\-path
--By default, the current directory is scanned for included files. This option adds another directory.
+-\-oldImplBase
+-Generates skeletons compatible with pre\-1.4 JDK ORBs. By default, the POA Inheritance Model server\-side bindings are generated. This option provides backward\-compatibility with older versions of the Java programming language by generating server\-side bindings that are \f2ImplBase\fP Inheritance Model classes.
 +\-i include\-path 
 +By default, the current directory is scanned for included files. This option adds another directory. 
  .TP 3
--\-keep
--If a file to be generated already exists, do not overwrite it. By default it is overwritten.
+-\-pkgPrefix type prefix
+-Wherever \f2type\fP is encountered at file scope, prefix the generated Java package name with \f2prefix\fP for all files generated for that type. The \f2type\fP is the simple name of either a top\-level module, or an IDL type defined outside of any module.
 +\-keep 
 +If a file to be generated already exists, do not overwrite it. By default it is overwritten. 
  .TP 3
--\-noWarn
--Suppresses warning messages.
+-\-pkgTranslate type package
 +\-noWarn 
 +Suppresses warning messages. 
- .TP 3
--\-oldImplBase
--Generates skeletons compatible with pre\-1.4 JDK ORBs. By default, the POA Inheritance Model server\-side bindings are generated. This option provides backward\-compatibility with older versions of the Java programming language by generating server\-side bindings that are \f2ImplBase\fP Inheritance Model classes.
++.TP 3
 +\-oldImplBase 
 +Generates skeletons compatible with pre\-1.4 JDK ORBs. By default, the POA Inheritance Model server\-side bindings are generated. This option provides backward\-compatibility with older versions of the Java programming language by generating server\-side bindings that are \f2ImplBase\fP Inheritance Model classes. 
- .TP 3
--\-pkgPrefix type prefix
--Wherever \f2type\fP is encountered at file scope, prefix the generated Java package name with \f2prefix\fP for all files generated for that type. The \f2type\fP is the simple name of either a top\-level module, or an IDL type defined outside of any module.
++.TP 3
 +\-pkgPrefix type prefix 
 +Wherever \f2type\fP is encountered at file scope, prefix the generated Java package name with \f2prefix\fP for all files generated for that type. The \f2type\fP is the simple name of either a top\-level module, or an IDL type defined outside of any module. 
- .TP 3
--\-pkgTranslate type package
++.TP 3
 +\-pkgTranslate type package 
  Whenever the module name \f2type\fP is encountered in an identifier, replace it in the identifier with \f2package\fP for all files in the generated Java package. Note that \f2pkgPrefix\fP changes are made first. \f2type\fP is the simple name of either a top\-level module, or an IDL type defined outside of any module, and must match the full package name exactly.
  .br
@@ -6453,62 +6460,70 @@
  \fP
  .fi
 -The following package names cannot be translated:
-+The following package names cannot be translated: 
- .RS 3
- .TP 2
- o
+-.RS 3
+-.TP 2
+-o
 -\f2org\fP
-+\f2org\fP 
- .TP 2
- o
+-.TP 2
+-o
 -\f2org.omg\fP or any subpackages of \f2org.omg\fP
-+\f2org.omg\fP or any subpackages of \f2org.omg\fP 
- .RE
+-.RE
 -Any attempt to translate these packages will result in uncompilable code, and the use of these packages as the first argument after \f2\-pkgTranslate\fP will be treated as an error.
-+Any attempt to translate these packages will result in uncompilable code, and the use of these packages as the first argument after \f2\-pkgTranslate\fP will be treated as an error. 
- .TP 3
+-.TP 3
 -\-skeletonName xxx%yyy
 -Use \f2xxx%yyy\fP as the pattern for naming the skeleton. The defaults are:
-+\-skeletonName xxx%yyy 
-+Use \f2xxx%yyy\fP as the pattern for naming the skeleton. The defaults are: 
++The following package names cannot be translated: 
  .RS 3
  .TP 2
  o
 -%POA for the \f2POA\fP base class (\f2\-fserver\fP or \f2\-fall\fP)
-+%POA for the \f2POA\fP base class (\f2\-fserver\fP or \f2\-fall\fP) 
++\f2org\fP 
  .TP 2
  o
 -_%ImplBase for the \f2oldImplBase\fP class (\f2\-oldImplBase\fP and (\f2\-fserver\fP or \f2\-fall\fP))
-+_%ImplBase for the \f2oldImplBase\fP class (\f2\-oldImplBase\fP and (\f2\-fserver\fP or \f2\-fall\fP)) 
++\f2org.omg\fP or any subpackages of \f2org.omg\fP 
  .RE
++Any attempt to translate these packages will result in uncompilable code, and the use of these packages as the first argument after \f2\-pkgTranslate\fP will be treated as an error. 
  .TP 3
 -\-td dir
 -Use \f2dir\fP for the output directory instead of the current directory.
-+\-td dir 
-+Use \f2dir\fP for the output directory instead of the current directory. 
- .TP 3
+-.TP 3
 -\-tieName xxx%yyy
 -Name the tie according to the pattern. The defaults are:
-+\-tieName xxx%yyy 
-+Name the tie according to the pattern. The defaults are: 
++\-skeletonName xxx%yyy 
++Use \f2xxx%yyy\fP as the pattern for naming the skeleton. The defaults are: 
  .RS 3
  .TP 2
  o
 -%POATie for the \f2POA\fP tie base class (\f2\-fserverTie\fP or \f2\-fallTie\fP)
-+%POATie for the \f2POA\fP tie base class (\f2\-fserverTie\fP or \f2\-fallTie\fP) 
++%POA for the \f2POA\fP base class (\f2\-fserver\fP or \f2\-fall\fP) 
  .TP 2
  o
 -%_Tie for the \f2oldImplBase\fP tie class (\f2\-oldImplBase\fP and (\f2\-fserverTie\fP or \f2\-fallTie\fP))
-+%_Tie for the \f2oldImplBase\fP tie class (\f2\-oldImplBase\fP and (\f2\-fserverTie\fP or \f2\-fallTie\fP)) 
++_%ImplBase for the \f2oldImplBase\fP class (\f2\-oldImplBase\fP and (\f2\-fserver\fP or \f2\-fall\fP)) 
  .RE
  .TP 3
 -\-nowarn, \-verbose
 -Verbose mode.
-+\-nowarn, \-verbose 
-+Verbose mode. 
++\-td dir 
++Use \f2dir\fP for the output directory instead of the current directory. 
  .TP 3
 -\-version
 -Display version information and terminate.
++\-tieName xxx%yyy 
++Name the tie according to the pattern. The defaults are: 
++.RS 3
++.TP 2
++o
++%POATie for the \f2POA\fP tie base class (\f2\-fserverTie\fP or \f2\-fallTie\fP) 
++.TP 2
++o
++%_Tie for the \f2oldImplBase\fP tie class (\f2\-oldImplBase\fP and (\f2\-fserverTie\fP or \f2\-fallTie\fP)) 
++.RE
++.TP 3
++\-nowarn, \-verbose 
++Verbose mode. 
++.TP 3
 +\-version 
 +Display version information and terminate. 
  .RE
@@ -6538,8 +6553,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/ja/appletviewer.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/ja/appletviewer.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/ja/appletviewer.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/ja/appletviewer.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,6 +19,51 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -6593,8 +6608,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/apt.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/ja/apt.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/ja/apt.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/ja/apt.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,9 +19,135 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -6733,8 +6748,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/extcheck.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/ja/extcheck.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/ja/extcheck.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/ja/extcheck.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,6 +19,55 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -6792,8 +6807,8 @@
 +jar(1)
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/idlj.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/ja/idlj.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/ja/idlj.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/ja/idlj.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,6 +19,720 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -7516,8 +7531,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/jar.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/ja/jar.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/ja/jar.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/ja/jar.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,6 +19,583 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -8103,8 +8118,8 @@
 +pack200(1)
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/jarsigner.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/ja/jarsigner.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/ja/jarsigner.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/ja/jarsigner.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,6 +19,1655 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -9762,8 +9777,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/java.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/ja/java.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/ja/java.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/ja/java.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -1,4 +1,4 @@
 -." Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
 +." Copyright (c) 1994, 2012, Oracle and/or its affiliates. All rights reserved.
@@ -10404,8 +10419,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/javac.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/ja/javac.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/ja/javac.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/ja/javac.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,6 +19,1222 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -11630,8 +11645,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/javadoc.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/ja/javadoc.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/ja/javadoc.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/ja/javadoc.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,4 +19,4179 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -15813,8 +15828,8 @@
 +http://docs.oracle.com/javase/7/docs/technotes/tools/findingclasses.html#srcfiles(tools.jar) 
 +.RE
 + 
---- ./jdk/src/bsd/doc/man/ja/javah.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/ja/javah.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/ja/javah.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/ja/javah.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,6 +19,120 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -15937,8 +15952,8 @@
 +javac(1)¡¢java(1)¡¢jdb(1)¡¢javap(1)¡¢javadoc(1)
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/javap.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/ja/javap.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/ja/javap.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/ja/javap.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,6 +19,299 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -16240,8 +16255,8 @@
 +javac(1)¡¢java(1)¡¢jdb(1)¡¢javah(1)¡¢javadoc(1)
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/javaws.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/ja/javaws.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/ja/javaws.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/ja/javaws.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,6 +19,204 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -16449,7 +16464,7 @@
 +.LP
 + 
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/bsd/doc/man/ja/jcmd.1	Sun May 01 21:26:40 2016 -0700
++++ ./jdk/src/bsd/doc/man/ja/jcmd.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -0,0 +1,118 @@
 +." Copyright (c) 1994, 2012, Oracle and/or its affiliates. All rights reserved.
 +." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -16569,8 +16584,8 @@
 +jps(1)
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/jconsole.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/ja/jconsole.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/ja/jconsole.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/ja/jconsole.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,6 +19,138 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -16711,8 +16726,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/jdb.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/ja/jdb.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/ja/jdb.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/ja/jdb.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,6 +19,312 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -17027,8 +17042,8 @@
 +javac(1)¡¢java(1)¡¢javah(1)¡¢javap(1)¡¢javadoc(1)
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/jhat.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/ja/jhat.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/ja/jhat.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/ja/jhat.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,6 +19,135 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -17166,8 +17181,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/jinfo.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/ja/jinfo.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/ja/jinfo.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/ja/jinfo.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,6 +19,148 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -17318,8 +17333,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/jmap.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/ja/jmap.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/ja/jmap.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/ja/jmap.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,6 +19,161 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -17483,8 +17498,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/jps.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/ja/jps.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/ja/jps.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/ja/jps.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,6 +19,260 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -17747,8 +17762,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/jrunscript.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/ja/jrunscript.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/ja/jrunscript.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/ja/jrunscript.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,6 +19,194 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -17945,8 +17960,8 @@
 +http://docs.oracle.com/javase/7/docs/technotes/tools/share/jsdocs/allclasses\-noframe.html¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/jsadebugd.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/ja/jsadebugd.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/ja/jsadebugd.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/ja/jsadebugd.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,6 +19,107 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -18056,8 +18071,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/jstack.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/ja/jstack.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/ja/jstack.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/ja/jstack.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,6 +19,154 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -18214,8 +18229,8 @@
 +º®¹ç¥â¡¼¥É¤Î¥¹¥¿¥Ã¥¯¡¦¥È¥ì¡¼¥¹(\-m¥ª¥×¥·¥ç¥ó»ÈÍÑ)¤Ï¡¢¥ê¥â¡¼¥È¡¦¥Ç¥Ð¥Ã¥°¡¦¥µ¡¼¥Ð¡¼¤Ç¤Ïµ¡Ç½¤·¤Þ¤»¤ó¡£
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/jstat.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/ja/jstat.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/ja/jstat.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/ja/jstat.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,6 +19,5370 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -23588,8 +23603,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/jstatd.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/ja/jstatd.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/ja/jstatd.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/ja/jstatd.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,6 +19,267 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -23859,8 +23874,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/keytool.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/ja/keytool.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/ja/keytool.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/ja/keytool.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -1,4 +1,4 @@
 -." Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
 +." Copyright (c) 1998-2011 keytool tool, Oracle and/or its affiliates. All rights reserved.
@@ -25696,8 +25711,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/native2ascii.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/ja/native2ascii.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/ja/native2ascii.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/ja/native2ascii.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,6 +19,54 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -25754,8 +25769,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/orbd.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/ja/orbd.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/ja/orbd.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/ja/orbd.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,6 +19,350 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -26108,8 +26123,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/pack200.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/ja/pack200.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/ja/pack200.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/ja/pack200.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,6 +19,344 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -26456,8 +26471,8 @@
 +JDK¤ËÉÕ°¤¹¤ëJava SE API»ÅÍͤȤÎÁê°ã¤¬¸«¤Ä¤«¤Ã¤¿¾ì¹ç¤Ë¤Ï¡¢»ÅÍͤòÍ¥À褷¤Æ¤¯¤À¤µ¤¤¡£
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/policytool.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/ja/policytool.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/ja/policytool.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/ja/policytool.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,6 +19,102 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -26562,8 +26577,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/rmic.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/ja/rmic.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/ja/rmic.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/ja/rmic.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,6 +19,209 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -26775,8 +26790,8 @@
 +http://docs.oracle.com/javase/7/docs/technotes/tools/index.html#classpath
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/rmid.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/ja/rmid.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/ja/rmid.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/ja/rmid.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,6 +19,310 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -27089,8 +27104,8 @@
 +http://docs.oracle.com/javase/7/docs/technotes/tools/index.html#classpath¡¢java(1)
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/rmiregistry.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/ja/rmiregistry.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/ja/rmiregistry.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/ja/rmiregistry.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,6 +19,65 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -27158,8 +27173,8 @@
 +\f2java.rmi.Naming\fP @
 +.fi
 +http://docs.oracle.com/javase/7/docs/api/java/rmi/Naming.html  
---- ./jdk/src/bsd/doc/man/ja/schemagen.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/ja/schemagen.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/ja/schemagen.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/ja/schemagen.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,6 +19,109 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -27271,8 +27286,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/serialver.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/ja/serialver.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/ja/serialver.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/ja/serialver.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,6 +19,79 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -27354,8 +27369,8 @@
 +http://docs.oracle.com/javase/7/docs/api/java/io/ObjectStreamClass.html
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/servertool.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/ja/servertool.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/ja/servertool.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/ja/servertool.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,6 +19,95 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -27453,8 +27468,8 @@
 +.SH "´ØÏ¢¹àÌÜ"
 +.LP
 +orbd(1)  
---- ./jdk/src/bsd/doc/man/ja/tnameserv.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/ja/tnameserv.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/ja/tnameserv.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/ja/tnameserv.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,6 +19,476 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -27933,8 +27948,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/unpack200.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/ja/unpack200.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/ja/unpack200.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/ja/unpack200.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,6 +19,160 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -28097,8 +28112,8 @@
 +JDK¤ËÉÕ°¤¹¤ëJava SE API»ÅÍͤȤÎÁê°ã¤¬¸«¤Ä¤«¤Ã¤¿¾ì¹ç¤Ë¤Ï¡¢»ÅÍͤòÍ¥À褷¤Æ¤¯¤À¤µ¤¤¡£
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/wsgen.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/ja/wsgen.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/ja/wsgen.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/ja/wsgen.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,4 +19,638 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -28739,8 +28754,8 @@
 +SOAP 1.2 WSDL¤¬À¸À®¤µ¤ì¤Þ¤¹¡£
 +.LP
 +¥µ¡¼¥Ó¥¹¤ò¥Ç¥×¥í¥¤¤¹¤ë¤È¤­¤ËJAXWS¥é¥ó¥¿¥¤¥à¤Ë¤è¤Ã¤Æ¼«Æ°Åª¤ËWSDL¤¬À¸À®¤µ¤ì¤ë¤¿¤á¡¢³«È¯»þ¤ËWSDL¤òÀ¸À®¤¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£ 
---- ./jdk/src/bsd/doc/man/ja/wsimport.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/ja/wsimport.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/ja/wsimport.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/ja/wsimport.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,4 +19,1048 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -29791,8 +29806,8 @@
 +Java¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤òÀ¸À®¤·¡¢\f2http://stockquote.example.com/quote?wsdl\fP¤ò¥¤¥ó¥Ý¡¼¥È¤·¤Æ¤½¤ÎJava¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤ò¥³¥ó¥Ñ¥¤¥ë¤·¤Þ¤¹
 +.br
 + 
---- ./jdk/src/bsd/doc/man/ja/xjc.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/ja/xjc.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/ja/xjc.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/ja/xjc.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,7 +19,279 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -30075,8 +30090,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/jar.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/jar.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/jar.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/jar.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,31 +19,31 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -30096,26 +30111,27 @@
  .TP 3
 -Create jar file
 -\f4jar c\fP\f2[v0Mmfe] [\fP\f2manifest\fP\f2] [\fP\f2jarfile\fP\f2] [\fP\f2entrypoint\fP\f2] [\-C\fP \f2dir\fP\f2]\fP \f2inputfiles\fP \f2[\-J\fP\f2option\fP\f2]\fP
-+Create jar file 
-+\f4jar c\fP\f2[v0Mmfe] [\fP\f2manifest\fP\f2] [\fP\f2jarfile\fP\f2] [\fP\f2entrypoint\fP\f2] [\-C\fP \f2dir\fP\f2]\fP \f2inputfiles\fP \f2[\-J\fP\f2option\fP\f2]\fP 
- .TP 3
+-.TP 3
 -Update jar file
 -\f4jar u\fP\f2[v0Mmfe] [\fP\f2manifest\fP\f2] [\fP\f2jarfile\fP\f2] [\fP\f2entrypoint\fP\f2] [\-C\fP \f2dir\fP\f2]\fP \f2inputfiles\fP \f2[\-J\fP\f2option\fP\f2]\fP
-+Update jar file 
-+\f4jar u\fP\f2[v0Mmfe] [\fP\f2manifest\fP\f2] [\fP\f2jarfile\fP\f2] [\fP\f2entrypoint\fP\f2] [\-C\fP \f2dir\fP\f2]\fP \f2inputfiles\fP \f2[\-J\fP\f2option\fP\f2]\fP 
++Create jar file 
++\f4jar c\fP\f2[v0Mmfe] [\fP\f2manifest\fP\f2] [\fP\f2jarfile\fP\f2] [\fP\f2entrypoint\fP\f2] [\-C\fP \f2dir\fP\f2]\fP \f2inputfiles\fP \f2[\-J\fP\f2option\fP\f2]\fP 
  .TP 3
 -Extract jar file
 -\f4jar x\fP\f2[vf] [\fP\f2jarfile\fP\f2] [\fP\f2inputfiles\fP\f2] [\-J\fP\f2option\fP\f2]\fP
-+Extract jar file 
-+\f4jar x\fP\f2[vf] [\fP\f2jarfile\fP\f2] [\fP\f2inputfiles\fP\f2] [\-J\fP\f2option\fP\f2]\fP 
++Update jar file 
++\f4jar u\fP\f2[v0Mmfe] [\fP\f2manifest\fP\f2] [\fP\f2jarfile\fP\f2] [\fP\f2entrypoint\fP\f2] [\-C\fP \f2dir\fP\f2]\fP \f2inputfiles\fP \f2[\-J\fP\f2option\fP\f2]\fP 
  .TP 3
 -List table of contents of jar file
 -\f4jar t\fP\f2[vf] [\fP\f2jarfile\fP\f2] [\fP\f2inputfiles\fP\f2] [\-J\fP\f2option\fP\f2]\fP
-+List table of contents of jar file 
-+\f4jar t\fP\f2[vf] [\fP\f2jarfile\fP\f2] [\fP\f2inputfiles\fP\f2] [\-J\fP\f2option\fP\f2]\fP 
++Extract jar file 
++\f4jar x\fP\f2[vf] [\fP\f2jarfile\fP\f2] [\fP\f2inputfiles\fP\f2] [\-J\fP\f2option\fP\f2]\fP 
  .TP 3
 -Add index to jar file
 -\f4jar i\fP \f2jarfile\fP \f2[\-J\fP\f2option\fP\f2]\fP
++List table of contents of jar file 
++\f4jar t\fP\f2[vf] [\fP\f2jarfile\fP\f2] [\fP\f2inputfiles\fP\f2] [\-J\fP\f2option\fP\f2]\fP 
++.TP 3
 +Add index to jar file 
 +\f4jar i\fP \f2jarfile\fP \f2[\-J\fP\f2option\fP\f2]\fP 
  .RE
@@ -30127,36 +30143,38 @@
  .TP 3
 -cuxtiv0Mmfe
 -Options that control the \f2jar\fP command.
-+cuxtiv0Mmfe 
-+Options that control the \f2jar\fP command. 
- .TP 3
+-.TP 3
 -jarfile
 -Jar file to be created (\f2c\fP), updated (\f2u\fP), extracted (\f2x\fP), or have its table of contents viewed (\f2t\fP). The \f2\-f\fP option and filename \f2jarfile\fP are a pair \-\- if either is present, they must both appear. Note that omitting \f2f\fP and \f2jarfile\fP accepts a "jar file" from standard input (for x and t) or sends the "jar file" to standard output (for c and u).
-+jarfile 
-+Jar file to be created (\f2c\fP), updated (\f2u\fP), extracted (\f2x\fP), or have its table of contents viewed (\f2t\fP). The \f2\-f\fP option and filename \f2jarfile\fP are a pair \-\- if either is present, they must both appear. Note that omitting \f2f\fP and \f2jarfile\fP accepts a "jar file" from standard input (for x and t) or sends the "jar file" to standard output (for c and u). 
- .TP 3
+-.TP 3
 -inputfiles
 -Files or directories, separated by spaces, to be combined into \f2jarfile\fP (for c and u), or to be extracted (for x) or listed (for t) from \f2jarfile\fP. All directories are processed recursively. The files are compressed unless option \f20\fP (zero) is used.
-+inputfiles 
-+Files or directories, separated by spaces, to be combined into \f2jarfile\fP (for c and u), or to be extracted (for x) or listed (for t) from \f2jarfile\fP. All directories are processed recursively. The files are compressed unless option \f20\fP (zero) is used. 
++cuxtiv0Mmfe 
++Options that control the \f2jar\fP command. 
  .TP 3
 -manifest
 -Pre\-existing manifest file whose \f2name\fP\f2:\fP \f2value\fP pairs are to be included in MANIFEST.MF in the jar file. The \f2\-m\fP option and filename \f2manifest\fP are a pair \-\- if either is present, they must both appear. The letters \f3m\fP, \f3f\fP and \f3e\fP must appear in the same order that \f2manifest\fP, \f2jarfile\fP, \f2entrypoint\fP appear.
-+manifest 
-+Pre\-existing manifest file whose \f2name\fP\f2:\fP \f2value\fP pairs are to be included in MANIFEST.MF in the jar file. The \f2\-m\fP option and filename \f2manifest\fP are a pair \-\- if either is present, they must both appear. The letters \f3m\fP, \f3f\fP and \f3e\fP must appear in the same order that \f2manifest\fP, \f2jarfile\fP, \f2entrypoint\fP appear. 
++jarfile 
++Jar file to be created (\f2c\fP), updated (\f2u\fP), extracted (\f2x\fP), or have its table of contents viewed (\f2t\fP). The \f2\-f\fP option and filename \f2jarfile\fP are a pair \-\- if either is present, they must both appear. Note that omitting \f2f\fP and \f2jarfile\fP accepts a "jar file" from standard input (for x and t) or sends the "jar file" to standard output (for c and u). 
  .TP 3
 -entrypoint
 -The name of the class that set as the application entry point for stand\-alone applications bundled into executable jar file. The \f2\-e\fP option and entrypoint are a pair \-\- if either is present, they must both appear. The letters \f3m\fP, \f3f\fP and \f3e\fP must appear in the same order that \f2manifest\fP, \f2jarfile\fP, \f2entrypoint\fP appear.
-+entrypoint 
-+The name of the class that set as the application entry point for stand\-alone applications bundled into executable jar file. The \f2\-e\fP option and entrypoint are a pair \-\- if either is present, they must both appear. The letters \f3m\fP, \f3f\fP and \f3e\fP must appear in the same order that \f2manifest\fP, \f2jarfile\fP, \f2entrypoint\fP appear. 
++inputfiles 
++Files or directories, separated by spaces, to be combined into \f2jarfile\fP (for c and u), or to be extracted (for x) or listed (for t) from \f2jarfile\fP. All directories are processed recursively. The files are compressed unless option \f20\fP (zero) is used. 
  .TP 3
 -\-C\ dir
 -Temporarily changes directories to \f2dir\fP while processing the following \f2inputfiles\fP argument. Multiple \f2\-C\ \fP\f2dir\fP \f2inputfiles\fP sets are allowed.
-+\-C\ dir 
-+Temporarily changes directories to \f2dir\fP while processing the following \f2inputfiles\fP argument. Multiple \f2\-C\ \fP\f2dir\fP \f2inputfiles\fP sets are allowed. 
++manifest 
++Pre\-existing manifest file whose \f2name\fP\f2:\fP \f2value\fP pairs are to be included in MANIFEST.MF in the jar file. The \f2\-m\fP option and filename \f2manifest\fP are a pair \-\- if either is present, they must both appear. The letters \f3m\fP, \f3f\fP and \f3e\fP must appear in the same order that \f2manifest\fP, \f2jarfile\fP, \f2entrypoint\fP appear. 
  .TP 3
 -\-Joption
 -Option to be passed into the Java runtime environment. (There must be no space between \f2\-J\fP and \f2option\fP).
++entrypoint 
++The name of the class that set as the application entry point for stand\-alone applications bundled into executable jar file. The \f2\-e\fP option and entrypoint are a pair \-\- if either is present, they must both appear. The letters \f3m\fP, \f3f\fP and \f3e\fP must appear in the same order that \f2manifest\fP, \f2jarfile\fP, \f2entrypoint\fP appear. 
++.TP 3
++\-C\ dir 
++Temporarily changes directories to \f2dir\fP while processing the following \f2inputfiles\fP argument. Multiple \f2\-C\ \fP\f2dir\fP \f2inputfiles\fP sets are allowed. 
++.TP 3
 +\-Joption 
 +Option to be passed into the Java runtime environment. (There must be no space between \f2\-J\fP and \f2option\fP). 
  .RE
@@ -30262,20 +30280,21 @@
  \fP
  .fi
 -updates the \f2foo.jar\fP manifest with the \f2name : value\fP pairs in \f2manifest\fP.
-+updates the \f2foo.jar\fP manifest with the \f2name : value\fP pairs in \f2manifest\fP. 
- .TP 3
+-.TP 3
 -x
 -Extracts files and directories from \f2jarfile\fP (if \f2f\fP is specified) or standard input (if \f2f\fP and \f2jarfile\fP are omitted). If \f2inputfiles\fP is specified, only those specified files and directories are extracted. Otherwise, all files and directories are extracted. The time and date of the extracted files are those given in the archive.
-+x 
-+Extracts files and directories from \f2jarfile\fP (if \f2f\fP is specified) or standard input (if \f2f\fP and \f2jarfile\fP are omitted). If \f2inputfiles\fP is specified, only those specified files and directories are extracted. Otherwise, all files and directories are extracted. The time and date of the extracted files are those given in the archive. 
++updates the \f2foo.jar\fP manifest with the \f2name : value\fP pairs in \f2manifest\fP. 
  .TP 3
 -t
 -Lists the table of contents from \f2jarfile\fP (if \f2f\fP is specified) or standard input (if \f2f\fP and \f2jarfile\fP are omitted). If \f2inputfiles\fP is specified, only those specified files and directories are listed. Otherwise, all files and directories are listed.
-+t 
-+Lists the table of contents from \f2jarfile\fP (if \f2f\fP is specified) or standard input (if \f2f\fP and \f2jarfile\fP are omitted). If \f2inputfiles\fP is specified, only those specified files and directories are listed. Otherwise, all files and directories are listed. 
++x 
++Extracts files and directories from \f2jarfile\fP (if \f2f\fP is specified) or standard input (if \f2f\fP and \f2jarfile\fP are omitted). If \f2inputfiles\fP is specified, only those specified files and directories are extracted. Otherwise, all files and directories are extracted. The time and date of the extracted files are those given in the archive. 
  .TP 3
 -i
 -Generate index information for the specified \f2jarfile\fP and its dependent jar files. For example:
++t 
++Lists the table of contents from \f2jarfile\fP (if \f2f\fP is specified) or standard input (if \f2f\fP and \f2jarfile\fP are omitted). If \f2inputfiles\fP is specified, only those specified files and directories are listed. Otherwise, all files and directories are listed. 
++.TP 3
 +i 
 +Generate index information for the specified \f2jarfile\fP and its dependent jar files. For example: 
  .nf
@@ -30286,29 +30305,30 @@
  .fi
  .LP
 -would generate an \f2INDEX.LIST\fP file in \f2foo.jar\fP which contains location information for each package in \f2foo.jar\fP and all the jar files specified in the \f2Class\-Path\fP attribute of \f2foo.jar\fP. See the index example.
-+would generate an \f2INDEX.LIST\fP file in \f2foo.jar\fP which contains location information for each package in \f2foo.jar\fP and all the jar files specified in the \f2Class\-Path\fP attribute of \f2foo.jar\fP. See the index example.  
- .TP 3
+-.TP 3
 -f
 -Specifies the file \f2jarfile\fP to be created (\f2c\fP), updated (\f2u\fP), extracted (\f2x\fP), indexed (\f2i\fP), or viewed (\f2t\fP). The \f2\-f\fP option and filename \f2jarfile\fP are a pair \-\- if present, they must both appear. Omitting \f2f\fP and \f2jarfile\fP accepts a jar file name from \f2stdin\fP(for x and t) or sends jar file to \f2stdout\fP (for c and u).
-+f 
-+Specifies the file \f2jarfile\fP to be created (\f2c\fP), updated (\f2u\fP), extracted (\f2x\fP), indexed (\f2i\fP), or viewed (\f2t\fP). The \f2\-f\fP option and filename \f2jarfile\fP are a pair \-\- if present, they must both appear. Omitting \f2f\fP and \f2jarfile\fP accepts a jar file name from \f2stdin\fP(for x and t) or sends jar file to \f2stdout\fP (for c and u). 
++would generate an \f2INDEX.LIST\fP file in \f2foo.jar\fP which contains location information for each package in \f2foo.jar\fP and all the jar files specified in the \f2Class\-Path\fP attribute of \f2foo.jar\fP. See the index example.  
  .TP 3
 -v
 -Generates verbose output to standard output. Examples shown below.
-+v 
-+Generates verbose output to standard output. Examples shown below. 
++f 
++Specifies the file \f2jarfile\fP to be created (\f2c\fP), updated (\f2u\fP), extracted (\f2x\fP), indexed (\f2i\fP), or viewed (\f2t\fP). The \f2\-f\fP option and filename \f2jarfile\fP are a pair \-\- if present, they must both appear. Omitting \f2f\fP and \f2jarfile\fP accepts a jar file name from \f2stdin\fP(for x and t) or sends jar file to \f2stdout\fP (for c and u). 
  .TP 3
 -0
 -(zero) Store without using ZIP compression.
-+0 
-+(zero) Store without using ZIP compression. 
++v 
++Generates verbose output to standard output. Examples shown below. 
  .TP 3
 -M
 -Do not create a manifest file entry (for c and u), or delete a manifest file entry if one exists (for u).
-+M 
-+Do not create a manifest file entry (for c and u), or delete a manifest file entry if one exists (for u). 
++0 
++(zero) Store without using ZIP compression. 
  .TP 3
 -m
++M 
++Do not create a manifest file entry (for c and u), or delete a manifest file entry if one exists (for u). 
++.TP 3
 +m 
  Includes \f2name : value\fP attribute pairs from the specified manifest file \f2manifest\fP in the file at \f2META\-INF/MANIFEST.MF\fP. \f2jar\fP adds a \f2name\ :\ value\fP pair unless an entry already exists with the same name, in which case \f2jar\fP updates its value.
  .br
@@ -30525,8 +30545,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/javac.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/javac.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/javac.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/javac.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -30620,43 +30640,45 @@
  .br
  .br
 -\f3Note:\fP The directory specified by \f3\-d\fP is not automatically added to your user class path.
-+\f3Note:\fP The directory specified by \f3\-d\fP is not automatically added to your user class path. 
- .TP 3
+-.TP 3
 -\-deprecation
 -Show a description of each use or override of a deprecated member or class. Without \f3\-deprecation\fP, \f3javac\fP shows a summary of the source files that use or override deprecated members or classes. \f3\-deprecation\fP is shorthand for \f3\-Xlint:deprecation\fP.
-+\-deprecation 
-+Show a description of each use or override of a deprecated member or class. Without \f3\-deprecation\fP, \f3javac\fP shows a summary of the source files that use or override deprecated members or classes. \f3\-deprecation\fP is shorthand for \f3\-Xlint:deprecation\fP. 
++\f3Note:\fP The directory specified by \f3\-d\fP is not automatically added to your user class path. 
  .TP 3
 -\-encoding encoding
 -Set the source file encoding name, such as \f2EUC\-JP and UTF\-8\fP. If \f3\-encoding\fP is not specified, the platform default converter is used.
-+\-encoding encoding 
-+Set the source file encoding name, such as \f2EUC\-JP and UTF\-8\fP. If \f3\-encoding\fP is not specified, the platform default converter is used.  
++\-deprecation 
++Show a description of each use or override of a deprecated member or class. Without \f3\-deprecation\fP, \f3javac\fP shows a summary of the source files that use or override deprecated members or classes. \f3\-deprecation\fP is shorthand for \f3\-Xlint:deprecation\fP. 
  .TP 3
 -\-endorseddirs directories
 -Override the location of endorsed standards path.
-+\-endorseddirs directories 
-+Override the location of endorsed standards path. 
++\-encoding encoding 
++Set the source file encoding name, such as \f2EUC\-JP and UTF\-8\fP. If \f3\-encoding\fP is not specified, the platform default converter is used.  
  .TP 3
 -\-extdirs directories
++\-endorseddirs directories 
++Override the location of endorsed standards path. 
++.TP 3
 +\-extdirs directories 
  Overrides the location of the \f2ext\fP directory. The \f2directories\fP variable is a colon\-separated list of directories. Each JAR archive in the specified directories is searched for class files. All JAR archives found are automatically part of the class path.
  .br
  .br
 -If you are cross\-compiling (compiling classes against bootstrap and extension classes of a different Java platform implementation), this option specifies the directories that contain the extension classes. See Cross\-Compilation Options for more information.
-+If you are cross\-compiling (compiling classes against bootstrap and extension classes of a different Java platform implementation), this option specifies the directories that contain the extension classes. See Cross\-Compilation Options for more information. 
- .TP 3
+-.TP 3
 -\-g
 -Generate all debugging information, including local variables. By default, only line number and source file information is generated.
-+\-g 
-+Generate all debugging information, including local variables. By default, only line number and source file information is generated. 
++If you are cross\-compiling (compiling classes against bootstrap and extension classes of a different Java platform implementation), this option specifies the directories that contain the extension classes. See Cross\-Compilation Options for more information. 
  .TP 3
 -\-g:none
 -Do not generate any debugging information.
-+\-g:none 
-+Do not generate any debugging information. 
++\-g 
++Generate all debugging information, including local variables. By default, only line number and source file information is generated. 
  .TP 3
 -\-g:{keyword list}
 -Generate only some kinds of debugging information, specified by a comma separated list of keywords. Valid keywords are:
++\-g:none 
++Do not generate any debugging information. 
++.TP 3
 +\-g:{keyword list} 
 +Generate only some kinds of debugging information, specified by a comma separated list of keywords. Valid keywords are: 
  .RS 3
@@ -30693,76 +30715,81 @@
  .br
  .br
 -\f3Note:\fP \f3CLASSPATH\fP, \f3\-classpath\fP, \f3\-bootclasspath\fP, and \f3\-extdirs\fP do \f2not\fP specify the classes used to run \f3javac\fP. Fiddling with the implementation of the compiler in this way is usually pointless and always risky. If you do need to do this, use the \f3\-J\fP option to pass through options to the underlying \f3java\fP launcher.
-+\f3Note:\fP \f3CLASSPATH\fP, \f3\-classpath\fP, \f3\-bootclasspath\fP, and \f3\-extdirs\fP do \f2not\fP specify the classes used to run \f3javac\fP. Fiddling with the implementation of the compiler in this way is usually pointless and always risky. If you do need to do this, use the \f3\-J\fP option to pass through options to the underlying \f3java\fP launcher. 
- .TP 3
+-.TP 3
 -\-nowarn
 -Disable warning messages. This has the same meaning as \f3\-Xlint:none\fP.
-+\-nowarn 
-+Disable warning messages. This has the same meaning as \f3\-Xlint:none\fP. 
- .TP 3
+-.TP 3
 -\-proc: {none,only}
 -Controls whether annotation processing and/or compilation is done. \f3\-proc:none\fP means that compilation takes place without annotation processing. \f3\-proc:only\fP means that only annotation processing is done, without any subsequent compilation.
-+\-proc: {none,only} 
-+Controls whether annotation processing and/or compilation is done. \f3\-proc:none\fP means that compilation takes place without annotation processing. \f3\-proc:only\fP means that only annotation processing is done, without any subsequent compilation. 
++\f3Note:\fP \f3CLASSPATH\fP, \f3\-classpath\fP, \f3\-bootclasspath\fP, and \f3\-extdirs\fP do \f2not\fP specify the classes used to run \f3javac\fP. Fiddling with the implementation of the compiler in this way is usually pointless and always risky. If you do need to do this, use the \f3\-J\fP option to pass through options to the underlying \f3java\fP launcher. 
  .TP 3
 -\-processor class1[,class2,class3...]
 -Names of the annotation processors to run. This bypasses the default discovery process.
-+\-processor class1[,class2,class3...] 
-+Names of the annotation processors to run. This bypasses the default discovery process. 
++\-nowarn 
++Disable warning messages. This has the same meaning as \f3\-Xlint:none\fP. 
  .TP 3
 -\-processorpath path
 -Specify where to find annotation processors; if this option is not used, the class path will be searched for processors.
-+\-processorpath path 
-+Specify where to find annotation processors; if this option is not used, the class path will be searched for processors. 
++\-proc: {none,only} 
++Controls whether annotation processing and/or compilation is done. \f3\-proc:none\fP means that compilation takes place without annotation processing. \f3\-proc:only\fP means that only annotation processing is done, without any subsequent compilation. 
  .TP 3
 -\-s dir
 -Specify the directory where to place generated source files. The directory must already exist; \f3javac\fP will not create it. If a class is part of a package, the compiler puts the source file in a subdirectory reflecting the package name, creating directories as needed. For example, if you specify \f3\-s /home/mysrc\fP and the class is called \f2com.mypackage.MyClass\fP, then the source file will be placed in \f2/home/mysrc/com/mypackage/MyClass.java\fP.
-+\-s dir 
-+Specify the directory where to place generated source files. The directory must already exist; \f3javac\fP will not create it. If a class is part of a package, the compiler puts the source file in a subdirectory reflecting the package name, creating directories as needed. For example, if you specify \f3\-s /home/mysrc\fP and the class is called \f2com.mypackage.MyClass\fP, then the source file will be placed in \f2/home/mysrc/com/mypackage/MyClass.java\fP. 
++\-processor class1[,class2,class3...] 
++Names of the annotation processors to run. This bypasses the default discovery process. 
  .TP 3
 -\-source release
 -Specifies the version of source code accepted. The following values for \f2release\fP are allowed:
++\-processorpath path 
++Specify where to find annotation processors; if this option is not used, the class path will be searched for processors. 
++.TP 3
++\-s dir 
++Specify the directory where to place generated source files. The directory must already exist; \f3javac\fP will not create it. If a class is part of a package, the compiler puts the source file in a subdirectory reflecting the package name, creating directories as needed. For example, if you specify \f3\-s /home/mysrc\fP and the class is called \f2com.mypackage.MyClass\fP, then the source file will be placed in \f2/home/mysrc/com/mypackage/MyClass.java\fP. 
++.TP 3
 +\-source release 
 +Specifies the version of source code accepted. The following values for \f2release\fP are allowed: 
  .RS 3
  .TP 3
 -1.3
 -The compiler does \f2not\fP support assertions, generics, or other language features introduced after JDK 1.3.
-+1.3 
-+The compiler does \f2not\fP support assertions, generics, or other language features introduced after Java SE 1.3. 
- .TP 3
+-.TP 3
 -1.4
 -The compiler accepts code containing assertions, which were introduced in JDK 1.4.
-+1.4 
-+The compiler accepts code containing assertions, which were introduced in Java SE 1.4. 
- .TP 3
+-.TP 3
 -1.5
 -The compiler accepts code containing generics and other language features introduced in JDK 5.
-+1.5 
-+The compiler accepts code containing generics and other language features introduced in Java SE 5. 
++1.3 
++The compiler does \f2not\fP support assertions, generics, or other language features introduced after Java SE 1.3. 
  .TP 3
 -5
 -Synonym for 1.5.
-+5 
-+Synonym for 1.5. 
- .TP 3
+-.TP 3
 -1.6
 -This is the default value. No language changes were introduced in Java SE 6. However, encoding errors in source files are now reported as errors, instead of warnings, as previously.
-+1.6 
-+No language changes were introduced in Java SE 6. However, encoding errors in source files are now reported as errors instead of warnings as in previous releases of Java SE. 
++1.4 
++The compiler accepts code containing assertions, which were introduced in Java SE 1.4. 
  .TP 3
 -6
 -Synonym for 1.6.
-+6 
-+Synonym for 1.6. 
++1.5 
++The compiler accepts code containing generics and other language features introduced in Java SE 5. 
  .TP 3
 -1.7
 -The compiler accepts code with features introduced in JDK 7.
-+1.7 
-+This is the default value. The compiler accepts code with features introduced in Java SE 7. 
++5 
++Synonym for 1.5. 
  .TP 3
 -7
 -Synonym for 1.7.
++1.6 
++No language changes were introduced in Java SE 6. However, encoding errors in source files are now reported as errors instead of warnings as in previous releases of Java SE. 
++.TP 3
++6 
++Synonym for 1.6. 
++.TP 3
++1.7 
++This is the default value. The compiler accepts code with features introduced in Java SE 7. 
++.TP 3
 +7 
 +Synonym for 1.7. 
  .RE
@@ -30773,25 +30800,26 @@
  .br
  .br
 -\f3Note:\fP Classes found through the class path may be subject to automatic recompilation if their sources are also found. See Searching For Types.
-+\f3Note:\fP Classes found through the class path may be subject to automatic recompilation if their sources are also found. See Searching For Types. 
- .TP 3
+-.TP 3
 -\-verbose
 -Verbose output. This includes information about each class loaded and each source file compiled.
-+\-verbose 
-+Verbose output. This includes information about each class loaded and each source file compiled. 
++\f3Note:\fP Classes found through the class path may be subject to automatic recompilation if their sources are also found. See Searching For Types. 
  .TP 3
 -\-version
 -Print version information.
-+\-version 
-+Print version information.  
++\-verbose 
++Verbose output. This includes information about each class loaded and each source file compiled. 
  .TP 3
 -\-Werror
 -Terminate compilation if warnings occur.
-+\-Werror 
-+Terminate compilation if warnings occur. 
++\-version 
++Print version information.  
  .TP 3
 -\-X
 -Display information about non\-standard options and exit.
++\-Werror 
++Terminate compilation if warnings occur. 
++.TP 3
 +\-X 
 +Display information about non\-standard options and exit. 
  .RE
@@ -30819,18 +30847,20 @@
  .TP 2
  o
 -If \-source is \f3not specified\fP, the value of \-target is \f31.7\fP
-+If \-source is \f3not specified\fP, the value of \-target is \f31.7\fP 
- .TP 2
- o
+-.TP 2
+-o
 -If \-source is \f31.2\fP, the value of \-target is \f31.4\fP
-+If \-source is \f31.2\fP, the value of \-target is \f31.4\fP 
++If \-source is \f3not specified\fP, the value of \-target is \f31.7\fP 
  .TP 2
  o
 -If \-source is \f31.3\fP, the value of \-target is \f31.4\fP
-+If \-source is \f31.3\fP, the value of \-target is \f31.4\fP 
++If \-source is \f31.2\fP, the value of \-target is \f31.4\fP 
  .TP 2
  o
 -For \f3all other values\fP of \-source, the value of \f3\-target\fP is the value of \f3\-source\fP.
++If \-source is \f31.3\fP, the value of \-target is \f31.4\fP 
++.TP 2
++o
 +If \-source is \f31.5\fP, the value of \-target is \f31.7\fP 
 +.TP 2
 +o
@@ -30855,81 +30885,91 @@
  .TP 3
 -\-Xbootclasspath/p:path
 -Prepend to the bootstrap class path.
-+\-Xbootclasspath/p:path 
-+Prepend to the bootstrap class path. 
- .TP 3
+-.TP 3
 -\-Xbootclasspath/a:path
 -Append to the bootstrap class path.
-+\-Xbootclasspath/a:path 
-+Append to the bootstrap class path. 
- .TP 3
+-.TP 3
 -\-Xbootclasspath/:path
 -Override location of bootstrap class files.
-+\-Xbootclasspath/:path 
-+Override location of bootstrap class files. 
- .TP 3
+-.TP 3
 -\-Xlint
 -Enable all recommended warnings. In this release, enabling all available warnings is recommended.
-+\-Xlint 
-+Enable all recommended warnings. In this release, enabling all available warnings is recommended. 
- .TP 3
+-.TP 3
 -\-Xlint:all
 -Enable all recommended warnings. In this release, enabling all available warnings is recommended.
-+\-Xlint:all 
-+Enable all recommended warnings. In this release, enabling all available warnings is recommended. 
- .TP 3
+-.TP 3
 -\-Xlint:none
 -Disable all warnings.
-+\-Xlint:none 
-+Disable all warnings. 
- .TP 3
+-.TP 3
 -\-Xlint:name
 -Enable warning \f2name\fP. See the section Warnings That Can Be Enabled or Disabled with \-Xlint Option for a list of warnings you can enable with this option.
-+\-Xlint:name 
-+Enable warning \f2name\fP. See the section Warnings That Can Be Enabled or Disabled with \-Xlint Option for a list of warnings you can enable with this option. 
++\-Xbootclasspath/p:path 
++Prepend to the bootstrap class path. 
  .TP 3
 -\-Xlint:\-name
 -Disable warning \f2name\fP. See the section Warnings That Can Be Enabled or Disabled with \-Xlint Option for a list of warnings you can disable with this option.
-+\-Xlint:\-name 
-+Disable warning \f2name\fP. See the section Warnings That Can Be Enabled or Disabled with \-Xlint Option for a list of warnings you can disable with this option. 
- .TP 3
+-.TP 3
 -\-Xmaxerrs number
 -Set the maximum number of errors to print.
-+\-Xmaxerrs number 
-+Set the maximum number of errors to print. 
- .TP 3
+-.TP 3
 -\-Xmaxwarns number
 -Set the maximum number of warnings to print.
-+\-Xmaxwarns number 
-+Set the maximum number of warnings to print. 
- .TP 3
+-.TP 3
 -\-Xstdout filename
 -Send compiler messages to the named file. By default, compiler messages go to \f2System.err\fP.
-+\-Xstdout filename 
-+Send compiler messages to the named file. By default, compiler messages go to \f2System.err\fP. 
++\-Xbootclasspath/a:path 
++Append to the bootstrap class path. 
  .TP 3
 -\-Xprefer:{newer,source}
 -Specify which file to read when both a source file and class file are found for a type. (See Searching For Types). If \f2\-Xprefer:newer\fP is used, it reads the newer of the source or class file for a type (default). If the \f2\-Xprefer:source\fP option is used, it reads source file. Use \f2\-Xprefer:source\fP when you want to be sure that any annotation processors can access annotations declared with a retention policy of \f2SOURCE\fP.
-+\-Xprefer:{newer,source} 
-+Specify which file to read when both a source file and class file are found for a type. (See Searching For Types). If \f2\-Xprefer:newer\fP is used, it reads the newer of the source or class file for a type (default). If the \f2\-Xprefer:source\fP option is used, it reads source file. Use \f2\-Xprefer:source\fP when you want to be sure that any annotation processors can access annotations declared with a retention policy of \f2SOURCE\fP.  
- .TP 3
+-.TP 3
 -\-Xpkginfo:{always,legacy,nonempty}
 -Specify handling of package\-info files
-+\-Xpkginfo:{always,legacy,nonempty} 
-+Specify handling of package\-info files 
++\-Xbootclasspath/:path 
++Override location of bootstrap class files. 
  .TP 3
 -\-Xprint
 -Print out textual representation of specified types for debugging purposes; perform neither annotation processing nor compilation. The format of the output may change.
-+\-Xprint 
-+Print out textual representation of specified types for debugging purposes; perform neither annotation processing nor compilation. The format of the output may change. 
++\-Xlint 
++Enable all recommended warnings. In this release, enabling all available warnings is recommended. 
  .TP 3
 -\-XprintProcessorInfo
 -Print information about which annotations a processor is asked to process.
-+\-XprintProcessorInfo 
-+Print information about which annotations a processor is asked to process. 
++\-Xlint:all 
++Enable all recommended warnings. In this release, enabling all available warnings is recommended. 
  .TP 3
 -\-XprintRounds
 -Print information about initial and subsequent annotation processing rounds.
++\-Xlint:none 
++Disable all warnings. 
++.TP 3
++\-Xlint:name 
++Enable warning \f2name\fP. See the section Warnings That Can Be Enabled or Disabled with \-Xlint Option for a list of warnings you can enable with this option. 
++.TP 3
++\-Xlint:\-name 
++Disable warning \f2name\fP. See the section Warnings That Can Be Enabled or Disabled with \-Xlint Option for a list of warnings you can disable with this option. 
++.TP 3
++\-Xmaxerrs number 
++Set the maximum number of errors to print. 
++.TP 3
++\-Xmaxwarns number 
++Set the maximum number of warnings to print. 
++.TP 3
++\-Xstdout filename 
++Send compiler messages to the named file. By default, compiler messages go to \f2System.err\fP. 
++.TP 3
++\-Xprefer:{newer,source} 
++Specify which file to read when both a source file and class file are found for a type. (See Searching For Types). If \f2\-Xprefer:newer\fP is used, it reads the newer of the source or class file for a type (default). If the \f2\-Xprefer:source\fP option is used, it reads source file. Use \f2\-Xprefer:source\fP when you want to be sure that any annotation processors can access annotations declared with a retention policy of \f2SOURCE\fP.  
++.TP 3
++\-Xpkginfo:{always,legacy,nonempty} 
++Specify handling of package\-info files 
++.TP 3
++\-Xprint 
++Print out textual representation of specified types for debugging purposes; perform neither annotation processing nor compilation. The format of the output may change. 
++.TP 3
++\-XprintProcessorInfo 
++Print information about which annotations a processor is asked to process. 
++.TP 3
 +\-XprintRounds 
 +Print information about initial and subsequent annotation processing rounds. 
  .RE
@@ -31371,30 +31411,34 @@
  \f2The javac Guide\fP @
  .fi
 -http://download.oracle.com/javase/7/docs/technotes/guides/javac/index.html
-+http://docs.oracle.com/javase/7/docs/technotes/guides/javac/index.html 
- .TP 2
- o
+-.TP 2
+-o
 -java(1) \- the Java Application Launcher
-+java(1) \- the Java Application Launcher 
- .TP 2
- o
+-.TP 2
+-o
 -jdb(1) \- Java Application Debugger
-+jdb(1) \- Java Application Debugger 
++http://docs.oracle.com/javase/7/docs/technotes/guides/javac/index.html 
  .TP 2
  o
 -javah(1) \- C Header and Stub File Generator
-+javah(1) \- C Header and Stub File Generator 
++java(1) \- the Java Application Launcher 
  .TP 2
  o
 -javap(1) \- Class File Disassembler
-+javap(1) \- Class File Disassembler 
++jdb(1) \- Java Application Debugger 
  .TP 2
  o
 -javadoc(1) \- API Documentation Generator
-+javadoc(1) \- API Documentation Generator 
++javah(1) \- C Header and Stub File Generator 
  .TP 2
  o
 -jar(1) \- JAR Archive Tool
++javap(1) \- Class File Disassembler 
++.TP 2
++o
++javadoc(1) \- API Documentation Generator 
++.TP 2
++o
 +jar(1) \- JAR Archive Tool 
  .TP 2
  o
@@ -31408,8 +31452,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/javadoc.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/javadoc.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/javadoc.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/javadoc.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -31425,26 +31469,27 @@
  .TP 3
 -options
 -Command\-line options, as specified in this document. To see a typical use of javadoc options, see Real\-World Example.
-+options 
-+Command\-line options, as specified in this document. To see a typical use of javadoc options, see Real\-World Example. 
- .TP 3
+-.TP 3
 -packagenames
 -A series of names of packages, separated by spaces, such as \f2java.lang\ java.lang.reflect\ java.awt\fP. You must separately specify each package you want to document. Wildcards are not allowed; use \-subpackages for recursion. The Javadoc tool uses \f2\-sourcepath\fP to look for these package names. See Example \- Documenting One or More Packages
-+packagenames 
-+A series of names of packages, separated by spaces, such as \f2java.lang\ java.lang.reflect\ java.awt\fP. You must separately specify each package you want to document. Wildcards are not allowed; use \-subpackages for recursion. The Javadoc tool uses \f2\-sourcepath\fP to look for these package names. See Example \- Documenting One or More Packages 
++options 
++Command\-line options, as specified in this document. To see a typical use of javadoc options, see Real\-World Example. 
  .TP 3
 -sourcefilenames
 -A series of source file names, separated by spaces, each of which can begin with a path and contain a wildcard such as asterisk (*). The Javadoc tool will process every file whose name ends with ".java", and whose name, when stripped of that suffix, is actually a legal class name (see the Java Language Specification). Therefore, you can name files with dashes (such as \f2X\-Buffer\fP), or other illegal characters, to prevent them from being documented. This is useful for test files and template files The path that precedes the source file name determines where javadoc will look for the file. (The Javadoc tool does \f2not\fP use \f2\-sourcepath\fP to look for these source file names.) Relative paths are relative to the current directory, so passing in \f2Button.java\fP is identical to \f2./Button.java\fP. A source file name with an absolute path and a wildcard, for example, is \f2/home/src/java/awt/Graphics*.java\fP. See Example\ \-\ Documenting One or More Classes. You can also mix packagenames and sourcefilenames, as in Example\ \-\ Documenting Both Packages and Classes
-+sourcefilenames 
-+A series of source file names, separated by spaces, each of which can begin with a path and contain a wildcard such as asterisk (*). The Javadoc tool will process every file whose name ends with ".java", and whose name, when stripped of that suffix, is actually a legal class name (see the Java Language Specification). Therefore, you can name files with dashes (such as \f2X\-Buffer\fP), or other illegal characters, to prevent them from being documented. This is useful for test files and template files The path that precedes the source file name determines where javadoc will look for the file. (The Javadoc tool does \f2not\fP use \f2\-sourcepath\fP to look for these source file names.) Relative paths are relative to the current directory, so passing in \f2Button.java\fP is identical to \f2./Button.java\fP. A source file name with an absolute path and a wildcard, for example, is \f2/home/src/java/awt/Graphics*.java\fP. See Example\ \-\ Documenting One or More Classes. You can also mix packagenames and sourcefilenames, as in Example\ \-\ Documenting Both Packages and Classes 
++packagenames 
++A series of names of packages, separated by spaces, such as \f2java.lang\ java.lang.reflect\ java.awt\fP. You must separately specify each package you want to document. Wildcards are not allowed; use \-subpackages for recursion. The Javadoc tool uses \f2\-sourcepath\fP to look for these package names. See Example \- Documenting One or More Packages 
  .TP 3
 -\-subpackages pkg1:pkg2:...
 -Generates documentation from source files in the specified packages and recursively in their subpackages. An alternative to supplying packagenames or sourcefilenames.
-+\-subpackages pkg1:pkg2:... 
-+Generates documentation from source files in the specified packages and recursively in their subpackages. An alternative to supplying packagenames or sourcefilenames. 
++sourcefilenames 
++A series of source file names, separated by spaces, each of which can begin with a path and contain a wildcard such as asterisk (*). The Javadoc tool will process every file whose name ends with ".java", and whose name, when stripped of that suffix, is actually a legal class name (see the Java Language Specification). Therefore, you can name files with dashes (such as \f2X\-Buffer\fP), or other illegal characters, to prevent them from being documented. This is useful for test files and template files The path that precedes the source file name determines where javadoc will look for the file. (The Javadoc tool does \f2not\fP use \f2\-sourcepath\fP to look for these source file names.) Relative paths are relative to the current directory, so passing in \f2Button.java\fP is identical to \f2./Button.java\fP. A source file name with an absolute path and a wildcard, for example, is \f2/home/src/java/awt/Graphics*.java\fP. See Example\ \-\ Documenting One or More Classes. You can also mix packagenames and sourcefilenames, as in Example\ \-\ Documenting Both Packages and Classes 
  .TP 3
 -@argfiles
 -One or more files that contain a list of Javadoc options, packagenames and sourcefilenames in any order. Wildcards (*) and \f2\-J\fP options are not allowed in these files.
++\-subpackages pkg1:pkg2:... 
++Generates documentation from source files in the specified packages and recursively in their subpackages. An alternative to supplying packagenames or sourcefilenames. 
++.TP 3
 +@argfiles 
 +One or more files that contain a list of Javadoc options, packagenames and sourcefilenames in any order. Wildcards (*) and \f2\-J\fP options are not allowed in these files.  
  .RE
@@ -31478,34 +31523,40 @@
  .TP 2
  o
 -Declarations (return types, argument types, field types)
-+Declarations (return types, argument types, field types) 
- .TP 2
- o
+-.TP 2
+-o
 -"See Also" sections generated from \f2@see\fP tags
-+"See Also" sections generated from \f2@see\fP tags 
- .TP 2
- o
+-.TP 2
+-o
 -In\-line text generated from \f2{@link}\fP tags
-+In\-line text generated from \f2{@link}\fP tags 
++Declarations (return types, argument types, field types) 
  .TP 2
  o
 -Exception names generated from \f2@throws\fP tags
-+Exception names generated from \f2@throws\fP tags 
- .TP 2
- o
+-.TP 2
+-o
 -"Specified by" links to members in interfaces and "Overrides" links to members in classes
-+"Specified by" links to members in interfaces and "Overrides" links to members in classes 
++"See Also" sections generated from \f2@see\fP tags 
  .TP 2
  o
 -Summary tables listing packages, classes and members
-+Summary tables listing packages, classes and members 
++In\-line text generated from \f2{@link}\fP tags 
  .TP 2
  o
 -Package and class inheritance trees
-+Package and class inheritance trees 
++Exception names generated from \f2@throws\fP tags 
  .TP 2
  o
 -The index
++"Specified by" links to members in interfaces and "Overrides" links to members in classes 
++.TP 2
++o
++Summary tables listing packages, classes and members 
++.TP 2
++o
++Package and class inheritance trees 
++.TP 2
++o
 +The index 
  .RE
  .LP
@@ -31602,36 +31653,38 @@
  .TP 3
 -generated document
 -The document generated by the javadoc tool from the doc comments in Java source code. The default generated document is in HTML and is created by the standard doclet.
-+generated document 
-+The document generated by the javadoc tool from the doc comments in Java source code. The default generated document is in HTML and is created by the standard doclet. 
- .LP
- .TP 3
+-.LP
+-.TP 3
 -name
 -A name of a program element written in the Java Language \-\- that is, the name of a package, class, interface, field, constructor or method. A name can be fully\-qualified, such as \f2java.lang.String.equals(java.lang.Object)\fP, or partially\-qualified, such as \f2equals(Object)\fP.
-+name 
-+A name of a program element written in the Java Language \-\- that is, the name of a package, class, interface, field, constructor or method. A name can be fully\-qualified, such as \f2java.lang.String.equals(java.lang.Object)\fP, or partially\-qualified, such as \f2equals(Object)\fP. 
++generated document 
++The document generated by the javadoc tool from the doc comments in Java source code. The default generated document is in HTML and is created by the standard doclet. 
  .LP
  .TP 3
 -documented classes
 -The classes and interfaces for which detailed documentation is generated during a javadoc run. To be documented, the source files must be available, their source filenames or package names must be passed into the javadoc command, and they must not be filtered out by their access modifier (public, protected, package\-private or private). We also refer to these as the classes included in the javadoc output, or the \f2included classes\fP.
-+documented classes 
-+The classes and interfaces for which detailed documentation is generated during a javadoc run. To be documented, the source files must be available, their source filenames or package names must be passed into the javadoc command, and they must not be filtered out by their access modifier (public, protected, package\-private or private). We also refer to these as the classes included in the javadoc output, or the \f2included classes\fP. 
++name 
++A name of a program element written in the Java Language \-\- that is, the name of a package, class, interface, field, constructor or method. A name can be fully\-qualified, such as \f2java.lang.String.equals(java.lang.Object)\fP, or partially\-qualified, such as \f2equals(Object)\fP. 
  .LP
  .TP 3
 -included classes
 -Classes and interfaces whose details are documented during a run of the Javadoc tool. Same as \f2documented classes\fP.
-+included classes 
-+Classes and interfaces whose details are documented during a run of the Javadoc tool. Same as \f2documented classes\fP. 
++documented classes 
++The classes and interfaces for which detailed documentation is generated during a javadoc run. To be documented, the source files must be available, their source filenames or package names must be passed into the javadoc command, and they must not be filtered out by their access modifier (public, protected, package\-private or private). We also refer to these as the classes included in the javadoc output, or the \f2included classes\fP. 
  .LP
  .TP 3
 -excluded classes
 -Classes and interfaces whose details are \f2not\fP documented during a run of the Javadoc tool.
-+excluded classes 
-+Classes and interfaces whose details are \f2not\fP documented during a run of the Javadoc tool. 
++included classes 
++Classes and interfaces whose details are documented during a run of the Javadoc tool. Same as \f2documented classes\fP. 
  .LP
  .TP 3
 -referenced classes
 -The classes and interfaces that are explicitly referred to in the definition (implementation) or doc comments of the documented classes and interfaces. Examples of references include return type, parameter type, cast type, extended class, implemented interface, imported classes, classes used in method bodies, @see, {@link}, {@linkplain}, and {@inheritDoc} tags. (Notice this definition has changed since
++excluded classes 
++Classes and interfaces whose details are \f2not\fP documented during a run of the Javadoc tool. 
++.LP
++.TP 3
 +referenced classes 
 +The classes and interfaces that are explicitly referred to in the definition (implementation) or doc comments of the documented classes and interfaces. Examples of references include return type, parameter type, cast type, extended class, implemented interface, imported classes, classes used in method bodies, @see, {@link}, {@linkplain}, and {@inheritDoc} tags. (Notice this definition has changed since 
  .na
@@ -31828,30 +31881,34 @@
  .TP 2
  o
 -One \f3class hierarchy page for the entire set of packages\fP (\f2overview\-tree.html\fP). To view this, click on "Overview" in the navigation bar, then click on "Tree".
-+One \f3class hierarchy page for the entire set of packages\fP (\f2overview\-tree.html\fP). To view this, click on "Overview" in the navigation bar, then click on "Tree".  
- .TP 2
- o
+-.TP 2
+-o
 -One \f3class hierarchy page for each package\fP (\f2package\-tree.html\fP) To view this, go to a particular package, class or interface page; click "Tree" to display the hierarchy for that package.
-+One \f3class hierarchy page for each package\fP (\f2package\-tree.html\fP) To view this, go to a particular package, class or interface page; click "Tree" to display the hierarchy for that package.  
- .TP 2
- o
+-.TP 2
+-o
 -One \f3"use" page\fP for each package (\f2package\-use.html\fP) and a separate one for each class and interface (\f2class\-use/\fP\f2classname\fP\f2.html\fP). This page describes what packages, classes, methods, constructors and fields use any part of the given class, interface or package. Given a class or interface A, its "use" page includes subclasses of A, fields declared as A, methods that return A, and methods and constructors with parameters of type A. You can access this page by first going to the package, class or interface, then clicking on the "Use" link in the navigation bar.
-+One \f3"use" page\fP for each package (\f2package\-use.html\fP) and a separate one for each class and interface (\f2class\-use/\fP\f2classname\fP\f2.html\fP). This page describes what packages, classes, methods, constructors and fields use any part of the given class, interface or package. Given a class or interface A, its "use" page includes subclasses of A, fields declared as A, methods that return A, and methods and constructors with parameters of type A. You can access this page by first going to the package, class or interface, then clicking on the "Use" link in the navigation bar.  
++One \f3class hierarchy page for the entire set of packages\fP (\f2overview\-tree.html\fP). To view this, click on "Overview" in the navigation bar, then click on "Tree".  
  .TP 2
  o
 -A \f3deprecated API page\fP (\f2deprecated\-list.html\fP) listing all deprecated names. (A deprecated name is not recommended for use, generally due to improvements, and a replacement name is usually given. Deprecated APIs may be removed in future implementations.)
-+A \f3deprecated API page\fP (\f2deprecated\-list.html\fP) listing all deprecated names. (A deprecated name is not recommended for use, generally due to improvements, and a replacement name is usually given. Deprecated APIs may be removed in future implementations.)  
++One \f3class hierarchy page for each package\fP (\f2package\-tree.html\fP) To view this, go to a particular package, class or interface page; click "Tree" to display the hierarchy for that package.  
  .TP 2
  o
 -A \f3constant field values page\fP (\f2constant\-values.html\fP) for the values of static fields.
-+A \f3constant field values page\fP (\f2constant\-values.html\fP) for the values of static fields.  
++One \f3"use" page\fP for each package (\f2package\-use.html\fP) and a separate one for each class and interface (\f2class\-use/\fP\f2classname\fP\f2.html\fP). This page describes what packages, classes, methods, constructors and fields use any part of the given class, interface or package. Given a class or interface A, its "use" page includes subclasses of A, fields declared as A, methods that return A, and methods and constructors with parameters of type A. You can access this page by first going to the package, class or interface, then clicking on the "Use" link in the navigation bar.  
  .TP 2
  o
 -A \f3serialized form page\fP (\f2serialized\-form.html\fP) for information about serializable and externalizable classes. Each such class has a description of its serialization fields and methods. This information is of interest to re\-implementors, not to developers using the API. While there is no link in the navigation bar, you can get to this information by going to any serialized class and clicking "Serialized Form" in the "See also" section of the class comment. The standard doclet automatically generates a serialized form page: any class (public or non\-public) that implements Serializable is included, along with \f2readObject\fP and \f2writeObject\fP methods, the fields that are serialized, and the doc comments from the \f2@serial\fP, \f2@serialField\fP, and \f2@serialData\fP tags. Public serializable classes can be excluded by marking them (or their package) with \f2@serial exclude\fP, and package\-private serializable classes can be included by marking them (or their package) with \f2@serial include\fP. As of 1.4, you can generate the complete serialized form for public and private classes by running javadoc \f2without\fP specifying the \f2\-private\fP option.
-+A \f3serialized form page\fP (\f2serialized\-form.html\fP) for information about serializable and externalizable classes. Each such class has a description of its serialization fields and methods. This information is of interest to re\-implementors, not to developers using the API. While there is no link in the navigation bar, you can get to this information by going to any serialized class and clicking "Serialized Form" in the "See also" section of the class comment. The standard doclet automatically generates a serialized form page: any class (public or non\-public) that implements Serializable is included, along with \f2readObject\fP and \f2writeObject\fP methods, the fields that are serialized, and the doc comments from the \f2@serial\fP, \f2@serialField\fP, and \f2@serialData\fP tags. Public serializable classes can be excluded by marking them (or their package) with \f2@serial exclude\fP, and package\-private serializable classes can be included by marking them (or their package) with \f2@serial include\fP. As of 1.4, you can generate the complete serialized form for public and private classes by running javadoc \f2without\fP specifying the \f2\-private\fP option.  
++A \f3deprecated API page\fP (\f2deprecated\-list.html\fP) listing all deprecated names. (A deprecated name is not recommended for use, generally due to improvements, and a replacement name is usually given. Deprecated APIs may be removed in future implementations.)  
  .TP 2
  o
 -An \f3index\fP (\f2index\-*.html\fP) of all class, interface, constructor, field and method names, alphabetically arranged. This is internationalized for Unicode and can be generated as a single file or as a separate file for each starting character (such as A\-Z for English).
++A \f3constant field values page\fP (\f2constant\-values.html\fP) for the values of static fields.  
++.TP 2
++o
++A \f3serialized form page\fP (\f2serialized\-form.html\fP) for information about serializable and externalizable classes. Each such class has a description of its serialization fields and methods. This information is of interest to re\-implementors, not to developers using the API. While there is no link in the navigation bar, you can get to this information by going to any serialized class and clicking "Serialized Form" in the "See also" section of the class comment. The standard doclet automatically generates a serialized form page: any class (public or non\-public) that implements Serializable is included, along with \f2readObject\fP and \f2writeObject\fP methods, the fields that are serialized, and the doc comments from the \f2@serial\fP, \f2@serialField\fP, and \f2@serialData\fP tags. Public serializable classes can be excluded by marking them (or their package) with \f2@serial exclude\fP, and package\-private serializable classes can be included by marking them (or their package) with \f2@serial include\fP. As of 1.4, you can generate the complete serialized form for public and private classes by running javadoc \f2without\fP specifying the \f2\-private\fP option.  
++.TP 2
++o
 +An \f3index\fP (\f2index\-*.html\fP) of all class, interface, constructor, field and method names, alphabetically arranged. This is internationalized for Unicode and can be generated as a single file or as a separate file for each starting character (such as A\-Z for English). 
  .RE
  .LP
@@ -31860,26 +31917,28 @@
  .TP 2
  o
 -A \f3help page\fP (\f2help\-doc.html\fP) that describes the navigation bar and the above pages. You can provide your own custom help file to override the default using \f2\-helpfile\fP.
-+A \f3help page\fP (\f2help\-doc.html\fP) that describes the navigation bar and the above pages. You can provide your own custom help file to override the default using \f2\-helpfile\fP. 
- .TP 2
- o
+-.TP 2
+-o
 -One \f3index.html file\fP which creates the HTML frames for display. This is the file you load to display the front page with frames. This file itself contains no text content.
-+One \f3index.html file\fP which creates the HTML frames for display. This is the file you load to display the front page with frames. This file itself contains no text content.  
++A \f3help page\fP (\f2help\-doc.html\fP) that describes the navigation bar and the above pages. You can provide your own custom help file to override the default using \f2\-helpfile\fP. 
  .TP 2
  o
 -Several \f3frame files\fP (\f2*\-frame.html\fP) containing lists of packages, classes and interfaces, used when HTML frames are being displayed.
-+Several \f3frame files\fP (\f2*\-frame.html\fP) containing lists of packages, classes and interfaces, used when HTML frames are being displayed.  
++One \f3index.html file\fP which creates the HTML frames for display. This is the file you load to display the front page with frames. This file itself contains no text content.  
  .TP 2
  o
 -A \f3package list\fP file (\f2package\-list\fP), used by the \f2\-link\fP and \f2\-linkoffline\fP options. This is a text file, not HTML, and is not reachable through any links.
-+A \f3package list\fP file (\f2package\-list\fP), used by the \f2\-link\fP and \f2\-linkoffline\fP options. This is a text file, not HTML, and is not reachable through any links.  
++Several \f3frame files\fP (\f2*\-frame.html\fP) containing lists of packages, classes and interfaces, used when HTML frames are being displayed.  
  .TP 2
  o
 -A \f3style sheet\fP file (\f2stylesheet.css\fP) that controls a limited amount of color, font family, font size, font style and positioning on the generated pages.
-+A \f3style sheet\fP file (\f2stylesheet.css\fP) that controls a limited amount of color, font family, font size, font style and positioning on the generated pages.  
++A \f3package list\fP file (\f2package\-list\fP), used by the \f2\-link\fP and \f2\-linkoffline\fP options. This is a text file, not HTML, and is not reachable through any links.  
  .TP 2
  o
 -A \f3doc\-files\fP directory that holds any image, example, source code or other files that you want copied to the destination directory. These files are not processed by the Javadoc tool in any manner \-\- that is, any javadoc tags in them will be ignored. This directory is not generated unless it exists in the source tree.
++A \f3style sheet\fP file (\f2stylesheet.css\fP) that controls a limited amount of color, font family, font size, font style and positioning on the generated pages.  
++.TP 2
++o
 +A \f3doc\-files\fP directory that holds any image, example, source code or other files that you want copied to the destination directory. These files are not processed by the Javadoc tool in any manner \-\- that is, any javadoc tags in them will be ignored. This directory is not generated unless it exists in the source tree. 
  .RE
  .LP
@@ -32414,32 +32473,26 @@
  Use the getComponentAt method.
  .fl
 -
-+        
- .fl
- \fP
- .fi
- .LP
+-.fl
+-\fP
+-.fi
+-.LP
 -You can extend \f2{@link}\fP to link to classes not being documented by using the \f2\-link\fP option.
-+You can extend \f2{@link}\fP to link to classes not being documented by using the \f2\-link\fP option. 
- .LP
+-.LP
 -For more details, see
-+For more details, see 
- .na
- \f2writing {@link} tags\fP @
- .fi
+-.na
+-\f2writing {@link} tags\fP @
+-.fi
 -http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#{@link}.
-+http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#{@link}. 
- .LP
- .TP 3
+-.LP
+-.TP 3
 -{@linkplain\  package.class#member\  label}
 -Identical to \f2{@link}\fP, except the link's label is displayed in plain text than code font. Useful when the label is plain text. Example:
-+{@linkplain\  package.class#member\  label} 
-+Identical to \f2{@link}\fP, except the link's label is displayed in plain text than code font. Useful when the label is plain text. Example: 
- .nf
- \f3
- .fl
-      Refer to {@linkplain add() the overridden method}.
- .fl
+-.nf
+-\f3
+-.fl
+-     Refer to {@linkplain add() the overridden method}.
+-.fl
 -
 +        
  .fl
@@ -32447,14 +32500,35 @@
  .fi
  .LP
 -This would display as:
-+This would display as: 
++You can extend \f2{@link}\fP to link to classes not being documented by using the \f2\-link\fP option. 
  .LP
 -Refer to the overridden method.
-+Refer to the overridden method. 
++For more details, see 
++.na
++\f2writing {@link} tags\fP @
++.fi
++http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#{@link}. 
  .LP
  .TP 3
 -{@literal\  text}
 -Displays \f2text\fP without interpreting the text as HTML markup or nested javadoc tags. This enables you to use regular angle brackets (\f2<\fP and \f2>\fP) instead of the HTML entities (\f2<\fP and \f2>\fP) in doc comments, such as in parameter types (\f2<Object>\fP), inequalities (\f23 < 4\fP), or arrows (\f2<\-\fP). For example, the doc comment text:
++{@linkplain\  package.class#member\  label} 
++Identical to \f2{@link}\fP, except the link's label is displayed in plain text than code font. Useful when the label is plain text. Example: 
++.nf
++\f3
++.fl
++     Refer to {@linkplain add() the overridden method}.
++.fl
++        
++.fl
++\fP
++.fi
++.LP
++This would display as: 
++.LP
++Refer to the overridden method. 
++.LP
++.TP 3
 +{@literal\  text} 
 +Displays \f2text\fP without interpreting the text as HTML markup or nested javadoc tags. This enables you to use regular angle brackets (\f2<\fP and \f2>\fP) instead of the HTML entities (\f2<\fP and \f2>\fP) in doc comments, such as in parameter types (\f2<Object>\fP), inequalities (\f23 < 4\fP), or arrows (\f2<\-\fP). For example, the doc comment text: 
  .nf
@@ -32711,18 +32785,20 @@
  .TP 2
  o
 -The first set of forms (with no class or package) will cause the Javadoc tool to search only through the current class's hierarchy. It will find a member of the current class or interface, one of its superclasses or superinterfaces, or one of its enclosing classes or interfaces (search steps 1\-3). It will not search the rest of the current package or other packages (search steps 4\-5).
-+The first set of forms (with no class or package) will cause the Javadoc tool to search only through the current class's hierarchy. It will find a member of the current class or interface, one of its superclasses or superinterfaces, or one of its enclosing classes or interfaces (search steps 1\-3). It will not search the rest of the current package or other packages (search steps 4\-5). 
- .TP 2
- o
+-.TP 2
+-o
 -If any method or constructor is entered as a name with no parentheses, such as \f2getValue\fP, and if there is no field with the same name, the Javadoc tool will correctly create a link to it, but will print a warning message reminding you to add the parentheses and arguments. If this method is overloaded, the Javadoc tool will link to the first method its search encounters, which is unspecified.
-+If any method or constructor is entered as a name with no parentheses, such as \f2getValue\fP, and if there is no field with the same name, the Javadoc tool will correctly create a link to it, but will print a warning message reminding you to add the parentheses and arguments. If this method is overloaded, the Javadoc tool will link to the first method its search encounters, which is unspecified. 
++The first set of forms (with no class or package) will cause the Javadoc tool to search only through the current class's hierarchy. It will find a member of the current class or interface, one of its superclasses or superinterfaces, or one of its enclosing classes or interfaces (search steps 1\-3). It will not search the rest of the current package or other packages (search steps 4\-5). 
  .TP 2
  o
 -Nested classes must be specified as \f2outer\fP\f2.\fP\f2inner\fP, not simply \f2inner\fP, for all forms.
-+Nested classes must be specified as \f2outer\fP\f2.\fP\f2inner\fP, not simply \f2inner\fP, for all forms. 
++If any method or constructor is entered as a name with no parentheses, such as \f2getValue\fP, and if there is no field with the same name, the Javadoc tool will correctly create a link to it, but will print a warning message reminding you to add the parentheses and arguments. If this method is overloaded, the Javadoc tool will link to the first method its search encounters, which is unspecified. 
  .TP 2
  o
 -As stated, the hash character (\f2#\fP), rather than a dot (\f2.\fP) separates a member from its class. This enables the Javadoc tool to resolve ambiguities, since the dot also separates classes, nested classes, packages, and subpackages. However, the Javadoc tool is generally lenient and will properly parse a dot if you know there is no ambiguity, though it will print a warning.
++Nested classes must be specified as \f2outer\fP\f2.\fP\f2inner\fP, not simply \f2inner\fP, for all forms. 
++.TP 2
++o
 +As stated, the hash character (\f2#\fP), rather than a dot (\f2.\fP) separates a member from its class. This enables the Javadoc tool to resolve ambiguities, since the dot also separates classes, nested classes, packages, and subpackages. However, the Javadoc tool is generally lenient and will properly parse a dot if you know there is no ambiguity, though it will print a warning. 
  .RE
  .LP
@@ -32921,26 +32997,29 @@
  \f2Sun's criteria\fP @
  .fi
 -http://java.sun.com/j2se/javadoc/writingapispecs/serialized\-criteria.html for including classes in the serialized form specification.
-+http://java.sun.com/j2se/javadoc/writingapispecs/serialized\-criteria.html for including classes in the serialized form specification. 
- .LP
- .TP 3
+-.LP
+-.TP 3
 -@serialField\  field\-name\  field\-type\  field\-description
 -Documents an \f2ObjectStreamField\fP component of a \f2Serializable\fP class's \f2serialPersistentFields\fP member. One \f2@serialField\fP tag should be used for each \f2ObjectStreamField\fP component.
-+@serialField\  field\-name\  field\-type\  field\-description 
-+Documents an \f2ObjectStreamField\fP component of a \f2Serializable\fP class's \f2serialPersistentFields\fP member. One \f2@serialField\fP tag should be used for each \f2ObjectStreamField\fP component. 
++http://java.sun.com/j2se/javadoc/writingapispecs/serialized\-criteria.html for including classes in the serialized form specification. 
  .LP
  .TP 3
 -@serialData\  data\-description
 -The \f2data\-description\fP documents the types and order of data in the serialized form. Specifically, this data includes the optional data written by the \f2writeObject\fP method and all data (including base classes) written by the \f2Externalizable.writeExternal\fP method.
-+@serialData\  data\-description 
-+The \f2data\-description\fP documents the types and order of data in the serialized form. Specifically, this data includes the optional data written by the \f2writeObject\fP method and all data (including base classes) written by the \f2Externalizable.writeExternal\fP method. 
- .LP
+-.LP
 -The \f2@serialData\fP tag can be used in the doc comment for the \f2writeObject\fP, \f2readObject\fP, \f2writeExternal\fP, \f2readExternal\fP, \f2writeReplace\fP, and \f2readResolve\fP methods.
-+The \f2@serialData\fP tag can be used in the doc comment for the \f2writeObject\fP, \f2readObject\fP, \f2writeExternal\fP, \f2readExternal\fP, \f2writeReplace\fP, and \f2readResolve\fP methods. 
++@serialField\  field\-name\  field\-type\  field\-description 
++Documents an \f2ObjectStreamField\fP component of a \f2Serializable\fP class's \f2serialPersistentFields\fP member. One \f2@serialField\fP tag should be used for each \f2ObjectStreamField\fP component. 
  .LP
  .TP 3
 -@since\  since\-text
 -Adds a "Since" heading with the specified \f2since\-text\fP to the generated documentation. The text has no special internal structure. This tag is valid in any doc comment: overview, package, class, interface, constructor, method or field. This tag means that this change or feature has existed since the software release specified by the \f2since\-text\fP. For example:
++@serialData\  data\-description 
++The \f2data\-description\fP documents the types and order of data in the serialized form. Specifically, this data includes the optional data written by the \f2writeObject\fP method and all data (including base classes) written by the \f2Externalizable.writeExternal\fP method. 
++.LP
++The \f2@serialData\fP tag can be used in the doc comment for the \f2writeObject\fP, \f2readObject\fP, \f2writeExternal\fP, \f2readExternal\fP, \f2writeReplace\fP, and \f2readResolve\fP methods. 
++.LP
++.TP 3
 +@since\  since\-text 
 +Adds a "Since" heading with the specified \f2since\-text\fP to the generated documentation. The text has no special internal structure. This tag is valid in any doc comment: overview, package, class, interface, constructor, method or field. This tag means that this change or feature has existed since the software release specified by the \f2since\-text\fP. For example: 
  .nf
@@ -33053,30 +33132,36 @@
  .TP 2
  o
 -\f2@see\fP
-+\f2@see\fP 
- .TP 2
- o
+-.TP 2
+-o
 -\f2@since\fP
-+\f2@since\fP 
- .TP 2
- o
+-.TP 2
+-o
 -\f2@author\fP
-+\f2@author\fP 
++\f2@see\fP 
  .TP 2
  o
 -\f2@version\fP
-+\f2@version\fP 
- .TP 2
- o
+-.TP 2
+-o
 -\f2{@link}\fP
-+\f2{@link}\fP 
++\f2@since\fP 
  .TP 2
  o
 -\f2{@linkplain}\fP
-+\f2{@linkplain}\fP 
++\f2@author\fP 
  .TP 2
  o
 -\f2{@docRoot}\fP
++\f2@version\fP 
++.TP 2
++o
++\f2{@link}\fP 
++.TP 2
++o
++\f2{@linkplain}\fP 
++.TP 2
++o
 +\f2{@docRoot}\fP 
  .RE
 -.SS
@@ -33089,34 +33174,42 @@
  .TP 2
  o
 -\f2@see\fP
-+\f2@see\fP 
- .TP 2
- o
+-.TP 2
+-o
 -\f2@since\fP
-+\f2@since\fP 
- .TP 2
- o
+-.TP 2
+-o
 -\f2@serial\fP
-+\f2@serial\fP 
- .TP 2
- o
+-.TP 2
+-o
 -\f2@author\fP
-+\f2@author\fP 
++\f2@see\fP 
  .TP 2
  o
 -\f2@version\fP
-+\f2@version\fP 
- .TP 2
- o
+-.TP 2
+-o
 -\f2{@link}\fP
-+\f2{@link}\fP 
++\f2@since\fP 
  .TP 2
  o
 -\f2{@linkplain}\fP
-+\f2{@linkplain}\fP 
++\f2@serial\fP 
  .TP 2
  o
 -\f2{@docRoot}\fP
++\f2@author\fP 
++.TP 2
++o
++\f2@version\fP 
++.TP 2
++o
++\f2{@link}\fP 
++.TP 2
++o
++\f2{@linkplain}\fP 
++.TP 2
++o
 +\f2{@docRoot}\fP 
  .RE
 -.SS
@@ -33129,38 +33222,46 @@
  .TP 2
  o
 -\f2@see\fP
-+\f2@see\fP 
- .TP 2
- o
+-.TP 2
+-o
 -\f2@since\fP
-+\f2@since\fP 
- .TP 2
- o
+-.TP 2
+-o
 -\f2@deprecated\fP
-+\f2@deprecated\fP 
- .TP 2
- o
+-.TP 2
+-o
 -\f2@serial\fP
-+\f2@serial\fP 
++\f2@see\fP 
  .TP 2
  o
 -\f2@author\fP
-+\f2@author\fP 
- .TP 2
- o
+-.TP 2
+-o
 -\f2@version\fP
-+\f2@version\fP 
++\f2@since\fP 
  .TP 2
  o
 -\f2{@link}\fP
-+\f2{@link}\fP 
++\f2@deprecated\fP 
  .TP 2
  o
 -\f2{@linkplain}\fP
-+\f2{@linkplain}\fP  
++\f2@serial\fP 
  .TP 2
  o
 -\f2{@docRoot}\fP
++\f2@author\fP 
++.TP 2
++o
++\f2@version\fP 
++.TP 2
++o
++\f2{@link}\fP 
++.TP 2
++o
++\f2{@linkplain}\fP  
++.TP 2
++o
 +\f2{@docRoot}\fP 
  .RE
  \f3An example of a class comment:\fP
@@ -33179,38 +33280,46 @@
  .TP 2
  o
 -\f2@see\fP
-+\f2@see\fP 
- .TP 2
- o
+-.TP 2
+-o
 -\f2@since\fP
-+\f2@since\fP 
- .TP 2
- o
+-.TP 2
+-o
 -\f2@deprecated\fP
-+\f2@deprecated\fP 
- .TP 2
- o
+-.TP 2
+-o
 -\f2@serial\fP
-+\f2@serial\fP 
++\f2@see\fP 
  .TP 2
  o
 -\f2@serialField\fP
-+\f2@serialField\fP 
- .TP 2
- o
+-.TP 2
+-o
 -\f2{@link}\fP
-+\f2{@link}\fP 
++\f2@since\fP 
  .TP 2
  o
 -\f2{@linkplain}\fP
-+\f2{@linkplain}\fP 
++\f2@deprecated\fP 
  .TP 2
  o
 -\f2{@docRoot}\fP
-+\f2{@docRoot}\fP 
++\f2@serial\fP 
  .TP 2
  o
 -\f2{@value}\fP
++\f2@serialField\fP 
++.TP 2
++o
++\f2{@link}\fP 
++.TP 2
++o
++\f2{@linkplain}\fP 
++.TP 2
++o
++\f2{@docRoot}\fP 
++.TP 2
++o
 +\f2{@value}\fP 
  .RE
  \f3An example of a field comment:\fP
@@ -33229,46 +33338,56 @@
  .TP 2
  o
 -\f2@see\fP
-+\f2@see\fP 
- .TP 2
- o
+-.TP 2
+-o
 -\f2@since\fP
-+\f2@since\fP 
- .TP 2
- o
+-.TP 2
+-o
 -\f2@deprecated\fP
-+\f2@deprecated\fP 
- .TP 2
- o
+-.TP 2
+-o
 -\f2@param\fP
-+\f2@param\fP 
- .TP 2
- o
+-.TP 2
+-o
 -\f2@return\fP
-+\f2@return\fP 
++\f2@see\fP 
  .TP 2
  o
 -\f2@throws\fP and \f2@exception\fP
-+\f2@throws\fP and \f2@exception\fP 
- .TP 2
- o
+-.TP 2
+-o
 -\f2@serialData\fP
-+\f2@serialData\fP 
++\f2@since\fP 
  .TP 2
  o
 -\f2{@link}\fP
-+\f2{@link}\fP 
++\f2@deprecated\fP 
  .TP 2
  o
 -\f2{@linkplain}\fP
-+\f2{@linkplain}\fP 
++\f2@param\fP 
  .TP 2
  o
 -\f2{@inheritDoc}\fP
-+\f2{@inheritDoc}\fP 
++\f2@return\fP 
  .TP 2
  o
 -\f2{@docRoot}\fP
++\f2@throws\fP and \f2@exception\fP 
++.TP 2
++o
++\f2@serialData\fP 
++.TP 2
++o
++\f2{@link}\fP 
++.TP 2
++o
++\f2{@linkplain}\fP 
++.TP 2
++o
++\f2{@inheritDoc}\fP 
++.TP 2
++o
 +\f2{@docRoot}\fP 
  .RE
  \f3An example of a method doc comment:\fP
@@ -33335,34 +33454,37 @@
  .br
  .br
 -The title on the overview page is set by \f2\-doctitle\fP.
-+The title on the overview page is set by \f2\-doctitle\fP.  
- .TP 3
+-.TP 3
 -\-public
 -Shows only public classes and members.
-+\-public 
-+Shows only public classes and members.  
- .TP 3
+-.TP 3
 -\-protected
 -Shows only protected and public classes and members. This is the default.
-+\-protected 
-+Shows only protected and public classes and members. This is the default.  
- .TP 3
+-.TP 3
 -\-package
 -Shows only package, protected, and public classes and members.
-+\-package 
-+Shows only package, protected, and public classes and members.  
++The title on the overview page is set by \f2\-doctitle\fP.  
  .TP 3
 -\-private
 -Shows all classes and members.
-+\-private 
-+Shows all classes and members.  
++\-public 
++Shows only public classes and members.  
  .TP 3
 -\-help
 -Displays the online help, which lists these javadoc and doclet command line options.
-+\-help 
-+Displays the online help, which lists these javadoc and doclet command line options.  
++\-protected 
++Shows only protected and public classes and members. This is the default.  
  .TP 3
 -\-doclet\  class
++\-package 
++Shows only package, protected, and public classes and members.  
++.TP 3
++\-private 
++Shows all classes and members.  
++.TP 3
++\-help 
++Displays the online help, which lists these javadoc and doclet command line options.  
++.TP 3
 +\-doclet\  class 
  Specifies the class file that starts the doclet used in generating the documentation. Use the fully\-qualified name. This doclet defines the content and formats the output. If the \f4\-doclet\fP option is not used, javadoc uses the standard doclet for generating the default HTML format. This class must contain the \f2start(Root)\fP method. The path to this starting class is defined by the \f2\-docletpath\fP option.
  .br
@@ -33552,25 +33674,26 @@
  \f2How Classes Are Found\fP @
  .fi
 -http://download.oracle.com/javase/7/docs/technotes/tools/findingclasses.html#srcfiles. for more details. Separate directories in \f2classpathlist\fP with colons (:).
-+http://docs.oracle.com/javase/7/docs/technotes/tools/findingclasses.html#srcfiles. for more details. Separate directories in \f2classpathlist\fP with colons (:).  
- .TP 3
+-.TP 3
 -\-extdirs\  dirlist
 -Specifies the directories where extension classes reside. These are any classes that use the Java Extension mechanism. The extdirs is part of the search path the Javadoc tool will use to look up source and class files. See \f2\-classpath\fP (above) for more details. Separate directories in \f2dirlist\fP with colons (:).
-+\-extdirs\  dirlist 
-+Specifies the directories where extension classes reside. These are any classes that use the Java Extension mechanism. The extdirs is part of the search path the Javadoc tool will use to look up source and class files. See \f2\-classpath\fP (above) for more details. Separate directories in \f2dirlist\fP with colons (:).  
++http://docs.oracle.com/javase/7/docs/technotes/tools/findingclasses.html#srcfiles. for more details. Separate directories in \f2classpathlist\fP with colons (:).  
  .TP 3
 -\-verbose
 -Provides more detailed messages while javadoc is running. Without the verbose option, messages appear for loading the source files, generating the documentation (one message per source file), and sorting. The verbose option causes the printing of additional messages specifying the number of milliseconds to parse each java source file.
-+\-verbose 
-+Provides more detailed messages while javadoc is running. Without the verbose option, messages appear for loading the source files, generating the documentation (one message per source file), and sorting. The verbose option causes the printing of additional messages specifying the number of milliseconds to parse each java source file.  
++\-extdirs\  dirlist 
++Specifies the directories where extension classes reside. These are any classes that use the Java Extension mechanism. The extdirs is part of the search path the Javadoc tool will use to look up source and class files. See \f2\-classpath\fP (above) for more details. Separate directories in \f2dirlist\fP with colons (:).  
  .TP 3
 -\-quiet
 -Shuts off non\-error and non\-warning messages, leaving only the warnings and errors appear, making them easier to view. Also suppresses the version string.
-+\-quiet 
-+Shuts off non\-error and non\-warning messages, leaving only the warnings and errors appear, making them easier to view. Also suppresses the version string.  
++\-verbose 
++Provides more detailed messages while javadoc is running. Without the verbose option, messages appear for loading the source files, generating the documentation (one message per source file), and sorting. The verbose option causes the printing of additional messages specifying the number of milliseconds to parse each java source file.  
  .TP 3
 -\-breakiterator\
 -Uses the internationalized sentence boundary of
++\-quiet 
++Shuts off non\-error and non\-warning messages, leaving only the warnings and errors appear, making them easier to view. Also suppresses the version string.  
++.TP 3
 +\-breakiterator\  
 +Uses the internationalized sentence boundary of 
  .na
@@ -33667,25 +33790,26 @@
  .br
  .br
 -You can access the generated "Use" page by first going to the class or package, then clicking on the "Use" link in the navigation bar.
-+You can access the generated "Use" page by first going to the class or package, then clicking on the "Use" link in the navigation bar.  
- .TP 3
+-.TP 3
 -\-version
 -Includes the @version text in the generated docs. This text is omitted by default. To tell what version of the Javadoc tool you are using, use the \f2\-J\-version\fP option.
-+\-version 
-+Includes the @version text in the generated docs. This text is omitted by default. To tell what version of the Javadoc tool you are using, use the \f2\-J\-version\fP option.  
++You can access the generated "Use" page by first going to the class or package, then clicking on the "Use" link in the navigation bar.  
  .TP 3
 -\-author
 -Includes the @author text in the generated docs.
-+\-author 
-+Includes the @author text in the generated docs.  
++\-version 
++Includes the @version text in the generated docs. This text is omitted by default. To tell what version of the Javadoc tool you are using, use the \f2\-J\-version\fP option.  
  .TP 3
 -\-splitindex
 -Splits the index file into multiple files, alphabetically, one file per letter, plus a file for any index entries that start with non\-alphabetical characters.
-+\-splitindex 
-+Splits the index file into multiple files, alphabetically, one file per letter, plus a file for any index entries that start with non\-alphabetical characters.  
++\-author 
++Includes the @author text in the generated docs.  
  .TP 3
 -\-windowtitle\  title
 -Specifies the title to be placed in the HTML <title> tag. This appears in the window title and in any browser bookmarks (favorite places) that someone creates for this page. This title should not contain any HTML tags, as the browser will not properly interpret them. Any internal quotation marks within \f2title\fP may have to be escaped. If \-windowtitle is omitted, the Javadoc tool uses the value of \-doctitle for this option.
++\-splitindex 
++Splits the index file into multiple files, alphabetically, one file per letter, plus a file for any index entries that start with non\-alphabetical characters.  
++.TP 3
 +\-windowtitle\  title 
 +Specifies the title to be placed in the HTML <title> tag. This appears in the window title and in any browser bookmarks (favorite places) that someone creates for this page. This title should not contain any HTML tags, as the browser will not properly interpret them. Any internal quotation marks within \f2title\fP may have to be escaped. If \-windowtitle is omitted, the Javadoc tool uses the value of \-doctitle for this option. 
  .nf
@@ -33779,28 +33903,36 @@
  .br
  .br
 -Use \f2\-link\fP:
-+Use \f2\-link\fP: 
- .RS 3
- .TP 2
- o
+-.RS 3
+-.TP 2
+-o
 -when using a relative path to the external API document, or
-+when using a relative path to the external API document, or 
- .TP 2
- o
+-.TP 2
+-o
 -when using an absolute URL to the external API document, if your shell allows a program to open a connection to that URL for reading.
-+when using an absolute URL to the external API document, if your shell allows a program to open a connection to that URL for reading. 
- .RE
+-.RE
 -Use \f2\-linkoffline\fP:
-+Use \f2\-linkoffline\fP: 
++Use \f2\-link\fP: 
  .RS 3
  .TP 2
  o
 -when using an absolute URL to the external API document, if your shell \f2does not allow\fP a program to open a connection to that URL for reading. This can occur if you are behind a firewall and the document you want to link to is on the other side.
-+when using an absolute URL to the external API document, if your shell \f2does not allow\fP a program to open a connection to that URL for reading. This can occur if you are behind a firewall and the document you want to link to is on the other side. 
++when using a relative path to the external API document, or 
++.TP 2
++o
++when using an absolute URL to the external API document, if your shell allows a program to open a connection to that URL for reading. 
  .RE
- .br
- .br
+-.br
+-.br
 -\f3Example using absolute links to the external docs\fP \- Let us say you want to link to the \f2java.lang\fP, \f2java.io\fP and other Java Platform packages at
++Use \f2\-linkoffline\fP: 
++.RS 3
++.TP 2
++o
++when using an absolute URL to the external API document, if your shell \f2does not allow\fP a program to open a connection to that URL for reading. This can occur if you are behind a firewall and the document you want to link to is on the other side. 
++.RE
++.br
++.br
 +\f3Example using absolute links to the external docs\fP \- Let us say you want to link to the \f2java.lang\fP, \f2java.io\fP and other Java Platform packages at 
  .na
 -\f2http://download.oracle.com/javase/7/docs/api/\fP @
@@ -34010,41 +34142,44 @@
  .TP 3
 -\-nodeprecated
 -Prevents the generation of any deprecated API at all in the documentation. This does what \-nodeprecatedlist does, plus it does not generate any deprecated API throughout the rest of the documentation. This is useful when writing code and you don't want to be distracted by the deprecated code.
-+\-nodeprecated 
-+Prevents the generation of any deprecated API at all in the documentation. This does what \-nodeprecatedlist does, plus it does not generate any deprecated API throughout the rest of the documentation. This is useful when writing code and you don't want to be distracted by the deprecated code.  
- .TP 3
+-.TP 3
 -\-nodeprecatedlist
 -Prevents the generation of the file containing the list of deprecated APIs (deprecated\-list.html) and the link in the navigation bar to that page. (However, javadoc continues to generate the deprecated API throughout the rest of the document.) This is useful if your source code contains no deprecated API, and you want to make the navigation bar cleaner.
-+\-nodeprecatedlist 
-+Prevents the generation of the file containing the list of deprecated APIs (deprecated\-list.html) and the link in the navigation bar to that page. (However, javadoc continues to generate the deprecated API throughout the rest of the document.) This is useful if your source code contains no deprecated API, and you want to make the navigation bar cleaner.  
- .TP 3
+-.TP 3
 -\-nosince
 -Omits from the generated docs the "Since" sections associated with the @since tags.
-+\-nosince 
-+Omits from the generated docs the "Since" sections associated with the @since tags.  
++\-nodeprecated 
++Prevents the generation of any deprecated API at all in the documentation. This does what \-nodeprecatedlist does, plus it does not generate any deprecated API throughout the rest of the documentation. This is useful when writing code and you don't want to be distracted by the deprecated code.  
  .TP 3
 -\-notree
 -Omits the class/interface hierarchy pages from the generated docs. These are the pages you reach using the "Tree" button in the navigation bar. The hierarchy is produced by default.
-+\-notree 
-+Omits the class/interface hierarchy pages from the generated docs. These are the pages you reach using the "Tree" button in the navigation bar. The hierarchy is produced by default.  
- .TP 3
+-.TP 3
 -\-noindex
 -Omits the index from the generated docs. The index is produced by default.
-+\-noindex 
-+Omits the index from the generated docs. The index is produced by default.  
++\-nodeprecatedlist 
++Prevents the generation of the file containing the list of deprecated APIs (deprecated\-list.html) and the link in the navigation bar to that page. (However, javadoc continues to generate the deprecated API throughout the rest of the document.) This is useful if your source code contains no deprecated API, and you want to make the navigation bar cleaner.  
  .TP 3
 -\-nohelp
 -Omits the HELP link in the navigation bars at the top and bottom of each page of output.
-+\-nohelp 
-+Omits the HELP link in the navigation bars at the top and bottom of each page of output.  
++\-nosince 
++Omits from the generated docs the "Since" sections associated with the @since tags.  
  .TP 3
 -\-nonavbar
 -Prevents the generation of the navigation bar, header and footer, otherwise found at the top and bottom of the generated pages. Has no affect on the "bottom" option. The \f2\-nonavbar\fP option is useful when you are interested only in the content and have no need for navigation, such as converting the files to PostScript or PDF for print only.
-+\-nonavbar 
-+Prevents the generation of the navigation bar, header and footer, otherwise found at the top and bottom of the generated pages. Has no affect on the "bottom" option. The \f2\-nonavbar\fP option is useful when you are interested only in the content and have no need for navigation, such as converting the files to PostScript or PDF for print only.  
++\-notree 
++Omits the class/interface hierarchy pages from the generated docs. These are the pages you reach using the "Tree" button in the navigation bar. The hierarchy is produced by default.  
  .TP 3
 -\-helpfile\  path/filename
 -Specifies the path of an alternate help file \f2path/filename\fP that the HELP link in the top and bottom navigation bars link to. Without this option, the Javadoc tool automatically creates a help file \f2help\-doc.html\fP that is hard\-coded in the Javadoc tool. This option enables you to override this default. The \f2filename\fP can be any name and is not restricted to \f2help\-doc.html\fP \-\- the Javadoc tool will adjust the links in the navigation bar accordingly. For example:
++\-noindex 
++Omits the index from the generated docs. The index is produced by default.  
++.TP 3
++\-nohelp 
++Omits the HELP link in the navigation bars at the top and bottom of each page of output.  
++.TP 3
++\-nonavbar 
++Prevents the generation of the navigation bar, header and footer, otherwise found at the top and bottom of the generated pages. Has no affect on the "bottom" option. The \f2\-nonavbar\fP option is useful when you are interested only in the content and have no need for navigation, such as converting the files to PostScript or PDF for print only.  
++.TP 3
 +\-helpfile\  path/filename 
 +Specifies the path of an alternate help file \f2path/filename\fP that the HELP link in the top and bottom navigation bars link to. Without this option, the Javadoc tool automatically creates a help file \f2help\-doc.html\fP that is hard\-coded in the Javadoc tool. This option enables you to override this default. The \f2filename\fP can be any name and is not restricted to \f2help\-doc.html\fP \-\- the Javadoc tool will adjust the links in the navigation bar accordingly. For example: 
  .nf
@@ -34271,24 +34406,26 @@
  \fP
  .fi
 -Alternatively, you can use the \f2\-taglet\fP option in place of its \f2\-tag\fP option, but that may be harder to read.
-+Alternatively, you can use the \f2\-taglet\fP option in place of its \f2\-tag\fP option, but that may be harder to read.  
- .TP 3
+-.TP 3
 -\-tagletpath\ \ tagletpathlist
 -Specifies the search paths for finding taglet class files (.class). The \f2tagletpathlist\fP can contain multiple paths by separating them with a colon (\f2:\fP). The Javadoc tool will search in all subdirectories of the specified paths.
-+\-tagletpath\ \ tagletpathlist 
-+Specifies the search paths for finding taglet class files (.class). The \f2tagletpathlist\fP can contain multiple paths by separating them with a colon (\f2:\fP). The Javadoc tool will search in all subdirectories of the specified paths.  
- .TP 3
+-.TP 3
 -\-docfilessubdirs\
 -Enables deep copying of "\f2doc\-files\fP" directories. In other words, subdirectories and all contents are recursively copied to the destination. For example, the directory \f2doc\-files/example/images\fP and all its contents would now be copied. There is also an option to exclude subdirectories.
-+\-docfilessubdirs\  
-+Enables deep copying of "\f2doc\-files\fP" directories. In other words, subdirectories and all contents are recursively copied to the destination. For example, the directory \f2doc\-files/example/images\fP and all its contents would now be copied. There is also an option to exclude subdirectories.  
++Alternatively, you can use the \f2\-taglet\fP option in place of its \f2\-tag\fP option, but that may be harder to read.  
  .TP 3
 -\-excludedocfilessubdir\ \ name1:name2...
 -Excludes any "\f2doc\-files\fP" subdirectories with the given names. This prevents the copying of SCCS and other source\-code\-control subdirectories.
-+\-excludedocfilessubdir\ \ name1:name2... 
-+Excludes any "\f2doc\-files\fP" subdirectories with the given names. This prevents the copying of SCCS and other source\-code\-control subdirectories.  
++\-tagletpath\ \ tagletpathlist 
++Specifies the search paths for finding taglet class files (.class). The \f2tagletpathlist\fP can contain multiple paths by separating them with a colon (\f2:\fP). The Javadoc tool will search in all subdirectories of the specified paths.  
  .TP 3
 -\-noqualifier\ \ all\  | \ packagename1:packagename2:...
++\-docfilessubdirs\  
++Enables deep copying of "\f2doc\-files\fP" directories. In other words, subdirectories and all contents are recursively copied to the destination. For example, the directory \f2doc\-files/example/images\fP and all its contents would now be copied. There is also an option to exclude subdirectories.  
++.TP 3
++\-excludedocfilessubdir\ \ name1:name2... 
++Excludes any "\f2doc\-files\fP" subdirectories with the given names. This prevents the copying of SCCS and other source\-code\-control subdirectories.  
++.TP 3
 +\-noqualifier\ \ all\  | \ packagename1:packagename2:... 
  Omits qualifying package name from ahead of class names in output. The argument to \f2\-noqualifier\fP is either "\f2all\fP" (all package qualifiers are omitted) or a colon\-separate list of packages, with wildcards, to be removed as qualifiers. The package name is removed from places where class or interface names appear.
  .br
@@ -34636,18 +34773,20 @@
  \f2Javadoc FAQ\fP @
  .fi
 -http://java.sun.com/j2se/javadoc/faq/index.html#B
-+http://java.sun.com/j2se/javadoc/faq/index.html#B 
- .TP 2
- o
+-.TP 2
+-o
 -\f3Bugs and Limitations\fP \- You can also see some bugs listed at Important Bug Fixes and Changes.
-+\f3Bugs and Limitations\fP \- You can also see some bugs listed at Important Bug Fixes and Changes. 
++http://java.sun.com/j2se/javadoc/faq/index.html#B 
  .TP 2
  o
 -\f3Version number\fP \- See version numbers.
-+\f3Version number\fP \- See version numbers. 
++\f3Bugs and Limitations\fP \- You can also see some bugs listed at Important Bug Fixes and Changes. 
  .TP 2
  o
 -\f3Documents only legal classes\fP \- When documenting a package, javadoc only reads files whose names are composed of legal class names. You can prevent javadoc from parsing a file by including, for example, a hyphen "\-" in its filename.
++\f3Version number\fP \- See version numbers. 
++.TP 2
++o
 +\f3Documents only legal classes\fP \- When documenting a package, javadoc only reads files whose names are composed of legal class names. You can prevent javadoc from parsing a file by including, for example, a hyphen "\-" in its filename. 
  .RE
 -.SS
@@ -34676,22 +34815,24 @@
  .TP 2
  o
 -javac(1)
-+javac(1) 
- .TP 2
- o
+-.TP 2
+-o
 -java(1)
-+java(1) 
++javac(1) 
  .TP 2
  o
 -jdb(1)
-+jdb(1) 
++java(1) 
  .TP 2
  o
 -javah(1)
-+javah(1) 
++jdb(1) 
  .TP 2
  o
 -javap(1)
++javah(1) 
++.TP 2
++o
 +javap(1) 
  .TP 2
  o
@@ -34724,8 +34865,8 @@
  .RE
 -
 + 
---- ./jdk/src/bsd/doc/man/javah.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/javah.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/javah.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/javah.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -34741,41 +34882,44 @@
  .TP 3
 -\-o outputfile
 -Concatenates the resulting header or source files for all the classes listed on the command line into \f2outputfile\fP. Only one of \f3\-o\fP or \f3\-d\fP may be used.
-+\-o outputfile 
-+Concatenates the resulting header or source files for all the classes listed on the command line into \f2outputfile\fP. Only one of \f3\-o\fP or \f3\-d\fP may be used. 
- .TP 3
+-.TP 3
 -\-d directory
 -Sets the directory where \f3javah\fP saves the header files or the stub files. Only one of \f3\-d\fP or \f3\-o\fP may be used.
-+\-d directory 
-+Sets the directory where \f3javah\fP saves the header files or the stub files. Only one of \f3\-d\fP or \f3\-o\fP may be used. 
- .TP 3
+-.TP 3
 -\-stubs
 -Causes \f3javah\fP to generate C declarations from the Java object file.
-+\-stubs 
-+Causes \f3javah\fP to generate C declarations from the Java object file. 
++\-o outputfile 
++Concatenates the resulting header or source files for all the classes listed on the command line into \f2outputfile\fP. Only one of \f3\-o\fP or \f3\-d\fP may be used. 
  .TP 3
 -\-verbose
 -Indicates verbose output and causes \f3javah\fP to print a message to stdout concerning the status of the generated files.
-+\-verbose 
-+Indicates verbose output and causes \f3javah\fP to print a message to stdout concerning the status of the generated files. 
- .TP 3
+-.TP 3
 -\-help
 -Print help message for \f3javah\fP usage.
-+\-help 
-+Print help message for \f3javah\fP usage. 
++\-d directory 
++Sets the directory where \f3javah\fP saves the header files or the stub files. Only one of \f3\-d\fP or \f3\-o\fP may be used. 
  .TP 3
 -\-version
 -Print out \f3javah\fP version information.
-+\-version 
-+Print out \f3javah\fP version information. 
++\-stubs 
++Causes \f3javah\fP to generate C declarations from the Java object file. 
  .TP 3
 -\-jni
 -Causes \f3javah\fP to create an output file containing JNI\-style native method function prototypes. This is the default output, so use of \f3\-jni\fP is optional.
-+\-jni 
-+Causes \f3javah\fP to create an output file containing JNI\-style native method function prototypes. This is the default output, so use of \f3\-jni\fP is optional. 
++\-verbose 
++Indicates verbose output and causes \f3javah\fP to print a message to stdout concerning the status of the generated files. 
  .TP 3
 -\-classpath path
 -Specifies the path \f3javah\fP uses to look up classes. Overrides the default or the CLASSPATH environment variable if it is set. Directories are separated by colons. Thus the general format for \f2path\fP is:
++\-help 
++Print help message for \f3javah\fP usage. 
++.TP 3
++\-version 
++Print out \f3javah\fP version information. 
++.TP 3
++\-jni 
++Causes \f3javah\fP to create an output file containing JNI\-style native method function prototypes. This is the default output, so use of \f3\-jni\fP is optional. 
++.TP 3
 +\-classpath path 
 +Specifies the path \f3javah\fP uses to look up classes. Overrides the default or the CLASSPATH environment variable if it is set. Directories are separated by colons. Thus the general format for \f2path\fP is: 
  .nf
@@ -34795,25 +34939,26 @@
  .br
  .br
 -For example, if directory \f2foo\fP contains \f2a.jar\fP and \f2b.JAR\fP, then the class path element \f2foo/*\fP is expanded to a \f2A.jar:b.JAR\fP, except that the order of jar files is unspecified. All jar files in the specified directory, even hidden ones, are included in the list. A classpath entry consisting simply of \f2*\fP expands to a list of all the jar files in the current directory. The \f2CLASSPATH\fP environment variable, where defined, will be similarly expanded. Any classpath wildcard expansion occurs before the Java virtual machine is started \-\- no Java program will ever see unexpanded wildcards except by querying the environment. For example; by invoking \f2System.getenv("CLASSPATH")\fP.
-+For example, if directory \f2foo\fP contains \f2a.jar\fP and \f2b.JAR\fP, then the class path element \f2foo/*\fP is expanded to a \f2A.jar:b.JAR\fP, except that the order of jar files is unspecified. All jar files in the specified directory, even hidden ones, are included in the list. A classpath entry consisting simply of \f2*\fP expands to a list of all the jar files in the current directory. The \f2CLASSPATH\fP environment variable, where defined, will be similarly expanded. Any classpath wildcard expansion occurs before the Java virtual machine is started \-\- no Java program will ever see unexpanded wildcards except by querying the environment. For example; by invoking \f2System.getenv("CLASSPATH")\fP.  
- .TP 3
+-.TP 3
 -\-bootclasspath path
 -Specifies path from which to load bootstrap classes. By default, the bootstrap classes are the classes implementing the core Java 2 platform located in \f2jre/lib/rt.jar\fP and several other jar files.
-+\-bootclasspath path 
-+Specifies path from which to load bootstrap classes. By default, the bootstrap classes are the classes implementing the core Java 2 platform located in \f2jre/lib/rt.jar\fP and several other jar files. 
++For example, if directory \f2foo\fP contains \f2a.jar\fP and \f2b.JAR\fP, then the class path element \f2foo/*\fP is expanded to a \f2A.jar:b.JAR\fP, except that the order of jar files is unspecified. All jar files in the specified directory, even hidden ones, are included in the list. A classpath entry consisting simply of \f2*\fP expands to a list of all the jar files in the current directory. The \f2CLASSPATH\fP environment variable, where defined, will be similarly expanded. Any classpath wildcard expansion occurs before the Java virtual machine is started \-\- no Java program will ever see unexpanded wildcards except by querying the environment. For example; by invoking \f2System.getenv("CLASSPATH")\fP.  
  .TP 3
 -\-old
 -Specifies that old JDK1.0\-style header files should be generated.
-+\-old 
-+Specifies that old JDK1.0\-style header files should be generated. 
++\-bootclasspath path 
++Specifies path from which to load bootstrap classes. By default, the bootstrap classes are the classes implementing the core Java 2 platform located in \f2jre/lib/rt.jar\fP and several other jar files. 
  .TP 3
 -\-force
 -Specifies that output files should always be written.
-+\-force 
-+Specifies that output files should always be written. 
++\-old 
++Specifies that old JDK1.0\-style header files should be generated. 
  .TP 3
 -\-Joption
 -Pass \f2option\fP to the Java virtual machine, where \f2option\fP is one of the options described on the reference page for the java(1). For example, \f3\-J\-Xms48m\fP sets the startup memory to 48 megabytes.
++\-force 
++Specifies that output files should always be written. 
++.TP 3
 +\-Joption 
 +Pass \f2option\fP to the Java virtual machine, where \f2option\fP is one of the options described on the reference page for the java(1). For example, \f3\-J\-Xms48m\fP sets the startup memory to 48 megabytes. 
  .RE
@@ -34836,8 +34981,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/javap.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/javap.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/javap.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/javap.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -34972,41 +35117,44 @@
  .TP 3
 -\-help \-\-help \-?
 -Prints out help message for \f3javap\fP.
-+\-help \-\-help \-? 
-+Prints out help message for \f3javap\fP. 
- .TP 3
+-.TP 3
 -\-version
 -Prints out version information.
-+\-version 
-+Prints out version information. 
- .TP 3
+-.TP 3
 -\-l
 -Prints out line and local variable tables.
-+\-l 
-+Prints out line and local variable tables. 
++\-help \-\-help \-? 
++Prints out help message for \f3javap\fP. 
  .TP 3
 -\-public
 -Shows only public classes and members.
-+\-public 
-+Shows only public classes and members. 
- .TP 3
+-.TP 3
 -\-protected
 -Shows only protected and public classes and members.
-+\-protected 
-+Shows only protected and public classes and members. 
++\-version 
++Prints out version information. 
  .TP 3
 -\-package
 -Shows only package, protected, and public classes and members. This is the default.
-+\-package 
-+Shows only package, protected, and public classes and members. This is the default. 
++\-l 
++Prints out line and local variable tables. 
  .TP 3
 -\-private \-p
 -Shows all classes and members.
-+\-private \-p 
-+Shows all classes and members. 
++\-public 
++Shows only public classes and members. 
  .TP 3
 -\-Jflag
 -Pass \f2flag\fP directly to the runtime system. Some examples:
++\-protected 
++Shows only protected and public classes and members. 
++.TP 3
++\-package 
++Shows only package, protected, and public classes and members. This is the default. 
++.TP 3
++\-private \-p 
++Shows all classes and members. 
++.TP 3
 +\-Jflag 
 +Pass \f2flag\fP directly to the runtime system. Some examples: 
  .nf
@@ -35039,25 +35187,26 @@
  \f2Java Virtual Machine Specification\fP @
  .fi
 -http://java.sun.com/docs/books/vmspec/.
-+http://java.sun.com/docs/books/vmspec/. 
- .TP 3
+-.TP 3
 -\-verbose
 -Prints stack size, number of \f2locals\fP and \f2args\fP for methods.
-+\-verbose 
-+Prints stack size, number of \f2locals\fP and \f2args\fP for methods. 
++http://java.sun.com/docs/books/vmspec/. 
  .TP 3
 -\-classpath path
 -Specifies the path \f3javap\fP uses to look up classes. Overrides the default or the CLASSPATH environment variable if it is set.
-+\-classpath path 
-+Specifies the path \f3javap\fP uses to look up classes. Overrides the default or the CLASSPATH environment variable if it is set. 
++\-verbose 
++Prints stack size, number of \f2locals\fP and \f2args\fP for methods. 
  .TP 3
 -\-bootclasspath path
 -Specifies path from which to load bootstrap classes. By default, the bootstrap classes are the classes implementing the core Java platform located in \f2jre/lib/rt.jar\fP and several other jar files.
-+\-bootclasspath path 
-+Specifies path from which to load bootstrap classes. By default, the bootstrap classes are the classes implementing the core Java platform located in \f2jre/lib/rt.jar\fP and several other jar files. 
++\-classpath path 
++Specifies the path \f3javap\fP uses to look up classes. Overrides the default or the CLASSPATH environment variable if it is set. 
  .TP 3
 -\-extdirs dirs
 -Overrides location at which installed extensions are searched for. The default location for extensions is the value of \f2java.ext.dirs\fP.
++\-bootclasspath path 
++Specifies path from which to load bootstrap classes. By default, the bootstrap classes are the classes implementing the core Java platform located in \f2jre/lib/rt.jar\fP and several other jar files. 
++.TP 3
 +\-extdirs dirs 
 +Overrides location at which installed extensions are searched for. The default location for extensions is the value of \f2java.ext.dirs\fP. 
  .RE
@@ -35069,8 +35218,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/javaws.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/javaws.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/javaws.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/javaws.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -35105,8 +35254,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/jconsole.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/jconsole.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/jconsole.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/jconsole.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -35187,20 +35336,21 @@
  \f2com.sun.tools.jconsole.JConsolePlugin\fP @
  .fi
 -http://download.oracle.com/javase/7/docs/jdk/api/jconsole/spec/com/sun/tools/jconsole/JConsolePlugin.html class.
-+http://docs.oracle.com/javase/7/docs/jdk/api/jconsole/spec/com/sun/tools/jconsole/JConsolePlugin.html class. 
- .TP 3
+-.TP 3
 -\-version
 -Output version information and exit.
-+\-version 
-+Output version information and exit. 
++http://docs.oracle.com/javase/7/docs/jdk/api/jconsole/spec/com/sun/tools/jconsole/JConsolePlugin.html class. 
  .TP 3
 -\-help
 -Output help message and exit.
-+\-help 
-+Output help message and exit. 
++\-version 
++Output version information and exit. 
  .TP 3
 -\-J<flag>
 -Pass <flag> to the Java virtual machine on which jconsole is run.
++\-help 
++Output help message and exit. 
++.TP 3
 +\-J<flag> 
 +Pass <flag> to the Java virtual machine on which jconsole is run. 
  .RE
@@ -35224,8 +35374,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/jdb.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/jdb.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/jdb.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/jdb.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -35352,22 +35502,24 @@
  .TP 2
  o
 -\f2print MyClass.myStaticField\fP
-+\f2print MyClass.myStaticField\fP 
- .TP 2
- o
+-.TP 2
+-o
 -\f2print myObj.myInstanceField\fP
-+\f2print myObj.myInstanceField\fP 
++\f2print MyClass.myStaticField\fP 
  .TP 2
  o
 -\f2print i + j + k\fP \f2(i, j, k are primities and either fields or local variables)\fP
-+\f2print i + j + k\fP \f2(i, j, k are primities and either fields or local variables)\fP 
++\f2print myObj.myInstanceField\fP 
  .TP 2
  o
 -\f2print myObj.myMethod()\fP \f2(if myMethod returns a non\-null)\fP
-+\f2print myObj.myMethod()\fP \f2(if myMethod returns a non\-null)\fP 
++\f2print i + j + k\fP \f2(i, j, k are primities and either fields or local variables)\fP 
  .TP 2
  o
 -\f2print new java.lang.String("Hello").length()\fP
++\f2print myObj.myMethod()\fP \f2(if myMethod returns a non\-null)\fP 
++.TP 2
++o
 +\f2print new java.lang.String("Hello").length()\fP 
  .RE
  .TP 3
@@ -35456,61 +35608,67 @@
  .TP 3
 -\-help
 -Displays a help message.
-+\-help 
-+Displays a help message. 
- .TP 3
+-.TP 3
 -\-sourcepath <dir1:dir2:...>
 -Uses the given path in searching for source files in the specified path. If this option is not specified, the default path of "." is used.
-+\-sourcepath <dir1:dir2:...> 
-+Uses the given path in searching for source files in the specified path. If this option is not specified, the default path of "." is used. 
- .TP 3
+-.TP 3
 -\-attach <address>
 -Attaches the debugger to previously running VM using the default connection mechanism.
-+\-attach <address> 
-+Attaches the debugger to previously running VM using the default connection mechanism. 
- .TP 3
+-.TP 3
 -\-listen <address>
 -Waits for a running VM to connect at the specified address using standard connector.
-+\-listen <address> 
-+Waits for a running VM to connect at the specified address using standard connector. 
- .TP 3
+-.TP 3
 -\-listenany
 -Waits for a running VM to connect at any available address using standard connector.
-+\-listenany 
-+Waits for a running VM to connect at any available address using standard connector. 
++\-help 
++Displays a help message. 
  .TP 3
 -\-launch
 -Launches the debugged application immediately upon startup of jdb. This option removes the need for using the \f2run\fP command. The debuged application is launched and then stopped just before the initial application class is loaded. At that point you can set any necessary breakpoints and use the \f2cont\fP to continue execution.
-+\-launch 
-+Launches the debugged application immediately upon startup of jdb. This option removes the need for using the \f2run\fP command. The debuged application is launched and then stopped just before the initial application class is loaded. At that point you can set any necessary breakpoints and use the \f2cont\fP to continue execution. 
- .TP 3
+-.TP 3
 -\-listconnectors
 -List the connectors available in this VM
-+\-listconnectors 
-+List the connectors available in this VM 
- .TP 3
+-.TP 3
 -\-connect <connector\-name>:<name1>=<value1>,...
 -Connects to target VM using named connector with listed argument values.
-+\-connect <connector\-name>:<name1>=<value1>,... 
-+Connects to target VM using named connector with listed argument values. 
++\-sourcepath <dir1:dir2:...> 
++Uses the given path in searching for source files in the specified path. If this option is not specified, the default path of "." is used. 
  .TP 3
 -\-dbgtrace [flags]
 -Prints info for debugging jdb.
-+\-dbgtrace [flags] 
-+Prints info for debugging jdb. 
++\-attach <address> 
++Attaches the debugger to previously running VM using the default connection mechanism. 
  .TP 3
 -\-tclient
 -Runs the application in the Java HotSpot(tm) VM (Client).
-+\-tclient 
-+Runs the application in the Java HotSpot(tm) VM (Client). 
++\-listen <address> 
++Waits for a running VM to connect at the specified address using standard connector. 
  .TP 3
 -\-tserver
 -Runs the application in the Java HotSpot(tm) VM (Server).
-+\-tserver 
-+Runs the application in the Java HotSpot(tm) VM (Server). 
++\-listenany 
++Waits for a running VM to connect at any available address using standard connector. 
  .TP 3
 -\-Joption
 -Pass \f2option\fP to the Java virtual machine used to run jdb. (Options for the application Java virtual machine are passed to the \f3run\fP command.) For example, \f3\-J\-Xms48m\fP sets the startup memory to 48 megabytes.
++\-launch 
++Launches the debugged application immediately upon startup of jdb. This option removes the need for using the \f2run\fP command. The debuged application is launched and then stopped just before the initial application class is loaded. At that point you can set any necessary breakpoints and use the \f2cont\fP to continue execution. 
++.TP 3
++\-listconnectors 
++List the connectors available in this VM 
++.TP 3
++\-connect <connector\-name>:<name1>=<value1>,... 
++Connects to target VM using named connector with listed argument values. 
++.TP 3
++\-dbgtrace [flags] 
++Prints info for debugging jdb. 
++.TP 3
++\-tclient 
++Runs the application in the Java HotSpot(tm) VM (Client). 
++.TP 3
++\-tserver 
++Runs the application in the Java HotSpot(tm) VM (Server). 
++.TP 3
 +\-Joption 
 +Pass \f2option\fP to the Java virtual machine used to run jdb. (Options for the application Java virtual machine are passed to the \f3run\fP command.) For example, \f3\-J\-Xms48m\fP sets the startup memory to 48 megabytes. 
  .RE
@@ -35559,8 +35717,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/jhat.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/jhat.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/jhat.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/jhat.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -35623,51 +35781,55 @@
  .TP 3
 -\-stack false/true
 -Turn off tracking object allocation call stack. Note that if allocation site information is not available in the heap dump, you have to set this flag to false. Default is true.
-+\-stack false/true 
-+Turn off tracking object allocation call stack. Note that if allocation site information is not available in the heap dump, you have to set this flag to false. Default is true. 
- .TP 3
+-.TP 3
 -\-refs false/true
 -Turn off tracking of references to objects. Default is true. By default, back pointers (objects pointing to a given object a.k.a referrers or in\-coming references) are calculated for all objects in the heap.
-+\-refs false/true 
-+Turn off tracking of references to objects. Default is true. By default, back pointers (objects pointing to a given object a.k.a referrers or in\-coming references) are calculated for all objects in the heap. 
- .TP 3
+-.TP 3
 -\-port port\-number
 -Set the port for the jhat's HTTP server. Default is 7000.
-+\-port port\-number 
-+Set the port for the jhat's HTTP server. Default is 7000. 
- .TP 3
+-.TP 3
 -\-exclude exclude\-file
 -Specify a file that lists data members that should be excluded from the "reachable objects" query. For example, if the file lists \f2java.lang.String.value\fP, then, whenever list of objects reachable from a specific object "o" are calculated, reference paths involving \f2java.lang.String.value\fP field will not considered.
-+\-exclude exclude\-file 
-+Specify a file that lists data members that should be excluded from the "reachable objects" query. For example, if the file lists \f2java.lang.String.value\fP, then, whenever list of objects reachable from a specific object "o" are calculated, reference paths involving \f2java.lang.String.value\fP field will not considered. 
++\-stack false/true 
++Turn off tracking object allocation call stack. Note that if allocation site information is not available in the heap dump, you have to set this flag to false. Default is true. 
  .TP 3
 -\-baseline baseline\-dump\-file
 -Specify a baseline heap dump. Objects in both heap dumps with the same object ID will be marked as not being "new". Other objects will be marked as "new". This is useful while comparing two different heap dumps.
-+\-baseline baseline\-dump\-file 
-+Specify a baseline heap dump. Objects in both heap dumps with the same object ID will be marked as not being "new". Other objects will be marked as "new". This is useful while comparing two different heap dumps. 
- .TP 3
+-.TP 3
 -\-debug int
 -Set debug level for this tool. 0 means no debug output. Set higher values for more verbose modes.
-+\-debug int 
-+Set debug level for this tool. 0 means no debug output. Set higher values for more verbose modes. 
++\-refs false/true 
++Turn off tracking of references to objects. Default is true. By default, back pointers (objects pointing to a given object a.k.a referrers or in\-coming references) are calculated for all objects in the heap. 
  .TP 3
 -\-version
 -Report version number and exit.
-+\-version 
-+Report version number and exit. 
++\-port port\-number 
++Set the port for the jhat's HTTP server. Default is 7000. 
  .TP 3
 -\-h
 -Output help message and exit.
-+\-h 
-+Output help message and exit. 
++\-exclude exclude\-file 
++Specify a file that lists data members that should be excluded from the "reachable objects" query. For example, if the file lists \f2java.lang.String.value\fP, then, whenever list of objects reachable from a specific object "o" are calculated, reference paths involving \f2java.lang.String.value\fP field will not considered. 
  .TP 3
 -\-help
 -Output help message and exit.
-+\-help 
-+Output help message and exit. 
++\-baseline baseline\-dump\-file 
++Specify a baseline heap dump. Objects in both heap dumps with the same object ID will be marked as not being "new". Other objects will be marked as "new". This is useful while comparing two different heap dumps. 
  .TP 3
 -\-J<flag>
 -Pass <flag> to the Java virtual machine on which jhat is run. For example, \-J\-Xmx512m to use a maximum heap size of 512MB.
++\-debug int 
++Set debug level for this tool. 0 means no debug output. Set higher values for more verbose modes. 
++.TP 3
++\-version 
++Report version number and exit. 
++.TP 3
++\-h 
++Output help message and exit. 
++.TP 3
++\-help 
++Output help message and exit. 
++.TP 3
 +\-J<flag> 
 +Pass <flag> to the Java virtual machine on which jhat is run. For example, \-J\-Xmx512m to use a maximum heap size of 512MB. 
  .RE
@@ -35695,8 +35857,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/jinfo.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/jinfo.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/jinfo.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/jinfo.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -35721,17 +35883,15 @@
  .TP 3
 -option
 -Options are mutually exclusive. Option, if used, should follow immediately after the command name.
-+option 
-+Options are mutually exclusive. Option, if used, should follow immediately after the command name. 
- .RE
- 
- .LP
- .RS 3
- .TP 3
+-.RE
+-
+-.LP
+-.RS 3
+-.TP 3
 -pid
 -process id for which the configuration info is to be printed. The process must be a Java process. To get a list of Java processes running on a machine, jps(1) may be used.
-+pid 
-+process id for which the configuration info is to be printed. The process must be a Java process. To get a list of Java processes running on a machine, jps(1) may be used. 
++option 
++Options are mutually exclusive. Option, if used, should follow immediately after the command name. 
  .RE
  
  .LP
@@ -35739,8 +35899,8 @@
  .TP 3
 -executable
 -Java executable from which the core dump was produced.
-+executable 
-+Java executable from which the core dump was produced. 
++pid 
++process id for which the configuration info is to be printed. The process must be a Java process. To get a list of Java processes running on a machine, jps(1) may be used. 
  .RE
  
  .LP
@@ -35748,8 +35908,8 @@
  .TP 3
 -core
 -core file for which the configuration info is to be printed.
-+core 
-+core file for which the configuration info is to be printed. 
++executable 
++Java executable from which the core dump was produced. 
  .RE
  
  .LP
@@ -35757,8 +35917,8 @@
  .TP 3
 -remote\-hostname\-or\-IP
 -remote debug server's (see jsadebugd(1)) hostname or IP address.
-+remote\-hostname\-or\-IP 
-+remote debug server's (see jsadebugd(1)) hostname or IP address. 
++core 
++core file for which the configuration info is to be printed. 
  .RE
  
  .LP
@@ -35766,6 +35926,13 @@
  .TP 3
 -server\-id
 -optional unique id, if multiple debug servers are running on the same remote host.
++remote\-hostname\-or\-IP 
++remote debug server's (see jsadebugd(1)) hostname or IP address. 
++.RE
++
++.LP
++.RS 3
++.TP 3
 +server\-id 
 +optional unique id, if multiple debug servers are running on the same remote host. 
  .RE
@@ -35832,8 +35999,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/jmap.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/jmap.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/jmap.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/jmap.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -35887,47 +36054,53 @@
  .TP 3
 -<no option>
 -When no option is used jmap prints shared object mappings. For each shared object loaded in the target VM, start address, the size of the mapping, and the full path of the shared object file are printed. This is similar to the Solaris \f3pmap\fP utility.
+-.br
+-.TP 3
+-\-dump:[live,]format=b,file=<filename>
+-Dumps the Java heap in hprof binary format to filename. The \f2live\fP suboption is optional. If specified, only the live objects in the heap are dumped. To browse the heap dump, you can use jhat(1) (Java Heap Analysis Tool) to read the generated file.
+-.br
+-.TP 3
+-\-finalizerinfo
+-Prints information on objects awaiting finalization.
 +<no option> 
 +When no option is used jmap prints shared object mappings. For each shared object loaded in the target VM, start address, the size of the mapping, and the full path of the shared object file are printed. This is similar to the Solaris \f3pmap\fP utility. 
  .br
  .TP 3
--\-dump:[live,]format=b,file=<filename>
--Dumps the Java heap in hprof binary format to filename. The \f2live\fP suboption is optional. If specified, only the live objects in the heap are dumped. To browse the heap dump, you can use jhat(1) (Java Heap Analysis Tool) to read the generated file.
+-\-heap
+-Prints a heap summary. GC algorithm used, heap configuration and generation wise heap usage are printed.
+-.br
+-.TP 3
+-\-histo[:live]
+-Prints a histogram of the heap. For each Java class, number of objects, memory size in bytes, and fully qualified class names are printed. VM internal class names are printed with '*' prefix. If the \f2live\fP suboption is specified, only live objects are counted.
 +\-dump:[live,]format=b,file=<filename> 
 +Dumps the Java heap in hprof binary format to filename. The \f2live\fP suboption is optional. If specified, only the live objects in the heap are dumped. To browse the heap dump, you can use jhat(1) (Java Heap Analysis Tool) to read the generated file. 
  .br
  .TP 3
--\-finalizerinfo
--Prints information on objects awaiting finalization.
+-\-permstat
+-Prints class loader wise statistics of permanent generation of Java heap. For each class loader, its name, liveness, address, parent class loader, and the number and size of classes it has loaded are printed. In addition, the number and size of interned Strings are printed.
 +\-finalizerinfo 
 +Prints information on objects awaiting finalization. 
  .br
  .TP 3
--\-heap
--Prints a heap summary. GC algorithm used, heap configuration and generation wise heap usage are printed.
+-\-F
+-Force. Use with jmap \-dump or jmap \-histo option if the pid does not respond. The \f2live\fP suboption is not supported in this mode.
 +\-heap 
 +Prints a heap summary. GC algorithm used, heap configuration and generation wise heap usage are printed. 
  .br
  .TP 3
--\-histo[:live]
--Prints a histogram of the heap. For each Java class, number of objects, memory size in bytes, and fully qualified class names are printed. VM internal class names are printed with '*' prefix. If the \f2live\fP suboption is specified, only live objects are counted.
+-\-h
 +\-histo[:live] 
 +Prints a histogram of the heap. For each Java class, number of objects, memory size in bytes, and fully qualified class names are printed. VM internal class names are printed with '*' prefix. If the \f2live\fP suboption is specified, only live objects are counted. 
- .br
- .TP 3
--\-permstat
--Prints class loader wise statistics of permanent generation of Java heap. For each class loader, its name, liveness, address, parent class loader, and the number and size of classes it has loaded are printed. In addition, the number and size of interned Strings are printed.
++.br
++.TP 3
 +\-permstat 
 +Prints class loader wise statistics of permanent generation of Java heap. For each class loader, its name, liveness, address, parent class loader, and the number and size of classes it has loaded are printed. In addition, the number and size of interned Strings are printed. 
- .br
- .TP 3
--\-F
--Force. Use with jmap \-dump or jmap \-histo option if the pid does not respond. The \f2live\fP suboption is not supported in this mode.
++.br
++.TP 3
 +\-F 
 +Force. Use with jmap \-dump or jmap \-histo option if the pid does not respond. The \f2live\fP suboption is not supported in this mode. 
- .br
- .TP 3
--\-h
++.br
++.TP 3
 +\-h 
  Prints a help message.
  .br
@@ -35969,8 +36142,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/jps.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/jps.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/jps.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/jps.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -36002,31 +36175,32 @@
  .TP 3
 -\-q
 -Suppress the output of the class name, JAR file name, and arguments passed to the \f2main\fP method, producing only a list of local VM identifiers.
-+\-q 
-+Suppress the output of the class name, JAR file name, and arguments passed to the \f2main\fP method, producing only a list of local VM identifiers. 
- .TP 3
+-.TP 3
 -\-m
 -Output the arguments passed to the main method. The output may be null for embedded JVMs.
-+\-m 
-+Output the arguments passed to the main method. The output may be null for embedded JVMs.  
++\-q 
++Suppress the output of the class name, JAR file name, and arguments passed to the \f2main\fP method, producing only a list of local VM identifiers. 
  .TP 3
 -\-l
 -Output the full package name for the application's main class or the full path name to the application's JAR file.
-+\-l 
-+Output the full package name for the application's main class or the full path name to the application's JAR file. 
++\-m 
++Output the arguments passed to the main method. The output may be null for embedded JVMs.  
  .TP 3
 -\-v
 -Output the arguments passed to the JVM.
-+\-v 
-+Output the arguments passed to the JVM. 
++\-l 
++Output the full package name for the application's main class or the full path name to the application's JAR file. 
  .TP 3
 -\-V
 -Output the arguments passed to the JVM through the flags file (the .hotspotrc file or the file specified by the \-XX:Flags=<\f2filename\fP> argument).
-+\-V 
-+Output the arguments passed to the JVM through the flags file (the .hotspotrc file or the file specified by the \-XX:Flags=<\f2filename\fP> argument). 
++\-v 
++Output the arguments passed to the JVM. 
  .TP 3
 -\-Joption
 -Pass \f2option\fP to the \f3java\fP launcher called by \f3jps\fP. For example, \f3\-J\-Xms48m\fP sets the startup memory to 48 megabytes. It is a common convention for \f3\-J\fP to pass options to the underlying VM executing applications written in Java.
++\-V 
++Output the arguments passed to the JVM through the flags file (the .hotspotrc file or the file specified by the \-XX:Flags=<\f2filename\fP> argument). 
++.TP 3
 +\-Joption 
 +Pass \f2option\fP to the \f3java\fP launcher called by \f3jps\fP. For example, \f3\-J\-Xms48m\fP sets the startup memory to 48 megabytes. It is a common convention for \f3\-J\fP to pass options to the underlying VM executing applications written in Java. 
  .RE
@@ -36086,8 +36260,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/jrunscript.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/jrunscript.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/jrunscript.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/jrunscript.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -36119,61 +36293,67 @@
  .TP 3
 -\-classpath path
 -Specify where to find the user's .class files that are accessed by the script.
-+\-classpath path 
-+Specify where to find the user's .class files that are accessed by the script. 
- .TP 3
+-.TP 3
 -\-cp path
 -This is a synonym for \-classpath \f2path\fP
-+\-cp path 
-+This is a synonym for \-classpath \f2path\fP 
- .TP 3
+-.TP 3
 -\-Dname=value
 -Set a Java system property.
-+\-Dname=value 
-+Set a Java system property. 
- .TP 3
+-.TP 3
 -\-J<flag>
 -Pass <flag> directly to the Java virtual machine on which jrunscript is run.
-+\-J<flag> 
-+Pass <flag> directly to the Java virtual machine on which jrunscript is run. 
- .TP 3
+-.TP 3
 -\-l language
 -Use the specified scripting language. By default, JavaScript is used. Note that to use other scripting languages, you also need to specify the corresponding script engine's jar file using \-cp or \-classpath option.
-+\-l language 
-+Use the specified scripting language. By default, JavaScript is used. Note that to use other scripting languages, you also need to specify the corresponding script engine's jar file using \-cp or \-classpath option. 
++\-classpath path 
++Specify where to find the user's .class files that are accessed by the script. 
  .TP 3
 -\-e script
 -Evaluate the given script. This option can be used to run "one liner" scripts specified completely on the command line.
-+\-e script 
-+Evaluate the given script. This option can be used to run "one liner" scripts specified completely on the command line. 
- .TP 3
+-.TP 3
 -\-encoding encoding
 -Specify the character encoding used while reading script files.
-+\-encoding encoding 
-+Specify the character encoding used while reading script files. 
- .TP 3
+-.TP 3
 -\-f script\-file
 -Evaluate the given script file (batch mode).
-+\-f script\-file 
-+Evaluate the given script file (batch mode). 
++\-cp path 
++This is a synonym for \-classpath \f2path\fP 
  .TP 3
 -\-f \-
 -Read and evaluate a script from standard input (interactive mode).
-+\-f \- 
-+Read and evaluate a script from standard input (interactive mode). 
++\-Dname=value 
++Set a Java system property. 
  .TP 3
 -\-help\
 -Output help message and exit.
-+\-help\  
-+Output help message and exit. 
++\-J<flag> 
++Pass <flag> directly to the Java virtual machine on which jrunscript is run. 
  .TP 3
 -\-?\
 -Output help message and exit.
-+\-?\  
-+Output help message and exit. 
++\-l language 
++Use the specified scripting language. By default, JavaScript is used. Note that to use other scripting languages, you also need to specify the corresponding script engine's jar file using \-cp or \-classpath option. 
  .TP 3
 -\-q\
 -List all script engines available and exit.
++\-e script 
++Evaluate the given script. This option can be used to run "one liner" scripts specified completely on the command line. 
++.TP 3
++\-encoding encoding 
++Specify the character encoding used while reading script files. 
++.TP 3
++\-f script\-file 
++Evaluate the given script file (batch mode). 
++.TP 3
++\-f \- 
++Read and evaluate a script from standard input (interactive mode). 
++.TP 3
++\-help\  
++Output help message and exit. 
++.TP 3
++\-?\  
++Output help message and exit. 
++.TP 3
 +\-q\  
 +List all script engines available and exit. 
  .RE
@@ -36234,8 +36414,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/jsadebugd.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/jsadebugd.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/jsadebugd.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/jsadebugd.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -36314,8 +36494,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/jstack.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/jstack.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/jstack.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/jstack.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -36425,8 +36605,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/jstat.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/jstat.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/jstat.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/jstat.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -36490,26 +36670,27 @@
  .TP 3
 -protocol
 -The communications protocol. If the \f2protocol\fP is omitted and a \f2hostname\fP is not specified, the default protocol is a platform specific optimized local protocol. If the \f2protocol\fP is omitted and a \f2hostname\fP is specified, then the default protocol is \f3rmi\fP.
-+protocol 
-+The communications protocol. If the \f2protocol\fP is omitted and a \f2hostname\fP is not specified, the default protocol is a platform specific optimized local protocol. If the \f2protocol\fP is omitted and a \f2hostname\fP is specified, then the default protocol is \f3rmi\fP. 
- .TP 3
+-.TP 3
 -lvmid
 -The local virtual machine identifier for the target JVM. The \f2lvmid\fP is a platform\-specific value that uniquely identifies a JVM on a system. The \f2lvmid\fP is the only required component of a virtual machine identifier. The \f2lvmid\fP is typically, but not necessarily, the operating system's process identifier for the target JVM process. You can use the jps(1) command to determine the \f2lvmid\fP. Also, you can determine \f2lvmid\fP on Unix platforms with the \f3ps\fP command, and on Windows with the Windows Task Manager.
-+lvmid 
-+The local virtual machine identifier for the target JVM. The \f2lvmid\fP is a platform\-specific value that uniquely identifies a JVM on a system. The \f2lvmid\fP is the only required component of a virtual machine identifier. The \f2lvmid\fP is typically, but not necessarily, the operating system's process identifier for the target JVM process. You can use the jps(1) command to determine the \f2lvmid\fP. Also, you can determine \f2lvmid\fP on Unix platforms with the \f3ps\fP command, and on Windows with the Windows Task Manager. 
++protocol 
++The communications protocol. If the \f2protocol\fP is omitted and a \f2hostname\fP is not specified, the default protocol is a platform specific optimized local protocol. If the \f2protocol\fP is omitted and a \f2hostname\fP is specified, then the default protocol is \f3rmi\fP. 
  .TP 3
 -hostname
 -A hostname or IP address indicating the target host. If \f2hostname\fP is omitted, then the target host is the local host.
-+hostname 
-+A hostname or IP address indicating the target host. If \f2hostname\fP is omitted, then the target host is the local host. 
++lvmid 
++The local virtual machine identifier for the target JVM. The \f2lvmid\fP is a platform\-specific value that uniquely identifies a JVM on a system. The \f2lvmid\fP is the only required component of a virtual machine identifier. The \f2lvmid\fP is typically, but not necessarily, the operating system's process identifier for the target JVM process. You can use the jps(1) command to determine the \f2lvmid\fP. Also, you can determine \f2lvmid\fP on Unix platforms with the \f3ps\fP command, and on Windows with the Windows Task Manager. 
  .TP 3
 -port
 -The default port for communicating with the remote server. If the \f2hostname\fP is omitted or the \f2protocol\fP specifies an optimized, local protocol, then \f2port\fP is ignored. Otherwise, treatment of the \f2port\fP parameter is implementation specific. For the default \f3rmi\fP protocol, the \f2port\fP indicates the port number for the rmiregistry on the remote host. If \f2port\fP is omitted, and \f2protocol\fP indicates \f3rmi\fP, then the default rmiregistry port (1099) is used.
-+port 
-+The default port for communicating with the remote server. If the \f2hostname\fP is omitted or the \f2protocol\fP specifies an optimized, local protocol, then \f2port\fP is ignored. Otherwise, treatment of the \f2port\fP parameter is implementation specific. For the default \f3rmi\fP protocol, the \f2port\fP indicates the port number for the rmiregistry on the remote host. If \f2port\fP is omitted, and \f2protocol\fP indicates \f3rmi\fP, then the default rmiregistry port (1099) is used. 
++hostname 
++A hostname or IP address indicating the target host. If \f2hostname\fP is omitted, then the target host is the local host. 
  .TP 3
 -servername
 -The treatment of this parameter depends on implementation. For the optimized local protocol, this field is ignored. For the \f3rmi\fP protocol, it represents the name of the RMI remote object on the remote host.
++port 
++The default port for communicating with the remote server. If the \f2hostname\fP is omitted or the \f2protocol\fP specifies an optimized, local protocol, then \f2port\fP is ignored. Otherwise, treatment of the \f2port\fP parameter is implementation specific. For the default \f3rmi\fP protocol, the \f2port\fP indicates the port number for the rmiregistry on the remote host. If \f2port\fP is omitted, and \f2protocol\fP indicates \f3rmi\fP, then the default rmiregistry port (1099) is used. 
++.TP 3
 +servername 
 +The treatment of this parameter depends on implementation. For the optimized local protocol, this field is ignored. For the \f3rmi\fP protocol, it represents the name of the RMI remote object on the remote host. 
  .RE
@@ -38036,8 +38217,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/jstatd.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/jstatd.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/jstatd.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/jstatd.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -38160,8 +38341,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/keytool.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/keytool.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/keytool.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/keytool.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -1,4 +1,4 @@
 -." Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
 +." Copyright (c) 1998-2011 keytool tool, Oracle and/or its affiliates. All rights reserved.
@@ -38191,26 +38372,28 @@
  .TP 2
  o
 -All command and option names are preceded by a minus sign (\-).
-+All command and option names are preceded by a minus sign (\-). 
- .TP 2
- o
+-.TP 2
+-o
 -The options for each command may be provided in any order.
-+The options for each command may be provided in any order. 
++All command and option names are preceded by a minus sign (\-). 
  .TP 2
  o
 -All items not italicized or in braces or square brackets are required to appear as is.
-+All items not italicized or in braces or square brackets are required to appear as is. 
++The options for each command may be provided in any order. 
  .TP 2
  o
 -Braces surrounding an option generally signify that a default value will be used if the option is not specified on the command line. Braces are also used around the \f2\-v\fP, \f2\-rfc\fP, and \f2\-J\fP options, which only have meaning if they appear on the command line (that is, they don't have any "default" values other than not existing).
-+Braces surrounding an option generally signify that a default value will be used if the option is not specified on the command line. Braces are also used around the \f2\-v\fP, \f2\-rfc\fP, and \f2\-J\fP options, which only have meaning if they appear on the command line (that is, they don't have any "default" values other than not existing). 
++All items not italicized or in braces or square brackets are required to appear as is. 
  .TP 2
  o
 -Brackets surrounding an option signify that the user is prompted for the value(s) if the option is not specified on the command line. (For a \f2\-keypass\fP option, if you do not specify the option on the command line, \f3keytool\fP will first attempt to use the keystore password to recover the private/secret key, and if this fails, will then prompt you for the private/secret key password.)
-+Brackets surrounding an option signify that the user is prompted for the value(s) if the option is not specified on the command line. (For a \f2\-keypass\fP option, if you do not specify the option on the command line, \f3keytool\fP will first attempt to use the keystore password to recover the private/secret key, and if this fails, will then prompt you for the private/secret key password.) 
++Braces surrounding an option generally signify that a default value will be used if the option is not specified on the command line. Braces are also used around the \f2\-v\fP, \f2\-rfc\fP, and \f2\-J\fP options, which only have meaning if they appear on the command line (that is, they don't have any "default" values other than not existing). 
  .TP 2
  o
 -Items in italics (option values) represent the actual values that must be supplied. For example, here is the format of the \f2\-printcert\fP command:
++Brackets surrounding an option signify that the user is prompted for the value(s) if the option is not specified on the command line. (For a \f2\-keypass\fP option, if you do not specify the option on the command line, \f3keytool\fP will first attempt to use the keystore password to recover the private/secret key, and if this fails, will then prompt you for the private/secret key password.) 
++.TP 2
++o
 +Items in italics (option values) represent the actual values that must be supplied. For example, here is the format of the \f2\-printcert\fP command: 
  .nf
  \f3
@@ -38291,30 +38474,34 @@
  .RS 3
  .TP 3
 -\-storetype storetype
-+\-storetype storetype 
- .LP
+-.LP
 -This qualifier specifies the type of keystore to be instantiated.
-+This qualifier specifies the type of keystore to be instantiated.  
- .TP 3
+-.TP 3
 -\-keystore keystore
-+\-keystore keystore 
- .LP
+-.LP
 -The keystore location.
-+The keystore location. 
++\-storetype storetype 
  .LP
 -If the JKS storetype is used and a keystore file does not yet exist, then certain \f3keytool\fP commands may result in a new keystore file being created. For example, if \f2keytool \-genkeypair\fP is invoked and the \f2\-keystore\fP option is not specified, the default keystore file named \f2.keystore\fP in the user's home directory will be created if it does not already exist. Similarly, if the \f2\-keystore \fP\f2ks_file\fP option is specified but \f2ks_file\fP does not exist, then it will be created
-+If the JKS storetype is used and a keystore file does not yet exist, then certain \f3keytool\fP commands may result in a new keystore file being created. For example, if \f2keytool \-genkeypair\fP is invoked and the \f2\-keystore\fP option is not specified, the default keystore file named \f2.keystore\fP in the user's home directory will be created if it does not already exist. Similarly, if the \f2\-keystore \fP\f2ks_file\fP option is specified but \f2ks_file\fP does not exist, then it will be created 
- .LP
+-.LP
 -Note that the input stream from the \f2\-keystore\fP option is passed to the \f2KeyStore.load\fP method. If \f2NONE\fP is specified as the URL, then a null stream is passed to the \f2KeyStore.load\fP method. \f2NONE\fP should be specified if the \f2KeyStore\fP is not file\-based (for example, if it resides on a hardware token device).
-+Note that the input stream from the \f2\-keystore\fP option is passed to the \f2KeyStore.load\fP method. If \f2NONE\fP is specified as the URL, then a null stream is passed to the \f2KeyStore.load\fP method. \f2NONE\fP should be specified if the \f2KeyStore\fP is not file\-based (for example, if it resides on a hardware token device).  
++This qualifier specifies the type of keystore to be instantiated.  
  .TP 3
 -\-storepass[:env|:file] argument
-+\-storepass[:env|:file] argument 
++\-keystore keystore 
  .LP
 -The password which is used to protect the integrity of the keystore.
-+The password which is used to protect the integrity of the keystore. 
++The keystore location. 
  .LP
 -If the modifier \f2env\fP or \f2file\fP is not specified, then the password has the value \f2argument\fP, which must be at least 6 characters long. Otherwise, the password is retrieved as follows:
++If the JKS storetype is used and a keystore file does not yet exist, then certain \f3keytool\fP commands may result in a new keystore file being created. For example, if \f2keytool \-genkeypair\fP is invoked and the \f2\-keystore\fP option is not specified, the default keystore file named \f2.keystore\fP in the user's home directory will be created if it does not already exist. Similarly, if the \f2\-keystore \fP\f2ks_file\fP option is specified but \f2ks_file\fP does not exist, then it will be created 
++.LP
++Note that the input stream from the \f2\-keystore\fP option is passed to the \f2KeyStore.load\fP method. If \f2NONE\fP is specified as the URL, then a null stream is passed to the \f2KeyStore.load\fP method. \f2NONE\fP should be specified if the \f2KeyStore\fP is not file\-based (for example, if it resides on a hardware token device).  
++.TP 3
++\-storepass[:env|:file] argument 
++.LP
++The password which is used to protect the integrity of the keystore. 
++.LP
 +If the modifier \f2env\fP or \f2file\fP is not specified, then the password has the value \f2argument\fP, which must be at least 6 characters long. Otherwise, the password is retrieved as follows: 
  .RS 3
  .TP 2
@@ -38328,45 +38515,52 @@
  .RE
  .LP
 -\f3Note\fP: All other options that require passwords, such as \f2\-keypass\fP, \f2\-srckeypass\fP, \f2\-destkeypass\fP \f2\-srcstorepass\fP, and \f2\-deststorepass\fP, accept the \f2env\fP and \f2file\fP modifiers. (Remember to separate the password option and the modifier with a colon, (\f2:\fP).)
-+\f3Note\fP: All other options that require passwords, such as \f2\-keypass\fP, \f2\-srckeypass\fP, \f2\-destkeypass\fP \f2\-srcstorepass\fP, and \f2\-deststorepass\fP, accept the \f2env\fP and \f2file\fP modifiers. (Remember to separate the password option and the modifier with a colon, (\f2:\fP).) 
- .LP
+-.LP
 -The password must be provided to all commands that access the keystore contents. For such commands, if a \f2\-storepass\fP option is not provided at the command line, the user is prompted for it.
-+The password must be provided to all commands that access the keystore contents. For such commands, if a \f2\-storepass\fP option is not provided at the command line, the user is prompted for it. 
- .LP
+-.LP
 -When retrieving information from the keystore, the password is optional; if no password is given, the integrity of the retrieved information cannot be checked and a warning is displayed.
-+When retrieving information from the keystore, the password is optional; if no password is given, the integrity of the retrieved information cannot be checked and a warning is displayed.  
- .TP 3
+-.TP 3
 -\-providerName provider_name
-+\-providerName provider_name 
- .LP
+-.LP
 -Used to identify a cryptographic service provider's name when listed in the security properties file.
-+Used to identify a cryptographic service provider's name when listed in the security properties file.  
- .TP 3
+-.TP 3
 -\-providerClass provider_class_name
-+\-providerClass provider_class_name 
++\f3Note\fP: All other options that require passwords, such as \f2\-keypass\fP, \f2\-srckeypass\fP, \f2\-destkeypass\fP \f2\-srcstorepass\fP, and \f2\-deststorepass\fP, accept the \f2env\fP and \f2file\fP modifiers. (Remember to separate the password option and the modifier with a colon, (\f2:\fP).) 
  .LP
 -Used to specify the name of cryptographic service provider's master class file when the service provider is not listed in the security properties file.
-+Used to specify the name of cryptographic service provider's master class file when the service provider is not listed in the security properties file.  
- .TP 3
+-.TP 3
 -\-providerArg provider_arg
-+\-providerArg provider_arg 
++The password must be provided to all commands that access the keystore contents. For such commands, if a \f2\-storepass\fP option is not provided at the command line, the user is prompted for it. 
  .LP
 -Used in conjunction with \f2\-providerClass\fP. Represents an optional string input argument for the constructor of \f2provider_class_name\fP.
-+Used in conjunction with \f2\-providerClass\fP. Represents an optional string input argument for the constructor of \f2provider_class_name\fP.  
++When retrieving information from the keystore, the password is optional; if no password is given, the integrity of the retrieved information cannot be checked and a warning is displayed.  
  .TP 3
 -\-protected
-+\-protected 
- .LP
+-.LP
 -Either \f2true\fP or \f2false\fP. This value should be specified as \f2true\fP if a password must be given via a protected authentication path such as a dedicated PIN reader.
-+Either \f2true\fP or \f2false\fP. This value should be specified as \f2true\fP if a password must be given via a protected authentication path such as a dedicated PIN reader. 
++\-providerName provider_name 
  .LP
 -Note: Since there are two keystores involved in \f2\-importkeystore\fP command, two options, namely, \f2\-srcprotected\fP and \f2\-destprotected\fP are provided for the source keystore and the destination keystore respectively.
-+Note: Since there are two keystores involved in \f2\-importkeystore\fP command, two options, namely, \f2\-srcprotected\fP and \f2\-destprotected\fP are provided for the source keystore and the destination keystore respectively.  
++Used to identify a cryptographic service provider's name when listed in the security properties file.  
  .TP 3
 -\-ext {name{:critical}{=value}}
-+\-ext {name{:critical}{=value}} 
++\-providerClass provider_class_name 
  .LP
 -Denotes an X.509 certificate extension. The option can be used in \-genkeypair and \-gencert to embed extensions into the certificate generated, or in \f2\-certreq\fP to show what extensions are requested in the certificate request. The option can appear multiple times. name can be a supported extension name (see below) or an arbitrary OID number. value, if provided, denotes the parameter for the extension; if omitted, denotes the default value (if defined) of the extension or the extension requires no parameter. The \f2:critical\fP modifier, if provided, means the extension's isCritical attribute is true; otherwise, false. You may use \f2:c\fP in place of \f2:critical\fP.
++Used to specify the name of cryptographic service provider's master class file when the service provider is not listed in the security properties file.  
++.TP 3
++\-providerArg provider_arg 
++.LP
++Used in conjunction with \f2\-providerClass\fP. Represents an optional string input argument for the constructor of \f2provider_class_name\fP.  
++.TP 3
++\-protected 
++.LP
++Either \f2true\fP or \f2false\fP. This value should be specified as \f2true\fP if a password must be given via a protected authentication path such as a dedicated PIN reader. 
++.LP
++Note: Since there are two keystores involved in \f2\-importkeystore\fP command, two options, namely, \f2\-srcprotected\fP and \f2\-destprotected\fP are provided for the source keystore and the destination keystore respectively.  
++.TP 3
++\-ext {name{:critical}{=value}} 
++.LP
 +Denotes an X.509 certificate extension. The option can be used in \-genkeypair and \-gencert to embed extensions into the certificate generated, or in \f2\-certreq\fP to show what extensions are requested in the certificate request. The option can appear multiple times. name can be a supported extension name (see below) or an arbitrary OID number. value, if provided, denotes the parameter for the extension; if omitted, denotes the default value (if defined) of the extension or the extension requires no parameter. The \f2:critical\fP modifier, if provided, means the extension's isCritical attribute is true; otherwise, false. You may use \f2:c\fP in place of \f2:critical\fP.  
  .RE
  
@@ -38474,24 +38668,26 @@
  .RS 3
  .TP 3
 -\-gencert {\-rfc} {\-infile infile} {\-outfile outfile} {\-alias alias} {\-sigalg sigalg} {\-dname dname} {\-startdate startdate {\-ext ext}* {\-validity valDays} [\-keypass keypass] {\-keystore keystore} [\-storepass storepass] {\-storetype storetype} {\-providername provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption}
-+\-gencert {\-rfc} {\-infile infile} {\-outfile outfile} {\-alias alias} {\-sigalg sigalg} {\-dname dname} {\-startdate startdate {\-ext ext}* {\-validity valDays} [\-keypass keypass] {\-keystore keystore} [\-storepass storepass] {\-storetype storetype} {\-providername provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption} 
- .LP
+-.LP
 -Generates a certificate as a response to a certificate request file (which can be created by the \f2keytool \-certreq\fP command). The command reads the request from \f2infile\fP (if omitted, from the standard input), signs it using alias's private key, and output the X.509 certificate into \f2outfile\fP (if omitted, to the standard output). If \f2\-rfc\fP is specified, output format is BASE64\-encoded PEM; otherwise, a binary DER is created.
-+Generates a certificate as a response to a certificate request file (which can be created by the \f2keytool \-certreq\fP command). The command reads the request from \f2infile\fP (if omitted, from the standard input), signs it using alias's private key, and output the X.509 certificate into \f2outfile\fP (if omitted, to the standard output). If \f2\-rfc\fP is specified, output format is BASE64\-encoded PEM; otherwise, a binary DER is created. 
- .LP
+-.LP
 -\f2sigalg\fP specifies the algorithm that should be used to sign the certificate. \f2startdate\fP is the start time/date that the certificate is valid. \f2valDays\fP tells the number of days for which the certificate should be considered valid.
-+\f2sigalg\fP specifies the algorithm that should be used to sign the certificate. \f2startdate\fP is the start time/date that the certificate is valid. \f2valDays\fP tells the number of days for which the certificate should be considered valid. 
++\-gencert {\-rfc} {\-infile infile} {\-outfile outfile} {\-alias alias} {\-sigalg sigalg} {\-dname dname} {\-startdate startdate {\-ext ext}* {\-validity valDays} [\-keypass keypass] {\-keystore keystore} [\-storepass storepass] {\-storetype storetype} {\-providername provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption} 
  .LP
 -If \f2dname\fP is provided, it's used as the subject of the generated certificate. Otherwise, the one from the certificate request is used.
-+If \f2dname\fP is provided, it's used as the subject of the generated certificate. Otherwise, the one from the certificate request is used. 
++Generates a certificate as a response to a certificate request file (which can be created by the \f2keytool \-certreq\fP command). The command reads the request from \f2infile\fP (if omitted, from the standard input), signs it using alias's private key, and output the X.509 certificate into \f2outfile\fP (if omitted, to the standard output). If \f2\-rfc\fP is specified, output format is BASE64\-encoded PEM; otherwise, a binary DER is created. 
  .LP
 -\f2ext\fP shows what X.509 extensions will be embedded in the certificate. Read Common Options for the grammar of \f2\-ext\fP.
-+\f2ext\fP shows what X.509 extensions will be embedded in the certificate. Read Common Options for the grammar of \f2\-ext\fP. 
++\f2sigalg\fP specifies the algorithm that should be used to sign the certificate. \f2startdate\fP is the start time/date that the certificate is valid. \f2valDays\fP tells the number of days for which the certificate should be considered valid. 
  .LP
 -The \f2\-gencert\fP command enables you to create certificate chains. The following example creates a certificate, \f2e1\fP, that contains three certificates in its certificate chain.
-+The \f2\-gencert\fP command enables you to create certificate chains. The following example creates a certificate, \f2e1\fP, that contains three certificates in its certificate chain. 
++If \f2dname\fP is provided, it's used as the subject of the generated certificate. Otherwise, the one from the certificate request is used. 
  .LP
 -The following commands creates four key pairs named \f2ca\fP, \f2ca1\fP, \f2ca2\fP, and \f2e1\fP:
++\f2ext\fP shows what X.509 extensions will be embedded in the certificate. Read Common Options for the grammar of \f2\-ext\fP. 
++.LP
++The \f2\-gencert\fP command enables you to create certificate chains. The following example creates a certificate, \f2e1\fP, that contains three certificates in its certificate chain. 
++.LP
 +The following commands creates four key pairs named \f2ca\fP, \f2ca1\fP, \f2ca2\fP, and \f2e1\fP: 
  .nf
  \f3
@@ -38519,24 +38715,26 @@
  .fi
  .TP 3
 -\-genkeypair {\-alias alias} {\-keyalg keyalg} {\-keysize keysize} {\-sigalg sigalg} [\-dname dname] [\-keypass keypass] {\-startdate value} {\-ext ext}* {\-validity valDays} {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption}
-+\-genkeypair {\-alias alias} {\-keyalg keyalg} {\-keysize keysize} {\-sigalg sigalg} [\-dname dname] [\-keypass keypass] {\-startdate value} {\-ext ext}* {\-validity valDays} {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption} 
- .LP
+-.LP
 -Generates a key pair (a public key and associated private key). Wraps the public key into an X.509 v3 self\-signed certificate, which is stored as a single\-element certificate chain. This certificate chain and the private key are stored in a new keystore entry identified by \f2alias\fP.
-+Generates a key pair (a public key and associated private key). Wraps the public key into an X.509 v3 self\-signed certificate, which is stored as a single\-element certificate chain. This certificate chain and the private key are stored in a new keystore entry identified by \f2alias\fP. 
- .LP
+-.LP
 -\f2keyalg\fP specifies the algorithm to be used to generate the key pair, and \f2keysize\fP specifies the size of each key to be generated. \f2sigalg\fP specifies the algorithm that should be used to sign the self\-signed certificate; this algorithm must be compatible with \f2keyalg\fP.
-+\f2keyalg\fP specifies the algorithm to be used to generate the key pair, and \f2keysize\fP specifies the size of each key to be generated. \f2sigalg\fP specifies the algorithm that should be used to sign the self\-signed certificate; this algorithm must be compatible with \f2keyalg\fP. 
++\-genkeypair {\-alias alias} {\-keyalg keyalg} {\-keysize keysize} {\-sigalg sigalg} [\-dname dname] [\-keypass keypass] {\-startdate value} {\-ext ext}* {\-validity valDays} {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption} 
  .LP
 -\f2dname\fP specifies the X.500 Distinguished Name to be associated with \f2alias\fP, and is used as the \f2issuer\fP and \f2subject\fP fields in the self\-signed certificate. If no distinguished name is provided at the command line, the user will be prompted for one.
-+\f2dname\fP specifies the X.500 Distinguished Name to be associated with \f2alias\fP, and is used as the \f2issuer\fP and \f2subject\fP fields in the self\-signed certificate. If no distinguished name is provided at the command line, the user will be prompted for one. 
++Generates a key pair (a public key and associated private key). Wraps the public key into an X.509 v3 self\-signed certificate, which is stored as a single\-element certificate chain. This certificate chain and the private key are stored in a new keystore entry identified by \f2alias\fP. 
  .LP
 -\f2keypass\fP is a password used to protect the private key of the generated key pair. If no password is provided, the user is prompted for it. If you press RETURN at the prompt, the key password is set to the same password as that used for the keystore. \f2keypass\fP must be at least 6 characters long.
-+\f2keypass\fP is a password used to protect the private key of the generated key pair. If no password is provided, the user is prompted for it. If you press RETURN at the prompt, the key password is set to the same password as that used for the keystore. \f2keypass\fP must be at least 6 characters long. 
++\f2keyalg\fP specifies the algorithm to be used to generate the key pair, and \f2keysize\fP specifies the size of each key to be generated. \f2sigalg\fP specifies the algorithm that should be used to sign the self\-signed certificate; this algorithm must be compatible with \f2keyalg\fP. 
  .LP
 -\f2startdate\fP specifies the issue time of the certificate, also known as the "Not Before" value of the X.509 certificate's Validity field.
-+\f2startdate\fP specifies the issue time of the certificate, also known as the "Not Before" value of the X.509 certificate's Validity field. 
++\f2dname\fP specifies the X.500 Distinguished Name to be associated with \f2alias\fP, and is used as the \f2issuer\fP and \f2subject\fP fields in the self\-signed certificate. If no distinguished name is provided at the command line, the user will be prompted for one. 
  .LP
 -The option value can be set in one of these two forms:
++\f2keypass\fP is a password used to protect the private key of the generated key pair. If no password is provided, the user is prompted for it. If you press RETURN at the prompt, the key password is set to the same password as that used for the keystore. \f2keypass\fP must be at least 6 characters long. 
++.LP
++\f2startdate\fP specifies the issue time of the certificate, also known as the "Not Before" value of the X.509 certificate's Validity field. 
++.LP
 +The option value can be set in one of these two forms: 
  .RS 3
  .TP 3
@@ -38559,78 +38757,89 @@
  .fi
  .LP
 -With the second form, the user sets the exact issue time in two parts, year/month/day and hour:minute:second (using the local time zone). The user may provide only one part, which means the other part is the same as the current date (or time). User must provide the exact number of digits as shown in the format definition (padding with 0 if shorter). When both the date and time are provided, there is one (and only one) space character between the two parts. The hour should always be provided in 24 hour format.
-+With the second form, the user sets the exact issue time in two parts, year/month/day and hour:minute:second (using the local time zone). The user may provide only one part, which means the other part is the same as the current date (or time). User must provide the exact number of digits as shown in the format definition (padding with 0 if shorter). When both the date and time are provided, there is one (and only one) space character between the two parts. The hour should always be provided in 24 hour format. 
- .LP
+-.LP
 -When the option is not provided, the start date is the current time. The option can be provided at most once.
-+When the option is not provided, the start date is the current time. The option can be provided at most once. 
- .LP
+-.LP
 -\f2valDays\fP specifies the number of days (starting at the date specified by \f2\-startdate\fP, or the current date if \f2\-startdate\fP is not specified) for which the certificate should be considered valid.
-+\f2valDays\fP specifies the number of days (starting at the date specified by \f2\-startdate\fP, or the current date if \f2\-startdate\fP is not specified) for which the certificate should be considered valid. 
++With the second form, the user sets the exact issue time in two parts, year/month/day and hour:minute:second (using the local time zone). The user may provide only one part, which means the other part is the same as the current date (or time). User must provide the exact number of digits as shown in the format definition (padding with 0 if shorter). When both the date and time are provided, there is one (and only one) space character between the two parts. The hour should always be provided in 24 hour format. 
  .LP
 -This command was named \f2\-genkey\fP in previous releases. This old name is still supported in this release and will be supported in future releases, but for clarity the new name, \f2\-genkeypair\fP, is preferred going forward.
-+This command was named \f2\-genkey\fP in previous releases. This old name is still supported in this release and will be supported in future releases, but for clarity the new name, \f2\-genkeypair\fP, is preferred going forward.  
- .TP 3
+-.TP 3
 -\-genseckey {\-alias alias} {\-keyalg keyalg} {\-keysize keysize} [\-keypass keypass] {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption}
-+\-genseckey {\-alias alias} {\-keyalg keyalg} {\-keysize keysize} [\-keypass keypass] {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption} 
++When the option is not provided, the start date is the current time. The option can be provided at most once. 
  .LP
 -Generates a secret key and stores it in a new \f2KeyStore.SecretKeyEntry\fP identified by \f2alias\fP.
-+Generates a secret key and stores it in a new \f2KeyStore.SecretKeyEntry\fP identified by \f2alias\fP. 
++\f2valDays\fP specifies the number of days (starting at the date specified by \f2\-startdate\fP, or the current date if \f2\-startdate\fP is not specified) for which the certificate should be considered valid. 
  .LP
 -\f2keyalg\fP specifies the algorithm to be used to generate the secret key, and \f2keysize\fP specifies the size of the key to be generated. \f2keypass\fP is a password used to protect the secret key. If no password is provided, the user is prompted for it. If you press RETURN at the prompt, the key password is set to the same password as that used for the keystore. \f2keypass\fP must be at least 6 characters long.
-+\f2keyalg\fP specifies the algorithm to be used to generate the secret key, and \f2keysize\fP specifies the size of the key to be generated. \f2keypass\fP is a password used to protect the secret key. If no password is provided, the user is prompted for it. If you press RETURN at the prompt, the key password is set to the same password as that used for the keystore. \f2keypass\fP must be at least 6 characters long.  
++This command was named \f2\-genkey\fP in previous releases. This old name is still supported in this release and will be supported in future releases, but for clarity the new name, \f2\-genkeypair\fP, is preferred going forward.  
  .TP 3
 -\-importcert {\-alias alias} {\-file cert_file} [\-keypass keypass] {\-noprompt} {\-trustcacerts} {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption}
-+\-importcert {\-alias alias} {\-file cert_file} [\-keypass keypass] {\-noprompt} {\-trustcacerts} {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption} 
- .LP
+-.LP
 -Reads the certificate or certificate chain (where the latter is supplied in a PKCS#7 formatted reply or a sequence of X.509 certificates) from the file \f2cert_file\fP, and stores it in the keystore entry identified by \f2alias\fP. If no file is given, the certificate or certificate chain is read from stdin.
-+Reads the certificate or certificate chain (where the latter is supplied in a PKCS#7 formatted reply or a sequence of X.509 certificates) from the file \f2cert_file\fP, and stores it in the keystore entry identified by \f2alias\fP. If no file is given, the certificate or certificate chain is read from stdin. 
- .LP
+-.LP
 -\f3keytool\fP can import X.509 v1, v2, and v3 certificates, and PKCS#7 formatted certificate chains consisting of certificates of that type. The data to be imported must be provided either in binary encoding format, or in printable encoding format (also known as Base64 encoding) as defined by the Internet RFC 1421 standard. In the latter case, the encoding must be bounded at the beginning by a string that starts with "\-\-\-\-\-BEGIN", and bounded at the end by a string that starts with "\-\-\-\-\-END".
-+\f3keytool\fP can import X.509 v1, v2, and v3 certificates, and PKCS#7 formatted certificate chains consisting of certificates of that type. The data to be imported must be provided either in binary encoding format, or in printable encoding format (also known as Base64 encoding) as defined by the Internet RFC 1421 standard. In the latter case, the encoding must be bounded at the beginning by a string that starts with "\-\-\-\-\-BEGIN", and bounded at the end by a string that starts with "\-\-\-\-\-END". 
++\-genseckey {\-alias alias} {\-keyalg keyalg} {\-keysize keysize} [\-keypass keypass] {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption} 
  .LP
 -You import a certificate for two reasons:
-+You import a certificate for two reasons: 
- .RS 3
+-.RS 3
++Generates a secret key and stores it in a new \f2KeyStore.SecretKeyEntry\fP identified by \f2alias\fP. 
++.LP
++\f2keyalg\fP specifies the algorithm to be used to generate the secret key, and \f2keysize\fP specifies the size of the key to be generated. \f2keypass\fP is a password used to protect the secret key. If no password is provided, the user is prompted for it. If you press RETURN at the prompt, the key password is set to the same password as that used for the keystore. \f2keypass\fP must be at least 6 characters long.  
  .TP 3
- 1.
+-1.
 -to add it to the list of trusted certificates, or
-+to add it to the list of trusted certificates, or 
- .TP 3
- 2.
+-.TP 3
+-2.
 -to import a certificate reply received from a CA as the result of submitting a Certificate Signing Request (see the \-certreq command) to that CA.
-+to import a certificate reply received from a CA as the result of submitting a Certificate Signing Request (see the \-certreq command) to that CA. 
- .RE
+-.RE
++\-importcert {\-alias alias} {\-file cert_file} [\-keypass keypass] {\-noprompt} {\-trustcacerts} {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption} 
  .LP
 -Which type of import is intended is indicated by the value of the \f2\-alias\fP option:
-+Which type of import is intended is indicated by the value of the \f2\-alias\fP option: 
++Reads the certificate or certificate chain (where the latter is supplied in a PKCS#7 formatted reply or a sequence of X.509 certificates) from the file \f2cert_file\fP, and stores it in the keystore entry identified by \f2alias\fP. If no file is given, the certificate or certificate chain is read from stdin. 
++.LP
++\f3keytool\fP can import X.509 v1, v2, and v3 certificates, and PKCS#7 formatted certificate chains consisting of certificates of that type. The data to be imported must be provided either in binary encoding format, or in printable encoding format (also known as Base64 encoding) as defined by the Internet RFC 1421 standard. In the latter case, the encoding must be bounded at the beginning by a string that starts with "\-\-\-\-\-BEGIN", and bounded at the end by a string that starts with "\-\-\-\-\-END". 
++.LP
++You import a certificate for two reasons: 
  .RS 3
  .TP 3
  1.
 -\f3If the alias does not point to a key entry\fP, then \f3keytool\fP assumes you are adding a trusted certificate entry. In this case, the alias should not already exist in the keystore. If the alias does already exist, then \f3keytool\fP outputs an error, since there is already a trusted certificate for that alias, and does not import the certificate.
-+\f3If the alias does not point to a key entry\fP, then \f3keytool\fP assumes you are adding a trusted certificate entry. In this case, the alias should not already exist in the keystore. If the alias does already exist, then \f3keytool\fP outputs an error, since there is already a trusted certificate for that alias, and does not import the certificate. 
++to add it to the list of trusted certificates, or 
  .TP 3
  2.
 -\f3If the alias points to a key entry\fP, then \f3keytool\fP assumes you are importing a certificate reply.
-+\f3If the alias points to a key entry\fP, then \f3keytool\fP assumes you are importing a certificate reply. 
++to import a certificate reply received from a CA as the result of submitting a Certificate Signing Request (see the \-certreq command) to that CA. 
  .RE
 -\f3Importing a New Trusted Certificate\fP
-+\f3Importing a New Trusted Certificate\fP 
- .LP
+-.LP
 -Before adding the certificate to the keystore, \f3keytool\fP tries to verify it by attempting to construct a chain of trust from that certificate to a self\-signed certificate (belonging to a root CA), using trusted certificates that are already available in the keystore.
-+Before adding the certificate to the keystore, \f3keytool\fP tries to verify it by attempting to construct a chain of trust from that certificate to a self\-signed certificate (belonging to a root CA), using trusted certificates that are already available in the keystore. 
  .LP
 -If the \f2\-trustcacerts\fP option has been specified, additional certificates are considered for the chain of trust, namely the certificates in a file named "cacerts".
-+If the \f2\-trustcacerts\fP option has been specified, additional certificates are considered for the chain of trust, namely the certificates in a file named "cacerts". 
++Which type of import is intended is indicated by the value of the \f2\-alias\fP option: 
++.RS 3
++.TP 3
++1.
++\f3If the alias does not point to a key entry\fP, then \f3keytool\fP assumes you are adding a trusted certificate entry. In this case, the alias should not already exist in the keystore. If the alias does already exist, then \f3keytool\fP outputs an error, since there is already a trusted certificate for that alias, and does not import the certificate. 
++.TP 3
++2.
++\f3If the alias points to a key entry\fP, then \f3keytool\fP assumes you are importing a certificate reply. 
++.RE
++\f3Importing a New Trusted Certificate\fP 
  .LP
 -If \f3keytool\fP fails to establish a trust path from the certificate to be imported up to a self\-signed certificate (either from the keystore or the "cacerts" file), the certificate information is printed out, and the user is prompted to verify it, e.g., by comparing the displayed certificate fingerprints with the fingerprints obtained from some other (trusted) source of information, which might be the certificate owner himself/herself. Be very careful to ensure the certificate is valid prior to importing it as a "trusted" certificate! \-\- see WARNING Regarding Importing Trusted Certificates. The user then has the option of aborting the import operation. If the \f2\-noprompt\fP option is given, however, there will be no interaction with the user.
 -\f3Importing a Certificate Reply\fP
-+If \f3keytool\fP fails to establish a trust path from the certificate to be imported up to a self\-signed certificate (either from the keystore or the "cacerts" file), the certificate information is printed out, and the user is prompted to verify it, e.g., by comparing the displayed certificate fingerprints with the fingerprints obtained from some other (trusted) source of information, which might be the certificate owner himself/herself. Be very careful to ensure the certificate is valid prior to importing it as a "trusted" certificate! \-\- see WARNING Regarding Importing Trusted Certificates. The user then has the option of aborting the import operation. If the \f2\-noprompt\fP option is given, however, there will be no interaction with the user. 
-+\f3Importing a Certificate Reply\fP 
++Before adding the certificate to the keystore, \f3keytool\fP tries to verify it by attempting to construct a chain of trust from that certificate to a self\-signed certificate (belonging to a root CA), using trusted certificates that are already available in the keystore. 
  .LP
 -When importing a certificate reply, the certificate reply is validated using trusted certificates from the keystore, and optionally using the certificates configured in the "cacerts" keystore file (if the \f2\-trustcacerts\fP option was specified).
-+When importing a certificate reply, the certificate reply is validated using trusted certificates from the keystore, and optionally using the certificates configured in the "cacerts" keystore file (if the \f2\-trustcacerts\fP option was specified). 
++If the \f2\-trustcacerts\fP option has been specified, additional certificates are considered for the chain of trust, namely the certificates in a file named "cacerts". 
  .LP
 -The methods of determining whether the certificate reply is trusted are described in the following:
++If \f3keytool\fP fails to establish a trust path from the certificate to be imported up to a self\-signed certificate (either from the keystore or the "cacerts" file), the certificate information is printed out, and the user is prompted to verify it, e.g., by comparing the displayed certificate fingerprints with the fingerprints obtained from some other (trusted) source of information, which might be the certificate owner himself/herself. Be very careful to ensure the certificate is valid prior to importing it as a "trusted" certificate! \-\- see WARNING Regarding Importing Trusted Certificates. The user then has the option of aborting the import operation. If the \f2\-noprompt\fP option is given, however, there will be no interaction with the user. 
++\f3Importing a Certificate Reply\fP 
++.LP
++When importing a certificate reply, the certificate reply is validated using trusted certificates from the keystore, and optionally using the certificates configured in the "cacerts" keystore file (if the \f2\-trustcacerts\fP option was specified). 
++.LP
 +The methods of determining whether the certificate reply is trusted are described in the following: 
  .RS 3
  .TP 2
@@ -38644,27 +38853,31 @@
  .RE
  .LP
 -If the public key in the certificate reply matches the user's public key already stored with under \f2alias\fP, the old certificate chain is replaced with the new certificate chain in the reply. The old chain can only be replaced if a valid \f2keypass\fP, the password used to protect the private key of the entry, is supplied. If no password is provided, and the private key password is different from the keystore password, the user is prompted for it.
-+If the public key in the certificate reply matches the user's public key already stored with under \f2alias\fP, the old certificate chain is replaced with the new certificate chain in the reply. The old chain can only be replaced if a valid \f2keypass\fP, the password used to protect the private key of the entry, is supplied. If no password is provided, and the private key password is different from the keystore password, the user is prompted for it. 
- .LP
+-.LP
 -This command was named \f2\-import\fP in previous releases. This old name is still supported in this release and will be supported in future releases, but for clarify the new name, \f2\-importcert\fP, is preferred going forward.
-+This command was named \f2\-import\fP in previous releases. This old name is still supported in this release and will be supported in future releases, but for clarify the new name, \f2\-importcert\fP, is preferred going forward.    
- .TP 3
+-.TP 3
 -\-importkeystore \-srckeystore srckeystore \-destkeystore destkeystore {\-srcstoretype srcstoretype} {\-deststoretype deststoretype} [\-srcstorepass srcstorepass] [\-deststorepass deststorepass] {\-srcprotected} {\-destprotected} {\-srcalias srcalias {\-destalias destalias} [\-srckeypass srckeypass] [\-destkeypass destkeypass] } {\-noprompt} {\-srcProviderName src_provider_name} {\-destProviderName dest_provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption}
-+\-importkeystore \-srckeystore srckeystore \-destkeystore destkeystore {\-srcstoretype srcstoretype} {\-deststoretype deststoretype} [\-srcstorepass srcstorepass] [\-deststorepass deststorepass] {\-srcprotected} {\-destprotected} {\-srcalias srcalias {\-destalias destalias} [\-srckeypass srckeypass] [\-destkeypass destkeypass] } {\-noprompt} {\-srcProviderName src_provider_name} {\-destProviderName dest_provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption} 
- .LP
+-.LP
 -Imports a single entry or all entries from a source keystore to a destination keystore.
-+Imports a single entry or all entries from a source keystore to a destination keystore. 
++If the public key in the certificate reply matches the user's public key already stored with under \f2alias\fP, the old certificate chain is replaced with the new certificate chain in the reply. The old chain can only be replaced if a valid \f2keypass\fP, the password used to protect the private key of the entry, is supplied. If no password is provided, and the private key password is different from the keystore password, the user is prompted for it. 
  .LP
 -When the \f2srcalias\fP option is provided, the command imports the single entry identified by the alias to the destination keystore. If a destination alias is not provided with \f2destalias\fP, then \f2srcalias\fP is used as the destination alias. If the source entry is protected by a password, \f2srckeypass\fP will be used to recover the entry. If \f2srckeypass\fP is not provided, then \f3keytool\fP will attempt to use \f2srcstorepass\fP to recover the entry. If \f2srcstorepass\fP is either not provided or is incorrect, the user will be prompted for a password. The destination entry will be protected using \f2destkeypass\fP. If \f2destkeypass\fP is not provided, the destination entry will be protected with the source entry password.
-+When the \f2srcalias\fP option is provided, the command imports the single entry identified by the alias to the destination keystore. If a destination alias is not provided with \f2destalias\fP, then \f2srcalias\fP is used as the destination alias. If the source entry is protected by a password, \f2srckeypass\fP will be used to recover the entry. If \f2srckeypass\fP is not provided, then \f3keytool\fP will attempt to use \f2srcstorepass\fP to recover the entry. If \f2srcstorepass\fP is either not provided or is incorrect, the user will be prompted for a password. The destination entry will be protected using \f2destkeypass\fP. If \f2destkeypass\fP is not provided, the destination entry will be protected with the source entry password. 
- .LP
+-.LP
 -If the \f2srcalias\fP option is not provided, then all entries in the source keystore are imported into the destination keystore. Each destination entry will be stored under the alias from the source entry. If the source entry is protected by a password, \f2srcstorepass\fP will be used to recover the entry. If \f2srcstorepass\fP is either not provided or is incorrect, the user will be prompted for a password. If a source keystore entry type is not supported in the destination keystore, or if an error occurs while storing an entry into the destination keystore, the user will be prompted whether to skip the entry and continue, or to quit. The destination entry will be protected with the source entry password.
-+If the \f2srcalias\fP option is not provided, then all entries in the source keystore are imported into the destination keystore. Each destination entry will be stored under the alias from the source entry. If the source entry is protected by a password, \f2srcstorepass\fP will be used to recover the entry. If \f2srcstorepass\fP is either not provided or is incorrect, the user will be prompted for a password. If a source keystore entry type is not supported in the destination keystore, or if an error occurs while storing an entry into the destination keystore, the user will be prompted whether to skip the entry and continue, or to quit. The destination entry will be protected with the source entry password. 
++This command was named \f2\-import\fP in previous releases. This old name is still supported in this release and will be supported in future releases, but for clarify the new name, \f2\-importcert\fP, is preferred going forward.    
++.TP 3
++\-importkeystore \-srckeystore srckeystore \-destkeystore destkeystore {\-srcstoretype srcstoretype} {\-deststoretype deststoretype} [\-srcstorepass srcstorepass] [\-deststorepass deststorepass] {\-srcprotected} {\-destprotected} {\-srcalias srcalias {\-destalias destalias} [\-srckeypass srckeypass] [\-destkeypass destkeypass] } {\-noprompt} {\-srcProviderName src_provider_name} {\-destProviderName dest_provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption} 
  .LP
 -If the destination alias already exists in the destination keystore, the user is prompted to either overwrite the entry, or to create a new entry under a different alias name.
-+If the destination alias already exists in the destination keystore, the user is prompted to either overwrite the entry, or to create a new entry under a different alias name. 
++Imports a single entry or all entries from a source keystore to a destination keystore. 
  .LP
 -Note that if \f2\-noprompt\fP is provided, the user will not be prompted for a new destination alias. Existing entries will automatically be overwritten with the destination alias name. Finally, entries that can not be imported are automatically skipped and a warning is output.
++When the \f2srcalias\fP option is provided, the command imports the single entry identified by the alias to the destination keystore. If a destination alias is not provided with \f2destalias\fP, then \f2srcalias\fP is used as the destination alias. If the source entry is protected by a password, \f2srckeypass\fP will be used to recover the entry. If \f2srckeypass\fP is not provided, then \f3keytool\fP will attempt to use \f2srcstorepass\fP to recover the entry. If \f2srcstorepass\fP is either not provided or is incorrect, the user will be prompted for a password. The destination entry will be protected using \f2destkeypass\fP. If \f2destkeypass\fP is not provided, the destination entry will be protected with the source entry password. 
++.LP
++If the \f2srcalias\fP option is not provided, then all entries in the source keystore are imported into the destination keystore. Each destination entry will be stored under the alias from the source entry. If the source entry is protected by a password, \f2srcstorepass\fP will be used to recover the entry. If \f2srcstorepass\fP is either not provided or is incorrect, the user will be prompted for a password. If a source keystore entry type is not supported in the destination keystore, or if an error occurs while storing an entry into the destination keystore, the user will be prompted whether to skip the entry and continue, or to quit. The destination entry will be protected with the source entry password. 
++.LP
++If the destination alias already exists in the destination keystore, the user is prompted to either overwrite the entry, or to create a new entry under a different alias name. 
++.LP
 +Note that if \f2\-noprompt\fP is provided, the user will not be prompted for a new destination alias. Existing entries will automatically be overwritten with the destination alias name. Finally, entries that can not be imported are automatically skipped and a warning is output.  
  .TP 3
 -\-printcertreq {\-file file}
@@ -38682,42 +38895,49 @@
  .RS 3
  .TP 3
 -\-certreq {\-alias alias} {\-dname dname} {\-sigalg sigalg} {\-file certreq_file} [\-keypass keypass] {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption}
-+\-certreq {\-alias alias} {\-dname dname} {\-sigalg sigalg} {\-file certreq_file} [\-keypass keypass] {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption} 
- .LP
+-.LP
 -Generates a Certificate Signing Request (CSR), using the PKCS#10 format.
-+Generates a Certificate Signing Request (CSR), using the PKCS#10 format. 
- .LP
+-.LP
 -A CSR is intended to be sent to a certificate authority (CA). The CA will authenticate the certificate requestor (usually off\-line) and will return a certificate or certificate chain, used to replace the existing certificate chain (which initially consists of a self\-signed certificate) in the keystore.
-+A CSR is intended to be sent to a certificate authority (CA). The CA will authenticate the certificate requestor (usually off\-line) and will return a certificate or certificate chain, used to replace the existing certificate chain (which initially consists of a self\-signed certificate) in the keystore. 
- .LP
+-.LP
 -The private key associated with \f2alias\fP is used to create the PKCS#10 certificate request. In order to access the private key, the appropriate password must be provided, since private keys are protected in the keystore with a password. If \f2keypass\fP is not provided at the command line, and is different from the password used to protect the integrity of the keystore, the user is prompted for it. If dname is provided, it's used as the subject in the CSR. Otherwise, the X.500 Distinguished Name associated with alias is used.
-+The private key associated with \f2alias\fP is used to create the PKCS#10 certificate request. In order to access the private key, the appropriate password must be provided, since private keys are protected in the keystore with a password. If \f2keypass\fP is not provided at the command line, and is different from the password used to protect the integrity of the keystore, the user is prompted for it. If dname is provided, it's used as the subject in the CSR. Otherwise, the X.500 Distinguished Name associated with alias is used. 
- .LP
+-.LP
 -\f2sigalg\fP specifies the algorithm that should be used to sign the CSR.
-+\f2sigalg\fP specifies the algorithm that should be used to sign the CSR. 
- .LP
+-.LP
 -The CSR is stored in the file \f2certreq_file\fP. If no file is given, the CSR is output to stdout.
-+The CSR is stored in the file \f2certreq_file\fP. If no file is given, the CSR is output to stdout. 
++\-certreq {\-alias alias} {\-dname dname} {\-sigalg sigalg} {\-file certreq_file} [\-keypass keypass] {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption} 
  .LP
 -Use the \f2importcert\fP command to import the response from the CA.
-+Use the \f2importcert\fP command to import the response from the CA.  
- .TP 3
+-.TP 3
 -\-exportcert {\-alias alias} {\-file cert_file} {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-rfc} {\-v} {\-protected} {\-Jjavaoption}
-+\-exportcert {\-alias alias} {\-file cert_file} {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-rfc} {\-v} {\-protected} {\-Jjavaoption} 
- .LP
+-.LP
 -Reads (from the keystore) the certificate associated with \f2alias\fP, and stores it in the file \f2cert_file\fP.
-+Reads (from the keystore) the certificate associated with \f2alias\fP, and stores it in the file \f2cert_file\fP. 
++Generates a Certificate Signing Request (CSR), using the PKCS#10 format. 
  .LP
 -If no file is given, the certificate is output to stdout.
-+If no file is given, the certificate is output to stdout. 
++A CSR is intended to be sent to a certificate authority (CA). The CA will authenticate the certificate requestor (usually off\-line) and will return a certificate or certificate chain, used to replace the existing certificate chain (which initially consists of a self\-signed certificate) in the keystore. 
  .LP
 -The certificate is by default output in binary encoding, but will instead be output in the printable encoding format, as defined by the Internet RFC 1421 standard, if the \f2\-rfc\fP option is specified.
-+The certificate is by default output in binary encoding, but will instead be output in the printable encoding format, as defined by the Internet RFC 1421 standard, if the \f2\-rfc\fP option is specified. 
++The private key associated with \f2alias\fP is used to create the PKCS#10 certificate request. In order to access the private key, the appropriate password must be provided, since private keys are protected in the keystore with a password. If \f2keypass\fP is not provided at the command line, and is different from the password used to protect the integrity of the keystore, the user is prompted for it. If dname is provided, it's used as the subject in the CSR. Otherwise, the X.500 Distinguished Name associated with alias is used. 
  .LP
 -If \f2alias\fP refers to a trusted certificate, that certificate is output. Otherwise, \f2alias\fP refers to a key entry with an associated certificate chain. In that case, the first certificate in the chain is returned. This certificate authenticates the public key of the entity addressed by \f2alias\fP.
-+If \f2alias\fP refers to a trusted certificate, that certificate is output. Otherwise, \f2alias\fP refers to a key entry with an associated certificate chain. In that case, the first certificate in the chain is returned. This certificate authenticates the public key of the entity addressed by \f2alias\fP. 
++\f2sigalg\fP specifies the algorithm that should be used to sign the CSR. 
  .LP
 -This command was named \f2\-export\fP in previous releases. This old name is still supported in this release and will be supported in future releases, but for clarify the new name, \f2\-exportcert\fP, is preferred going forward.
++The CSR is stored in the file \f2certreq_file\fP. If no file is given, the CSR is output to stdout. 
++.LP
++Use the \f2importcert\fP command to import the response from the CA.  
++.TP 3
++\-exportcert {\-alias alias} {\-file cert_file} {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-rfc} {\-v} {\-protected} {\-Jjavaoption} 
++.LP
++Reads (from the keystore) the certificate associated with \f2alias\fP, and stores it in the file \f2cert_file\fP. 
++.LP
++If no file is given, the certificate is output to stdout. 
++.LP
++The certificate is by default output in binary encoding, but will instead be output in the printable encoding format, as defined by the Internet RFC 1421 standard, if the \f2\-rfc\fP option is specified. 
++.LP
++If \f2alias\fP refers to a trusted certificate, that certificate is output. Otherwise, \f2alias\fP refers to a key entry with an associated certificate chain. In that case, the first certificate in the chain is returned. This certificate authenticates the public key of the entity addressed by \f2alias\fP. 
++.LP
 +This command was named \f2\-export\fP in previous releases. This old name is still supported in this release and will be supported in future releases, but for clarify the new name, \f2\-exportcert\fP, is preferred going forward.  
  .RE
  
@@ -38741,18 +38961,19 @@
 +You cannot specify both \f2\-v\fP and \f2\-rfc\fP.  
  .TP 3
 -\-printcert {\-file cert_file | \-sslserver host[:port]} {\-jarfile JAR_file {\-rfc} {\-v} {\-Jjavaoption}
-+\-printcert {\-file cert_file | \-sslserver host[:port]} {\-jarfile JAR_file {\-rfc} {\-v} {\-Jjavaoption} 
- .LP
+-.LP
 -Reads the certificate from the file \f2cert_file\fP, the SSL server located at \f2host:port\fP, or the signed JAR file \f2JAR_file\fP (with the option \f2\-jarfile\fP and prints its contents in a human\-readable format. When no port is specified, the standard HTTPS port 443 is assumed. Note that \f2\-sslserver\fP and \f2\-file\fP options cannot be provided at the same time. Otherwise, an error is reported. If neither option is given, the certificate is read from stdin.
-+Reads the certificate from the file \f2cert_file\fP, the SSL server located at \f2host:port\fP, or the signed JAR file \f2JAR_file\fP (with the option \f2\-jarfile\fP and prints its contents in a human\-readable format. When no port is specified, the standard HTTPS port 443 is assumed. Note that \f2\-sslserver\fP and \f2\-file\fP options cannot be provided at the same time. Otherwise, an error is reported. If neither option is given, the certificate is read from stdin. 
++\-printcert {\-file cert_file | \-sslserver host[:port]} {\-jarfile JAR_file {\-rfc} {\-v} {\-Jjavaoption} 
  .LP
 -If \f2\-rfc\fP is specified, keytool prints the certificate in PEM mode as defined by the Internet RFC 1421 standard.
-+If \f2\-rfc\fP is specified, keytool prints the certificate in PEM mode as defined by the Internet RFC 1421 standard. 
++Reads the certificate from the file \f2cert_file\fP, the SSL server located at \f2host:port\fP, or the signed JAR file \f2JAR_file\fP (with the option \f2\-jarfile\fP and prints its contents in a human\-readable format. When no port is specified, the standard HTTPS port 443 is assumed. Note that \f2\-sslserver\fP and \f2\-file\fP options cannot be provided at the same time. Otherwise, an error is reported. If neither option is given, the certificate is read from stdin. 
  .LP
 -If the certificate is read from a file or stdin, it may be either binary encoded or in printable encoding format, as defined by the Internet RFC 1421 standard
-+If the certificate is read from a file or stdin, it may be either binary encoded or in printable encoding format, as defined by the Internet RFC 1421 standard 
++If \f2\-rfc\fP is specified, keytool prints the certificate in PEM mode as defined by the Internet RFC 1421 standard. 
  .LP
 -If the SSL server is behind a firewall, \f2\-J\-Dhttps.proxyHost=proxyhost\fP and \f2\-J\-Dhttps.proxyPort=proxyport\fP can be specified on the command line for proxy tunneling. See the
++If the certificate is read from a file or stdin, it may be either binary encoded or in printable encoding format, as defined by the Internet RFC 1421 standard 
++.LP
 +If the SSL server is behind a firewall, \f2\-J\-Dhttps.proxyHost=proxyhost\fP and \f2\-J\-Dhttps.proxyPort=proxyport\fP can be specified on the command line for proxy tunneling. See the 
  .na
  \f2JSSE Reference Guide\fP @
@@ -38784,33 +39005,37 @@
  .RS 3
  .TP 3
 -\-storepasswd [\-new new_storepass] {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-Jjavaoption}
-+\-storepasswd [\-new new_storepass] {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-Jjavaoption} 
- .LP
+-.LP
 -Changes the password used to protect the integrity of the keystore contents. The new password is \f2new_storepass\fP, which must be at least 6 characters long.
-+Changes the password used to protect the integrity of the keystore contents. The new password is \f2new_storepass\fP, which must be at least 6 characters long.  
- .TP 3
+-.TP 3
 -\-keypasswd {\-alias alias} [\-keypass old_keypass] [\-new new_keypass] {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-Jjavaoption}
-+\-keypasswd {\-alias alias} [\-keypass old_keypass] [\-new new_keypass] {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-Jjavaoption} 
- .LP
+-.LP
 -Changes the password under which the private/secret key identified by \f2alias\fP is protected, from \f2old_keypass\fP to \f2new_keypass\fP, which must be at least 6 characters long.
-+Changes the password under which the private/secret key identified by \f2alias\fP is protected, from \f2old_keypass\fP to \f2new_keypass\fP, which must be at least 6 characters long. 
++\-storepasswd [\-new new_storepass] {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-Jjavaoption} 
  .LP
 -If the \f2\-keypass\fP option is not provided at the command line, and the key password is different from the keystore password, the user is prompted for it.
-+If the \f2\-keypass\fP option is not provided at the command line, and the key password is different from the keystore password, the user is prompted for it. 
- .LP
+-.LP
 -If the \f2\-new\fP option is not provided at the command line, the user is prompted for it.
-+If the \f2\-new\fP option is not provided at the command line, the user is prompted for it.  
++Changes the password used to protect the integrity of the keystore contents. The new password is \f2new_storepass\fP, which must be at least 6 characters long.  
  .TP 3
 -\-delete [\-alias alias] {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption}
-+\-delete [\-alias alias] {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption} 
++\-keypasswd {\-alias alias} [\-keypass old_keypass] [\-new new_keypass] {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-Jjavaoption} 
  .LP
 -Deletes from the keystore the entry identified by \f2alias\fP. The user is prompted for the alias, if no alias is provided at the command line.
-+Deletes from the keystore the entry identified by \f2alias\fP. The user is prompted for the alias, if no alias is provided at the command line.  
++Changes the password under which the private/secret key identified by \f2alias\fP is protected, from \f2old_keypass\fP to \f2new_keypass\fP, which must be at least 6 characters long. 
++.LP
++If the \f2\-keypass\fP option is not provided at the command line, and the key password is different from the keystore password, the user is prompted for it. 
++.LP
++If the \f2\-new\fP option is not provided at the command line, the user is prompted for it.  
  .TP 3
 -\-changealias {\-alias alias} [\-destalias destalias] [\-keypass keypass] {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption}
-+\-changealias {\-alias alias} [\-destalias destalias] [\-keypass keypass] {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption} 
++\-delete [\-alias alias] {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption} 
  .LP
 -Move an existing keystore entry from the specified \f2alias\fP to a new alias, \f2destalias\fP. If no destination alias is provided, the command will prompt for one. If the original entry is protected with an entry password, the password can be supplied via the "\-keypass" option. If no key password is provided, the \f2storepass\fP (if given) will be attempted first. If that attempt fails, the user will be prompted for a password.
++Deletes from the keystore the entry identified by \f2alias\fP. The user is prompted for the alias, if no alias is provided at the command line.  
++.TP 3
++\-changealias {\-alias alias} [\-destalias destalias] [\-keypass keypass] {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption} 
++.LP
 +Move an existing keystore entry from the specified \f2alias\fP to a new alias, \f2destalias\fP. If no destination alias is provided, the command will prompt for one. If the original entry is protected with an entry password, the password can be supplied via the "\-keypass" option. If no key password is provided, the \f2storepass\fP (if given) will be attempted first. If that attempt fails, the user will be prompted for a password.  
  .RE
  
@@ -38978,41 +39203,44 @@
  .TP 2
  o
 -\f3KeyStore Implementation\fP
-+\f3KeyStore Implementation\fP 
- .LP
+-.LP
 -The \f2KeyStore\fP class provided in the \f2java.security\fP package supplies well\-defined interfaces to access and modify the information in a keystore. It is possible for there to be multiple different concrete implementations, where each implementation is that for a particular \f2type\fP of keystore.
-+The \f2KeyStore\fP class provided in the \f2java.security\fP package supplies well\-defined interfaces to access and modify the information in a keystore. It is possible for there to be multiple different concrete implementations, where each implementation is that for a particular \f2type\fP of keystore. 
++\f3KeyStore Implementation\fP 
  .LP
 -Currently, two command\-line tools (\f3keytool\fP and \f3jarsigner\fP) and a GUI\-based tool named \f3Policy Tool\fP make use of keystore implementations. Since \f2KeyStore\fP is publicly available, users can write additional security applications that use it.
-+Currently, two command\-line tools (\f3keytool\fP and \f3jarsigner\fP) and a GUI\-based tool named \f3Policy Tool\fP make use of keystore implementations. Since \f2KeyStore\fP is publicly available, users can write additional security applications that use it. 
++The \f2KeyStore\fP class provided in the \f2java.security\fP package supplies well\-defined interfaces to access and modify the information in a keystore. It is possible for there to be multiple different concrete implementations, where each implementation is that for a particular \f2type\fP of keystore. 
  .LP
 -There is a built\-in default implementation, provided by Oracle. It implements the keystore as a file, utilizing a proprietary keystore type (format) named "JKS". It protects each private key with its individual password, and also protects the integrity of the entire keystore with a (possibly different) password.
-+There is a built\-in default implementation, provided by Oracle. It implements the keystore as a file, utilizing a proprietary keystore type (format) named "JKS". It protects each private key with its individual password, and also protects the integrity of the entire keystore with a (possibly different) password. 
++Currently, two command\-line tools (\f3keytool\fP and \f3jarsigner\fP) and a GUI\-based tool named \f3Policy Tool\fP make use of keystore implementations. Since \f2KeyStore\fP is publicly available, users can write additional security applications that use it. 
  .LP
 -Keystore implementations are provider\-based. More specifically, the application interfaces supplied by \f2KeyStore\fP are implemented in terms of a "Service Provider Interface" (SPI). That is, there is a corresponding abstract \f2KeystoreSpi\fP class, also in the \f2java.security\fP package, which defines the Service Provider Interface methods that "providers" must implement. (The term "provider" refers to a package or a set of packages that supply a concrete implementation of a subset of services that can be accessed by the Java Security API.) Thus, to provide a keystore implementation, clients must implement a "provider" and supply a KeystoreSpi subclass implementation, as described in
++There is a built\-in default implementation, provided by Oracle. It implements the keystore as a file, utilizing a proprietary keystore type (format) named "JKS". It protects each private key with its individual password, and also protects the integrity of the entire keystore with a (possibly different) password. 
++.LP
 +Keystore implementations are provider\-based. More specifically, the application interfaces supplied by \f2KeyStore\fP are implemented in terms of a "Service Provider Interface" (SPI). That is, there is a corresponding abstract \f2KeystoreSpi\fP class, also in the \f2java.security\fP package, which defines the Service Provider Interface methods that "providers" must implement. (The term "provider" refers to a package or a set of packages that supply a concrete implementation of a subset of services that can be accessed by the Java Security API.) Thus, to provide a keystore implementation, clients must implement a "provider" and supply a KeystoreSpi subclass implementation, as described in 
  .na
  \f2How to Implement a Provider for the Java Cryptography Architecture\fP @
  .fi
 -http://download.oracle.com/javase/7/docs/technotes/guides/security/crypto/HowToImplAProvider.html.
-+http://docs.oracle.com/javase/7/docs/technotes/guides/security/crypto/HowToImplAProvider.html. 
- .LP
+-.LP
 -Applications can choose different \f2types\fP of keystore implementations from different providers, using the "getInstance" factory method supplied in the \f2KeyStore\fP class. A keystore type defines the storage and data format of the keystore information, and the algorithms used to protect private/secret keys in the keystore and the integrity of the keystore itself. Keystore implementations of different types are not compatible.
-+Applications can choose different \f2types\fP of keystore implementations from different providers, using the "getInstance" factory method supplied in the \f2KeyStore\fP class. A keystore type defines the storage and data format of the keystore information, and the algorithms used to protect private/secret keys in the keystore and the integrity of the keystore itself. Keystore implementations of different types are not compatible. 
- .LP
+-.LP
 -\f3keytool\fP works on any file\-based keystore implementation. (It treats the keystore location that is passed to it at the command line as a filename and converts it to a FileInputStream, from which it loads the keystore information.) The \f3jarsigner\fP and \f3policytool\fP tools, on the other hand, can read a keystore from any location that can be specified using a URL.
-+\f3keytool\fP works on any file\-based keystore implementation. (It treats the keystore location that is passed to it at the command line as a filename and converts it to a FileInputStream, from which it loads the keystore information.) The \f3jarsigner\fP and \f3policytool\fP tools, on the other hand, can read a keystore from any location that can be specified using a URL. 
++http://docs.oracle.com/javase/7/docs/technotes/guides/security/crypto/HowToImplAProvider.html. 
  .LP
 -For \f3keytool\fP and \f3jarsigner\fP, you can specify a keystore type at the command line, via the \f2\-storetype\fP option. For \f3Policy Tool\fP, you can specify a keystore type via the "Keystore" menu.
-+For \f3keytool\fP and \f3jarsigner\fP, you can specify a keystore type at the command line, via the \f2\-storetype\fP option. For \f3Policy Tool\fP, you can specify a keystore type via the "Keystore" menu. 
++Applications can choose different \f2types\fP of keystore implementations from different providers, using the "getInstance" factory method supplied in the \f2KeyStore\fP class. A keystore type defines the storage and data format of the keystore information, and the algorithms used to protect private/secret keys in the keystore and the integrity of the keystore itself. Keystore implementations of different types are not compatible. 
  .LP
 -If you don't explicitly specify a keystore type, the tools choose a keystore implementation based simply on the value of the \f2keystore.type\fP property specified in the security properties file. The security properties file is called \f2java.security\fP, and it resides in the security properties directory, \f2java.home\fP/lib/security, where \f2java.home\fP is the runtime environment's directory (the \f2jre\fP directory in the SDK or the top\-level directory of the Java 2 Runtime Environment).
-+If you don't explicitly specify a keystore type, the tools choose a keystore implementation based simply on the value of the \f2keystore.type\fP property specified in the security properties file. The security properties file is called \f2java.security\fP, and it resides in the security properties directory, \f2java.home\fP/lib/security, where \f2java.home\fP is the runtime environment's directory (the \f2jre\fP directory in the SDK or the top\-level directory of the Java 2 Runtime Environment).  
++\f3keytool\fP works on any file\-based keystore implementation. (It treats the keystore location that is passed to it at the command line as a filename and converts it to a FileInputStream, from which it loads the keystore information.) The \f3jarsigner\fP and \f3policytool\fP tools, on the other hand, can read a keystore from any location that can be specified using a URL. 
  .LP
 -Each tool gets the \f2keystore.type\fP value and then examines all the currently\-installed providers until it finds one that implements keystores of that type. It then uses the keystore implementation from that provider.
-+Each tool gets the \f2keystore.type\fP value and then examines all the currently\-installed providers until it finds one that implements keystores of that type. It then uses the keystore implementation from that provider. 
++For \f3keytool\fP and \f3jarsigner\fP, you can specify a keystore type at the command line, via the \f2\-storetype\fP option. For \f3Policy Tool\fP, you can specify a keystore type via the "Keystore" menu. 
  .LP
 -The \f2KeyStore\fP class defines a static method named \f2getDefaultType\fP that lets applications and applets retrieve the value of the \f2keystore.type\fP property. The following line of code creates an instance of the default keystore type (as specified in the \f2keystore.type\fP property):
++If you don't explicitly specify a keystore type, the tools choose a keystore implementation based simply on the value of the \f2keystore.type\fP property specified in the security properties file. The security properties file is called \f2java.security\fP, and it resides in the security properties directory, \f2java.home\fP/lib/security, where \f2java.home\fP is the runtime environment's directory (the \f2jre\fP directory in the SDK or the top\-level directory of the Java 2 Runtime Environment).  
++.LP
++Each tool gets the \f2keystore.type\fP value and then examines all the currently\-installed providers until it finds one that implements keystores of that type. It then uses the keystore implementation from that provider. 
++.LP
 +The \f2KeyStore\fP class defines a static method named \f2getDefaultType\fP that lets applications and applets retrieve the value of the \f2keystore.type\fP property. The following line of code creates an instance of the default keystore type (as specified in the \f2keystore.type\fP property): 
  .nf
  \f3
@@ -39061,39 +39289,45 @@
  .RS 3
  .TP 3
 -Public Keys
-+Public Keys 
- .LP
+-.LP
 -These are numbers associated with a particular entity, and are intended to be known to everyone who needs to have trusted interactions with that entity. Public keys are used to verify signatures.
-+These are numbers associated with a particular entity, and are intended to be known to everyone who needs to have trusted interactions with that entity. Public keys are used to verify signatures.  
- .TP 3
+-.TP 3
 -Digitally Signed
-+Digitally Signed 
- .LP
+-.LP
 -If some data is \f2digitally signed\fP it has been stored with the "identity" of an entity, and a signature that proves that entity knows about the data. The data is rendered unforgeable by signing with the entity's private key.
-+If some data is \f2digitally signed\fP it has been stored with the "identity" of an entity, and a signature that proves that entity knows about the data. The data is rendered unforgeable by signing with the entity's private key.  
- .TP 3
+-.TP 3
 -Identity
-+Identity 
++Public Keys 
  .LP
 -A known way of addressing an entity. In some systems the identity is the public key, in others it can be anything from a Unix UID to an Email address to an X.509 Distinguished Name.
-+A known way of addressing an entity. In some systems the identity is the public key, in others it can be anything from a Unix UID to an Email address to an X.509 Distinguished Name.  
- .TP 3
+-.TP 3
 -Signature
-+Signature 
- .LP
+-.LP
 -A signature is computed over some data using the private key of an entity (the \f2signer\fP, which in the case of a certificate is also known as the \f2issuer\fP).
-+A signature is computed over some data using the private key of an entity (the \f2signer\fP, which in the case of a certificate is also known as the \f2issuer\fP).  
++These are numbers associated with a particular entity, and are intended to be known to everyone who needs to have trusted interactions with that entity. Public keys are used to verify signatures.  
  .TP 3
 -Private Keys
-+Private Keys 
++Digitally Signed 
  .LP
 -These are numbers, each of which is supposed to be known only to the particular entity whose private key it is (that is, it's supposed to be kept secret). Private and public keys exist in pairs in all public key cryptography systems (also referred to as "public key crypto systems"). In a typical public key crypto system, such as DSA, a private key corresponds to exactly one public key. Private keys are used to compute signatures.
-+These are numbers, each of which is supposed to be known only to the particular entity whose private key it is (that is, it's supposed to be kept secret). Private and public keys exist in pairs in all public key cryptography systems (also referred to as "public key crypto systems"). In a typical public key crypto system, such as DSA, a private key corresponds to exactly one public key. Private keys are used to compute signatures.  
++If some data is \f2digitally signed\fP it has been stored with the "identity" of an entity, and a signature that proves that entity knows about the data. The data is rendered unforgeable by signing with the entity's private key.  
  .TP 3
 -Entity
-+Entity 
++Identity 
  .LP
 -An entity is a person, organization, program, computer, business, bank, or something else you are trusting to some degree.
++A known way of addressing an entity. In some systems the identity is the public key, in others it can be anything from a Unix UID to an Email address to an X.509 Distinguished Name.  
++.TP 3
++Signature 
++.LP
++A signature is computed over some data using the private key of an entity (the \f2signer\fP, which in the case of a certificate is also known as the \f2issuer\fP).  
++.TP 3
++Private Keys 
++.LP
++These are numbers, each of which is supposed to be known only to the particular entity whose private key it is (that is, it's supposed to be kept secret). Private and public keys exist in pairs in all public key cryptography systems (also referred to as "public key crypto systems"). In a typical public key crypto system, such as DSA, a private key corresponds to exactly one public key. Private keys are used to compute signatures.  
++.TP 3
++Entity 
++.LP
 +An entity is a person, organization, program, computer, business, bank, or something else you are trusting to some degree.  
  .RE
  .LP
@@ -39133,48 +39367,53 @@
  .RS 3
  .TP 3
 -Version
-+Version 
- .LP
+-.LP
 -This identifies which version of the X.509 standard applies to this certificate, which affects what information can be specified in it. Thus far, three versions are defined. \f3keytool\fP can import and export v1, v2, and v3 certificates. It generates v3 certificates.
-+This identifies which version of the X.509 standard applies to this certificate, which affects what information can be specified in it. Thus far, three versions are defined. \f3keytool\fP can import and export v1, v2, and v3 certificates. It generates v3 certificates. 
- .LP
+-.LP
 -\f2X.509 Version 1\fP has been available since 1988, is widely deployed, and is the most generic.
-+\f2X.509 Version 1\fP has been available since 1988, is widely deployed, and is the most generic. 
++Version 
  .LP
 -\f2X.509 Version 2\fP introduced the concept of subject and issuer unique identifiers to handle the possibility of reuse of subject and/or issuer names over time. Most certificate profile documents strongly recommend that names not be reused, and that certificates should not make use of unique identifiers. Version 2 certificates are not widely used.
-+\f2X.509 Version 2\fP introduced the concept of subject and issuer unique identifiers to handle the possibility of reuse of subject and/or issuer names over time. Most certificate profile documents strongly recommend that names not be reused, and that certificates should not make use of unique identifiers. Version 2 certificates are not widely used. 
++This identifies which version of the X.509 standard applies to this certificate, which affects what information can be specified in it. Thus far, three versions are defined. \f3keytool\fP can import and export v1, v2, and v3 certificates. It generates v3 certificates. 
  .LP
 -\f2X.509 Version 3\fP is the most recent (1996) and supports the notion of extensions, whereby anyone can define an extension and include it in the certificate. Some common extensions in use today are: \f2KeyUsage\fP (limits the use of the keys to particular purposes such as "signing\-only") and \f2AlternativeNames\fP (allows other identities to also be associated with this public key, e.g. DNS names, Email addresses, IP addresses). Extensions can be marked \f2critical\fP to indicate that the extension should be checked and enforced/used. For example, if a certificate has the KeyUsage extension marked critical and set to "keyCertSign" then if this certificate is presented during SSL communication, it should be rejected, as the certificate extension indicates that the associated private key should only be used for signing certificates and not for SSL use.
-+\f2X.509 Version 3\fP is the most recent (1996) and supports the notion of extensions, whereby anyone can define an extension and include it in the certificate. Some common extensions in use today are: \f2KeyUsage\fP (limits the use of the keys to particular purposes such as "signing\-only") and \f2AlternativeNames\fP (allows other identities to also be associated with this public key, e.g. DNS names, Email addresses, IP addresses). Extensions can be marked \f2critical\fP to indicate that the extension should be checked and enforced/used. For example, if a certificate has the KeyUsage extension marked critical and set to "keyCertSign" then if this certificate is presented during SSL communication, it should be rejected, as the certificate extension indicates that the associated private key should only be used for signing certificates and not for SSL use.  
- .TP 3
+-.TP 3
 -Serial Number
-+Serial Number 
++\f2X.509 Version 1\fP has been available since 1988, is widely deployed, and is the most generic. 
  .LP
 -The entity that created the certificate is responsible for assigning it a serial number to distinguish it from other certificates it issues. This information is used in numerous ways, for example when a certificate is revoked its serial number is placed in a Certificate Revocation List (CRL).
-+The entity that created the certificate is responsible for assigning it a serial number to distinguish it from other certificates it issues. This information is used in numerous ways, for example when a certificate is revoked its serial number is placed in a Certificate Revocation List (CRL).  
++\f2X.509 Version 2\fP introduced the concept of subject and issuer unique identifiers to handle the possibility of reuse of subject and/or issuer names over time. Most certificate profile documents strongly recommend that names not be reused, and that certificates should not make use of unique identifiers. Version 2 certificates are not widely used. 
++.LP
++\f2X.509 Version 3\fP is the most recent (1996) and supports the notion of extensions, whereby anyone can define an extension and include it in the certificate. Some common extensions in use today are: \f2KeyUsage\fP (limits the use of the keys to particular purposes such as "signing\-only") and \f2AlternativeNames\fP (allows other identities to also be associated with this public key, e.g. DNS names, Email addresses, IP addresses). Extensions can be marked \f2critical\fP to indicate that the extension should be checked and enforced/used. For example, if a certificate has the KeyUsage extension marked critical and set to "keyCertSign" then if this certificate is presented during SSL communication, it should be rejected, as the certificate extension indicates that the associated private key should only be used for signing certificates and not for SSL use.  
  .TP 3
 -Signature Algorithm Identifier
-+Signature Algorithm Identifier 
- .LP
+-.LP
 -This identifies the algorithm used by the CA to sign the certificate.
-+This identifies the algorithm used by the CA to sign the certificate.  
- .TP 3
+-.TP 3
 -Issuer Name
-+Issuer Name 
++Serial Number 
  .LP
 -The X.500 Distinguished Name of the entity that signed the certificate. This is normally a CA. Using this certificate implies trusting the entity that signed this certificate. (Note that in some cases, such as \f2root or top\-level\fP CA certificates, the issuer signs its own certificate.)
-+The X.500 Distinguished Name of the entity that signed the certificate. This is normally a CA. Using this certificate implies trusting the entity that signed this certificate. (Note that in some cases, such as \f2root or top\-level\fP CA certificates, the issuer signs its own certificate.)  
++The entity that created the certificate is responsible for assigning it a serial number to distinguish it from other certificates it issues. This information is used in numerous ways, for example when a certificate is revoked its serial number is placed in a Certificate Revocation List (CRL).  
  .TP 3
 -Validity Period
-+Validity Period 
++Signature Algorithm Identifier 
  .LP
 -Each certificate is valid only for a limited amount of time. This period is described by a start date and time and an end date and time, and can be as short as a few seconds or almost as long as a century. The validity period chosen depends on a number of factors, such as the strength of the private key used to sign the certificate or the amount one is willing to pay for a certificate. This is the expected period that entities can rely on the public value, if the associated private key has not been compromised.
-+Each certificate is valid only for a limited amount of time. This period is described by a start date and time and an end date and time, and can be as short as a few seconds or almost as long as a century. The validity period chosen depends on a number of factors, such as the strength of the private key used to sign the certificate or the amount one is willing to pay for a certificate. This is the expected period that entities can rely on the public value, if the associated private key has not been compromised.  
++This identifies the algorithm used by the CA to sign the certificate.  
  .TP 3
 -Subject Name
-+Subject Name 
++Issuer Name 
  .LP
 -The name of the entity whose public key the certificate identifies. This name uses the X.500 standard, so it is intended to be unique across the Internet. This is the X.500 Distinguished Name (DN) of the entity, for example,
++The X.500 Distinguished Name of the entity that signed the certificate. This is normally a CA. Using this certificate implies trusting the entity that signed this certificate. (Note that in some cases, such as \f2root or top\-level\fP CA certificates, the issuer signs its own certificate.)  
++.TP 3
++Validity Period 
++.LP
++Each certificate is valid only for a limited amount of time. This period is described by a start date and time and an end date and time, and can be as short as a few seconds or almost as long as a century. The validity period chosen depends on a number of factors, such as the strength of the private key used to sign the certificate or the amount one is willing to pay for a certificate. This is the expected period that entities can rely on the public value, if the associated private key has not been compromised.  
++.TP 3
++Subject Name 
++.LP
 +The name of the entity whose public key the certificate identifies. This name uses the X.500 standard, so it is intended to be unique across the Internet. This is the X.500 Distinguished Name (DN) of the entity, for example, 
  .nf
  \f3
@@ -39195,27 +39434,30 @@
  .TP 2
  o
 -\f3Certificate Chains\fP
-+\f3Certificate Chains\fP 
- .LP
+-.LP
 -\f3keytool\fP can create and manage keystore "key" entries that each contain a private key and an associated certificate "chain". The first certificate in the chain contains the public key corresponding to the private key.
-+\f3keytool\fP can create and manage keystore "key" entries that each contain a private key and an associated certificate "chain". The first certificate in the chain contains the public key corresponding to the private key. 
- .LP
+-.LP
 -When keys are first generated (see the \-genkeypair command), the chain starts off containing a single element, a \f2self\-signed certificate\fP. A self\-signed certificate is one for which the issuer (signer) is the same as the subject (the entity whose public key is being authenticated by the certificate). Whenever the \f2\-genkeypair\fP command is called to generate a new public/private key pair, it also wraps the public key into a self\-signed certificate.
-+When keys are first generated (see the \-genkeypair command), the chain starts off containing a single element, a \f2self\-signed certificate\fP. A self\-signed certificate is one for which the issuer (signer) is the same as the subject (the entity whose public key is being authenticated by the certificate). Whenever the \f2\-genkeypair\fP command is called to generate a new public/private key pair, it also wraps the public key into a self\-signed certificate. 
++\f3Certificate Chains\fP 
  .LP
 -Later, after a Certificate Signing Request (CSR) has been generated (see the \-certreq command) and sent to a Certification Authority (CA), the response from the CA is imported (see \-importcert), and the self\-signed certificate is replaced by a chain of certificates. At the bottom of the chain is the certificate (reply) issued by the CA authenticating the subject's public key. The next certificate in the chain is one that authenticates the \f2CA\fP's public key.
-+Later, after a Certificate Signing Request (CSR) has been generated (see the \-certreq command) and sent to a Certification Authority (CA), the response from the CA is imported (see \-importcert), and the self\-signed certificate is replaced by a chain of certificates. At the bottom of the chain is the certificate (reply) issued by the CA authenticating the subject's public key. The next certificate in the chain is one that authenticates the \f2CA\fP's public key. 
- .LP
+-.LP
 -In many cases, this is a self\-signed certificate (that is, a certificate from the CA authenticating its own public key) and the last certificate in the chain. In other cases, the CA may return a chain of certificates. In this case, the bottom certificate in the chain is the same (a certificate signed by the CA, authenticating the public key of the key entry), but the second certificate in the chain is a certificate signed by a \f2different\fP CA, authenticating the public key of the CA you sent the CSR to. Then, the next certificate in the chain will be a certificate authenticating the second CA's key, and so on, until a self\-signed "root" certificate is reached. Each certificate in the chain (after the first) thus authenticates the public key of the signer of the previous certificate in the chain.
-+In many cases, this is a self\-signed certificate (that is, a certificate from the CA authenticating its own public key) and the last certificate in the chain. In other cases, the CA may return a chain of certificates. In this case, the bottom certificate in the chain is the same (a certificate signed by the CA, authenticating the public key of the key entry), but the second certificate in the chain is a certificate signed by a \f2different\fP CA, authenticating the public key of the CA you sent the CSR to. Then, the next certificate in the chain will be a certificate authenticating the second CA's key, and so on, until a self\-signed "root" certificate is reached. Each certificate in the chain (after the first) thus authenticates the public key of the signer of the previous certificate in the chain. 
++\f3keytool\fP can create and manage keystore "key" entries that each contain a private key and an associated certificate "chain". The first certificate in the chain contains the public key corresponding to the private key. 
  .LP
 -Many CAs only return the issued certificate, with no supporting chain, especially when there is a flat hierarchy (no intermediates CAs). In this case, the certificate chain must be established from trusted certificate information already stored in the keystore.
-+Many CAs only return the issued certificate, with no supporting chain, especially when there is a flat hierarchy (no intermediates CAs). In this case, the certificate chain must be established from trusted certificate information already stored in the keystore. 
++When keys are first generated (see the \-genkeypair command), the chain starts off containing a single element, a \f2self\-signed certificate\fP. A self\-signed certificate is one for which the issuer (signer) is the same as the subject (the entity whose public key is being authenticated by the certificate). Whenever the \f2\-genkeypair\fP command is called to generate a new public/private key pair, it also wraps the public key into a self\-signed certificate. 
  .LP
 -A different reply format (defined by the PKCS#7 standard) also includes the supporting certificate chain, in addition to the issued certificate. Both reply formats can be handled by \f3keytool\fP.
-+A different reply format (defined by the PKCS#7 standard) also includes the supporting certificate chain, in addition to the issued certificate. Both reply formats can be handled by \f3keytool\fP. 
++Later, after a Certificate Signing Request (CSR) has been generated (see the \-certreq command) and sent to a Certification Authority (CA), the response from the CA is imported (see \-importcert), and the self\-signed certificate is replaced by a chain of certificates. At the bottom of the chain is the certificate (reply) issued by the CA authenticating the subject's public key. The next certificate in the chain is one that authenticates the \f2CA\fP's public key. 
  .LP
 -The top\-level (root) CA certificate is self\-signed. However, the trust into the root's public key does not come from the root certificate itself (anybody could generate a self\-signed certificate with the distinguished name of say, the VeriSign root CA!), but from other sources like a newspaper. The root CA public key is widely known. The only reason it is stored in a certificate is because this is the format understood by most tools, so the certificate in this case is only used as a "vehicle" to transport the root CA's public key. Before you add the root CA certificate to your keystore, you should view it (using the \f2\-printcert\fP option) and compare the displayed fingerprint with the well\-known fingerprint (obtained from a newspaper, the root CA's Web page, etc.).
++In many cases, this is a self\-signed certificate (that is, a certificate from the CA authenticating its own public key) and the last certificate in the chain. In other cases, the CA may return a chain of certificates. In this case, the bottom certificate in the chain is the same (a certificate signed by the CA, authenticating the public key of the key entry), but the second certificate in the chain is a certificate signed by a \f2different\fP CA, authenticating the public key of the CA you sent the CSR to. Then, the next certificate in the chain will be a certificate authenticating the second CA's key, and so on, until a self\-signed "root" certificate is reached. Each certificate in the chain (after the first) thus authenticates the public key of the signer of the previous certificate in the chain. 
++.LP
++Many CAs only return the issued certificate, with no supporting chain, especially when there is a flat hierarchy (no intermediates CAs). In this case, the certificate chain must be established from trusted certificate information already stored in the keystore. 
++.LP
++A different reply format (defined by the PKCS#7 standard) also includes the supporting certificate chain, in addition to the issued certificate. Both reply formats can be handled by \f3keytool\fP. 
++.LP
 +The top\-level (root) CA certificate is self\-signed. However, the trust into the root's public key does not come from the root certificate itself (anybody could generate a self\-signed certificate with the distinguished name of say, the VeriSign root CA!), but from other sources like a newspaper. The root CA public key is widely known. The only reason it is stored in a certificate is because this is the format understood by most tools, so the certificate in this case is only used as a "vehicle" to transport the root CA's public key. Before you add the root CA certificate to your keystore, you should view it (using the \f2\-printcert\fP option) and compare the displayed fingerprint with the well\-known fingerprint (obtained from a newspaper, the root CA's Web page, etc.).   
  .TP 2
  o
@@ -39242,21 +39484,22 @@
  .TP 2
  o
 -\f3The Internet RFC 1421 Certificate Encoding Standard\fP
-+\f3The Internet RFC 1421 Certificate Encoding Standard\fP 
- .LP
+-.LP
 -Certificates are often stored using the printable encoding format defined by the Internet RFC 1421 standard, instead of their binary encoding. This certificate format, also known as "Base 64 encoding", facilitates exporting certificates to other applications by email or through some other mechanism.
-+Certificates are often stored using the printable encoding format defined by the Internet RFC 1421 standard, instead of their binary encoding. This certificate format, also known as "Base 64 encoding", facilitates exporting certificates to other applications by email or through some other mechanism. 
++\f3The Internet RFC 1421 Certificate Encoding Standard\fP 
  .LP
 -Certificates read by the \f2\-importcert\fP and \f2\-printcert\fP commands can be in either this format or binary encoded.
-+Certificates read by the \f2\-importcert\fP and \f2\-printcert\fP commands can be in either this format or binary encoded. 
++Certificates are often stored using the printable encoding format defined by the Internet RFC 1421 standard, instead of their binary encoding. This certificate format, also known as "Base 64 encoding", facilitates exporting certificates to other applications by email or through some other mechanism. 
  .LP
 -The \f2\-exportcert\fP command by default outputs a certificate in binary encoding, but will instead output a certificate in the printable encoding format, if the \f2\-rfc\fP option is specified.
-+The \f2\-exportcert\fP command by default outputs a certificate in binary encoding, but will instead output a certificate in the printable encoding format, if the \f2\-rfc\fP option is specified. 
++Certificates read by the \f2\-importcert\fP and \f2\-printcert\fP commands can be in either this format or binary encoded. 
  .LP
 -The \f2\-list\fP command by default prints the SHA1 fingerprint of a certificate. If the \f2\-v\fP option is specified, the certificate is printed in human\-readable format, while if the \f2\-rfc\fP option is specified, the certificate is output in the printable encoding format.
-+The \f2\-list\fP command by default prints the SHA1 fingerprint of a certificate. If the \f2\-v\fP option is specified, the certificate is printed in human\-readable format, while if the \f2\-rfc\fP option is specified, the certificate is output in the printable encoding format. 
++The \f2\-exportcert\fP command by default outputs a certificate in binary encoding, but will instead output a certificate in the printable encoding format, if the \f2\-rfc\fP option is specified. 
  .LP
 -In its printable encoding format, the encoded certificate is bounded at the beginning by
++The \f2\-list\fP command by default prints the SHA1 fingerprint of a certificate. If the \f2\-v\fP option is specified, the certificate is printed in human\-readable format, while if the \f2\-rfc\fP option is specified, the certificate is output in the printable encoding format. 
++.LP
 +In its printable encoding format, the encoded certificate is bounded at the beginning by 
  .nf
  \f3
@@ -39284,26 +39527,28 @@
  .TP 2
  o
 -\f2commonName\fP \- common name of a person, e.g., "Susan Jones"
-+\f2commonName\fP \- common name of a person, e.g., "Susan Jones" 
- .TP 2
- o
+-.TP 2
+-o
 -\f2organizationUnit\fP \- small organization (e.g., department or division) name, e.g., "Purchasing"
-+\f2organizationUnit\fP \- small organization (e.g., department or division) name, e.g., "Purchasing" 
++\f2commonName\fP \- common name of a person, e.g., "Susan Jones" 
  .TP 2
  o
 -\f2organizationName\fP \- large organization name, e.g., "ABCSystems, Inc."
-+\f2organizationName\fP \- large organization name, e.g., "ABCSystems, Inc." 
++\f2organizationUnit\fP \- small organization (e.g., department or division) name, e.g., "Purchasing" 
  .TP 2
  o
 -\f2localityName\fP \- locality (city) name, e.g., "Palo Alto"
-+\f2localityName\fP \- locality (city) name, e.g., "Palo Alto" 
++\f2organizationName\fP \- large organization name, e.g., "ABCSystems, Inc." 
  .TP 2
  o
 -\f2stateName\fP \- state or province name, e.g., "California"
-+\f2stateName\fP \- state or province name, e.g., "California" 
++\f2localityName\fP \- locality (city) name, e.g., "Palo Alto" 
  .TP 2
  o
 -\f2country\fP \- two\-letter country code, e.g., "CH"
++\f2stateName\fP \- state or province name, e.g., "California" 
++.TP 2
++o
 +\f2country\fP \- two\-letter country code, e.g., "CH" 
  .RE
  
@@ -39409,8 +39654,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/native2ascii.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/native2ascii.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/native2ascii.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/native2ascii.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -39451,8 +39696,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/orbd.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/orbd.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/orbd.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/orbd.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -39686,8 +39931,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/pack200.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/pack200.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/pack200.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/pack200.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -39852,8 +40097,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/policytool.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/policytool.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/policytool.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/policytool.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,71 +19,86 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -39887,15 +40132,15 @@
  .RS 3
  .TP 3
 -\
-+file 
-+directs \f2policytool\fP to load a local policy file 
- .TP 3
+-.TP 3
 -Run the policytool Administrator's utility
 -\f4policytool\fP
 -.TP 3
 -Run policytool and load the specified policy file
 -\f4policytool\fP\f2[\-file\ \fP\f2filename\fP\f2]\fP
--.TP 3
++file 
++directs \f2policytool\fP to load a local policy file 
+ .TP 3
 -\
 -.TP 3
 -where:
@@ -39971,8 +40216,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/rmic.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/rmic.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/rmic.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/rmic.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -40023,20 +40268,21 @@
  would place the stub and skeleton classes derived from \f2MyClass\fP into the directory \f2/java/classes/foo\fP. If the \f2\-d\fP option is not specified, the default behavior is as if \f2"\-d\ ."\fP were specified: the package hierarchy of the target class is created in the current directory, and stub/tie/skeleton files are placed within it. (Note that in some previous versions of \f3rmic\fP, if \f2\-d\fP was not specified, then the package hierarchy was \f2not\fP created, and all of the output files were placed directly in the current directory.)
  .br
 -\
-+\  
- .TP 3
+-.TP 3
 -\-extdirs path
 -Overrides location of installed extensions
-+\-extdirs path 
-+Overrides location of installed extensions 
++\  
  .TP 3
 -\-g
 -Enables generation of all debugging information, including local variables. By default, only line number information is generated.
-+\-g 
-+Enables generation of all debugging information, including local variables. By default, only line number information is generated. 
++\-extdirs path 
++Overrides location of installed extensions 
  .TP 3
 -\-idl
 -Causes \f2rmic\fP to generate OMG IDL for the classes specified and any classes referenced. IDL provides a purely declarative, programming language\-independent way of specifying an object's API. The IDL is used as a specification for methods and data that can be written in and invoked from any language that provides CORBA bindings. This includes Java and C++ among others. See the
++\-g 
++Enables generation of all debugging information, including local variables. By default, only line number information is generated. 
++.TP 3
 +\-idl 
 +Causes \f2rmic\fP to generate OMG IDL for the classes specified and any classes referenced. IDL provides a purely declarative, programming language\-independent way of specifying an object's API. The IDL is used as a specification for methods and data that can be written in and invoked from any language that provides CORBA bindings. This includes Java and C++ among others. See the 
  .na
@@ -40116,41 +40362,44 @@
  .TP 3
 -\-J
 -Used in conjunction with any \f2java\fP option, it passes the option following the \f2\-J\fP (no spaces between the \-J and the option) on to the \f2java\fP interpreter.
-+\-J 
-+Used in conjunction with any \f2java\fP option, it passes the option following the \f2\-J\fP (no spaces between the \-J and the option) on to the \f2java\fP interpreter. 
- .TP 3
+-.TP 3
 -\-keep or \-keepgenerated
 -Retains the generated \f2.java\fP source files for the stub, skeleton, and/or tie classes and writes them to the same directory as the \f2.class\fP files.
-+\-keep or \-keepgenerated 
-+Retains the generated \f2.java\fP source files for the stub, skeleton, and/or tie classes and writes them to the same directory as the \f2.class\fP files. 
- .TP 3
+-.TP 3
 -\-nowarn
 -Turns off warnings. If used the compiler does not print out any warnings.
-+\-nowarn 
-+Turns off warnings. If used the compiler does not print out any warnings. 
++\-J 
++Used in conjunction with any \f2java\fP option, it passes the option following the \f2\-J\fP (no spaces between the \-J and the option) on to the \f2java\fP interpreter. 
  .TP 3
 -\-nowrite
 -Does not write compiled classes to the file system.
-+\-nowrite 
-+Does not write compiled classes to the file system. 
- .TP 3
+-.TP 3
 -\-vcompat
 -Generates stub and skeleton classes compatible with both the 1.1 and 1.2 JRMP stub protocol versions. (This option was the default in releases prior to 5.0.) The generated stub classes will use the 1.1 stub protocol version when loaded in a JDK 1.1 virtual machine and will use the 1.2 stub protocol version when loaded into a 1.2 (or later) virtual machine. The generated skeleton classes will support both 1.1 and 1.2 stub protocol versions. The generated classes are relatively large in order to support both modes of operation.
-+\-vcompat 
-+Generates stub and skeleton classes compatible with both the 1.1 and 1.2 JRMP stub protocol versions. (This option was the default in releases prior to 5.0.) The generated stub classes will use the 1.1 stub protocol version when loaded in a JDK 1.1 virtual machine and will use the 1.2 stub protocol version when loaded into a 1.2 (or later) virtual machine. The generated skeleton classes will support both 1.1 and 1.2 stub protocol versions. The generated classes are relatively large in order to support both modes of operation. 
++\-keep or \-keepgenerated 
++Retains the generated \f2.java\fP source files for the stub, skeleton, and/or tie classes and writes them to the same directory as the \f2.class\fP files. 
  .TP 3
 -\-verbose
 -Causes the compiler and linker to print out messages about what classes are being compiled and what class files are being loaded.
-+\-verbose 
-+Causes the compiler and linker to print out messages about what classes are being compiled and what class files are being loaded. 
++\-nowarn 
++Turns off warnings. If used the compiler does not print out any warnings. 
  .TP 3
 -\-v1.1
 -Generates stub and skeleton classes for the 1.1 JRMP stub protocol version only. Note that this option is only useful for generating stub classes that are serialization\-compatible with pre\-existing, statically\-deployed stub classes that were generated by the \f3rmic\fP tool from JDK 1.1 and that cannot be upgraded (and dynamic class loading is not being used).
-+\-v1.1 
-+Generates stub and skeleton classes for the 1.1 JRMP stub protocol version only. Note that this option is only useful for generating stub classes that are serialization\-compatible with pre\-existing, statically\-deployed stub classes that were generated by the \f3rmic\fP tool from JDK 1.1 and that cannot be upgraded (and dynamic class loading is not being used). 
++\-nowrite 
++Does not write compiled classes to the file system. 
  .TP 3
 -\-v1.2
 -(default) Generates stub classes for the 1.2 JRMP stub protocol version only. No skeleton classes are generated with this option because skeleton classes are not used with the 1.2 stub protocol version. The generated stub classes will not work if they are loaded into a JDK 1.1 virtual machine.
++\-vcompat 
++Generates stub and skeleton classes compatible with both the 1.1 and 1.2 JRMP stub protocol versions. (This option was the default in releases prior to 5.0.) The generated stub classes will use the 1.1 stub protocol version when loaded in a JDK 1.1 virtual machine and will use the 1.2 stub protocol version when loaded into a 1.2 (or later) virtual machine. The generated skeleton classes will support both 1.1 and 1.2 stub protocol versions. The generated classes are relatively large in order to support both modes of operation. 
++.TP 3
++\-verbose 
++Causes the compiler and linker to print out messages about what classes are being compiled and what class files are being loaded. 
++.TP 3
++\-v1.1 
++Generates stub and skeleton classes for the 1.1 JRMP stub protocol version only. Note that this option is only useful for generating stub classes that are serialization\-compatible with pre\-existing, statically\-deployed stub classes that were generated by the \f3rmic\fP tool from JDK 1.1 and that cannot be upgraded (and dynamic class loading is not being used). 
++.TP 3
 +\-v1.2 
 +(default) Generates stub classes for the 1.2 JRMP stub protocol version only. No skeleton classes are generated with this option because skeleton classes are not used with the 1.2 stub protocol version. The generated stub classes will not work if they are loaded into a JDK 1.1 virtual machine. 
  .RE
@@ -40181,8 +40430,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/rmid.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/rmid.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/rmid.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/rmid.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -40462,8 +40711,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/rmiregistry.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/rmiregistry.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/rmiregistry.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/rmiregistry.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,14 +19,14 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -40506,8 +40755,8 @@
  .fi
 -http://download.oracle.com/javase/7/docs/api/java/rmi/Naming.html
 +http://docs.oracle.com/javase/7/docs/api/java/rmi/Naming.html  
---- ./jdk/src/bsd/doc/man/schemagen.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/schemagen.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/schemagen.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/schemagen.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -40574,8 +40823,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/serialver.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/serialver.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/serialver.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/serialver.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -40635,8 +40884,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/servertool.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/servertool.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/servertool.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/servertool.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,13 +19,13 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -40675,66 +40924,73 @@
  .TP 3
 -register \-server\ <server\ class\ name> \ \-classpath\ <classpath\ to\ server> [\ \-applicationName\ <application\ name> \-args\ <args\ to\ server> \-vmargs\ <flags\ to\ be\ passed\ to\ Java\ VM> \ ]
 -Register a new persistent server with the Object Request Broker Daemon (ORBD). If the server is not already registered, it is registered and activated. This command causes an install method to be invoked in the main class of the server identified by the \f2\-server\fP option. The install method must be \f2public static void install(org.omg.CORBA.ORB)\fP. The install method is optional and enables the developer to provide their own server installation behavior (for example, creating database schema).
-+register \-server\ <server\ class\ name> \ \-classpath\ <classpath\ to\ server> [\ \-applicationName\ <application\ name> \-args\ <args\ to\ server> \-vmargs\ <flags\ to\ be\ passed\ to\ Java\ VM> \ ] 
-+Register a new persistent server with the Object Request Broker Daemon (ORBD). If the server is not already registered, it is registered and activated. This command causes an install method to be invoked in the main class of the server identified by the \f2\-server\fP option. The install method must be \f2public static void install(org.omg.CORBA.ORB)\fP. The install method is optional and enables the developer to provide their own server installation behavior (for example, creating database schema). 
- .TP 3
+-.TP 3
 -unregister \-serverid\ <server\ id\ >\ | \-applicationName\ <application\ name>
 -Unregister a server from the ORBD by using either its server id or its application name. This command causes an uninstall method to be invoked in the main class of the server identified by the \f2\-server\fP option. The uninstall method must be \f2public static void uninstall(org.omg.CORBA.ORB)\fP. The uninstall method is optional and enables the developer to provide their own server uninstall behavior (for example, undoing the behavior of the install method).
-+unregister \-serverid\ <server\ id\ >\ | \-applicationName\ <application\ name> 
-+Unregister a server from the ORBD by using either its server id or its application name. This command causes an uninstall method to be invoked in the main class of the server identified by the \f2\-server\fP option. The uninstall method must be \f2public static void uninstall(org.omg.CORBA.ORB)\fP. The uninstall method is optional and enables the developer to provide their own server uninstall behavior (for example, undoing the behavior of the install method). 
- .TP 3
+-.TP 3
 -getserverid \-applicationName\ <application\ name>
 -Return the server id that corresponds with an application.
-+getserverid \-applicationName\ <application\ name> 
-+Return the server id that corresponds with an application. 
- .TP 3
+-.TP 3
 -list
 -List information about all persistent servers registered with the ORBD.
-+list 
-+List information about all persistent servers registered with the ORBD. 
- .TP 3
+-.TP 3
 -listappnames
 -List the application names for all servers currently registered with the ORBD.
-+listappnames 
-+List the application names for all servers currently registered with the ORBD. 
- .TP 3
+-.TP 3
 -listactive
 -List information about all persistent servers that have been launched by the ORBD and are currently running.
-+listactive 
-+List information about all persistent servers that have been launched by the ORBD and are currently running. 
++register \-server\ <server\ class\ name> \ \-classpath\ <classpath\ to\ server> [\ \-applicationName\ <application\ name> \-args\ <args\ to\ server> \-vmargs\ <flags\ to\ be\ passed\ to\ Java\ VM> \ ] 
++Register a new persistent server with the Object Request Broker Daemon (ORBD). If the server is not already registered, it is registered and activated. This command causes an install method to be invoked in the main class of the server identified by the \f2\-server\fP option. The install method must be \f2public static void install(org.omg.CORBA.ORB)\fP. The install method is optional and enables the developer to provide their own server installation behavior (for example, creating database schema). 
  .TP 3
 -locate \-serverid\ <server\ id\ >\ | \-applicationName\ <application\ name> [\-endpointType\ <endpointType>\ ]
 -Locate the endpoints (ports) of a specific type for all ORBs created by a registered server. If a server is not already running, it is activated. If an endpoint type is not specified, then the plain/non\-protected endpoint associated with each ORB in a server is returned.
-+locate \-serverid\ <server\ id\ >\ | \-applicationName\ <application\ name> [\-endpointType\ <endpointType>\ ] 
-+Locate the endpoints (ports) of a specific type for all ORBs created by a registered server. If a server is not already running, it is activated. If an endpoint type is not specified, then the plain/non\-protected endpoint associated with each ORB in a server is returned. 
- .TP 3
+-.TP 3
 -locateperorb \-serverid\ <server\ id\ >\ | \-applicationName\ <application\ name> [\-orbid\ <ORB\ name>\ ]
 -Locate all the endpoints (ports) registered by a specific ORB of registered server. If a server is not already running, then it is activated. If an \f2orbid\fP is not specified, the default value of "" is assigned to the \f2orbid\fP. If any ORBs are created with an \f2orbid\fP of empty string, all ports registered by it are returned.
-+locateperorb \-serverid\ <server\ id\ >\ | \-applicationName\ <application\ name> [\-orbid\ <ORB\ name>\ ] 
-+Locate all the endpoints (ports) registered by a specific ORB of registered server. If a server is not already running, then it is activated. If an \f2orbid\fP is not specified, the default value of "" is assigned to the \f2orbid\fP. If any ORBs are created with an \f2orbid\fP of empty string, all ports registered by it are returned. 
- .TP 3
+-.TP 3
 -orblist \-serverid\ <server\ id\ >\ | \-applicationName\ <application\ name>
 -Lists the ORBId of the ORBs defined on a server. An ORBId is the string name for the ORB created by the server. If the server is not already running, it is activated.
-+orblist \-serverid\ <server\ id\ >\ | \-applicationName\ <application\ name> 
-+Lists the ORBId of the ORBs defined on a server. An ORBId is the string name for the ORB created by the server. If the server is not already running, it is activated. 
++unregister \-serverid\ <server\ id\ >\ | \-applicationName\ <application\ name> 
++Unregister a server from the ORBD by using either its server id or its application name. This command causes an uninstall method to be invoked in the main class of the server identified by the \f2\-server\fP option. The uninstall method must be \f2public static void uninstall(org.omg.CORBA.ORB)\fP. The uninstall method is optional and enables the developer to provide their own server uninstall behavior (for example, undoing the behavior of the install method). 
  .TP 3
 -shutdown \-serverid\ <server\ id\ >\ | \-applicationName\ <application\ name>
 -Shutdown an active server that is registered with ORBD. During execution of this command, the \f2shutdown()\fP method defined in the class specified by either the \f2\-serverid\fP or \f2\-applicationName\fP parameter is also invoked to shutdown the server process appropriately.
-+shutdown \-serverid\ <server\ id\ >\ | \-applicationName\ <application\ name> 
-+Shutdown an active server that is registered with ORBD. During execution of this command, the \f2shutdown()\fP method defined in the class specified by either the \f2\-serverid\fP or \f2\-applicationName\fP parameter is also invoked to shutdown the server process appropriately. 
++getserverid \-applicationName\ <application\ name> 
++Return the server id that corresponds with an application. 
  .TP 3
 -startup \-serverid\ <server\ id\ >\ | \-applicationName\ <application\ name>
 -Startup or activate a server that is registered with ORBD. If the server is not running, this command launches the server. If the server is already running, an error message is returned to the user.
-+startup \-serverid\ <server\ id\ >\ | \-applicationName\ <application\ name> 
-+Startup or activate a server that is registered with ORBD. If the server is not running, this command launches the server. If the server is already running, an error message is returned to the user. 
++list 
++List information about all persistent servers registered with the ORBD. 
  .TP 3
 -help
 -List all the commands available to the server through the server tool.
-+help 
-+List all the commands available to the server through the server tool. 
++listappnames 
++List the application names for all servers currently registered with the ORBD. 
  .TP 3
 -quit
 -Exit the server tool.
++listactive 
++List information about all persistent servers that have been launched by the ORBD and are currently running. 
++.TP 3
++locate \-serverid\ <server\ id\ >\ | \-applicationName\ <application\ name> [\-endpointType\ <endpointType>\ ] 
++Locate the endpoints (ports) of a specific type for all ORBs created by a registered server. If a server is not already running, it is activated. If an endpoint type is not specified, then the plain/non\-protected endpoint associated with each ORB in a server is returned. 
++.TP 3
++locateperorb \-serverid\ <server\ id\ >\ | \-applicationName\ <application\ name> [\-orbid\ <ORB\ name>\ ] 
++Locate all the endpoints (ports) registered by a specific ORB of registered server. If a server is not already running, then it is activated. If an \f2orbid\fP is not specified, the default value of "" is assigned to the \f2orbid\fP. If any ORBs are created with an \f2orbid\fP of empty string, all ports registered by it are returned. 
++.TP 3
++orblist \-serverid\ <server\ id\ >\ | \-applicationName\ <application\ name> 
++Lists the ORBId of the ORBs defined on a server. An ORBId is the string name for the ORB created by the server. If the server is not already running, it is activated. 
++.TP 3
++shutdown \-serverid\ <server\ id\ >\ | \-applicationName\ <application\ name> 
++Shutdown an active server that is registered with ORBD. During execution of this command, the \f2shutdown()\fP method defined in the class specified by either the \f2\-serverid\fP or \f2\-applicationName\fP parameter is also invoked to shutdown the server process appropriately. 
++.TP 3
++startup \-serverid\ <server\ id\ >\ | \-applicationName\ <application\ name> 
++Startup or activate a server that is registered with ORBD. If the server is not running, this command launches the server. If the server is already running, an error message is returned to the user. 
++.TP 3
++help 
++List all the commands available to the server through the server tool. 
++.TP 3
 +quit 
 +Exit the server tool. 
  .RE
@@ -40744,8 +41000,8 @@
  .LP
 -orbd(1)
 +orbd(1)  
---- ./jdk/src/bsd/doc/man/tnameserv.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/tnameserv.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/tnameserv.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/tnameserv.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,18 +19,18 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -40773,22 +41029,24 @@
  .TP 2
  o
 -Java\ IDL Transient Naming Service
-+Java\ IDL Transient Naming Service 
- .TP 2
- o
+-.TP 2
+-o
 -Starting the Java\ IDL Transient Naming Service
-+Starting the Java\ IDL Transient Naming Service 
++Java\ IDL Transient Naming Service 
  .TP 2
  o
 -Stopping the Java\ IDL Transient Naming Service
-+Stopping the Java\ IDL Transient Naming Service 
++Starting the Java\ IDL Transient Naming Service 
  .TP 2
  o
 -Sample Client: Adding Objects to the Namespace
-+Sample Client: Adding Objects to the Namespace 
++Stopping the Java\ IDL Transient Naming Service 
  .TP 2
  o
 -Sample Client: Browsing the Namespace
++Sample Client: Adding Objects to the Namespace 
++.TP 2
++o
 +Sample Client: Browsing the Namespace 
  .RE
  
@@ -41016,8 +41274,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/unpack200.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/unpack200.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/unpack200.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/unpack200.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -41084,8 +41342,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/wsgen.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/wsgen.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/wsgen.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/wsgen.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -41301,8 +41559,8 @@
  .LP
 -Note that you do not have to generate WSDL at the development time as JAXWS runtime will automatically generate a WSDL for you when you deploy your service.
 +Note that you do not have to generate WSDL at the development time as JAXWS runtime will automatically generate a WSDL for you when you deploy your service. 
---- ./jdk/src/bsd/doc/man/wsimport.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/wsimport.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/wsimport.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/wsimport.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -41317,22 +41575,24 @@
  .TP 2
  o
 -Service Endpoint Interface (SEI)
-+Service Endpoint Interface (SEI) 
- .TP 2
- o
+-.TP 2
+-o
 -Service
-+Service 
++Service Endpoint Interface (SEI) 
  .TP 2
  o
 -Exception class mapped from wsdl:fault (if any)
-+Exception class mapped from wsdl:fault (if any) 
++Service 
  .TP 2
  o
 -Async Reponse Bean derived from response wsdl:message (if any)
-+Async Reponse Bean derived from response wsdl:message (if any) 
++Exception class mapped from wsdl:fault (if any) 
  .TP 2
  o
 -JAXB generated value types (mapped java classes from schema types)
++Async Reponse Bean derived from response wsdl:message (if any) 
++.TP 2
++o
 +JAXB generated value types (mapped java classes from schema types) 
  .RE
  .LP
@@ -41599,8 +41859,8 @@
  .br
 -
 + 
---- ./jdk/src/bsd/doc/man/xjc.1	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/bsd/doc/man/xjc.1	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/bsd/doc/man/xjc.1	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/bsd/doc/man/xjc.1	Sat Aug 20 12:04:16 2016 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -41647,105 +41907,119 @@
  Specify one or more external binding files to process. (Each binding file must have its own \f2"\-b"\fP switch.) The syntax of the external binding files is extremely flexible. You may have a single binding file that contains customizations for multiple schemas or you can break the customizations into multiple bindings files: \f2xjc schema1.xsd schema2.xsd schema3.xsd \-b bindings123.xjb\fP
  .br
 -\f2xjc schema1.xsd schema2.xsd schema3.xsd \-b bindings1.xjb \-b bindings2.xjb \-b bindings3.xjb\fP In addition, the ordering of the schema files and binding files on the command line does not matter.
-+\f2xjc schema1.xsd schema2.xsd schema3.xsd \-b bindings1.xjb \-b bindings2.xjb \-b bindings3.xjb\fP In addition, the ordering of the schema files and binding files on the command line does not matter. 
- .TP 3
+-.TP 3
 -\-d <dir>
 -By default, the XJC binding compiler will generate the Java content classes in the current directory. Use this option to specify an alternate output directory. The output directory must already exist, the XJC binding compiler will not create it for you.
-+\-d <dir> 
-+By default, the XJC binding compiler will generate the Java content classes in the current directory. Use this option to specify an alternate output directory. The output directory must already exist, the XJC binding compiler will not create it for you. 
- .TP 3
+-.TP 3
 -\-p <pkg>
 -Specifying a target package via this command\-line option overrides any binding customization for package name and the default package name algorithm defined in the specification.
-+\-p <pkg> 
-+Specifying a target package via this command\-line option overrides any binding customization for package name and the default package name algorithm defined in the specification. 
- .TP 3
+-.TP 3
 -\-httpproxy <proxy>
 -Specify the HTTP/HTTPS proxy. The format is [user[:password]@]proxyHost[:proxyPort]. The old \f2\-host\fP and \f2\-port\fP are still supported by the RI for backwards compatibility, but they have been deprecated. Note that the password specified with this option is an argument that is visible to other users who use the \f2top\fP command, for example. For greater security, use \f2\-httpproxyfile\fP, below.
-+\-httpproxy <proxy> 
-+Specify the HTTP/HTTPS proxy. The format is [user[:password]@]proxyHost[:proxyPort]. The old \f2\-host\fP and \f2\-port\fP are still supported by the RI for backwards compatibility, but they have been deprecated. Note that the password specified with this option is an argument that is visible to other users who use the \f2top\fP command, for example. For greater security, use \f2\-httpproxyfile\fP, below. 
- .TP 3
+-.TP 3
 -\-httpproxyfile <file>
 -Specify the HTTP/HTTPS proxy using a file. Same format as above, but the password specified in the file is not visible to other users.
-+\-httpproxyfile <file> 
-+Specify the HTTP/HTTPS proxy using a file. Same format as above, but the password specified in the file is not visible to other users. 
- .TP 3
+-.TP 3
 -\-classpath <arg>
 -Specify where to find client application class files used by the \f2<jxb:javaType>\fP and \f2<xjc:superClass>\fP customizations.
-+\-classpath <arg> 
-+Specify where to find client application class files used by the \f2<jxb:javaType>\fP and \f2<xjc:superClass>\fP customizations. 
- .TP 3
+-.TP 3
 -\-catalog <file>
 -Specify catalog files to resolve external entity references. Supports TR9401, XCatalog, and OASIS XML Catalog format. Please read the XML Entity and URI Resolvers document or the \f2catalog\-resolver\fP sample application.
-+\-catalog <file> 
-+Specify catalog files to resolve external entity references. Supports TR9401, XCatalog, and OASIS XML Catalog format. Please read the XML Entity and URI Resolvers document or the \f2catalog\-resolver\fP sample application. 
- .TP 3
+-.TP 3
 -\-readOnly
 -By default, the XJC binding compiler does not write\-protect the Java source files it generates. Use this option to force the XJC binding compiler to mark the generated Java sources read\-only.
-+\-readOnly 
-+By default, the XJC binding compiler does not write\-protect the Java source files it generates. Use this option to force the XJC binding compiler to mark the generated Java sources read\-only. 
- .TP 3
+-.TP 3
 -\-npa
 -Supress the generation of package level annotations into **/package\-info.java. Using this switch causes the generated code to internalize those annotations into the other generated classes.
-+\-npa 
-+Supress the generation of package level annotations into **/package\-info.java. Using this switch causes the generated code to internalize those annotations into the other generated classes. 
- .TP 3
+-.TP 3
 -\-no\-header
 -Supress the generation of a file header comment that includes some note and timestamp. Using this makes the generated code more diff\-friendly.
-+\-no\-header 
-+Supress the generation of a file header comment that includes some note and timestamp. Using this makes the generated code more diff\-friendly. 
++\f2xjc schema1.xsd schema2.xsd schema3.xsd \-b bindings1.xjb \-b bindings2.xjb \-b bindings3.xjb\fP In addition, the ordering of the schema files and binding files on the command line does not matter. 
  .TP 3
 -\-target 2.0
 -Avoid generating code that relies on any JAXB 2.1 features. This will allow the generated code to run with JAXB 2.0 runtime (such as JavaSE 6.)
-+\-target 2.0 
-+Avoid generating code that relies on any JAXB 2.1 features. This will allow the generated code to run with JAXB 2.0 runtime (such as JavaSE 6.) 
- .TP 3
+-.TP 3
 -\-xmlschema
 -Treat input schemas as W3C XML Schema (default). If you do not specify this switch, your input schemas will be treated as W3C XML Schema.
-+\-xmlschema 
-+Treat input schemas as W3C XML Schema (default). If you do not specify this switch, your input schemas will be treated as W3C XML Schema. 
- .TP 3
+-.TP 3
 -\-relaxng
 -Treat input schemas as RELAX NG (experimental, unsupported). Support for RELAX NG schemas is provided as a JAXB Vendor Extension.
-+\-relaxng 
-+Treat input schemas as RELAX NG (experimental, unsupported). Support for RELAX NG schemas is provided as a JAXB Vendor Extension. 
- .TP 3
+-.TP 3
 -\-relaxng\-compact
 -Treat input schemas as RELAX NG compact syntax(experimental, unsupported). Support for RELAX NG schemas is provided as a JAXB Vendor Extension.
-+\-relaxng\-compact 
-+Treat input schemas as RELAX NG compact syntax(experimental, unsupported). Support for RELAX NG schemas is provided as a JAXB Vendor Extension. 
- .TP 3
+-.TP 3
 -\-dtd
 -Treat input schemas as XML DTD (experimental, unsupported). Support for RELAX NG schemas is provided as a JAXB Vendor Extension.
-+\-dtd 
-+Treat input schemas as XML DTD (experimental, unsupported). Support for RELAX NG schemas is provided as a JAXB Vendor Extension. 
++\-d <dir> 
++By default, the XJC binding compiler will generate the Java content classes in the current directory. Use this option to specify an alternate output directory. The output directory must already exist, the XJC binding compiler will not create it for you. 
  .TP 3
 -\-wsdl
 -Treat input as WSDL and compile schemas inside it (experimental,unsupported).
-+\-wsdl 
-+Treat input as WSDL and compile schemas inside it (experimental,unsupported). 
- .TP 3
+-.TP 3
 -\-quiet
 -Suppress compiler output, such as progress information and warnings.
-+\-quiet 
-+Suppress compiler output, such as progress information and warnings. 
++\-p <pkg> 
++Specifying a target package via this command\-line option overrides any binding customization for package name and the default package name algorithm defined in the specification. 
  .TP 3
 -\-verbose
 -Be extra verbose, such as printing informational messages or displaying stack traces upon some errors.
-+\-verbose 
-+Be extra verbose, such as printing informational messages or displaying stack traces upon some errors. 
++\-httpproxy <proxy> 
++Specify the HTTP/HTTPS proxy. The format is [user[:password]@]proxyHost[:proxyPort]. The old \f2\-host\fP and \f2\-port\fP are still supported by the RI for backwards compatibility, but they have been deprecated. Note that the password specified with this option is an argument that is visible to other users who use the \f2top\fP command, for example. For greater security, use \f2\-httpproxyfile\fP, below. 
  .TP 3
 -\-help
 -Display a brief summary of the compiler switches.
-+\-help 
-+Display a brief summary of the compiler switches. 
++\-httpproxyfile <file> 
++Specify the HTTP/HTTPS proxy using a file. Same format as above, but the password specified in the file is not visible to other users. 
  .TP 3
 -\-version
 -Display the compiler version information.
-+\-version 
-+Display the compiler version information. 
++\-classpath <arg> 
++Specify where to find client application class files used by the \f2<jxb:javaType>\fP and \f2<xjc:superClass>\fP customizations. 
  .TP 3
 -<schema file/URL/dir>
 -Specify one or more schema files to compile. If you specify a directory, then xjc will scan it for all schema files and compile them.
++\-catalog <file> 
++Specify catalog files to resolve external entity references. Supports TR9401, XCatalog, and OASIS XML Catalog format. Please read the XML Entity and URI Resolvers document or the \f2catalog\-resolver\fP sample application. 
++.TP 3
++\-readOnly 
++By default, the XJC binding compiler does not write\-protect the Java source files it generates. Use this option to force the XJC binding compiler to mark the generated Java sources read\-only. 
++.TP 3
++\-npa 
++Supress the generation of package level annotations into **/package\-info.java. Using this switch causes the generated code to internalize those annotations into the other generated classes. 
++.TP 3
++\-no\-header 
++Supress the generation of a file header comment that includes some note and timestamp. Using this makes the generated code more diff\-friendly. 
++.TP 3
++\-target 2.0 
++Avoid generating code that relies on any JAXB 2.1 features. This will allow the generated code to run with JAXB 2.0 runtime (such as JavaSE 6.) 
++.TP 3
++\-xmlschema 
++Treat input schemas as W3C XML Schema (default). If you do not specify this switch, your input schemas will be treated as W3C XML Schema. 
++.TP 3
++\-relaxng 
++Treat input schemas as RELAX NG (experimental, unsupported). Support for RELAX NG schemas is provided as a JAXB Vendor Extension. 
++.TP 3
++\-relaxng\-compact 
++Treat input schemas as RELAX NG compact syntax(experimental, unsupported). Support for RELAX NG schemas is provided as a JAXB Vendor Extension. 
++.TP 3
++\-dtd 
++Treat input schemas as XML DTD (experimental, unsupported). Support for RELAX NG schemas is provided as a JAXB Vendor Extension. 
++.TP 3
++\-wsdl 
++Treat input as WSDL and compile schemas inside it (experimental,unsupported). 
++.TP 3
++\-quiet 
++Suppress compiler output, such as progress information and warnings. 
++.TP 3
++\-verbose 
++Be extra verbose, such as printing informational messages or displaying stack traces upon some errors. 
++.TP 3
++\-help 
++Display a brief summary of the compiler switches. 
++.TP 3
++\-version 
++Display the compiler version information. 
++.TP 3
 +<schema file/URL/dir> 
 +Specify one or more schema files to compile. If you specify a directory, then xjc will scan it for all schema files and compile them. 
  .RE
@@ -41869,8 +42143,8 @@
  .LP
 -
 + 
---- ./jdk/src/share/classes/java/util/TimeZone.java	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/share/classes/java/util/TimeZone.java	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/share/classes/java/util/TimeZone.java	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/share/classes/java/util/TimeZone.java	Sat Aug 20 12:04:16 2016 -0700
 @@ -917,15 +917,13 @@
          }
          int gmtOffset =  (hours * 60 + num) * 60 * 1000;
@@ -41888,8 +42162,8 @@
          }
          return zi;
      }
---- ./jdk/src/share/classes/sun/awt/FontConfiguration.java	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/share/classes/sun/awt/FontConfiguration.java	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/share/classes/sun/awt/FontConfiguration.java	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/share/classes/sun/awt/FontConfiguration.java	Sat Aug 20 12:04:16 2016 -0700
 @@ -1146,7 +1146,7 @@
       */
      HashMap<String, Boolean> existsMap;
@@ -41899,8 +42173,8 @@
              return false;
          } else if (existsMap == null) {
             existsMap = new HashMap<String, Boolean>();
---- ./jdk/src/share/classes/sun/awt/OSInfo.java	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/share/classes/sun/awt/OSInfo.java	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/share/classes/sun/awt/OSInfo.java	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/share/classes/sun/awt/OSInfo.java	Sat Aug 20 12:04:16 2016 -0700
 @@ -39,6 +39,7 @@
          WINDOWS,
          LINUX,
@@ -41920,8 +42194,8 @@
              if (osName.contains("OS X")) {
                  return MACOSX;
              }
---- ./jdk/src/share/classes/sun/font/FontUtilities.java	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/share/classes/sun/font/FontUtilities.java	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/share/classes/sun/font/FontUtilities.java	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/share/classes/sun/font/FontUtilities.java	Sat Aug 20 12:04:16 2016 -0700
 @@ -48,6 +48,8 @@
  
      public static boolean isLinux;
@@ -41943,8 +42217,8 @@
                  isMacOSX = osName.contains("OS X"); // TODO: MacOSX
  
                  String t2kStr = System.getProperty("sun.java2d.font.scaler");
---- ./jdk/src/share/classes/sun/font/SunFontManager.java	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/share/classes/sun/font/SunFontManager.java	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/share/classes/sun/font/SunFontManager.java	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/share/classes/sun/font/SunFontManager.java	Sat Aug 20 12:04:16 2016 -0700
 @@ -418,7 +418,7 @@
                           * registerFonts method as on-screen these JRE fonts
                           * always go through the T2K rasteriser.
@@ -41954,8 +42228,8 @@
                              /* Linux font configuration uses these fonts */
                              registerFontDir(jreFontDirName);
                          }
---- ./jdk/src/share/classes/sun/print/PSPrinterJob.java	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/share/classes/sun/print/PSPrinterJob.java	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/share/classes/sun/print/PSPrinterJob.java	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/share/classes/sun/print/PSPrinterJob.java	Sat Aug 20 12:04:16 2016 -0700
 @@ -1568,7 +1568,7 @@
          }
  
@@ -41965,9 +42239,9 @@
              execCmd = new String[ncomps];
              execCmd[n++] = "/usr/bin/lpr";
              if ((pFlags & PRINTER) != 0) {
---- ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java	Sun May 01 21:26:40 2016 -0700
-@@ -83,7 +83,8 @@
+--- ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java	Sat Aug 20 12:04:16 2016 -0700
+@@ -84,7 +84,8 @@
                              String osname = System.getProperty("os.name");
                              if (osname.startsWith("SunOS")) {
                                  gssLibs = new String[]{ "libgss.so" };
@@ -41977,16 +42251,16 @@
                                  gssLibs = new String[]{
                                      "libgssapi.so",
                                      "libgssapi_krb5.so",
---- ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider	Sat Aug 20 12:04:16 2016 -0700
 @@ -30,4 +30,5 @@
  #[solaris]sun.tools.attach.SolarisAttachProvider
  #[windows]sun.tools.attach.WindowsAttachProvider
  #[linux]sun.tools.attach.LinuxAttachProvider
 +#[bsd]sun.tools.attach.BsdAttachProvider
  #[macosx]sun.tools.attach.BsdAttachProvider
---- ./jdk/src/share/classes/sun/tools/jar/Main.java	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/share/classes/sun/tools/jar/Main.java	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/share/classes/sun/tools/jar/Main.java	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/share/classes/sun/tools/jar/Main.java	Sat Aug 20 12:04:16 2016 -0700
 @@ -51,6 +51,7 @@
      String zname = "";
      String[] files;
@@ -42046,8 +42320,8 @@
                  if (!d.exists() && !d.mkdirs() || !d.isDirectory()) {
                      throw new IOException(formatMsg(
                          "error.create.dir", d.getPath()));
---- ./jdk/src/share/classes/sun/tools/jar/resources/jar.properties	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/share/classes/sun/tools/jar/resources/jar.properties	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/share/classes/sun/tools/jar/resources/jar.properties	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/share/classes/sun/tools/jar/resources/jar.properties	Sat Aug 20 12:04:16 2016 -0700
 @@ -44,6 +44,8 @@
          {0} : could not create directory
  error.incorrect.length=\
@@ -42057,8 +42331,8 @@
  out.added.manifest=\
          added manifest
  out.update.manifest=\
---- ./jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt	Sat Aug 20 12:04:16 2016 -0700
 @@ -38,6 +38,7 @@
  #       gnumake JDK=<java_home> OSNAME=solaris [OPT=true] [LIBARCH=sparcv9]
  #       gnumake JDK=<java_home> OSNAME=linux   [OPT=true]
@@ -42097,8 +42371,8 @@
  # Common -I options
  CFLAGS += -I.
  CFLAGS += -I../agent_util
---- ./jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp	Sat Aug 20 12:04:16 2016 -0700
 @@ -33,6 +33,10 @@
  
  #include <stdlib.h>
@@ -42119,8 +42393,8 @@
  #define SWAP_BYTES(a) \
      ((((a) << 8) & 0xff00) | 0x00ff) & (((a) >> 8) | 0xff00)
  #else
---- ./jdk/src/share/native/com/sun/media/sound/SoundDefs.h	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/share/native/com/sun/media/sound/SoundDefs.h	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/share/native/com/sun/media/sound/SoundDefs.h	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/share/native/com/sun/media/sound/SoundDefs.h	Sat Aug 20 12:04:16 2016 -0700
 @@ -64,7 +64,7 @@
  
  
@@ -42130,8 +42404,8 @@
  #include <sys/types.h>
  #endif
  
---- ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h	Sat Aug 20 12:04:16 2016 -0700
 @@ -24,6 +24,9 @@
   * questions.
   */
@@ -42155,8 +42429,8 @@
  #ifdef __NEWVALID       /* special setup for Sun test regime */
  #if defined(i386) || defined(i486) || \
      defined(intel) || defined(x86) || defined(arm) || \
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c	Sat Aug 20 12:04:16 2016 -0700
 @@ -86,7 +86,7 @@
  #endif /* MLIB_USE_FTOI_CLAMPING */
  
@@ -42196,8 +42470,8 @@
  
  #endif /* _NO_LONGLONG */
  
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c	Sat Aug 20 12:04:16 2016 -0700
 @@ -126,7 +126,7 @@
  #define D2I(x) CLAMP_S32((x) SAT_OFF)
  
@@ -42237,8 +42511,8 @@
  #endif /* _NO_LONGLONG */
  
  /***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c	Sat Aug 20 12:04:16 2016 -0700
 @@ -94,7 +94,7 @@
  #define D2I(x) CLAMP_S32((x) SAT_OFF)
  
@@ -42278,8 +42552,8 @@
  #endif /* _NO_LONGLONG */
  
  /***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c	Sat Aug 20 12:04:16 2016 -0700
 @@ -126,7 +126,7 @@
  #define D2I(x) CLAMP_S32((x) SAT_OFF)
  
@@ -42319,8 +42593,8 @@
  #endif /* _NO_LONGLONG */
  
  /***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c	Sat Aug 20 12:04:16 2016 -0700
 @@ -95,7 +95,7 @@
  #define D2I(x) CLAMP_S32((x) SAT_OFF)
  
@@ -42360,8 +42634,8 @@
  #endif /* _NO_LONGLONG */
  
  /***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c	Sat Aug 20 12:04:16 2016 -0700
 @@ -126,7 +126,7 @@
  #define D2I(x) CLAMP_S32((x) SAT_OFF)
  
@@ -42401,8 +42675,8 @@
  #endif /* _NO_LONGLONG */
  
  /***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c	Sat Aug 20 12:04:16 2016 -0700
 @@ -94,7 +94,7 @@
  #define D2I(x) CLAMP_S32((x) SAT_OFF)
  
@@ -42442,8 +42716,8 @@
  #endif /* _NO_LONGLONG */
  
  /***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c	Sat Aug 20 12:04:16 2016 -0700
 @@ -95,7 +95,7 @@
      dst = dp[0];
      if (ld_offset + size < 32) {
@@ -42663,8 +42937,8 @@
    }
  
  #else  /* _LONGLONG */
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c	Sat Aug 20 12:04:16 2016 -0700
 @@ -168,7 +168,7 @@
  }
  
@@ -42945,8 +43219,8 @@
        dp[12] = t0;
        dp[13] = t1;
        dp[14] = t2;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c	Sat Aug 20 12:04:16 2016 -0700
 @@ -88,7 +88,7 @@
  } d64_2_f32;
  
@@ -43098,8 +43372,8 @@
  
    ((mlib_u32*)lh)[0] = l;  ((mlib_u32*)lh)[1] = l;
    ((mlib_u32*)lh)[2] = l;  ((mlib_u32*)lh)[3] = h;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c	Sat Aug 20 12:04:16 2016 -0700
 @@ -30,7 +30,7 @@
  typedef union {
    mlib_d64 db;
@@ -43109,8 +43383,8 @@
      mlib_s32 int1, int0;
  #else
      mlib_s32 int0, int1;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c	Sat Aug 20 12:04:16 2016 -0700
 @@ -275,11 +275,11 @@
        for (i = 0; j <= (b_size - 4); j += 4, i++) {
          src0 = src1;
@@ -43209,8 +43483,8 @@
          s0 = s1;
          dp += SIZE;
          sp += SIZE;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c	Sat Aug 20 12:04:16 2016 -0700
 @@ -120,7 +120,7 @@
    }                                                               \
  }
@@ -44443,8 +44717,8 @@
        dp[12] = t0;
        dp[13] = t1;
        dp[14] = t2;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_image.h	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_image.h	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_image.h	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_image.h	Sat Aug 20 12:04:16 2016 -0700
 @@ -27,9 +27,21 @@
  #ifndef MLIB_IMAGE_H
  #define MLIB_IMAGE_H
@@ -44468,8 +44742,8 @@
  #include <mlib_types.h>
  #include <mlib_status.h>
  #include <mlib_sys.h>
---- ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c	Sat Aug 20 12:04:16 2016 -0700
 @@ -26,7 +26,7 @@
  
  #include <stdlib.h>
@@ -44491,8 +44765,8 @@
    return valloc(size);
  #else
    return (void *) memalign(8, size);
---- ./jdk/src/share/native/sun/awt/medialib/mlib_types.h	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_types.h	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_types.h	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_types.h	Sat Aug 20 12:04:16 2016 -0700
 @@ -59,7 +59,7 @@
  
  #if defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(__GNUC__)
@@ -44502,8 +44776,8 @@
  #include <stddef.h>                     /* for ptrdiff_t */
  #include <stdint.h>                     /* for uintptr_t */
  #elif defined(__linux__)
---- ./jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h	Sat Aug 20 12:04:16 2016 -0700
 @@ -26,7 +26,7 @@
  #ifndef OGLFuncs_h_Included
  #define OGLFuncs_h_Included
@@ -44513,8 +44787,8 @@
  #include <dlfcn.h>
  #endif
  #include "jni.h"
---- ./jdk/src/solaris/back/util_md.h	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/solaris/back/util_md.h	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/solaris/back/util_md.h	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/solaris/back/util_md.h	Sat Aug 20 12:04:16 2016 -0700
 @@ -51,7 +51,7 @@
  
  /* On little endian machines, convert java big endian numbers. */
@@ -44524,8 +44798,8 @@
  
  #define HOST_TO_JAVA_CHAR(x) (((x & 0xff) << 8) | ((x >> 8) & (0xff)))
  #define HOST_TO_JAVA_SHORT(x) (((x & 0xff) << 8) | ((x >> 8) & (0xff)))
---- ./jdk/src/solaris/bin/ergo.c	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/solaris/bin/ergo.c	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/solaris/bin/ergo.c	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/solaris/bin/ergo.c	Sat Aug 20 12:04:16 2016 -0700
 @@ -100,6 +100,27 @@
  /* Compute physical memory by asking the OS */
  uint64_t
@@ -44560,8 +44834,8 @@
    return result;
 +#endif
  }
---- ./jdk/src/solaris/bin/ergo.h	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/solaris/bin/ergo.h	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/solaris/bin/ergo.h	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/solaris/bin/ergo.h	Sat Aug 20 12:04:16 2016 -0700
 @@ -33,6 +33,10 @@
  #include <sys/stat.h>
  #include <unistd.h>
@@ -44573,8 +44847,8 @@
  
  #include "java.h"
  
---- ./jdk/src/solaris/bin/ergo_i586.c	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/solaris/bin/ergo_i586.c	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/solaris/bin/ergo_i586.c	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/solaris/bin/ergo_i586.c	Sat Aug 20 12:04:16 2016 -0700
 @@ -106,7 +106,7 @@
  
  #endif /* __solaris__ */
@@ -44633,8 +44907,8 @@
    return result;
 +#endif
  }
---- ./jdk/src/solaris/bin/java_md_solinux.c	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/solaris/bin/java_md_solinux.c	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/solaris/bin/java_md_solinux.c	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/solaris/bin/java_md_solinux.c	Sat Aug 20 12:04:16 2016 -0700
 @@ -909,8 +909,9 @@
   * onwards the filename returned in DL_info structure from dladdr is
   * an absolute pathname so technically realpath isn't required.
@@ -44691,8 +44965,8 @@
  /* --- Splash Screen shared library support --- */
  static const char* SPLASHSCREEN_SO = JNI_LIB_NAME("splashscreen");
  static void* hSplashLib = NULL;
---- ./jdk/src/solaris/bin/java_md_solinux.h	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/solaris/bin/java_md_solinux.h	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/solaris/bin/java_md_solinux.h	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/solaris/bin/java_md_solinux.h	Sat Aug 20 12:04:16 2016 -0700
 @@ -33,6 +33,10 @@
  #include <sys/time.h>
  #define CounterGet()              (gethrtime()/1000)
@@ -44714,8 +44988,8 @@
  #else /* Solaris */
  static const char *system_dir   = "/usr/jdk";
  static const char *user_dir     = "/jdk";
---- ./jdk/src/solaris/classes/java/lang/UNIXProcess.java.bsd	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/solaris/classes/java/lang/UNIXProcess.java.bsd	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/solaris/classes/java/lang/UNIXProcess.java.bsd	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/solaris/classes/java/lang/UNIXProcess.java.bsd	Sat Aug 20 12:04:16 2016 -0700
 @@ -95,7 +95,14 @@
              public LaunchMechanism run() {
                  String javahome = System.getProperty("java.home");
@@ -44732,8 +45006,8 @@
                  String s = System.getProperty(
                      "jdk.lang.Process.launchMechanism", "posix_spawn");
  
---- ./jdk/src/solaris/classes/sun/awt/X11FontManager.java	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/solaris/classes/sun/awt/X11FontManager.java	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/solaris/classes/sun/awt/X11FontManager.java	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/solaris/classes/sun/awt/X11FontManager.java	Sat Aug 20 12:04:16 2016 -0700
 @@ -213,7 +213,7 @@
          if (fontID != null) {
              fileName = (String)fontNameMap.get(fontID);
@@ -44761,8 +45035,8 @@
               (!mFontConfig.foundOsSpecificFile() ||
                !mFontConfig.fontFilesArePresent()) ||
               (FontUtilities.isSolaris && !mFontConfig.fontFilesArePresent()))) {
---- ./jdk/src/solaris/classes/sun/net/PortConfig.java	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/solaris/classes/sun/net/PortConfig.java	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/solaris/classes/sun/net/PortConfig.java	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/solaris/classes/sun/net/PortConfig.java	Sat Aug 20 12:04:16 2016 -0700
 @@ -52,7 +52,7 @@
                      } else if (os.startsWith("SunOS")) {
                          defaultLower = 32768;
@@ -44772,8 +45046,8 @@
                          defaultLower = 49152;
                          defaultUpper = 65535;
                      } else {
---- ./jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java	Sat Aug 20 12:04:16 2016 -0700
 @@ -50,7 +50,7 @@
              return new SolarisAsynchronousChannelProvider();
          if (osname.equals("Linux"))
@@ -44783,8 +45057,8 @@
              return new BsdAsynchronousChannelProvider();
          throw new InternalError("platform not recognized");
      }
---- ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java	Sat Aug 20 12:04:16 2016 -0700
 @@ -70,6 +70,8 @@
              return createProvider("sun.nio.fs.LinuxFileSystemProvider");
          if (osname.equals("Darwin") || osname.contains("OS X"))
@@ -44794,8 +45068,8 @@
          throw new AssertionError("Platform not recognized");
      }
  }
---- ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java	Sat Aug 20 12:04:16 2016 -0700
 @@ -129,6 +129,7 @@
  
      static boolean isBSD() {
@@ -44804,8 +45078,8 @@
                  osname.contains("OS X"));
      }
  
---- ./jdk/src/solaris/javavm/export/jvm_md.h	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/solaris/javavm/export/jvm_md.h	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/solaris/javavm/export/jvm_md.h	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/solaris/javavm/export/jvm_md.h	Sat Aug 20 12:04:16 2016 -0700
 @@ -75,7 +75,11 @@
  #define JVM_O_O_APPEND   O_APPEND
  #define JVM_O_EXCL       O_EXCL
@@ -44818,8 +45092,8 @@
  
  /* Signals */
  
---- ./jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c	Sat Aug 20 12:04:16 2016 -0700
 @@ -168,6 +168,9 @@
      /*
       * XXXBSD: there's no way available to get swap info in
@@ -44869,8 +45143,8 @@
       */
      // throw_internal_error(env, "Unimplemented in FreeBSD");
      return (100);
---- ./jdk/src/solaris/native/java/io/UnixFileSystem_md.c	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/solaris/native/java/io/UnixFileSystem_md.c	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/solaris/native/java/io/UnixFileSystem_md.c	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/solaris/native/java/io/UnixFileSystem_md.c	Sat Aug 20 12:04:16 2016 -0700
 @@ -151,7 +151,6 @@
      return rv;
  }
@@ -44879,8 +45153,8 @@
  JNIEXPORT jboolean JNICALL
  Java_java_io_UnixFileSystem_setPermission(JNIEnv *env, jobject this,
                                            jobject file,
---- ./jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c	Sat Aug 20 12:04:16 2016 -0700
 @@ -56,7 +56,7 @@
  
      for (i = 0; environ[i]; i++) {
@@ -44899,8 +45173,8 @@
              jbyteArray var, val;
              const char * valBeg = varEnd + 1;
              jsize varLength = varEnd - environ[i];
---- ./jdk/src/solaris/native/java/lang/childproc.c	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/solaris/native/java/lang/childproc.c	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/solaris/native/java/lang/childproc.c	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/solaris/native/java/lang/childproc.c	Sat Aug 20 12:04:16 2016 -0700
 @@ -62,6 +62,16 @@
    return c >= '0' && c <= '9';
  }
@@ -44926,8 +45200,8 @@
  
  int
  moveDescriptor(int fd_from, int fd_to)
---- ./jdk/src/solaris/native/java/lang/java_props_md.c	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/solaris/native/java/lang/java_props_md.c	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/solaris/native/java/lang/java_props_md.c	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/solaris/native/java/lang/java_props_md.c	Sat Aug 20 12:04:16 2016 -0700
 @@ -151,7 +151,7 @@
      lc = setlocale(cat, NULL);
  #endif
@@ -44957,8 +45231,8 @@
      } else {
          sprops.language = "en";
          sprops.encoding = "ISO8859-1";
---- ./jdk/src/solaris/native/java/net/NetworkInterface.c	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/solaris/native/java/net/NetworkInterface.c	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/solaris/native/java/net/NetworkInterface.c	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/solaris/native/java/net/NetworkInterface.c	Sat Aug 20 12:04:16 2016 -0700
 @@ -60,14 +60,19 @@
  #include <sys/param.h>
  #include <sys/ioctl.h>
@@ -45013,8 +45287,8 @@
    return 0;
  }
  
---- ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c	Sat Aug 20 12:04:16 2016 -0700
 @@ -23,12 +23,12 @@
   * questions.
   */
@@ -45052,8 +45326,8 @@
              len = sizeof(struct sockaddr_in);
          }
          JVM_Connect(fd, (struct sockaddr *)&addr, len);
---- ./jdk/src/solaris/native/java/net/bsd_close.c	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/solaris/native/java/net/bsd_close.c	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/solaris/native/java/net/bsd_close.c	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/solaris/native/java/net/bsd_close.c	Sat Aug 20 12:04:16 2016 -0700
 @@ -345,6 +345,76 @@
   * signal other than our wakeup signal.
   */
@@ -45137,8 +45411,8 @@
      }
 +#endif
  }
---- ./jdk/src/solaris/native/java/net/net_util_md.c	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/solaris/native/java/net/net_util_md.c	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/solaris/native/java/net/net_util_md.c	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/solaris/native/java/net/net_util_md.c	Sat Aug 20 12:04:16 2016 -0700
 @@ -45,6 +45,10 @@
  #endif
  #endif
@@ -45174,8 +45448,8 @@
  
      return setsockopt(fd, level, opt, arg, len);
  }
---- ./jdk/src/solaris/native/java/net/net_util_md.h	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/solaris/native/java/net/net_util_md.h	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/solaris/native/java/net/net_util_md.h	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/solaris/native/java/net/net_util_md.h	Sat Aug 20 12:04:16 2016 -0700
 @@ -37,7 +37,7 @@
  #endif
  
@@ -45185,8 +45459,8 @@
  extern int NET_Timeout(int s, long timeout);
  extern int NET_Read(int s, void* buf, size_t len);
  extern int NET_RecvFrom(int s, void *buf, int len, unsigned int flags,
---- ./jdk/src/solaris/native/java/util/TimeZone_md.c	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/solaris/native/java/util/TimeZone_md.c	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/solaris/native/java/util/TimeZone_md.c	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/solaris/native/java/util/TimeZone_md.c	Sat Aug 20 12:04:16 2016 -0700
 @@ -123,7 +123,7 @@
          return NULL;
      }
@@ -45220,8 +45494,8 @@
  }
 -#endif /* MACOSX */
 +#endif /* _ALLBSD_SOURCE */
---- ./jdk/src/solaris/native/sun/awt/awt_Font.c	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/solaris/native/sun/awt/awt_Font.c	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_Font.c	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/solaris/native/sun/awt/awt_Font.c	Sat Aug 20 12:04:16 2016 -0700
 @@ -334,7 +334,7 @@
              if (strcmp(style, "regular") == 0) {
                  altstyle = "roman";
@@ -45231,8 +45505,8 @@
              if (!strcmp(family, "lucidasans")) {
                  family = "lucida";
              }
---- ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c	Sat Aug 20 12:04:16 2016 -0700
 @@ -123,7 +123,7 @@
   */
  
@@ -45292,8 +45566,8 @@
  #endif /* HEADLESS */
      return point;
  }
---- ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c	Sat Aug 20 12:04:16 2016 -0700
 @@ -67,7 +67,7 @@
                                  XIMPreeditDrawCallbackStruct *);
  static void PreeditCaretCallback(XIC, XPointer,
@@ -45533,8 +45807,8 @@
      AWT_LOCK();
      adjustStatusWindow(window);
      AWT_UNLOCK();
---- ./jdk/src/solaris/native/sun/awt/awt_Robot.c	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/solaris/native/sun/awt/awt_Robot.c	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_Robot.c	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/solaris/native/sun/awt/awt_Robot.c	Sat Aug 20 12:04:16 2016 -0700
 @@ -46,7 +46,7 @@
  #include "wsutils.h"
  #include "list.h"
@@ -45544,8 +45818,8 @@
  #include <sys/socket.h>
  #endif
  
---- ./jdk/src/solaris/native/sun/awt/awt_util.h	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/solaris/native/sun/awt/awt_util.h	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_util.h	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/solaris/native/sun/awt/awt_util.h	Sat Aug 20 12:04:16 2016 -0700
 @@ -187,7 +187,7 @@
  #ifdef __solaris__
  extern Widget awt_util_getXICStatusAreaWindow(Widget w);
@@ -45564,8 +45838,8 @@
  typedef struct _XmImRefRec {
    Cardinal      num_refs;       /* Number of referencing widgets. */
    Cardinal      max_refs;       /* Maximum length of refs array. */
---- ./jdk/src/solaris/native/sun/awt/awt_wm.c	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/solaris/native/sun/awt/awt_wm.c	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_wm.c	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/solaris/native/sun/awt/awt_wm.c	Sat Aug 20 12:04:16 2016 -0700
 @@ -121,12 +121,19 @@
  static Atom XA_KWM_WIN_MAXIMIZED;
  
@@ -45663,8 +45937,8 @@
          awt_wmgr = OPENLOOK_WM;
      }
      else {
---- ./jdk/src/solaris/native/sun/awt/awt_wm.h	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/solaris/native/sun/awt/awt_wm.h	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_wm.h	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/solaris/native/sun/awt/awt_wm.h	Sat Aug 20 12:04:16 2016 -0700
 @@ -45,7 +45,10 @@
      KDE2_WM,
      SAWFISH_WM,
@@ -45677,8 +45951,8 @@
  };
  
  extern void awt_wm_init(void);
---- ./jdk/src/solaris/native/sun/awt/extutil.h	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/solaris/native/sun/awt/extutil.h	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/solaris/native/sun/awt/extutil.h	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/solaris/native/sun/awt/extutil.h	Sat Aug 20 12:04:16 2016 -0700
 @@ -58,7 +58,7 @@
   */
  /* $XFree86: xc/include/extensions/extutil.h,v 1.5 2001/01/17 17:53:20 dawes Exp $ */
@@ -45694,8 +45968,8 @@
  
 -#endif /* __linux__ || MACOSX */
 +#endif /* __linux__ || _ALLBSD_SOURCE */
---- ./jdk/src/solaris/native/sun/awt/fontpath.c	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/solaris/native/sun/awt/fontpath.c	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/solaris/native/sun/awt/fontpath.c	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/solaris/native/sun/awt/fontpath.c	Sat Aug 20 12:04:16 2016 -0700
 @@ -23,7 +23,7 @@
   * questions.
   */
@@ -45773,8 +46047,8 @@
      }
  #endif
  #endif /* !HEADLESS */
---- ./jdk/src/solaris/native/sun/awt/robot_common.c	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/solaris/native/sun/awt/robot_common.c	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/solaris/native/sun/awt/robot_common.c	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/solaris/native/sun/awt/robot_common.c	Sat Aug 20 12:04:16 2016 -0700
 @@ -27,7 +27,7 @@
      #error This file should not be included in headless library
  #endif
@@ -45784,8 +46058,8 @@
  #include <stdlib.h>
  #endif
  
---- ./jdk/src/solaris/native/sun/java2d/j2d_md.h	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/solaris/native/sun/java2d/j2d_md.h	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/solaris/native/sun/java2d/j2d_md.h	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/solaris/native/sun/java2d/j2d_md.h	Sat Aug 20 12:04:16 2016 -0700
 @@ -28,9 +28,9 @@
  #include <sys/types.h>
  
@@ -45798,8 +46072,8 @@
  #include <stdint.h>
  #endif /* __linux__ || MACOSX */
  
---- ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c	Sat Aug 20 12:04:16 2016 -0700
 @@ -804,7 +804,7 @@
  static int initialized;
  static int usevis = JNI_TRUE;
@@ -45809,8 +46083,8 @@
  #   define ULTRA_CHIP   "sparc64"
  #else
  #   define ULTRA_CHIP   "sun4u"
---- ./jdk/src/solaris/native/sun/net/portconfig.c	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/solaris/native/sun/net/portconfig.c	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/solaris/native/sun/net/portconfig.c	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/solaris/native/sun/net/portconfig.c	Sat Aug 20 12:04:16 2016 -0700
 @@ -66,6 +66,24 @@
          range->higher = net_getParam("/dev/tcp", "tcp_largest_anon_port");
          return 0;
@@ -45836,8 +46110,8 @@
  #elif defined(_ALLBSD_SOURCE)
      {
          int ret;
---- ./jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c	Sat Aug 20 12:04:16 2016 -0700
 @@ -204,7 +204,7 @@
          return IOS_THROWN;
      }
@@ -45856,8 +46130,8 @@
  #endif
  
      if (numBytes > 0)
---- ./jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c	Sat Aug 20 12:04:16 2016 -0700
 @@ -227,6 +227,21 @@
      fl.l_start = (off64_t)pos;
      fl.l_type = F_UNLCK;
@@ -45880,8 +46154,8 @@
      if (lockResult < 0) {
          JNU_ThrowIOExceptionWithLastError(env, "Release failed");
      }
---- ./jdk/src/solaris/native/sun/nio/ch/NativeThread.c	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/solaris/native/sun/nio/ch/NativeThread.c	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/solaris/native/sun/nio/ch/NativeThread.c	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/solaris/native/sun/nio/ch/NativeThread.c	Sat Aug 20 12:04:16 2016 -0700
 @@ -33,12 +33,19 @@
  #include "nio_util.h"
  
@@ -45930,8 +46204,8 @@
      if (pthread_kill((pthread_t)thread, INTERRUPT_SIGNAL))
          JNU_ThrowIOExceptionWithLastError(env, "Thread signal failed");
  #endif
---- ./jdk/src/solaris/native/sun/nio/ch/Sctp.h	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/solaris/native/sun/nio/ch/Sctp.h	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/solaris/native/sun/nio/ch/Sctp.h	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/solaris/native/sun/nio/ch/Sctp.h	Sat Aug 20 12:04:16 2016 -0700
 @@ -320,8 +320,20 @@
  typedef int sctp_peeloff_func(int sock, sctp_assoc_t id);
  
@@ -45971,8 +46245,8 @@
  jboolean loadSocketExtensionFuncs(JNIEnv* env);
  
  #endif /* !SUN_NIO_CH_SCTP_H */
---- ./jdk/src/solaris/native/sun/nio/ch/SctpNet.c	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/solaris/native/sun/nio/ch/SctpNet.c	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/solaris/native/sun/nio/ch/SctpNet.c	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/solaris/native/sun/nio/ch/SctpNet.c	Sat Aug 20 12:04:16 2016 -0700
 @@ -58,6 +58,7 @@
   */
  jboolean loadSocketExtensionFuncs
@@ -45989,8 +46263,8 @@
  
      funcsLoaded = JNI_TRUE;
      return JNI_TRUE;
---- ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c	Sat Aug 20 12:04:16 2016 -0700
 @@ -33,6 +33,11 @@
  
  #include "j2secmod.h"
@@ -46025,8 +46299,8 @@
      (*env)->ReleaseStringUTFChars(env, jLibName, libName);
      dprintf2("-handle: %u (0X%X)\n", hModule, hModule);
  
---- ./jdk/src/solaris/native/sun/xawt/XWindow.c	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/src/solaris/native/sun/xawt/XWindow.c	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/src/solaris/native/sun/xawt/XWindow.c	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/src/solaris/native/sun/xawt/XWindow.c	Sat Aug 20 12:04:16 2016 -0700
 @@ -867,7 +867,7 @@
  {
      KeySym originalKeysym = *keysym;
@@ -46036,8 +46310,8 @@
      /* The following code on Linux will cause the keypad keys
       * not to echo on JTextField when the NumLock is on. The
       * keysyms will be 0, because the last parameter 2 is not defined.
---- ./jdk/test/Makefile	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/Makefile	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/Makefile	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/Makefile	Sat Aug 20 12:04:16 2016 -0700
 @@ -79,6 +79,11 @@
    endif
    OS_VERSION := $(shell $(UNAME) -r)
@@ -46050,8 +46324,8 @@
  ifeq ($(UNAME_S), Darwin)
    OS_NAME     = macosx
    OS_ARCH    := $(shell $(UNAME) -m)
---- ./jdk/test/com/sun/corba/5036554/TestCorbaBug.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/com/sun/corba/5036554/TestCorbaBug.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/com/sun/corba/5036554/TestCorbaBug.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/com/sun/corba/5036554/TestCorbaBug.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -48,7 +48,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -46061,8 +46335,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -56,7 +56,7 @@
  
  OS=`uname -s`
@@ -46072,8 +46346,8 @@
        PATHSEP=":"
        ;;
  
---- ./jdk/test/com/sun/jdi/JITDebug.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/com/sun/jdi/JITDebug.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/com/sun/jdi/JITDebug.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/com/sun/jdi/JITDebug.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -63,7 +63,7 @@
  OS=`uname -s`
  export TRANSPORT_METHOD
@@ -46083,8 +46357,8 @@
        PATHSEP=":"
        TRANSPORT_METHOD=dt_socket
        ;;
---- ./jdk/test/com/sun/jdi/PrivateTransportTest.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/com/sun/jdi/PrivateTransportTest.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/com/sun/jdi/PrivateTransportTest.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/com/sun/jdi/PrivateTransportTest.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -123,7 +123,7 @@
      esac
      libloc=${jreloc}/lib/${libarch}
@@ -46094,8 +46368,8 @@
      xx=`find ${jreloc}/lib -name libdt_socket.so`
      libloc=`dirname ${xx}`
      ;;
---- ./jdk/test/com/sun/jdi/ShellScaffold.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/com/sun/jdi/ShellScaffold.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/com/sun/jdi/ShellScaffold.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/com/sun/jdi/ShellScaffold.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -284,7 +284,7 @@
           psCmd=ps
           jstack=jstack.exe
@@ -46105,8 +46379,8 @@
           transport=dt_socket
           address=
           devnull=/dev/null
---- ./jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -112,7 +112,7 @@
        fi
        ;;
@@ -46116,8 +46390,8 @@
        pass "This test always passes on $OS"
        ;;
  
---- ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -45,7 +45,7 @@
  
  OS=`uname -s`
@@ -46127,8 +46401,8 @@
      PS=":"
      ;;
    Windows* | CYGWIN*)
---- ./jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -72,6 +72,16 @@
     done
  }
@@ -46156,8 +46430,8 @@
       Darwin )
         # $ sysctl -n vm.swapusage 
         # total = 8192.00M  used = 7471.11M  free = 720.89M  (encrypted)
---- ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -48,7 +48,7 @@
  
  # Test GetMaxFileDescriptorCount if we are running on Unix
@@ -46167,8 +46441,8 @@
         runOne GetMaxFileDescriptorCount
         ;;
      * )
---- ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -48,7 +48,7 @@
  
  # Test GetOpenFileDescriptorCount if we are running on Unix
@@ -46178,8 +46452,8 @@
         runOne GetOpenFileDescriptorCount
         ;;
      * )
---- ./jdk/test/java/awt/Focus/NPEInKFMOnButtonClickInDialogTest/NPEInKFMOnButtonClickInDialogTest.java	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/java/awt/Focus/NPEInKFMOnButtonClickInDialogTest/NPEInKFMOnButtonClickInDialogTest.java	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/java/awt/Focus/NPEInKFMOnButtonClickInDialogTest/NPEInKFMOnButtonClickInDialogTest.java	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/java/awt/Focus/NPEInKFMOnButtonClickInDialogTest/NPEInKFMOnButtonClickInDialogTest.java	Sat Aug 20 12:04:16 2016 -0700
 @@ -50,8 +50,8 @@
  
      public static void main(String[] args) {
@@ -46191,8 +46465,8 @@
              return;
          }
  
---- ./jdk/test/java/awt/PrintJob/Text/stringwidth.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/java/awt/PrintJob/Text/stringwidth.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/java/awt/PrintJob/Text/stringwidth.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/java/awt/PrintJob/Text/stringwidth.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -25,10 +25,11 @@
  fi
  
@@ -46209,8 +46483,8 @@
  # Windows
  
  if [ -z "${TESTJAVA}" ] ; then
---- ./jdk/test/java/io/File/GetXSpace.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/java/io/File/GetXSpace.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/java/io/File/GetXSpace.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/java/io/File/GetXSpace.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -26,7 +26,7 @@
  # set platform-dependent variable
  OS=`uname -s`
@@ -46220,8 +46494,8 @@
    Windows_98 )    return    ;;
    Windows* )      SID=`sid`; TMP="c:/temp"  ;;
    * )
---- ./jdk/test/java/io/FileOutputStream/ManyFiles.java	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/java/io/FileOutputStream/ManyFiles.java	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/java/io/FileOutputStream/ManyFiles.java	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/java/io/FileOutputStream/ManyFiles.java	Sat Aug 20 12:04:16 2016 -0700
 @@ -43,7 +43,7 @@
          // Windows capability it is much simpler to only run it
          // on that platform.
@@ -46231,8 +46505,8 @@
              return;
  
          for (int n = 0; n < NUM_FILES; n++) {
---- ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -41,7 +41,7 @@
  # Need to determine the classpath separator and filepath separator based on the
  # operating system.
@@ -46242,8 +46516,8 @@
    PS=":"  ;;
  Windows* | CYGWIN* )
    PS=";"  ;;
---- ./jdk/test/java/io/Serializable/serialver/classpath/run.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/java/io/Serializable/serialver/classpath/run.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/java/io/Serializable/serialver/classpath/run.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/java/io/Serializable/serialver/classpath/run.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -47,7 +47,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -46253,8 +46527,8 @@
      PS=":"    ;;
    Windows* | CYGWIN* )
      PS=";"    ;;
---- ./jdk/test/java/io/Serializable/serialver/nested/run.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/java/io/Serializable/serialver/nested/run.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/java/io/Serializable/serialver/nested/run.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/java/io/Serializable/serialver/nested/run.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -47,7 +47,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -46264,8 +46538,8 @@
      PS=":"    ;;
    Windows* | CYGWIN* )
      PS=";"    ;;
---- ./jdk/test/java/lang/ClassLoader/Assert.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/java/lang/ClassLoader/Assert.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/java/lang/ClassLoader/Assert.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/java/lang/ClassLoader/Assert.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -25,7 +25,7 @@
  
  OS=`uname -s`
@@ -46275,8 +46549,8 @@
      FS="/"
      CHMOD="${FS}bin${FS}chmod"
      ;;
---- ./jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -45,13 +45,7 @@
  # set platform-specific variables
  OS=`uname -s`
@@ -46292,8 +46566,8 @@
      FS="/"
      ;;
    AIX )
---- ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -49,13 +49,7 @@
  # set platform-specific variables
  OS=`uname -s`
@@ -46309,8 +46583,8 @@
      FS="/"
      ;;
    AIX )
---- ./jdk/test/java/lang/StringCoding/CheckEncodings.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/java/lang/StringCoding/CheckEncodings.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/java/lang/StringCoding/CheckEncodings.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/java/lang/StringCoding/CheckEncodings.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -30,7 +30,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -46320,8 +46594,8 @@
    Windows* | CYGWIN* )
      echo "Passed"; exit 0 ;;
    * ) echo "Unrecognized system!" ;  exit 1 ;;
---- ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -44,7 +44,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -46331,8 +46605,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/java/lang/instrument/MakeJAR2.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/java/lang/instrument/MakeJAR2.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/java/lang/instrument/MakeJAR2.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/java/lang/instrument/MakeJAR2.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -49,7 +49,7 @@
  
  OS=`uname -s`
@@ -46342,8 +46616,8 @@
        PATHSEP=":"
        ;;
  
---- ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -35,15 +35,7 @@
  
  OS=`uname -s`
@@ -46361,8 +46635,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -61,7 +61,7 @@
  while true; do
    echo "Run $i: TestSystemLoadAvg"
@@ -46372,8 +46646,8 @@
           runOne GetSystemLoadAverage
           ;;
        * )
---- ./jdk/test/java/net/Authenticator/B4933582.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/java/net/Authenticator/B4933582.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/java/net/Authenticator/B4933582.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/java/net/Authenticator/B4933582.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -26,7 +26,7 @@
  
  OS=`uname -s`
@@ -46383,8 +46657,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java	Sat Aug 20 12:04:16 2016 -0700
 @@ -45,6 +45,8 @@
              return (true);
          if (p.getProperty ("os.name").equals ("Linux"))
@@ -46394,8 +46668,8 @@
          if (p.getProperty ("os.name").startsWith ("Mac OS"))
              return (true);
          // Check for specific Solaris version from here
---- ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -27,7 +27,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -46405,8 +46679,8 @@
      PATHSEP=":"
      FILESEP="/"
      ;;
---- ./jdk/test/java/net/Socket/OldSocketImpl.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/java/net/Socket/OldSocketImpl.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/java/net/Socket/OldSocketImpl.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/java/net/Socket/OldSocketImpl.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -28,7 +28,7 @@
  
  OS=`uname -s`
@@ -46416,8 +46690,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/java/net/URL/B5086147.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/java/net/URL/B5086147.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/java/net/URL/B5086147.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/java/net/URL/B5086147.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -26,7 +26,7 @@
  
  OS=`uname -s`
@@ -46427,8 +46701,8 @@
      exit 0
      ;;
    CYGWIN* )
---- ./jdk/test/java/net/URL/runconstructor.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/java/net/URL/runconstructor.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/java/net/URL/runconstructor.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/java/net/URL/runconstructor.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -27,7 +27,7 @@
  #
  OS=`uname -s`
@@ -46438,8 +46712,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/java/net/URLClassLoader/B5077773.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/java/net/URLClassLoader/B5077773.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/java/net/URLClassLoader/B5077773.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/java/net/URLClassLoader/B5077773.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -34,7 +34,7 @@
  
  OS=`uname -s`
@@ -46449,8 +46723,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -27,7 +27,7 @@
  
  OS=`uname -s`
@@ -46460,8 +46734,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/java/net/URLConnection/6212146/test.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/java/net/URLConnection/6212146/test.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/java/net/URLConnection/6212146/test.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/java/net/URLConnection/6212146/test.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -33,7 +33,7 @@
  
  OS=`uname -s`
@@ -46471,8 +46745,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile	Sat Aug 20 12:04:16 2016 -0700
 @@ -71,6 +71,48 @@
    EXTRA_LIBS = -lc
  endif
@@ -46522,8 +46796,8 @@
  LIBDIR=lib/$(PLATFORM)-$(ARCH)
  LAUNCHERLIB=$(LIBDIR)/libLauncher.so
  
---- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -33,11 +33,14 @@
  # @run shell run_tests.sh
  
@@ -46592,8 +46866,8 @@
  
  LIBDIR=lib/${PLATFORM}-${ARCH}
  LAUNCHERLIB=${LIBDIR}/libLauncher.so
---- ./jdk/test/java/nio/charset/Charset/default.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/java/nio/charset/Charset/default.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/java/nio/charset/Charset/default.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/java/nio/charset/Charset/default.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -41,10 +41,14 @@
  fi
  
@@ -46613,8 +46887,8 @@
  
  JAVA=$TESTJAVA/bin/java
  
---- ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -34,7 +34,7 @@
  
  OS=`uname -s`
@@ -46624,8 +46898,8 @@
    # Skip locale test for Windows
    Windows* | CYGWIN* )
      echo "Passed"; exit 0 ;;
---- ./jdk/test/java/nio/charset/spi/basic.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/java/nio/charset/spi/basic.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/java/nio/charset/spi/basic.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/java/nio/charset/spi/basic.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -70,10 +70,14 @@
      L="$1"
      shift
@@ -46654,8 +46928,8 @@
    Windows* )      CPS=';' ;;
    *)              echo "Unknown platform: `uname`"; exit 1 ;;
  esac
---- ./jdk/test/java/nio/file/FileSystem/Basic.java	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/java/nio/file/FileSystem/Basic.java	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/java/nio/file/FileSystem/Basic.java	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/java/nio/file/FileSystem/Basic.java	Sat Aug 20 12:04:16 2016 -0700
 @@ -76,6 +76,8 @@
              checkSupported(fs, "posix", "unix", "owner", "acl", "user");
          if (os.equals("Linux"))
@@ -46665,8 +46939,8 @@
          if (os.contains("OS X"))
              checkSupported(fs, "posix", "unix", "owner");
          if (os.equals("Windows"))
---- ./jdk/test/java/nio/file/Files/CopyAndMove.java	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/java/nio/file/Files/CopyAndMove.java	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/java/nio/file/Files/CopyAndMove.java	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/java/nio/file/Files/CopyAndMove.java	Sat Aug 20 12:04:16 2016 -0700
 @@ -634,7 +634,7 @@
  
                  // check POSIX attributes are copied
@@ -46685,8 +46959,8 @@
          boolean isDirectory = isDirectory(file, NOFOLLOW_LINKS);
  
          if (isUnix) {
---- ./jdk/test/java/rmi/registry/readTest/readTest.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/java/rmi/registry/readTest/readTest.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/java/rmi/registry/readTest/readTest.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/java/rmi/registry/readTest/readTest.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -34,7 +34,7 @@
  REGARGS=""
  
@@ -46696,8 +46970,8 @@
      PS=":"
      FS="/"
      CHMOD="${FS}bin${FS}chmod"
---- ./jdk/test/java/rmi/reliability/launch_reliability.ksh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/java/rmi/reliability/launch_reliability.ksh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/java/rmi/reliability/launch_reliability.ksh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/java/rmi/reliability/launch_reliability.ksh	Sat Aug 20 12:04:16 2016 -0700
 @@ -84,14 +84,12 @@
  
  
@@ -46717,8 +46991,8 @@
  
  export PATH_SEP
  mainpid=$$
---- ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -46,15 +46,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -46736,8 +47010,8 @@
      PATHSEP=":"
      FILESEP="/"
      ;;
---- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -34,15 +34,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -46755,8 +47029,8 @@
      PATHSEP=":"
      FILESEP="/"
      ;;
---- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -50,19 +50,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -46778,8 +47052,8 @@
      PATHSEP=":"
      FILESEP="/"
      ;;
---- ./jdk/test/java/security/Security/signedfirst/Dyn.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/java/security/Security/signedfirst/Dyn.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/java/security/Security/signedfirst/Dyn.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/java/security/Security/signedfirst/Dyn.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -46,15 +46,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -46797,8 +47071,8 @@
      PATHSEP=":"
      FILESEP="/"
      ;;
---- ./jdk/test/java/security/Security/signedfirst/Static.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/java/security/Security/signedfirst/Static.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/java/security/Security/signedfirst/Static.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/java/security/Security/signedfirst/Static.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -46,15 +46,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -46816,8 +47090,8 @@
      PATHSEP=":"
      FILESEP="/"
      ;;
---- ./jdk/test/java/util/Currency/PropertiesTest.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/java/util/Currency/PropertiesTest.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/java/util/Currency/PropertiesTest.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/java/util/Currency/PropertiesTest.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -30,7 +30,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -46827,8 +47101,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/java/util/PluggableLocale/ExecTest.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/java/util/PluggableLocale/ExecTest.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/java/util/PluggableLocale/ExecTest.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/java/util/PluggableLocale/ExecTest.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -58,7 +58,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -46838,8 +47112,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -31,7 +31,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -46849,8 +47123,8 @@
      PATHSEP=":"
      FILESEP="/"
      ;;
---- ./jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -72,10 +72,10 @@
  Windows* | CYGWIN* )
      DEL=";"
@@ -46864,8 +47138,8 @@
      DEL=":"
      HAS_S=YES
      ;;
---- ./jdk/test/java/util/ServiceLoader/basic.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/java/util/ServiceLoader/basic.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/java/util/ServiceLoader/basic.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/java/util/ServiceLoader/basic.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -42,9 +42,7 @@
  
  OS=`uname -s`
@@ -46877,8 +47151,8 @@
        SEP=':' ;;
      * )
        SEP='\;' ;;
---- ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -51,7 +51,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -46888,8 +47162,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -92,6 +92,14 @@
        TMP="/tmp"
        ;;
@@ -46905,8 +47179,8 @@
     AIX )
        VAR="A different value for AIX"
        DEFAULT_JDK=/
---- ./jdk/test/javax/script/CommonSetup.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/javax/script/CommonSetup.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/javax/script/CommonSetup.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/javax/script/CommonSetup.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -36,7 +36,7 @@
  
  OS=`uname -s`
@@ -46916,8 +47190,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/javax/security/auth/Subject/doAs/Test.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/javax/security/auth/Subject/doAs/Test.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/javax/security/auth/Subject/doAs/Test.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/javax/security/auth/Subject/doAs/Test.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -33,17 +33,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -46937,8 +47211,8 @@
      PS=":"
      FS="/"
      RM="/bin/rm -f"
---- ./jdk/test/jprt.config	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/jprt.config	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/jprt.config	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/jprt.config	Sat Aug 20 12:04:16 2016 -0700
 @@ -71,8 +71,8 @@
  
  # Uses 'uname -s', but only expect SunOS or Linux, assume Windows otherwise.
@@ -47006,8 +47280,8 @@
  
  # Export PATH setting
  PATH="${path4sdk}"
---- ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -50,7 +50,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47017,8 +47291,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/lib/testlibrary/jdk/testlibrary/Platform.java	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/lib/testlibrary/jdk/testlibrary/Platform.java	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/lib/testlibrary/jdk/testlibrary/Platform.java	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/lib/testlibrary/jdk/testlibrary/Platform.java	Sat Aug 20 12:04:16 2016 -0700
 @@ -53,8 +53,13 @@
          return isOs("linux");
      }
@@ -47034,8 +47308,8 @@
      }
  
      public static String getOsName() {
---- ./jdk/test/sun/awt/dnd/8024061/bug8024061.java	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/sun/awt/dnd/8024061/bug8024061.java	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/sun/awt/dnd/8024061/bug8024061.java	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/sun/awt/dnd/8024061/bug8024061.java	Sat Aug 20 12:04:16 2016 -0700
 @@ -107,8 +107,8 @@
  
      public static void main(String[] args) throws AWTException, InvocationTargetException, InterruptedException {
@@ -47047,8 +47321,8 @@
                                 "skipping!");
              return;
          }
---- ./jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -45,37 +45,53 @@
  # has to locate libjvm.so. Also $! is not reliable on some releases of MKS.
  #{
@@ -47128,8 +47402,8 @@
  
  
  #
---- ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -35,7 +35,7 @@
  UMASK=`umask`
  
@@ -47139,8 +47413,8 @@
      PATHSEP=":"
      FILESEP="/"
      DFILESEP=$FILESEP
---- ./jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -86,10 +86,12 @@
  #    on Windows 98.
  
@@ -47158,8 +47432,8 @@
  
  JAVA=${TESTJAVA}/bin/java
  CLASSPATH=${TESTCLASSES}
---- ./jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -70,10 +70,12 @@
  # security the password file.
  
@@ -47177,8 +47451,8 @@
  
  
  # Create configuration file and dummy password file
---- ./jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -69,10 +69,12 @@
  # security the password file.
  
@@ -47196,8 +47470,8 @@
  
  # Create management and SSL configuration files
  
---- ./jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -36,7 +36,7 @@
  
  OS=`uname -s`
@@ -47207,8 +47481,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/sun/net/www/MarkResetTest.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/sun/net/www/MarkResetTest.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/sun/net/www/MarkResetTest.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/sun/net/www/MarkResetTest.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -28,7 +28,7 @@
  
  OS=`uname -s`
@@ -47218,8 +47492,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -28,7 +28,7 @@
  
  OS=`uname -s`
@@ -47229,8 +47503,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/sun/net/www/protocol/jar/B5105410.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/sun/net/www/protocol/jar/B5105410.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/sun/net/www/protocol/jar/B5105410.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/sun/net/www/protocol/jar/B5105410.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -31,7 +31,7 @@
  
  OS=`uname -s`
@@ -47240,8 +47514,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -31,7 +31,7 @@
  
  OS=`uname -s`
@@ -47251,8 +47525,8 @@
      PS=":"
      FS="/"
      CHMOD="${FS}bin${FS}chmod"
---- ./jdk/test/sun/nio/ch/SelProvider.java	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/sun/nio/ch/SelProvider.java	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/sun/nio/ch/SelProvider.java	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/sun/nio/ch/SelProvider.java	Sat Aug 20 12:04:16 2016 -0700
 @@ -39,7 +39,7 @@
                  expected = "sun.nio.ch.DevPollSelectorProvider";
              } else if ("Linux".equals(osname)) {
@@ -47262,8 +47536,8 @@
                  expected = "sun.nio.ch.KQueueSelectorProvider";
              } else {
                  return;
---- ./jdk/test/sun/security/krb5/runNameEquals.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/sun/security/krb5/runNameEquals.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/sun/security/krb5/runNameEquals.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/sun/security/krb5/runNameEquals.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -48,7 +48,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47273,8 +47547,8 @@
      PATHSEP=":"
      FILESEP="/"
      NATIVE=true
---- ./jdk/test/sun/security/pkcs11/KeyStore/Basic.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/sun/security/pkcs11/KeyStore/Basic.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/sun/security/pkcs11/KeyStore/Basic.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/sun/security/pkcs11/KeyStore/Basic.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -131,6 +131,27 @@
  	;;
      esac
@@ -47303,8 +47577,8 @@
    Windows* )  
      FS="\\"
      PS=";"
---- ./jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -93,6 +93,27 @@
  	;;
      esac
@@ -47333,8 +47607,19 @@
    Windows* )
      FS="\\"
      PS=";"
---- ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/sun/security/pkcs11/PKCS11Test.java	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/sun/security/pkcs11/PKCS11Test.java	Sat Aug 20 12:04:16 2016 -0700
+@@ -245,6 +245,8 @@
+         osMap.put("SunOS-amd64-64", "/usr/lib/mps/64/");
+         osMap.put("Linux-i386-32", "/usr/lib/");
+         osMap.put("Linux-amd64-64", "/usr/lib64/");
++        osMap.put("FreeBSD-i386-32", "/usr/local/lib/");
++        osMap.put("FreeBSD-amd64-64", "/usr/local/lib/");
+     }
+ 
+     private final static char[] hexDigits = "0123456789abcdef".toCharArray();
+--- ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -50,19 +50,7 @@
  
  OS=`uname -s`
@@ -47356,8 +47641,8 @@
      FS="/"
      PS=":"
      CP="${FS}bin${FS}cp"
---- ./jdk/test/sun/security/pkcs11/Provider/Login.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/sun/security/pkcs11/Provider/Login.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/sun/security/pkcs11/Provider/Login.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/sun/security/pkcs11/Provider/Login.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -51,19 +51,7 @@
  
  OS=`uname -s`
@@ -47379,8 +47664,8 @@
      FS="/"
      PS=":"
      CP="${FS}bin${FS}cp"
---- ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -44,11 +44,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47394,8 +47679,8 @@
      PATHSEP=":"
      FILESEP="/"
      ;;
---- ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -47,15 +47,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47413,8 +47698,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -33,7 +33,7 @@
  
  OS=`uname -s`
@@ -47424,8 +47709,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -42,7 +42,7 @@
  
  OS=`uname -s`
@@ -47435,8 +47720,8 @@
          FILESEP="/"
          PATHSEP=":"
          ;;
---- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -32,7 +32,7 @@
  HOSTNAME=`uname -n`
  OS=`uname -s`
@@ -47446,8 +47731,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -32,7 +32,7 @@
  HOSTNAME=`uname -n`
  OS=`uname -s`
@@ -47457,8 +47742,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -46,7 +46,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47468,8 +47753,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -46,7 +46,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47479,8 +47764,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/jarsigner/diffend.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/sun/security/tools/jarsigner/diffend.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/sun/security/tools/jarsigner/diffend.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/sun/security/tools/jarsigner/diffend.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -41,7 +41,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47490,8 +47775,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/jarsigner/oldsig.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/sun/security/tools/jarsigner/oldsig.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/sun/security/tools/jarsigner/oldsig.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/sun/security/tools/jarsigner/oldsig.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -42,7 +42,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47501,8 +47786,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -46,7 +46,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47512,8 +47797,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -47,15 +47,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47531,8 +47816,8 @@
      PATHSEP=":"
      FILESEP="/"
      ;;
---- ./jdk/test/sun/security/tools/keytool/NoExtNPE.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/sun/security/tools/keytool/NoExtNPE.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/sun/security/tools/keytool/NoExtNPE.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/sun/security/tools/keytool/NoExtNPE.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -42,13 +42,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47548,8 +47833,8 @@
      FILESEP="/"
      ;;
    AIX )
---- ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -45,7 +45,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47559,8 +47844,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -46,7 +46,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47570,11 +47855,11 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/keytool/autotest.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/sun/security/tools/keytool/autotest.sh	Sun May 01 21:26:40 2016 -0700
-@@ -72,6 +72,27 @@
-         ;;
-     esac
+--- ./jdk/test/sun/security/tools/keytool/autotest.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/sun/security/tools/keytool/autotest.sh	Sat Aug 20 12:04:16 2016 -0700
+@@ -71,6 +71,27 @@
+             "/usr/lib/x86_64-linux-gnu/nss/libsoftokn3.so"`
+     fi
      ;;
 +  *BSD | Darwin )
 +    case "${OS}" in
@@ -47600,8 +47885,8 @@
    * )
      echo "Will not run test on: ${OS}"
      exit 0;
---- ./jdk/test/sun/security/tools/keytool/i18n.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/sun/security/tools/keytool/i18n.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/sun/security/tools/keytool/i18n.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/sun/security/tools/keytool/i18n.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -46,7 +46,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47611,8 +47896,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/keytool/printssl.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/sun/security/tools/keytool/printssl.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/sun/security/tools/keytool/printssl.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/sun/security/tools/keytool/printssl.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -37,7 +37,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47622,8 +47907,8 @@
      FS="/"
      ;;
    CYGWIN* )
---- ./jdk/test/sun/security/tools/keytool/resource.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/sun/security/tools/keytool/resource.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/sun/security/tools/keytool/resource.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/sun/security/tools/keytool/resource.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -43,7 +43,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47633,8 +47918,8 @@
      NULL=/dev/null
      FS="/"
      ;;
---- ./jdk/test/sun/security/tools/keytool/standard.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/sun/security/tools/keytool/standard.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/sun/security/tools/keytool/standard.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/sun/security/tools/keytool/standard.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -44,7 +44,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47644,8 +47929,8 @@
      FS="/"
      ;;
    Windows_* )
---- ./jdk/test/sun/security/tools/policytool/Alias.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/sun/security/tools/policytool/Alias.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/sun/security/tools/policytool/Alias.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/sun/security/tools/policytool/Alias.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -47,7 +47,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47655,8 +47940,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/policytool/ChangeUI.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/sun/security/tools/policytool/ChangeUI.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/sun/security/tools/policytool/ChangeUI.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/sun/security/tools/policytool/ChangeUI.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -46,7 +46,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47666,8 +47951,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -46,7 +46,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47677,8 +47962,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/policytool/SaveAs.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/sun/security/tools/policytool/SaveAs.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/sun/security/tools/policytool/SaveAs.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/sun/security/tools/policytool/SaveAs.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -47,7 +47,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47688,8 +47973,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -46,7 +46,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47699,8 +47984,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/policytool/UsePolicy.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/sun/security/tools/policytool/UsePolicy.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/sun/security/tools/policytool/UsePolicy.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/sun/security/tools/policytool/UsePolicy.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -46,7 +46,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47710,8 +47995,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/policytool/i18n.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/sun/security/tools/policytool/i18n.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/sun/security/tools/policytool/i18n.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/sun/security/tools/policytool/i18n.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -46,7 +46,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47722,7 +48007,7 @@
      PS=":"
      FS="/"
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh	Sun May 01 21:26:40 2016 -0700
++++ ./jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -0,0 +1,111 @@
 +#
 +# Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
@@ -47835,8 +48120,8 @@
 +
 +   else fail "unspecified test failure"
 +fi
---- ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -54,7 +54,7 @@
  
  OS=`uname -s`
@@ -47846,8 +48131,8 @@
        PATHSEP=":"
        ;;
  
---- ./jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -33,7 +33,7 @@
  
  case `uname -s` in
@@ -47857,8 +48142,8 @@
  esac
  
  N2A=$TESTJAVA/bin/native2ascii
---- ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh	Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh	Sun May 01 21:26:40 2016 -0700
+--- ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh	Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh	Sat Aug 20 12:04:16 2016 -0700
 @@ -56,7 +56,7 @@
  
  OS=`uname -s`
@@ -47868,8 +48153,8 @@
        PATHSEP=":"
        ;;
  
---- ./langtools/.hgtags	Wed Mar 23 21:08:25 2016 +0000
-+++ ./langtools/.hgtags	Sun May 01 16:42:36 2016 -0700
+--- ./langtools/.hgtags	Wed Jul 20 04:05:06 2016 +0100
++++ ./langtools/.hgtags	Sat Aug 20 11:56:22 2016 -0700
 @@ -123,6 +123,7 @@
  9425dd4f53d5bfcd992d9aecea0eb7d8b2d4f62b jdk7-b146
  d34578643d1c6c752d4a6b5e79c6ab1b60850b4a jdk7u1-b01
@@ -47878,13 +48163,13 @@
  cd2cc8b5edb045b950aed46d159b4fb8fc2fd1df jdk7u1-b02
  82820a30201dbf4b80f1916f3d0f4a92ad21b61a jdk7u1-b03
  baa2c13c70fea3d6e259a34f0903197fdceb64b5 jdk7u1-b04
-@@ -605,3 +606,4 @@
- 08e99c45e470ce8b87875c1cbe78ac2f341555a3 jdk7u91-b02
- 3c71abf7435352aee6e74ba2581274181ad3d17e jdk7u95-b00
+@@ -607,3 +608,4 @@
  93a2788178e6ebebfbd30075f51ab35ac4f1b2a1 jdk7u99-b00
-+5713b8d2db3f1fc0c9802fdaf30ca802cddf8f65 jdk7u101-b00
---- ./langtools/test/Makefile	Wed Mar 23 21:08:25 2016 +0000
-+++ ./langtools/test/Makefile	Sun May 01 16:42:36 2016 -0700
+ 5713b8d2db3f1fc0c9802fdaf30ca802cddf8f65 jdk7u101-b00
+ e65eb66727550af75293996fc42e2c49c2002659 jdk7u111-b00
++a5002845bff276d1a8e4bdb4a0dcb972509f7d07 jdk7u111-b01
+--- ./langtools/test/Makefile	Wed Jul 20 04:05:06 2016 +0100
++++ ./langtools/test/Makefile	Sat Aug 20 11:56:22 2016 -0700
 @@ -42,6 +42,14 @@
      ARCH=i586
    endif
@@ -47920,8 +48205,8 @@
  
  # Root of all test results
  TEST_OUTPUT_DIR = $(TEST_ROOT)/../build/$(PLATFORM)-$(ARCH)/test/langtools
---- ./langtools/test/tools/javac/4846262/Test.sh	Wed Mar 23 21:08:25 2016 +0000
-+++ ./langtools/test/tools/javac/4846262/Test.sh	Sun May 01 16:42:36 2016 -0700
+--- ./langtools/test/tools/javac/4846262/Test.sh	Wed Jul 20 04:05:06 2016 +0100
++++ ./langtools/test/tools/javac/4846262/Test.sh	Sat Aug 20 11:56:22 2016 -0700
 @@ -44,7 +44,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47931,8 +48216,8 @@
      FS="/"
      ;;
    CYGWIN* )
---- ./langtools/test/tools/javac/6302184/T6302184.sh	Wed Mar 23 21:08:25 2016 +0000
-+++ ./langtools/test/tools/javac/6302184/T6302184.sh	Sun May 01 16:42:36 2016 -0700
+--- ./langtools/test/tools/javac/6302184/T6302184.sh	Wed Jul 20 04:05:06 2016 +0100
++++ ./langtools/test/tools/javac/6302184/T6302184.sh	Sat Aug 20 11:56:22 2016 -0700
 @@ -41,7 +41,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47942,8 +48227,8 @@
      FS="/"
      ;;
    CYGWIN* )
---- ./langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh	Wed Mar 23 21:08:25 2016 +0000
-+++ ./langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh	Sun May 01 16:42:36 2016 -0700
+--- ./langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh	Wed Jul 20 04:05:06 2016 +0100
++++ ./langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh	Sat Aug 20 11:56:22 2016 -0700
 @@ -56,7 +56,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47953,8 +48238,8 @@
      FS="/"
      CHMOD="${FS}bin${FS}chmod"
      ;;
---- ./langtools/test/tools/javac/ExtDirs/ExtDirs.sh	Wed Mar 23 21:08:25 2016 +0000
-+++ ./langtools/test/tools/javac/ExtDirs/ExtDirs.sh	Sun May 01 16:42:36 2016 -0700
+--- ./langtools/test/tools/javac/ExtDirs/ExtDirs.sh	Wed Jul 20 04:05:06 2016 +0100
++++ ./langtools/test/tools/javac/ExtDirs/ExtDirs.sh	Sat Aug 20 11:56:22 2016 -0700
 @@ -54,7 +54,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47964,8 +48249,8 @@
      PS=":"
      FS="/"
      ;;
---- ./langtools/test/tools/javac/MissingInclude.sh	Wed Mar 23 21:08:25 2016 +0000
-+++ ./langtools/test/tools/javac/MissingInclude.sh	Sun May 01 16:42:36 2016 -0700
+--- ./langtools/test/tools/javac/MissingInclude.sh	Wed Jul 20 04:05:06 2016 +0100
++++ ./langtools/test/tools/javac/MissingInclude.sh	Sat Aug 20 11:56:22 2016 -0700
 @@ -47,7 +47,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47975,8 +48260,8 @@
      FS="/"
      ;;
    Windows* )
---- ./langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh	Wed Mar 23 21:08:25 2016 +0000
-+++ ./langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh	Sun May 01 16:42:36 2016 -0700
+--- ./langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh	Wed Jul 20 04:05:06 2016 +0100
++++ ./langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh	Sat Aug 20 11:56:22 2016 -0700
 @@ -52,7 +52,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47986,8 +48271,8 @@
      PS=":"
      FS="/"
      ;;
---- ./langtools/test/tools/javac/T5090006/compiler.sh	Wed Mar 23 21:08:25 2016 +0000
-+++ ./langtools/test/tools/javac/T5090006/compiler.sh	Sun May 01 16:42:36 2016 -0700
+--- ./langtools/test/tools/javac/T5090006/compiler.sh	Wed Jul 20 04:05:06 2016 +0100
++++ ./langtools/test/tools/javac/T5090006/compiler.sh	Sat Aug 20 11:56:22 2016 -0700
 @@ -47,7 +47,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47997,8 +48282,8 @@
      FS="/"
      ;;
    Windows* )
---- ./langtools/test/tools/javac/apt.sh	Wed Mar 23 21:08:25 2016 +0000
-+++ ./langtools/test/tools/javac/apt.sh	Sun May 01 16:42:36 2016 -0700
+--- ./langtools/test/tools/javac/apt.sh	Wed Jul 20 04:05:06 2016 +0100
++++ ./langtools/test/tools/javac/apt.sh	Sat Aug 20 11:56:22 2016 -0700
 @@ -38,7 +38,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48008,8 +48293,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./langtools/test/tools/javac/constDebug/ConstDebug.sh	Wed Mar 23 21:08:25 2016 +0000
-+++ ./langtools/test/tools/javac/constDebug/ConstDebug.sh	Sun May 01 16:42:36 2016 -0700
+--- ./langtools/test/tools/javac/constDebug/ConstDebug.sh	Wed Jul 20 04:05:06 2016 +0100
++++ ./langtools/test/tools/javac/constDebug/ConstDebug.sh	Sat Aug 20 11:56:22 2016 -0700
 @@ -47,7 +47,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48019,8 +48304,8 @@
      PS=":"
      FS="/"
      ;;
---- ./langtools/test/tools/javac/fatalErrors/NoJavaLang.sh	Wed Mar 23 21:08:25 2016 +0000
-+++ ./langtools/test/tools/javac/fatalErrors/NoJavaLang.sh	Sun May 01 16:42:36 2016 -0700
+--- ./langtools/test/tools/javac/fatalErrors/NoJavaLang.sh	Wed Jul 20 04:05:06 2016 +0100
++++ ./langtools/test/tools/javac/fatalErrors/NoJavaLang.sh	Sat Aug 20 11:56:22 2016 -0700
 @@ -48,7 +48,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48030,8 +48315,8 @@
      FS="/"
      ;;
    CYGWIN* )
---- ./langtools/test/tools/javac/innerClassFile/Driver.sh	Wed Mar 23 21:08:25 2016 +0000
-+++ ./langtools/test/tools/javac/innerClassFile/Driver.sh	Sun May 01 16:42:36 2016 -0700
+--- ./langtools/test/tools/javac/innerClassFile/Driver.sh	Wed Jul 20 04:05:06 2016 +0100
++++ ./langtools/test/tools/javac/innerClassFile/Driver.sh	Sat Aug 20 11:56:22 2016 -0700
 @@ -53,7 +53,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48041,8 +48326,8 @@
      FS="/"
      ;;
    Windows* )
---- ./langtools/test/tools/javac/javazip/Test.sh	Wed Mar 23 21:08:25 2016 +0000
-+++ ./langtools/test/tools/javac/javazip/Test.sh	Sun May 01 16:42:36 2016 -0700
+--- ./langtools/test/tools/javac/javazip/Test.sh	Wed Jul 20 04:05:06 2016 +0100
++++ ./langtools/test/tools/javac/javazip/Test.sh	Sat Aug 20 11:56:22 2016 -0700
 @@ -41,7 +41,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48052,8 +48337,8 @@
      FS="/"
      SCR=`pwd`
      ;;
---- ./langtools/test/tools/javac/links/links.sh	Wed Mar 23 21:08:25 2016 +0000
-+++ ./langtools/test/tools/javac/links/links.sh	Sun May 01 16:42:36 2016 -0700
+--- ./langtools/test/tools/javac/links/links.sh	Wed Jul 20 04:05:06 2016 +0100
++++ ./langtools/test/tools/javac/links/links.sh	Sat Aug 20 11:56:22 2016 -0700
 @@ -53,7 +53,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48063,8 +48348,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./langtools/test/tools/javac/newlines/Newlines.sh	Wed Mar 23 21:08:25 2016 +0000
-+++ ./langtools/test/tools/javac/newlines/Newlines.sh	Sun May 01 16:42:36 2016 -0700
+--- ./langtools/test/tools/javac/newlines/Newlines.sh	Wed Jul 20 04:05:06 2016 +0100
++++ ./langtools/test/tools/javac/newlines/Newlines.sh	Sat Aug 20 11:56:22 2016 -0700
 @@ -50,7 +50,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48074,8 +48359,8 @@
      FS="/"
      ;;
    Windows* )
---- ./langtools/test/tools/javac/stackmap/T4955930.sh	Wed Mar 23 21:08:25 2016 +0000
-+++ ./langtools/test/tools/javac/stackmap/T4955930.sh	Sun May 01 16:42:36 2016 -0700
+--- ./langtools/test/tools/javac/stackmap/T4955930.sh	Wed Jul 20 04:05:06 2016 +0100
++++ ./langtools/test/tools/javac/stackmap/T4955930.sh	Sat Aug 20 11:56:22 2016 -0700
 @@ -41,7 +41,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48085,8 +48370,8 @@
      FS="/"
      ;;
    Windows_95 | Windows_98 | Windows_NT )
---- ./langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh	Wed Mar 23 21:08:25 2016 +0000
-+++ ./langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh	Sun May 01 16:42:36 2016 -0700
+--- ./langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh	Wed Jul 20 04:05:06 2016 +0100
++++ ./langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh	Sat Aug 20 11:56:22 2016 -0700
 @@ -55,7 +55,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48096,8 +48381,8 @@
      if [ -d /usr/lib/locale/en_US.UTF-8 -o -d /usr/lib/locale/en_US.utf8 ]
      then
          ENV="env LANG=en_US.UTF-8"
---- ./langtools/test/tools/javah/6257087/foo.sh	Wed Mar 23 21:08:25 2016 +0000
-+++ ./langtools/test/tools/javah/6257087/foo.sh	Sun May 01 16:42:36 2016 -0700
+--- ./langtools/test/tools/javah/6257087/foo.sh	Wed Jul 20 04:05:06 2016 +0100
++++ ./langtools/test/tools/javah/6257087/foo.sh	Sat Aug 20 11:56:22 2016 -0700
 @@ -41,7 +41,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48107,8 +48392,8 @@
      PS=":"
      FS="/"
      ;;
---- ./langtools/test/tools/javah/ConstMacroTest.sh	Wed Mar 23 21:08:25 2016 +0000
-+++ ./langtools/test/tools/javah/ConstMacroTest.sh	Sun May 01 16:42:36 2016 -0700
+--- ./langtools/test/tools/javah/ConstMacroTest.sh	Wed Jul 20 04:05:06 2016 +0100
++++ ./langtools/test/tools/javah/ConstMacroTest.sh	Sat Aug 20 11:56:22 2016 -0700
 @@ -56,7 +56,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48118,8 +48403,8 @@
      PS=":"
      FS="/"
      ;;
---- ./langtools/test/tools/javah/MissingParamClassTest.sh	Wed Mar 23 21:08:25 2016 +0000
-+++ ./langtools/test/tools/javah/MissingParamClassTest.sh	Sun May 01 16:42:36 2016 -0700
+--- ./langtools/test/tools/javah/MissingParamClassTest.sh	Wed Jul 20 04:05:06 2016 +0100
++++ ./langtools/test/tools/javah/MissingParamClassTest.sh	Sat Aug 20 11:56:22 2016 -0700
 @@ -58,7 +58,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48129,8 +48414,8 @@
      PS=":"
      FS="/"
      ;;
---- ./langtools/test/tools/javah/ReadOldClass.sh	Wed Mar 23 21:08:25 2016 +0000
-+++ ./langtools/test/tools/javah/ReadOldClass.sh	Sun May 01 16:42:36 2016 -0700
+--- ./langtools/test/tools/javah/ReadOldClass.sh	Wed Jul 20 04:05:06 2016 +0100
++++ ./langtools/test/tools/javah/ReadOldClass.sh	Sat Aug 20 11:56:22 2016 -0700
 @@ -43,7 +43,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48140,8 +48425,8 @@
      PS=":"
      FS="/"
      ;;
---- ./langtools/test/tools/javap/pathsep.sh	Wed Mar 23 21:08:25 2016 +0000
-+++ ./langtools/test/tools/javap/pathsep.sh	Sun May 01 16:42:36 2016 -0700
+--- ./langtools/test/tools/javap/pathsep.sh	Wed Jul 20 04:05:06 2016 +0100
++++ ./langtools/test/tools/javap/pathsep.sh	Sat Aug 20 11:56:22 2016 -0700
 @@ -40,7 +40,7 @@
  # set platform-dependent variables
  OS=`uname -s`