creadur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rdon...@apache.org
Subject svn commit: r1369341 - /creadur/whisker/trunk/src/site/apt/examples/license-family.apt
Date Sat, 04 Aug 2012 15:11:22 GMT
Author: rdonkin
Date: Sat Aug  4 15:11:22 2012
New Revision: 1369341

URL: http://svn.apache.org/viewvc?rev=1369341&view=rev
Log:
Paste in content generated by integration test built on example data.

Modified:
    creadur/whisker/trunk/src/site/apt/examples/license-family.apt

Modified: creadur/whisker/trunk/src/site/apt/examples/license-family.apt
URL: http://svn.apache.org/viewvc/creadur/whisker/trunk/src/site/apt/examples/license-family.apt?rev=1369341&r1=1369340&r2=1369341&view=diff
==============================================================================
--- creadur/whisker/trunk/src/site/apt/examples/license-family.apt (original)
+++ creadur/whisker/trunk/src/site/apt/examples/license-family.apt Sat Aug  4 15:11:22 2012
@@ -1057,10 +1057,35 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SU
 
 This distribution contains third party resources.
 Within the . directory
-    licensed under the Apache License, Version 2 http://www.apache.org/licenses/LICENSE-2.0.txt
 (as above)
-        from The Legion of the Bouncy Example  http://example.org/ 
+    licensed under the BSD (2 Clause) http://opensource.org/licenses/BSD-2-Clause  (as follows)
+ 
+            
+            Copyright (c) 2000-2010, The Example Project
+            All rights reserved.
+            
+            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.
+            
+            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.
+                            
+        from The Example Project  http://example.org/ 
             boo.png
 
-
 +---------------------------------------+
    
\ No newline at end of file



Mime
View raw message