Bug#649530: [copyright-format] clearer definitions and more consistent License: stanza specification

[Jonathan Nieder <jrnieder@gmail.com>]

Charles Plessy wrote:

> would the following changes solve the problem with license exceptions ?

Here's some tweaks for application on top.  With these tweaks, I'm
happy with it.

 copyright-format/copyright-format.xml |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/copyright-format/copyright-format.xml b/copyright-format/copyright-format.xml
index 3ae033dc..e125f705 100644
--- a/copyright-format/copyright-format.xml
+++ b/copyright-format/copyright-format.xml
@@ -323,10 +323,12 @@ License: GPL-2+</programlisting>
     <section id="stand-alone-license-paragraph">
       <title>Stand-alone License Paragraph (Optional, Repeatable)</title>
       <para>
-        Stand-alone <varname>License</varname> paragraphs expand license short
-        names, optionally followed by an exception statement, and are useful
-        in particular with sets of files that are dual (tri, etc) licensed, or
-        when the same license occurs multiple times.
+        Stand-alone <varname>License</varname> paragraphs can be used to
+        provide the full license text for a given license once, instead of
+        once for 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 stand-alone License
@@ -467,9 +469,9 @@ License: MPL-1.1
       </para>
       <para>
         Remaining lines: if left blank here, the file
-        <emphasis>must</emphasis> include one or more<link
+        <emphasis>must</emphasis> include a <link
         linkend="stand-alone-license-paragraph">stand-alone License
-        paragraphs</link> matching the first line's license short
+        paragraph</link> matching each of the first line's license short
         names, with their exception if any.
         Otherwise, this field should either
         include the full text of the license(s) or include a pointer to the
-- 
1.7.9