creadur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rdon...@apache.org
Subject svn commit: r1368210 - /creadur/whisker/trunk/src/site/apt/examples/license-family.apt
Date Wed, 01 Aug 2012 19:27:07 GMT
Author: rdonkin
Date: Wed Aug  1 19:27:07 2012
New Revision: 1368210

URL: http://svn.apache.org/viewvc?rev=1368210&view=rev
Log:
More content for the example

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=1368210&r1=1368209&r2=1368210&view=diff
==============================================================================
--- creadur/whisker/trunk/src/site/apt/examples/license-family.apt (original)
+++ creadur/whisker/trunk/src/site/apt/examples/license-family.apt Wed Aug  1 19:27:07 2012
@@ -69,10 +69,6 @@ Parameterising a Template for a License 
 
       * an informal {{{./3rd-party-group-sample.xml}group}}
   
- Whisker treats individual maintainers, 
- groups, for- and non-profit corporations as {{{../faq.html#what-is-org}organisations}},
- so these examples are almost identical.
- 
  
  If you're using an IDE then see the 
   {{{../meta-data.html}meta data reference}} for a 
@@ -370,13 +366,67 @@ Parameterising a Template for a License 
 * Adding A Third Party to the Distribution
 
   Let's add <<<boo.png>>> to the distribution,
-  licensed under the same Apache License 
-  by (let's say) <The Legion of the Bouncy Example> (of <<<example.org>>>)
a hypothetical
-  informal group. 
-  If <<<example.org>>> had chosen a different license, 
-  then this license might have to be added but 
-  otherwise the process would be analogous.
+  licensed with the
+  {{{http://opensource.org/licenses/BSD-2-Clause}BSD (2 Clause) license}} 
+  from the (hypothetical) <Example Project>. The license shipped is
   
++---------------------------------------+
+  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:
+
+    1. Redistributions of source code must retain the above copyright notice, 
+       this list of conditions and the following disclaimer.
+    
+    2. 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.
++---------------------------------------+
+
+  Consulting the 
+  {{{http://opensource.org/licenses/index.html}open source initiative}},
+  we find this corresponds to the 
+  {{{http://opensource.org/licenses/BSD-2-Clause}BSD (2 Clause) license}}
+  template.
+ 
++---------------------------------------+
+Copyright (c) <YEAR>, <OWNER>
+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.
++---------------------------------------+
+
 ** Add Organisation  
 
   As far as Whisker is



Mime
View raw message