You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@creadur.apache.org by rd...@apache.org on 2012/07/22 12:51:25 UTC
svn commit: r1364255 - in /creadur/whisker/trunk/src/site:
apt/examples/in-5-mins.apt fml/faq.fml
Author: rdonkin
Date: Sun Jul 22 10:51:25 2012
New Revision: 1364255
URL: http://svn.apache.org/viewvc?rev=1364255&view=rev
Log:
Start documenting the concept of 'primary', as used in Whisker.
Modified:
creadur/whisker/trunk/src/site/apt/examples/in-5-mins.apt
creadur/whisker/trunk/src/site/fml/faq.fml
Modified: creadur/whisker/trunk/src/site/apt/examples/in-5-mins.apt
URL: http://svn.apache.org/viewvc/creadur/whisker/trunk/src/site/apt/examples/in-5-mins.apt?rev=1364255&r1=1364254&r2=1364255&view=diff
==============================================================================
--- creadur/whisker/trunk/src/site/apt/examples/in-5-mins.apt (original)
+++ creadur/whisker/trunk/src/site/apt/examples/in-5-mins.apt Sun Jul 22 10:51:25 2012
@@ -47,7 +47,7 @@ Whisker In 5 Minutes
Each license, notice and organisation is described once
above, and then
{{{../faq.html#why-ids}referenced by id}} below.
- Begin with an outline:
+ Begin with an outline.
+---------------------------------------+
<manifest>
@@ -66,6 +66,8 @@ Whisker In 5 Minutes
* Definitions
+ Begin with the {{{../faq.html#what-is-primary}primary}} definitions.
+
** Add The Primary License
Licenses should be entered once into the <<<licenses>>>
Modified: creadur/whisker/trunk/src/site/fml/faq.fml
URL: http://svn.apache.org/viewvc/creadur/whisker/trunk/src/site/fml/faq.fml?rev=1364255&r1=1364254&r2=1364255&view=diff
==============================================================================
--- creadur/whisker/trunk/src/site/fml/faq.fml (original)
+++ creadur/whisker/trunk/src/site/fml/faq.fml Sun Jul 22 10:51:25 2012
@@ -41,6 +41,28 @@
</p>
</answer>
</faq>
+ <faq id='what-is-primary'>
+ <question>What Do You Mean by Primary?</question>
+ <answer>
+ <p>
+Whisker documentation often talks about a <em>primary license</em>,
+a <em>primary organisation</em> and so on.
+The meta-data contains elements like <code>primary-license</code> and
+<code>primary-notice</code>. Though the intended meaning might accord
+with intuition, a more precise description may help to deepen
+understanding of software licensing.
+ </p>
+ <p>
+By <em>primary</em>, we mean the
+main license, notice or organisation associated with the project.
+Take, for example, a project here at <a href='http://www.apache.org'>Apache</a>.
+In this case, the primary license would be
+<a href='http://www.apache.org/licenses/LICENSE-2.0.html'>The Apache License, Version 2</a>
+and the primary organisation
+<a href='http://www.apache.org/foundation/'>The Apache Software Foundation</a>.
+ </p>
+ </answer>
+ </faq>
<faq id='where-is-dtd'>
<question>Is a DTD available?</question>
<answer>