[svn-r25242] Bring revisions #24505 - #24670 from trunk to revise_chunks.

Tested on jam, ostrich, koala, platypus.

2 files changed, 45 insertions, 44 deletions

diff --git a/release_docs/INSTALL_CMake.txt b/release_docs/INSTALL_CMake.txt
index 5811bec..d431644 100644
--- a/release_docs/INSTALL_CMake.txt
+++ b/release_docs/INSTALL_CMake.txt
@@ -38,16 +38,16 @@ Notes: This short set of instructions is written for users who want to
       4. Configure the C library, tools and tests with this command:
          cmake -G "Visual Studio 10" -DBUILD_TESTING:BOOL=ON -DHDF5_BUILD_TOOLS:BOOL=ON ..
       
-      3. Build the C library, tools and tests with this command:
+      5. Build the C library, tools and tests with this command:
          cmake --build . --config Release
       
-      4. Test the C library and tools with this command:
+      6. Test the C library and tools with this command:
          ctest . -C Release
       
-      5. Create an install image with this command:
+      7. Create an install image with this command:
          cpack -C Release CPackConfig.cmake
       
-      6. Install with this command:
+      8. Install with this command:
          HDF5-1.8.12-win32.exe
         
    B. Linux Quick Step Building HDF5 Libraries with CMake Using GCC
@@ -66,16 +66,16 @@ Notes: This short set of instructions is written for users who want to
       4. Configure the C library, tools and tests with this command:
          cmake -G "Unix Makefiles" -DBUILD_TESTING:BOOL=ON -DHDF5_BUILD_TOOLS:BOOL=ON ..
       
-      3. Build the C library, tools and tests with this command:
+      5. Build the C library, tools and tests with this command:
          cmake --build . --config Release
       
-      4. Test the C library and tools with this command:
+      6. Test the C library and tools with this command:
          ctest . -C Release
       
-      5. Create an install image with this command:
+      7. Create an install image with this command:
          cpack -C Release CPackConfig.cmake
       
-      6. Install with this command:
+      8. Install with this command:
          HDF5-1.8.12-Linux.sh
       
 
@@ -128,35 +128,36 @@ II. Preconditions
                cmake -C ../config/cmake/cacheinit.cmake -G "Visual Studio 10" \
                -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=OFF -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=OFF ..
 
+Notes: CMake and HDF5
 
-Notes: More information about using CMake can be found at the KitWare site, 
-       www.cmake.org.
-         
-       CMake uses the command line; however, the visual CMake tool is 
-       available for the configuration step. The steps are similar for
-       all the operating systems supported by CMake.
-       
-       NOTES:
-         1. Using CMake for building and using HDF5 is under active development. 
-            While we have attempted to provide error-free files, please 
-            understand that development with CMake has not been extensively 
-            tested outside of HDF. The CMake specific files may change
-            before the next release.
+   1. Using CMake for building and using HDF5 is under active development. 
+      While we have attempted to provide error-free files, please 
+      understand that development with CMake has not been extensively 
+      tested outside of HDF. The CMake specific files may change
+      before the next release.
             
-         2. CMake support for HDF5 development should be usable on any 
-            system where CMake is supported. Please send us any comments on 
-            how CMake support can be improved on any system. Visit the 
-            KitWare site for more information about CMake.
+   2. CMake support for HDF5 development should be usable on any 
+      system where CMake is supported. Please send us any comments on 
+      how CMake support can be improved on any system. Visit the 
+      KitWare site for more information about CMake.
             
-         3. Build and test results can be submitted to our CDash server at:
+   3. Build and test results can be submitted to our CDash server at:
                  cdash.hdfgroup.uiuc.edu. 
-            Please read the HDF and CDash document at:
+      Please read the HDF and CDash document at:
                  www.hdfgroup.org/CDash/HowToSubmit. 
             
-         4. See the appendix at the bottom of this file for examples of using
-            a ctest script for building and testing. Using a ctest script is
-            preferred because of its flexibility.
+   4. See the appendix at the bottom of this file for examples of using
+      a ctest script for building and testing. Using a ctest script is
+      preferred because of its flexibility.
             
