Merge branch 'master' into gfortran-testdevel/gfortran-test

6 files changed, 9 insertions, 9 deletions

diff --git a/zlib/contrib/dotzlib/DotZLib.chm b/zlib/contrib/dotzlib/DotZLib.chm
index 0bc7df7..f214a44 100644
--- a/zlib/contrib/dotzlib/DotZLib.chm
+++ b/zlib/contrib/dotzlib/DotZLib.chm
diff --git a/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs b/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs
index 788b2fc..de88dcf 100644
--- a/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs
+++ b/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs
@@ -34,7 +34,7 @@ namespace DotZLib
         }

 

         /// <summary>

-        /// Initializes a new instance of the checksum generator basewith a specified value

+        /// Initializes a new instance of the checksum generator base with a specified value

         /// </summary>

         /// <param name="initialValue">The value to set the current checksum to</param>

         public ChecksumGeneratorBase(uint initialValue)

@@ -61,7 +61,7 @@ namespace DotZLib
         /// <exception cref="ArgumentException">The sum of offset and count is larger than the length of <c>data</c></exception>

         /// <exception cref="NullReferenceException"><c>data</c> is a null reference</exception>

         /// <exception cref="ArgumentOutOfRangeException">Offset or count is negative.</exception>

-        /// <remarks>All the other <c>Update</c> methods are implmeneted in terms of this one.

+        /// <remarks>All the other <c>Update</c> methods are implemented in terms of this one.

         /// This is therefore the only method a derived class has to implement</remarks>

         public abstract void Update(byte[] data, int offset, int count);

 

diff --git a/zlib/contrib/dotzlib/DotZLib/CodecBase.cs b/zlib/contrib/dotzlib/DotZLib/CodecBase.cs
index 42e6da3..c4bc8b8 100644
--- a/zlib/contrib/dotzlib/DotZLib/CodecBase.cs
+++ b/zlib/contrib/dotzlib/DotZLib/CodecBase.cs
@@ -139,7 +139,7 @@ namespace DotZLib
         /// <remarks>This must be implemented by a derived class</remarks>

         protected abstract void CleanUp();

 

-        // performs the release of the handles and calls the dereived CleanUp()

+        // performs the release of the handles and calls the derived CleanUp()

         private void CleanUp(bool isDisposing)

         {

             if (!_isDisposed)

@@ -160,7 +160,7 @@ namespace DotZLib
         #region Helper methods

 

         /// <summary>

-        /// Copies a number of bytes to the internal codec buffer - ready for proccesing

+        /// Copies a number of bytes to the internal codec buffer - ready for processing

         /// </summary>

         /// <param name="data">The byte array that contains the data to copy</param>

         /// <param name="startIndex">The index of the first byte to copy</param>

diff --git a/zlib/contrib/dotzlib/DotZLib/GZipStream.cs b/zlib/contrib/dotzlib/DotZLib/GZipStream.cs
index b161300..58091d3 100644
--- a/zlib/contrib/dotzlib/DotZLib/GZipStream.cs
+++ b/zlib/contrib/dotzlib/DotZLib/GZipStream.cs
@@ -246,7 +246,7 @@ namespace DotZLib
         }

 

         /// <summary>

-        ///  Not suppported.

+        ///  Not supported.

         /// </summary>

         /// <param name="offset"></param>

         /// <param name="origin"></param>

@@ -268,7 +268,7 @@ namespace DotZLib
         }

 

         /// <summary>

-        /// Gets/sets the current position in the <c>GZipStream</c>. Not suppported.

+        /// Gets/sets the current position in the <c>GZipStream</c>. Not supported.

         /// </summary>

         /// <remarks>In this implementation this property is not supported</remarks>

         /// <exception cref="NotSupportedException">Always thrown</exception>

@@ -285,7 +285,7 @@ namespace DotZLib
         }

 

         /// <summary>

-        /// Gets the size of the stream. Not suppported.

+        /// Gets the size of the stream. Not supported.

         /// </summary>

         /// <remarks>In this implementation this property is not supported</remarks>

         /// <exception cref="NotSupportedException">Always thrown</exception>

diff --git a/zlib/contrib/dotzlib/DotZLib/UnitTests.cs b/zlib/contrib/dotzlib/DotZLib/UnitTests.cs
index 44f7633..d4f0980 100644
--- a/zlib/contrib/dotzlib/DotZLib/UnitTests.cs
+++ b/zlib/contrib/dotzlib/DotZLib/UnitTests.cs
@@ -156,7 +156,7 @@ namespace DotZLibTests
         public void Info_Version()

         {

             Info info = new Info();

-            Assert.AreEqual("1.2.11", Info.Version);

+            Assert.AreEqual("1.3.1", Info.Version);

             Assert.AreEqual(32, info.SizeOfUInt);

             Assert.AreEqual(32, info.SizeOfULong);

             Assert.AreEqual(32, info.SizeOfPointer);

diff --git a/zlib/contrib/dotzlib/readme.txt b/zlib/contrib/dotzlib/readme.txt
index b239572..47454fc 100644
--- a/zlib/contrib/dotzlib/readme.txt
+++ b/zlib/contrib/dotzlib/readme.txt
@@ -36,7 +36,7 @@ Build instructions:
    in the same directory as the DotZLib.build file.

    You can define 2 properties on the nant command-line to control the build:

    debug={true|false} to toggle between release/debug builds (default=true).

-   nunit={true|false} to include or esclude unit tests (default=true).

+   nunit={true|false} to include or exclude unit tests (default=true).

    Also the target clean will remove binaries.

    Output file (DotZLib.dll) will be found in either ./DotZLib/bin/release

    or ./DotZLib/bin/debug, depending on whether you are building the release