[svn-r20557] Update Windows doc references

4 files changed, 18 insertions, 15 deletions

diff --git a/release_docs/CMake.txt b/release_docs/CMake.txt
index e916df9..24f130b 100755
--- a/release_docs/CMake.txt
+++ b/release_docs/CMake.txt
@@ -25,8 +25,11 @@ Notes: This short instruction is written for users who want to quickly build
             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:
-            www.cdash.hdfgroup.org. 
+         3. If you are building HDF5 on Windows, do NOT use or execute any
+            files from the windows folder.
+            
+         4. Build and test results can be submitted to our CDash server at:
+            cdash.hdfgroup.uiuc.edu. 
             Please read the HDF and CDash document at:
             www.hdfgroup.org/CDash/HowToSubmit. 
             
diff --git a/release_docs/INSTALL_Windows.txt b/release_docs/INSTALL_Windows.txt
index 71f19aa..c54bd02 100644
--- a/release_docs/INSTALL_Windows.txt
+++ b/release_docs/INSTALL_Windows.txt
@@ -62,12 +62,16 @@ Preconditions:
                 Click the "Miscellaneous" tab and uncheck "TAR file smart CR/LF 
                 conversion" option, then click OK.
 
-   4. CMake is available for this release. CMake 2.8.2 can be downloaded from
-      the KitWare website at http://www.kitware.com.
+   4. CMake is available for this release. CMake 2.8.4 can be downloaded from
+      the KitWare website at http://www.kitware.com. See CMake.txt file for
+      more information.
       
       Note: We have attempted to mirror our Autoconf configuration files for
             maintainence reasons. We will maintain the current VS2008 project
             files for the 1.8 product.
+      Warning: The instructions in this file are not compatible with CMake.
+            Follow the instructions in CMake.txt, dot not use any files from
+            the WINDOWS subfolder.
             
    5. Set up a directory structure to unpack the library.  For example:
 
diff --git a/release_docs/INSTALL_Windows_From_Command_Line.txt b/release_docs/INSTALL_Windows_From_Command_Line.txt
index 7557441..fc02d25 100755
--- a/release_docs/INSTALL_Windows_From_Command_Line.txt
+++ b/release_docs/INSTALL_Windows_From_Command_Line.txt
@@ -5,7 +5,7 @@
 Note: This instruction is written for users who would like to build HDF5
       libraries and tools from the HDF5 source code package on command
       line. We no longer support building HDF5 using Microsoft Visual 
-	  Studio .NET 2003 or Visual Studio VS2005 or Intel Fortran 91.
+    Studio .NET 2003 or Visual Studio VS2005 or Intel Fortran 91.
          
       Currently, we support:
       
@@ -18,7 +18,7 @@ Note: This instruction is written for users who would like to build HDF5
       For all other Windows development tools, HDF5 should be built in
       the development environment.  Please refer to INSTALL_Windows.txt
       for detailed HDF5 building and installation information, or 
-      INSTALL_Windows_Short.txt for quick HDF5 building and installation
+      INSTALL_Windows_Short_VS2008.txt for quick HDF5 building and installation
       instructions.
                         
 WARNINGS:
@@ -85,7 +85,6 @@ notes in INSTALL_Windows.txt before starting below procedures.
               /vs9              Build HDF5 using Visual Studio 2008
               /fort             Build and test HDF5 with Fortran libraries
               /ivf101           Build HDF5 Fortran using Intel Visual Fortran 10.1
-              /ivf111           Build HDF5 Fortran using Intel Visual Fortran 11.1
               /useenv           Build HDF5 using compiler settings defined
                                 in the environment, rather than the IDE.
               /?                Help information
@@ -113,7 +112,6 @@ notes in INSTALL_Windows.txt before starting below procedures.
               /vs9              Build HDF5 using Visual Studio 2008
               /fort             Build HDF5 with Fortran libraries
               /ivf101           Build HDF5 Fortran using Intel Visual Fortran 10.1
-              /ivf111           Build HDF5 Fortran using Intel Visual Fortran 11.1
               /nodebug          Build HDF5 release versions only
                                 Note: Default is to build debug and release versions
               /useenv           Build HDF5 using compiler settings defined
@@ -147,9 +145,9 @@ notes in INSTALL_Windows.txt before starting below procedures.
                                          tools.  To use this option, HDF5 
                                          Fortran libraries must have been built.
 
-			  nodebug option can be added to any of the above options to only
-			  test the release versions.
-			  
+        nodebug option can be added to any of the above options to only
+        test the release versions.
+        
             Invoke a command prompt window and run hdf5check with appropriate 
             option.  Users are encouraged to pipe the test output into a file.  
             You should find no "*FAILED*" marks.
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 3d68fbc..37c5f29 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -314,11 +314,9 @@ The following platforms and compilers have been tested for this release.
                                   Visual Studio 2010 (cmake)
                                   Cygwin(1.7.7 native gcc(4.3.4) compiler and gfortran)
 
-    Windows Vista                 Visual Studio 2008 w/ Intel Fortran 10.1 (project files)
-                                  Visual Studio 2008 w/ Intel Fortran 11.1 (cmake)
+    Windows Vista                 Visual Studio 2008 w/ Intel Fortran 11.1 (cmake)
 
-    Windows Vista x64             Visual Studio 2008 w/ Intel Fortran 10.1 (project files)
-                                  Visual Studio 2008 w/ Intel Fortran 11.1 (cmake)
+    Windows Vista x64             Visual Studio 2008 w/ Intel Fortran 11.1 (cmake)
 
     Windows 7                     Visual Studio 2008 w/ Intel Fortran 11.1 (cmake)