From b87ba9e56ba48d777628e7850b584a2a092f74b6 Mon Sep 17 00:00:00 2001
From: Russ Allbery <rra@debian.org>
Date: Sun, 26 Feb 2012 19:25:36 -0800
Subject: [PATCH] Additional wording clarifications to copyright-format 1.0

* Additional wording improvements to copyright-format 1.0 for clarity.
  Also mention that the Files pattern syntax is the same as fnmatch(3)
  and GNU find -path without [] patterns.  Thanks, Jonathan Nieder and
  Ben Finney.
---
 copyright-format/copyright-format-1.0.xml | 38 +++++++++++++++--------
 debian/changelog                          |  4 +++
 2 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/copyright-format/copyright-format-1.0.xml b/copyright-format/copyright-format-1.0.xml
index 1da4c7e..277a4e0 100644
--- a/copyright-format/copyright-format-1.0.xml
+++ b/copyright-format/copyright-format-1.0.xml
@@ -80,8 +80,8 @@
     </para>
     <para>
       Even where licenses are DFSG-free and mutually compatible, users may
-      wish a way to identify software under certain licenses (for example,
-      if they have a problem with the Affero GPL).
+      wish for a way to identify software under certain licenses (if, for
+      example, they have special reasons to avoid certain licenses).
     </para>
   </section>
 
@@ -166,8 +166,8 @@
         in a package's <varname>Description</varname> field in Debian
         control files.  In some but not all cases, the first line may have
         special meaning as a synopsis, similar to how the
-        <varname>Description</varname> field uses it for the short
-        description. See Debian Policy's section 5.6.13, <ulink
+        <varname>Description</varname> field uses the first line for the
+        short description. See Debian Policy's section 5.6.13, <ulink
         url="http://www.debian.org/doc/debian-policy/ch-controlfields#s-f-Description"><quote>Description</quote></ulink>,
         for details.  For example, <varname>Disclaimer</varname> is a
         formatted text field that has no special first line, and
@@ -241,14 +241,17 @@
         </listitem>
       </itemizedlist>
       <para>
-        The <varname>Copyright</varname> and <varname>License</varname> fields
-        in the <emphasis>header paragraph</emphasis> may complement but do not
-        replace the <emphasis>Files paragraphs</emphasis>.  They can be used
-        to summarise the copyright notices or redistribution terms for the
-        whole package, such as when a work combines a permissive and a
-        copyleft license and the combination requires some clarification, or
-        to document a <emphasis>compilation copyright</emphasis> and license.
-        It is possible to use only <varname>License</varname> in the header
+        The <varname>Copyright</varname> and <varname>License</varname>
+        fields in the <emphasis>header paragraph</emphasis> may complement
+        but do not replace the <emphasis>Files paragraphs</emphasis>.  If
+        present, they summarise the copyright notices or redistribution
+        terms for the package as a whole.  For example, when a work
+        combines a permissive and a copyleft license,
+        <varname>License</varname> can be used to clarify the license
+        terms for the combination.  <varname>Copyright</varname> and
+        <varname>License</varname> together can also be used to document a
+        <emphasis>compilation copyright</emphasis> and license.  It is
+        possible to use only <varname>License</varname> in the header
         paragraph, but <varname>Copyright</varname> alone makes no sense.
       </para>
 
@@ -446,7 +449,7 @@ License: MPL-1.1
       <title><varname>Disclaimer</varname></title>
       <para>
         Formatted text, no synopsis: this field is used for non-free or
-        contrib packages to say that they are not part of Debian and to
+        contrib packages to state that they are not part of Debian and to
         explain why (see Debian Policy section <ulink
         url="http://www.debian.org/doc/debian-policy/ch-docs#s-copyrightfile">12.5</ulink>).
       </para>
@@ -606,6 +609,15 @@ Copyright 2009, 2010 Angela Watts</programlisting>
         </informaltable>
         Any other character following a backslash is an error.
       </para>
+      <para>
+        This is the same pattern syntax as
+        <citerefentry><refentrytitle>fnmatch</refentrytitle>
+        <manvolnum>3</manvolnum></citerefentry> without the
+        <constant>FNM_PATHNAME</constant> flag, or the argument to the
+        <literal>-path</literal> test of the GNU <command>find</command>
+        command, except that <literal>[]</literal> wildcards are not
+        recognized.
+      </para>
       <para>
         Multiple <varname>Files</varname> paragraphs are allowed.  The last
         paragraph that matches a particular file applies to it.  More
diff --git a/debian/changelog b/debian/changelog
index 110c87c..d2704ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ debian-policy (3.9.3.1) UNRELEASED; urgency=low
 
   * Fix cross-reference to control field syntax in Policy 5.4 (source
     package control files).  Thanks, Jakub Wilk.  (Closes: #661412)
+  * Additional wording improvements to copyright-format 1.0 for clarity.
+    Also mention that the Files pattern syntax is the same as fnmatch(3)
+    and GNU find -path without [] patterns.  Thanks, Jonathan Nieder and
+    Ben Finney.
   * Install the HTML version of upgrading-checklist in the policy.html
     directory as upgrading-checklist.html so that it can be deployed on
     www.debian.org in a way that will allow links to Policy sections to
-- 
2.39.2