From 7839baa92b69874eddc5b296b1be3a181d910160 Mon Sep 17 00:00:00 2001
From: pabs <pabs@pablotron.org>
Date: Sat, 30 May 2009 04:58:07 -0400
Subject: fix license

---
 README        | 16 ++++++++--------
 zipstream.php |  7 ++-----
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/README b/README
index 906cccb..2ae8b27 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-ZipStream 0.2.1 README
+ZipStream 0.2.2 README
 ======================
 
 Please see the file COPYING for licensing and warranty information.  The
@@ -11,21 +11,21 @@ Overview
 A fast and simple streaming zip file downloader for PHP.  Here's a
 simple example:
 
-  # create a new zipstream object
-  $zip = new ZipStream('example.zip');
+    # create a new zipstream object
+    $zip = new ZipStream('example.zip');
 
-  # add a file named 'image.jpg'
-  $zip->add_file('image.jpg', file_get_contents('image.jpg'));
+    # add a file named 'image.jpg'
+    $zip->add_file('image.jpg', file_get_contents('image.jpg'));
 
-  # finish the zip stream
-  $zip->finish();
+    # finish the zip stream
+    $zip->finish();
 
 You can also add comments, modify file timestamps, and customize (or
 disable) the HTTP headers.  See the class file for details.  There are a
 couple of additional examples in the initial release announcement at the
 following URL:
 
-  http://pablotron.org/?cid=1535
+    http://pablotron.org/?cid=1535
 
 Requirements
 ============
diff --git a/zipstream.php b/zipstream.php
index a004277..efa6c50 100644
--- a/zipstream.php
+++ b/zipstream.php
@@ -15,10 +15,7 @@
 # the following conditions:                                              #
 #                                                                        #
 # The above copyright notice and this permission notice shall be         #
-# included in all copies of the Software, its documentation and          #
-# marketing & publicity materials, and acknowledgment shall be given in  #
-# the documentation, materials and software packages that this Software  #
-# was used.                                                              #
+# included in all copies or substantial portions of the of the Software. #
 #                                                                        #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        #
 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     #
@@ -79,7 +76,7 @@
 #   $zip->finish();
 #
 class ZipStream {
-  const VERSION = '0.2.1';
+  const VERSION = '0.2.2';
 
   var $opt = array(),
       $files = array(),
-- 
cgit v1.2.3