creadur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rdon...@apache.org
Subject svn commit: r1364288 - /creadur/whisker/trunk/src/site/fml/faq.fml
Date Sun, 22 Jul 2012 13:10:38 GMT
Author: rdonkin
Date: Sun Jul 22 13:10:37 2012
New Revision: 1364288

URL: http://svn.apache.org/viewvc?rev=1364288&view=rev
Log:
Describe what is meant by organisation.

Modified:
    creadur/whisker/trunk/src/site/fml/faq.fml

Modified: creadur/whisker/trunk/src/site/fml/faq.fml
URL: http://svn.apache.org/viewvc/creadur/whisker/trunk/src/site/fml/faq.fml?rev=1364288&r1=1364287&r2=1364288&view=diff
==============================================================================
--- creadur/whisker/trunk/src/site/fml/faq.fml (original)
+++ creadur/whisker/trunk/src/site/fml/faq.fml Sun Jul 22 13:10:37 2012
@@ -68,8 +68,8 @@ by the project to the software distribut
 <a href='http://www.apache.org/legal/src-headers.html'>insists</a> that 
 original source is 
 <abbr title='The Apache License, Version 2'><code>AL2</code></abbr>
licensed.
-The <em>primary organisation</em> should be the legal entity issuing 
-the primary license. Apache, for example, uses 
+The <em>primary organisation</em> should be the legal entity 
+issuing the primary license. Apache, for example, uses 
 <a href='http://www.apache.org/licenses/index.html#clas'>contributor license agreements</a>,
 <a href='http://www.apache.org/licenses/index.html#grants'>grants</a> and
 <code><abbr title='The Apache License, Version 2'>AL2</abbr> Section 5</code>
@@ -88,8 +88,8 @@ original source is 
 <abbr title='The Apache License, Version 2'><code>AL2</code></abbr>
licensed.
             </p>
             <p>
-The <em>primary organisation</em> should be the legal entity issuing 
-the <em>primary license</em>. Apache, for example, uses 
+The <em>primary organisation</em> should be the legal entity 
+issuing the <em>primary license</em>. Apache, for example, uses 
 <a href='http://www.apache.org/licenses/index.html#clas'>contributor license agreements</a>,
 <a href='http://www.apache.org/licenses/index.html#grants'>grants</a> and
 <code><abbr title='The Apache License, Version 2'>AL2</abbr> Section 5</code>
@@ -101,6 +101,45 @@ copyright may be assigned to the organis
             </p>            
         </answer>
     </faq>
+    <faq id='what-is-org'>
+        <question>What do you mean by an organisation?</question>
+        <answer>
+            <p>
+Whisker uses <em>organisation</em> to identify and describe groups or individuals
+who license the third party works distributed. This includes a wide variety of
+entities, for example 
+            </p>
+            <ul>
+<li>non-profit corporations such as 
+<a href='http://www.apache.org/foundation'>The Apache Software Foundation</a>,

+<a href='http://www.fsf.org/about/'>The Free Software Foundation</a> and 
+<a href='http://www.gnome.org/foundation/'>The GNOME Foundation</a>;
+</li>
+<li>
+for-profit corporations such as
+VMWare Inc., Google Inc. and IBM Corporation;
+</li>
+<li>
+academic institutions such as the 
+<a href='http://berkeley.edu/'>University of California, Berkeley</a>,
+the
+<a href='http://web.mit.edu/'>Massachusetts Institute of Technology</a> and
+<a href='http://osuosl.org/'>Oregon State University</a>; 
+</li>
+<li>
+groups and collectives such as 
+<a href='http://www.bouncycastle.org'>The Legion of the Bouncy Castle</a> and
+<a href='http://www.joda.org'>Joda</a>
+</li>
+<li>and individual maintainers.
+</li>
+            </ul>
+            <p>
+ To reduce duplication and increase comprehension, Whisker often
+ groups results by organisation.
+            </p>
+        </answer>    
+    </faq>
     <faq id='where-is-dtd'>
         <question>Is a DTD available?</question>
         <answer>



Mime
View raw message