Put license in zlib.3 man page.

Previously there was a confusing reference to a "distribution
directory".

diff --git a/zlib.3 b/zlib.3
index 1936042f7f92623c9cb64f41615de3dffc5c09ca..1cc38059d788f8e748c140c176002275896c1f75 100644 (file)
--- a/zlib.3
+++ b/zlib.3
@@ -1,4 +1,4 @@
-.TH ZLIB 3 "xx May 2013"
+.TH ZLIB 3 "7 July 2015"
 .SH NAME
 zlib \- compression/decompression library
 .SH SYNOPSIS
@@ -124,17 +124,35 @@ http://zlib.net/zlib_faq.html
 before asking for help.
 Send questions and/or comments to zlib@gzip.org,
 or (for the Windows DLL version) to Gilles Vollant (info@winimage.com).
-.SH AUTHORS
+.SH AUTHORS AND LICENSE
 Version 1.2.8.1
-Copyright (C) 1995-2013 Jean-loup Gailly (jloup@gzip.org)
-and Mark Adler (madler@alumni.caltech.edu).
 .LP
-This software is provided "as-is,"
-without any express or implied warranty.
-In no event will the authors be held liable for any damages
+Copyright (C) 1995-2015 Jean-loup Gailly and Mark Adler
+.LP
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
 arising from the use of this software.
-See the distribution directory with respect to requirements
-governing redistribution.
+.LP
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+.LP
+.nr step 1 1
+.IP \n[step]. 3
+The origin of this software must not be misrepresented; you must not
+claim that you wrote the original software. If you use this software
+in a product, an acknowledgment in the product documentation would be
+appreciated but is not required.
+.IP \n+[step].
+Altered source versions must be plainly marked as such, and must not be
+misrepresented as being the original software.
+.IP \n+[step].
+This notice may not be removed or altered from any source distribution.
+.LP
+Jean-loup Gailly        Mark Adler
+.br
+jloup@gzip.org          madler@alumni.caltech.edu
+.LP
 The deflate format used by
 .I zlib
 was defined by Phil Katz.

diff --git a/zlib.3.pdf b/zlib.3.pdf
index dc3c70a09e4a77dc25fa9e7374c31e495fa26aad..7073f1a90054cfab42f90d43c530cce287ff2baa 100644 (file)
Binary files a/zlib.3.pdf and b/zlib.3.pdf differ