From 1fc646e52bbcf6d443455e4ea02d2db7c31c4c50 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Thu, 4 Oct 2018 16:48:34 -0500
Subject: Reconciled docs with 1.10 branch

---
 release_docs/INSTALL_Cygwin.txt | 12 +++---
 release_docs/RELEASE.txt        | 84 +++++++++++++++++++++++++----------------
 2 files changed, 58 insertions(+), 38 deletions(-)

diff --git a/release_docs/INSTALL_Cygwin.txt b/release_docs/INSTALL_Cygwin.txt
index ddffcf1..74f494c 100644
--- a/release_docs/INSTALL_Cygwin.txt
+++ b/release_docs/INSTALL_Cygwin.txt
@@ -66,12 +66,11 @@ Preconditions:
     2.2.2 Szip
        The HDF5 library has a predefined compression filter that uses
        the extended-Rice lossless compression algorithm for chunked
-       datatsets. For more information about Szip compression and 
-       license terms see 
-       http://hdfgroup.org/HDF5/doc_resource/SZIP/index.html.
+       datatsets. For more information on Szip compression, license terms, 
+       and obtaining the Szip source code, see:
+
+          https://portal.hdfgroup.org/display/HDF5/Szip+Compression+in+HDF+Products
       
-       The latest supported public release of SZIP is available from
-       ftp://ftp.hdfgroup.org/lib-external/szip/2.1.
     
     2.3 Additional Utilities
     
@@ -266,4 +265,5 @@ Build, Test and Install HDF5 on Cygwin
 
 -----------------------------------------------------------------------
 
-Need Further assistance, email help@hdfgroup.org
+    HDF Forum:     https://forum.hdfgroup.org/
+    HDF Helpdesk:  https://portal.hdfgroup.org/display/support/The+HDF+Help+Desk
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 3acc1ed..f21d844 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -48,6 +48,24 @@ New Features
 
     Configuration:
     -------------
+    - Add toolchain and cross-compile support
+
+      Added info on using a toolchain file to INSTALL_CMAKE.txt. A
+      toolchain file is also used in cross-compiling, which requires
+      CMAKE_CROSSCOMPILING_EMULATOR to be set. To help with cross-compiling
+      the fortran configure process, the HDF5UseFortran.cmake file macros
+      were improved. Fixed a Fortran configure file issue that incorrectly
+      used #cmakdefine instead of #define.
+
+      (ADB - 2018/10/04, HDFFV-10594)
+
+    - Add warning flags for Intel compilers
+
+      Identified Intel compiler specific warnings flags that should be used
+      instead of GNU flags.
+
+      (ADB - 2018/10/04, TRILABS-21)
+
     - Add default rpath to targets
 
       Default rpaths should be set in shared executables and
@@ -162,38 +180,6 @@ New Features
 
     Java Library:
     ----------------
-    - JNI native library dependencies
-
-      The build for the hdf5_java native library used the wrong
-      hdf5 target library for CMake builds. Correcting the hdf5_java
-      library to build with the shared hdf5 library required testing
-      paths to change also.
-
-      (ADB - 2018/08/31, HDFFV-10568)
-
-    - Java iterator callbacks
-
-      Change global callback object to a small stack structure in order
-      to fix a runtime crash. This crash was discovered when iterating
-      through a file with nested group members. The global variable
-      visit_callback is overwritten when recursion starts. When recursion
-      completes, visit_callback will be pointing to the wrong callback method.
-
-      (ADB - 2018/08/15, HDFFV-10536)
-
-    - Java HDFLibraryException class
-
-      Change parent class from Exception to RuntimeException.
-
-      (ADB - 2018/07/30, HDFFV-10534)
-
-    - JNI Read and Write
-
-      Refactored variable-length functions, H5DreadVL and H5AreadVL,
-      to correct dataset and attribute reads. New write functions,
-      H5DwriteVL and H5AwriteVL, are under construction.
-
-      (ADB - 2018/06/02, HDFFV-10519)
 
     Tools:
     ------
@@ -251,6 +237,40 @@ Bug Fixes since HDF5-1.10.3 release
 
       (JTH - 2018/08/25, HDFFV-10501)
 
+    Java Library:
+    ----------------
+    - JNI native library dependencies
+    
+      The build for the hdf5_java native library used the wrong
+      hdf5 target library for CMake builds. Correcting the hdf5_java
+      library to build with the shared hdf5 library required testing
+      paths to change also.
+
+      (ADB - 2018/08/31, HDFFV-10568)
+     - Java iterator callbacks
+
+      Change global callback object to a small stack structure in order
+      to fix a runtime crash. This crash was discovered when iterating
+      through a file with nested group members. The global variable
+      visit_callback is overwritten when recursion starts. When recursion
+      completes, visit_callback will be pointing to the wrong callback method.
+
+      (ADB - 2018/08/15, HDFFV-10536)
+
+    - Java HDFLibraryException class
+
+      Change parent class from Exception to RuntimeException.
+
+      (ADB - 2018/07/30, HDFFV-10534)
+
+    - JNI Read and Write
+
+      Refactored variable-length functions, H5DreadVL and H5AreadVL,
+      to correct dataset and attribute reads. New write functions,
+      H5DwriteVL and H5AwriteVL, are under construction.
+
+      (ADB - 2018/06/02, HDFFV-10519)
+
     Configuration
     -------------
     -
-- 
cgit v0.12