Bug#648387: [copyright-format] English proofreading.
Justin B Rye wrote:
>> Charles Plessy wrote:
>>> - "Another kind of list value has one value per line". Not straightforward...
[...]
> Shouldn't it be "Another type of list has one value per line"? The
> values don't have one value per line - they only have one line each.
Makes sense. I put "Another type of field".
[...]
> ...but this looks a bit awkward and fussy. You could eliminate the
> pluralisation issue by making it:
>
> priority of the conjunctions "or" and "and". "And" has priority over "or".
I snipped away the problematic clause and also applied the other
changes you proposed.
Patch below, intended for application on top of Charles's patch.
Thoughts?
copyright-format/copyright-format.xml | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/copyright-format/copyright-format.xml b/copyright-format/copyright-format.xml
index 2420631d..cbc5d85b 100644
--- a/copyright-format/copyright-format.xml
+++ b/copyright-format/copyright-format.xml
@@ -124,9 +124,8 @@
paragraph</link>.
</para>
<para>
- The value of each field is of one of the four types listed below. The
- definition for each field in this document indicates which type of
- value it takes.
+ There are four types of fields. The definition for each field in this
+ document indicates which type of value it takes.
</para>
<section id="single-line">
@@ -153,7 +152,7 @@
<section id="line-based-lists">
<title>Line-based lists</title>
<para>
- Another kind of list value has one value per line. For example,
+ Another type of field has one value per line. For example,
<varname>Copyright</varname> can list many copyright statements, one per
line.
</para>
@@ -508,8 +507,8 @@ License: MPL-1.1
Copyright 2009 Angela Watts</programlisting>
and file B has:
<programlisting>Copyright 2010 Angela Watts</programlisting>
- the <varname>Copyright</varname> field for a stanza covering both
- file A and file B need contain only:
+ then the <varname>Copyright</varname> field for a stanza covering both
+ file A and file B only needs to contain:
<programlisting>Copyright 2008 John Smith
Copyright 2009, 2010 Angela Watts</programlisting>
</para>
@@ -1078,10 +1077,9 @@ also delete it here.</programlisting>
<programlisting>License: GPL-1+ or Artistic</programlisting>
This is for a file that has both GPL and classic BSD code in it:
<programlisting>License: GPL-2+ and BSD</programlisting>
- For the most complex cases, the comma is used to disambiguate the
- priority of <literal>or</literal>s and <literal>and</literal>s
- <literal>and</literal> has the priority over <literal>or</literal>,
- unless preceded by a comma. For instance:
+ For the most complex cases, commas are used to disambiguate.
+ The conjunction <quote><literal>and</literal></quote> has priority over
+ <quote><literal>or</literal></quote> unless preceded by a comma. For instance:
</para>
<simpara>
<literal>A or B and C</literal> means <literal>A or (B and C)</literal>.
--
1.7.9
Reply to: