r208 - // /web/deps/dep5.mdwn

[vorlon at users.alioth.debian.org]

Author: vorlon
Date: Fri Nov 25 20:19:42 2011
New Revision: 208

URL: http://svn.debian.org/wsvn/dep/?sc=1&rev=208
Log:
document that only one exception is allowed per license in a license
specification, and also that exception syntax may not be used when
additional restrictions are imposed, only when additional permissions are
being granted.

Modified:
    /   (props changed)
    web/deps/dep5.mdwn

Modified: web/deps/dep5.mdwn
URL: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=208&op=diff
==============================================================================
--- web/deps/dep5.mdwn (original)
+++ web/deps/dep5.mdwn Fri Nov 25 20:19:42 2011
@@ -1036,12 +1036,27 @@
         target="_top">many versions of the MIT license</a>. Please
         use Expat instead, when it matches.</p>
 
-        <p>Exceptions and clarifications are signaled in plain
-        text, by appending <tt class="literal">with <code class=
-        "varname"><tt class=
-        "replaceable"><i>keywords</i></tt></code> exception</tt> to
+        <p>An exception or clarification to a license is signaled
+        in plain text, by appending <tt class="literal">with <code
+        class="varname"><tt class=
+        "replaceable"><i>keyword</i></tt></code> exception</tt> to
         the short name. This document provides a list of keywords
-        that refer to the most frequent exceptions.</p>
+        that must be used when referring to the most frequent
+        exceptions.  When exceptions other than these are in effect
+        that modify a common license by granting additional
+        permissions, you may use an arbitrary keyword not taken
+        from the below list of keywords.  When a license differs
+        from a common license because of added restrictions rather
+        than because of added permissions, a distinct short name
+        should be used instead of <tt class="literal">with <code
+        class="varname"><tt class=
+        "replaceable"><i>keyword</i></tt></code> exception</tt>.
+        </p>
+
+        <p>Only one exception may be specified for each license
+        within a given license specification.  If more than one
+        exception applies to a single license, an arbitrary short
+        name must be used instead.</p>
 
         <p>The GPL <tt class="literal">Font</tt> exception refers
         to the text added to the license notice of each file as