r274 - in /web/deps/dep5: copyright-format.xml index.html

[plessy at users.alioth.debian.org]

Author: plessy
Date: Sat Feb 11 12:44:26 2012
New Revision: 274

URL: http://svn.debian.org/wsvn/dep/?sc=1&rev=274
Log:
Clarify the use of stand-alone license paragraph with license exceptions.

Discussed in http://bugs.debian.org/649530, but does not close it.

Modified:
    web/deps/dep5/copyright-format.xml
    web/deps/dep5/index.html

Modified: web/deps/dep5/copyright-format.xml
URL: http://svn.debian.org/wsvn/dep/web/deps/dep5/copyright-format.xml?rev=274&op=diff
==============================================================================
--- web/deps/dep5/copyright-format.xml (original)
+++ web/deps/dep5/copyright-format.xml Sat Feb 11 12:44:26 2012
@@ -325,10 +325,12 @@
     <section id="stand-alone-license-paragraph">
       <title>Stand-alone License Paragraph (optional, repeatable)</title>
       <para>
-        Where a set of files are covered by multiple licenses, or one
-        license occurs multiple times, you can use a single-line
-        <varname>License</varname> field and standalone
-        <varname>License</varname> paragraphs to expand the license short names.
+        Stand-alone <varname>License</varname> paragraphs can be used to
+        provide the full license text for a given license once, instead of
+        repeating it in each <varname>Files</varname> paragraph that refers to
+        it.  The first line of the <varname>License</varname> field must be a
+        single license short name or a short name followed by a license
+        exception.
       </para>
       <para>
         The following fields may be present in a standalone License
@@ -468,12 +470,11 @@
         single copyright file.
       </para>
       <para>
-        Remaining lines: if these are omitted, the file
-        <emphasis>must</emphasis> include a <link
+        If there are no remaining lines, then all of the short names
+        or short names followed by license exceptions making up the
+        first line must be described in <link
         linkend="stand-alone-license-paragraph">standalone License
-        paragraph</link> matching each license short
-        name listed on the first line.
-        Otherwise, this field should either
+        paragraphs</link>.  Otherwise, this field should either
         include the full text of the license(s) or include a pointer to the
         license file under <filename>/usr/share/common-licenses</filename>. 
         This field should include all text needed in order to fulfill both

Modified: web/deps/dep5/index.html
URL: http://svn.debian.org/wsvn/dep/web/deps/dep5/index.html?rev=274&op=diff
==============================================================================
--- web/deps/dep5/index.html (original)
+++ web/deps/dep5/index.html Sat Feb 11 12:44:26 2012
@@ -397,11 +397,14 @@
         id="stand-alone-license-paragraph">Stand-alone License
         Paragraph (optional, repeatable)</a></h3>
 
-        <p>Where a set of files are covered by multiple licenses,
-        or one license occurs multiple times, you can use a
-        single-line <code class="varname">License</code> field and
-        standalone <code class="varname">License</code> paragraphs
-        to expand the license short names.</p>
+        <p>Stand-alone <code class="varname">License</code>
+        paragraphs can be used to provide the full license text for
+        a given license once, instead of repeating it in each
+        <code class="varname">Files</code> paragraph that refers to
+        it. The first line of the <code class=
+        "varname">License</code> field must be a single license
+        short name or a short name followed by a license
+        exception.</p>
 
         <p>The following fields may be present in a standalone
         License paragraph.</p>
@@ -417,7 +420,7 @@
         </ul>
 
         <div class="example">
-          <a name="AEN141" id="AEN141"></a>
+          <a name="AEN142" id="AEN142"></a>
 
           <p><b>Example 1. tri-licensed files</b></p>
           <pre class="programlisting">
@@ -438,7 +441,7 @@
         </div>
 
         <div class="example">
-          <a name="AEN144" id="AEN144"></a>
+          <a name="AEN145" id="AEN145"></a>
 
           <p><b>Example 2. recurrent license</b></p>
           <pre class="programlisting">
@@ -574,12 +577,11 @@
         arbitrary names are only guaranteed to be unique within a
         single copyright file.</p>
 
-        <p>Remaining lines: if these are omitted, the file
-        <span class="emphasis"><i class="emphasis">must</i></span>
-        include a <a href=
+        <p>If there are no remaining lines, then all of the short
+        names or short names followed by license exceptions making
+        up the first line must be described in <a href=
         "#stand-alone-license-paragraph">standalone License
-        paragraph</a> matching each license short name listed on
-        the first line. Otherwise, this field should either include
+        paragraphs</a>. Otherwise, this field should either include
         the full text of the license(s) or include a pointer to the
         license file under <tt class=
         "filename">/usr/share/common-licenses</tt>. This field