Commit:    22a6c198288fc88f2ab6050bd2735f171c2e48cb
Author:    Matt Ficken <v-maf...@microsoft.com>         Mon, 26 Nov 2012 
15:07:39 -0800
Parents:   a6627916e2c9f97d9084915f9be2dc322a1e9697
Branches:  master

Link:       
http://git.php.net/?p=pftt2.git;a=commitdiff;h=22a6c198288fc88f2ab6050bd2735f171c2e48cb

Log:
license clarification


Former-commit-id: 9b033e8b77ce2af6dec526d707dac7f44754b2f2

Changed paths:
  A  LICENSE.txt
  M  README.mdown


Diff:
diff --git a/LICENSE.txt b/LICENSE.txt
new file mode 100644
index 0000000..d4f05f1
--- /dev/null
+++ b/LICENSE.txt
@@ -0,0 +1,31 @@
+Copyright (c) 2012, Microsoft Corporation
+All rights reserved.
+
+Contains code from the following open source libraries:
+ - ICU4J (EPL License) http://icu-project.org/
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+- Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+
+- Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   
+ - Neither the name of the Microsoft Corporation nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/README.mdown b/README.mdown
index 43734eb..7ffefd5 100644
--- a/README.mdown
+++ b/README.mdown
@@ -14,7 +14,7 @@ PFTT has and can mean many different things:
 
 ## License
 
-BSD
+BSD-3 Clause. See LICENSE.txt
 
 ## API Documentation
 
@@ -124,6 +124,14 @@ Run a second test pass, using a different build and/or 
test-pack
 
 PFTT will automatically generate an FBC report and display it using system 
default web browser
 
+Setup Wordpress (or other ~20 other PHP application), IIS and MySQL
+
+    > pftt -config iis,wordpress,mysql setup
+
+Run PHPT tests on Apache (instead of CLI)
+
+    > pftt -config apache phpt_all C:\php-sdk\php-5.4.7-win32-vc9-x86 
C:\php-sdk\php-test-pack-5.4-r1234567 Or pftt phpt_list 
C:\php-sdk\php-5.4.7-win32-vc9-x86 C:\php-sdk\php-test-pack-5.4-r1234567 
SKIP_list_file Or pftt phpt_named C:\php-sdk\php-5.4.7-win32-vc9-x86 
C:\php-sdk\php-test-pack-5.4-r1234567 021
+
 ## DEVELOPMENT
 
  - Install Eclipse Java IDE 4.2 (Juno), not Eclipse Classic see 
http://eclipse.org/

Reply via email to