+Notes: CMake in General
+
+   1. More information about using CMake can be found at the KitWare site at 
+      www.cmake.org.
+         
+   2. CMake uses the command line; however, the visual CMake tool is 
+      available for the configuration step. The steps are similar for
+      all the operating systems supported by CMake.
 
 
 
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 11e9cf9..adec8f8 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -1281,34 +1281,34 @@ The following platforms are not supported but have been tested for this release.
                                   g++ 4.6.1 20110422
                                   gfortran 4.6.1 20110422
 
-    Debian7.1.0 3.2.0-4-686 #1 SMP Debian 3.2.46-1 i686 GNU/Linux
+    Debian7.2.0 3.2.0-4-686 #1 SMP Debian 3.2.51-1 i686 GNU/Linux
                                   gcc (Debian 4.7.2-5) 4.7.2
                                   GNU Fortran (Debian 4.7.2-5) 4.7.2
                                   (cmake and autotools)
 
-    Debian7.1.0 3.2.0-4-amd64 #1 SMP Debian 3.2.46-1 x86_64 GNU/Linux
+    Debian7.2.0 3.2.0-4-amd64 #1 SMP Debian 3.2.51-1 x86_64 GNU/Linux
                                   gcc (Debian 4.7.2-5) 4.7.2
                                   GNU Fortran (Debian 4.7.2-5) 4.7.2
                                   (cmake and autotools)
 
-    Fedora19 3.11.1-200.fc19.i6866 #1 SMP i686 i686 i386 GNU/Linux
-                                  gcc (GCC) 4.8.1 20130603 (Red Hat 4.8.1-1)
-                                  GNU Fortran (GCC) 4.8.1 20130603 (Red Hat 4.8.1-1)
+    Fedora20 3.11.10-301.fc20.i6866 #1 SMP i686 i686 i386 GNU/Linux
+                                  gcc (GCC) 4.8.2 20131212 (Red Hat 4.8.2-7)
+                                  GNU Fortran (GCC) 4.8.2 20130603 (Red Hat 4.8.2-7)
                                   (cmake and autotools)
 
-    Fedora19 3.11.1-200.fc19.x86_64 #1 SMP x86_64 x86_64 x86_64 GNU/Linux
-                                  gcc (GCC) 4.8.1 20130603 (Red Hat 4.8.1-1)
-                                  GNU Fortran (GCC) 4.8.1 20130603 (Red Hat 4.8.1-1)
+    Fedora20 3.11.10-301.fc20.x86_64 #1 SMP x86_64 x86_64 x86_64 GNU/Linux
+                                  gcc (GCC) 4.8.2 20131212 (Red Hat 4.8.2-7)
+                                  GNU Fortran (GCC) 4.8.2 20130603 (Red Hat 4.8.2-7)
                                   (cmake and autotools)
 
-    SUSE 12.3 3.7.10-1.16-desktop #1 SMP PREEMPT i686 i686 i386 GNU/Linux
-                                  gcc (SUSE Linux) 4.7.2
-                                  GNU Fortran (SUSE Linux) 4.7.2
+    SUSE 13.1 3.11.6-4-desktop #1 SMP PREEMPT i686 athlon i386 GNU/Linux
+                                  gcc (SUSE Linux) 4.8.1
+                                  GNU Fortran (SUSE Linux) 4.8.1
                                   (cmake and autotools)
 
-    SUSE 12.3 3.7.10-1.16-desktop #1 SMP PREEMPT x86_64 x86_64 x86_64 GNU/Linux
-                                  gcc (SUSE Linux) 4.7.2
-                                  GNU Fortran (SUSE Linux) 4.7.2 
+    SUSE 13.1 3.11.6-4-desktop #1 SMP PREEMPT x86_64 x86_64 x86_64 GNU/Linux
+                                  gcc (SUSE Linux) 4.8.1
+                                  GNU Fortran (SUSE Linux) 4.8.1
                                   (cmake and autotools)
 
     Ubuntu 13.10 3.11.0-13-generic #20-Ubuntu SMP i686 GNU/Linux