[svn-r15021] Purpose: Minor updates to Windows documentation via Kent's recommendations.

2 files changed, 33 insertions, 19 deletions

diff --git a/release_docs/INSTALL_Cygwin.txt b/release_docs/INSTALL_Cygwin.txt
index 6163539..20da44a 100644
--- a/release_docs/INSTALL_Cygwin.txt
+++ b/release_docs/INSTALL_Cygwin.txt
@@ -28,7 +28,6 @@ Preconditions:
        gcc-3.4.4 is included in Cygwin, which includes: 
        gcc    : GNU C compiler
        gcc-g++: GNU C++ compiler
-       gcc-g77: GNU Fortran 77 compiler
 
    2.2 Fortran Compiler HDF5-1.8 Supported
        
@@ -97,8 +96,17 @@ Install HDF5 on Cygwin
    2.3 Bzip'd tar archive (*.tar.bz2)
 
             $ bunzip2 < hdf5-1.8.1.tar.bz2 | tar xf - 
+
+2. Setup Environment
+
+    In Cygwin, most compilers and setting are automatically detected during
+    the configure script.  However, if you are building Fortran we recommend 
+    that you explicitly set the "FC" variable in your environment to use the 
+    g95 Fortran compiler.  For example, issue the command:
+    
+            $ export FC=g95
             
-3. Configuring 
+4. Configuring 
      
    Notes: See detailed information in hdf5/release_docs/INSTALL, 
           part 5. Full installation instructions for source 
@@ -112,19 +120,19 @@ Install HDF5 on Cygwin
      
    In short,
      
-   3.1 To configure HDF5 C Library, using 
+   To configure HDF5 C Library, using 
             
             $ ./configure
                    
-   3.2 To configure HDF5 C/C++ Library, using
+   To configure HDF5 C/C++ Library, using
 
             $ ./configure --enable-cxx
                    
-   3.3 To configure HDF5 C/Fortran Library, using
+   To configure HDF5 C/Fortran Library, using
 
             $ ./configure --enable-fortran
                    
-   3.4 To configure HDF5 C with Szip library, using
+   To configure HDF5 C with Szip library, using
 
             $ ./configure  --with-szlib="path to szlib"
            
@@ -135,15 +143,15 @@ Install HDF5 on Cygwin
            
             $ ./configure --with-szlib=/cygdrive/c/szip
                    
-   3.5 To configure HDF5 C without Zlib,
+   To configure HDF5 C without Zlib,
      
        To disable zlib, using
 
            $ ./configure --without-zlib
            
-   3.6 Two ways to configure HDF5 C with specified Zlib
+   Two ways to configure HDF5 C with specified Zlib
      
-     3.6.1 Using
+      Using
 
            $ ./configure --with-zlib=INCDIR,LIBDIR
 
@@ -153,7 +161,7 @@ Install HDF5 on Cygwin
 
  $ ./configure --with-zlib=/cygdrive/c/usr/include,/cygdrive/c/usr/lib
 
-     3.6.2 Through the CPPFLAGS and LDFLAGS Variables
+      Through the CPPFLAGS and LDFLAGS Variables
            
        For example, if zlib was installed in the directory 
        /cygdrive/c/usr then using the following command to configure 
@@ -163,7 +171,7 @@ Install HDF5 on Cygwin
            $ LDFLAGS=-L/cygdrive/c/usr/lib \
            $ ./configure
 
-   3.7 To specify the installation directories, using 
+    To specify the installation directories, using 
 
             $ ./configure --prefix="path for installation"
                  
@@ -174,7 +182,7 @@ Install HDF5 on Cygwin
        the path with the `--prefix=PATH' switch as in the above
        command.
 
-   3.8 Combination of Switches 
+    Combination of Switches 
 
        All of the above switches can be combined together. For 
        example, if users want to configure HDF5 C/C++/Fortran 
@@ -209,7 +217,7 @@ Install HDF5 on Cygwin
              --enable-fortran 
              <"If no more switches, then hit Enter">
                           
-4. Make and Make Check
+5. Make and Make Check
 
    After configuration is done successfully, run the following series of
    commands to build, test and install HDF5
@@ -220,17 +228,17 @@ Install HDF5 on Cygwin
    Before run "make install", check output file for "make check", there
    should be no failures at all.
 
-5. Make Install
+6. Make Install
 
             $ make install  > "output file name"
    
      
-6. Check installed HDF5 library
+7. Check installed HDF5 library
 
-   After step 4, go to your installation directory, there should be 
+   After step 6, go to your installation directory, there should be 
    three subdirectories: "bin" "include" and "lib".
 
-7. Known Problems 
+8. Known Problems 
    
    Shared libraries can not be built on Cygwin In release 1.8.
 
diff --git a/release_docs/INSTALL_Windows.txt b/release_docs/INSTALL_Windows.txt
index 4fc7819..76b0c09 100644
--- a/release_docs/INSTALL_Windows.txt
+++ b/release_docs/INSTALL_Windows.txt
@@ -33,7 +33,11 @@ Contents:
 
 Preconditions:
 
-   1. Installed Microsoft Visual Studio 2005.
+   1. Installed Microsoft Visual Studio.  This document is written for Visual
+      Studio 2005, although we also support Visual Studio .NET 2003.  Most of 
+      the instructions are the same, although some features are unsupported in
+      Visual Studio .NET.  For simple Visual Studio .NET instructions, see the
+      document INSTALL_Windows_NET.TXT.
    
    2. (Optional) Installed Intel Compiler 9.1 if you want to build HDF5 Fortran 
       libraries.
@@ -428,7 +432,9 @@ Note:   The complete testing suite can take a long time to run on even fast
         
             set HDF5TestExpress=3
             
-        If the variable is unset, it takes on the value 1.
+        If the variable is unset, it takes on the value 1.  Note that when
+        HDF5TestExpress is set to 2 or 3, some features may not be thoroughly
+        tested.  For most users, we recommend not setting this variable.
         
 
 We provide 2 options for users to test HDF5 libraries and tools.