summaryrefslogtreecommitdiff
path: root/zlib.3
diff options
context:
space:
mode:
authorMark Adler <madler@alumni.caltech.edu>2015-07-07 20:11:01 -0700
committerMark Adler <madler@alumni.caltech.edu>2015-07-07 20:11:01 -0700
commite7ebb399d7a7ef9fd88c8fb194f943169fdaa346 (patch)
tree0037c22195277f92c66165eb90f8e202d1dbdbb5 /zlib.3
parent95698093f023852ca4365df307c19a1d7cfa3687 (diff)
downloadzlib-e7ebb399d7a7ef9fd88c8fb194f943169fdaa346.tar.gz
Put license in zlib.3 man page.
Previously there was a confusing reference to a "distribution directory".
Diffstat (limited to 'zlib.3')
-rw-r--r--zlib.336
1 files changed, 27 insertions, 9 deletions
diff --git a/zlib.3 b/zlib.3
index 1936042..1cc3805 100644
--- 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.