creadur-commits mailing list archives

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

URL: http://svn.apache.org/viewvc?rev=1369313&view=rev
Log:
Clean up the final bit of description

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=1369313&r1=1369312&r2=1369313&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 13:13:59 2012
@@ -533,7 +533,6 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SU
 
 +---------------------------------------+
     ...
-    <!-- Contents -->
     <within dir='.'>
         ...
         <with-license id='osi:BSD2'>
@@ -541,49 +540,27 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SU
         ...
 +---------------------------------------+
   
-  
-  Resources
-  are grouped by organisation, so the <<<by-organisation>>> containing
-  the new resource named <<<boo.png>>> needs to refer (by <<<id>>>)

-  to the <<<organisation>>> we added earlier. 
+  Within each license, resources are grouped by organisation.
+  So the <<<by-organisation>>> containing
+  the new resource named <<<boo.png>>> needs to 
+  {{{../faq.html#why-ids}refer}} (by <<<id>>>) 
+  to the <<<organisation>>> we added earlier - <<<example.org>>>.

    
 +---------------------------------------+
     ...
-    <!-- Contents -->
     <within dir='.'>
-        <with-license id='osi:AL2'>
+        ...
+        <with-license id='osi:BSD2'>
             ...
             <by-organisation id='example.org'>
                 <resource name='boo.png'/>
             </by-organisation>
         </with-license>
-    </within>
-</manifest>
-+---------------------------------------+
-
-  That's about all there is to the addition of this new resource licensed from
-  an informal group.
- 
-  If <The Legion of the Bouncy Example> had distributed 
-  a <<<NOTICE>>> for this resource, then 
-  (after finding that the <<<NOTICE>>> is not already included) a
-  <<<notice>>> description would need to be added to <<<notices>>>
-  above and referenced by id from the resource. Something like:
-  
-+---------------------------------------+
     ...
-    <!-- Contents -->
-    <within dir='.'>
-        <with-license id='osi:AL2'>
-            ...
-            <by-organisation id='example.org'>
-                <resource name='boo.png' notice='example.org/boo'/>
-            </by-organisation>
-        </with-license>
-    </within>
-</manifest>
 +---------------------------------------+
-  
+
+  That's about all there is to adding <<<boo.png>>>,
+  a new BSD (2 Clause) licensed resource. 
 
 * And Finally
 



Mime
View raw message