r273 - in /web/deps/dep5: copyright-format.xml index.html
plessy at users.alioth.debian.org
plessy at users.alioth.debian.org
Sat Feb 11 07:25:56 UTC 2012
Author: plessy
Date: Sat Feb 11 07:25:55 2012
New Revision: 273
URL: http://svn.debian.org/wsvn/dep/?sc=1&rev=273
Log:
English proofreading, thanks to Justin B Rye and Jonathan Nieder.
Closes: #648387
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=273&op=diff
==============================================================================
--- web/deps/dep5/copyright-format.xml (original)
+++ web/deps/dep5/copyright-format.xml Sat Feb 11 07:25:55 2012
@@ -81,9 +81,9 @@
no way to know how much of Debian should be stripped from such a system.
</para>
<para>
- A user might want to have a way to avoid software with certain licenses
- they have a problem with, even if the licenses are DFSG-free. For example,
- the Affero GPL.
+ Even where licenses are DFSG-free and mutually compatible, users might want
+ a way to avoid software with certain licenses, for example if they have a
+ problem with the Affero GPL.
</para>
</section>
@@ -127,16 +127,15 @@
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">
<title>Single-line values</title>
<para>
- A single-line value means that the whole value of a field must fit
- on a single line. For example, the <varname>Format</varname> field
+ This means that the whole value of a field must fit on a single line.
+ For example, the <varname>Format</varname> field
has a single-line value specifying the version of the
machine-readable format that is used.
</para>
@@ -145,18 +144,17 @@
<section id="white-space-lists">
<title>Whitespace-separated lists</title>
<para>
- A whitespace-separated list means that the field value may be on one
- line or many, but values in the list are separated by one or more
- whitespace characters (including space, TAB, and newline). For
- example, the <varname>Files</varname> field has a list of filename
- patterns.
+ This means that the field value may be on one line or many, but values
+ in the list are separated by one or more whitespace characters
+ (including space, TAB, and newline). For example, the
+ <varname>Files</varname> field has a list of filename patterns.
</para>
</section>
<section id="line-based-lists">
<title>Line-based lists</title>
<para>
- Another kind of list value has one value per line. For example,
+ This means that the field has one value per line. For example,
<varname>Upstream-Contact</varname> can list contact addresses, one per
line.
</para>
@@ -167,7 +165,7 @@
<para>
Formatted text fields use the same rules as the long description in a
package's <varname>Description</varname> field, possibly also using the
- first line as a synopsis, like <varname>Description</varname> uses it
+ first line as a synopsis, just as <varname>Description</varname> uses it
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> has no special
@@ -183,13 +181,13 @@
is called the <link linkend="header-paragraph">header paragraph</link>.
Every other paragraph is either a <link
linkend="files-paragraph">Files paragraph</link> or a <link
- linkend="stand-alone-license-paragraph">stand-alone License
+ linkend="stand-alone-license-paragraph">standalone License
paragraph</link>. This is similar to source and binary package
paragraphs in <filename>debian/control</filename> files.
</para>
<section id="header-paragraph">
- <title>Header paragraph (Once)</title>
+ <title>Header paragraph (once)</title>
<para>
The following fields may be present in a header paragraph.
</para>
@@ -261,9 +259,9 @@
</section>
<section id="files-paragraph">
- <title>Files paragraph (Repeatable)</title>
- <para>
- The declaration of copyright and license for files is done in one or
+ <title>Files paragraph (repeatable)</title>
+ <para>
+ The declaration of copyright and license for files may consist of one or
more paragraphs. In the simplest case, a single paragraph can be used
which applies to the whole package. Only the license and copyright
information required by the Debian archive is required to be listed
@@ -325,15 +323,15 @@
</section>
<section id="stand-alone-license-paragraph">
- <title>Stand-alone License Paragraph (Optional, Repeatable)</title>
- <para>
- Where a set of files are dual (tri, etc) licensed, or when the same
+ <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 stand-alone
+ <varname>License</varname> field and standalone
<varname>License</varname> paragraphs to expand the license short names.
</para>
<para>
- The following fields may be present in a stand-alone License
+ The following fields may be present in a standalone License
paragraph.
</para>
@@ -417,7 +415,7 @@
<section id="source-field">
<title><varname>Source</varname></title>
<para>
- Formatted text, no synopsis: an explanation from where the upstream
+ Formatted text, no synopsis: an explanation of where the upstream
source came from. Typically this would be a URL, but it might be a
free-form explanation. The Debian Policy section <ulink
url="http://www.debian.org/doc/debian-policy/ch-docs#s-copyrightfile">12.5</ulink>
@@ -457,7 +455,7 @@
be different or simplified from a combination of all the per-file
license information. In a Files paragraph, this field gives the
licensing terms for the files listed in the <varname>Files</varname>
- field for this paragraph. In a stand-alone License paragraph, it
+ field for this paragraph. In a standalone License paragraph, it
gives the licensing terms for those paragraphs which reference it.
</para>
<para>
@@ -470,9 +468,9 @@
single copyright file.
</para>
<para>
- Remaining lines: if left blank here, the file
+ Remaining lines: if these are omitted, the file
<emphasis>must</emphasis> include a <link
- linkend="stand-alone-license-paragraph">stand-alone License
+ linkend="stand-alone-license-paragraph">standalone License
paragraph</link> matching each license short
name listed on the first line.
Otherwise, this field should either
@@ -512,8 +510,8 @@
Copyright 2009 Angela Watts</programlisting>
and file B has:
<programlisting>Copyright 2010 Angela Watts</programlisting>
- the <varname>Copyright</varname> field for a paragraph covering both
- file A and file B need contain only:
+ then the <varname>Copyright</varname> field for a paragraph covering both
+ file A and file B only needs to contain:
<programlisting>Copyright 2008 John Smith
Copyright 2009, 2010 Angela Watts</programlisting>
</para>
@@ -592,8 +590,8 @@
paragraph that matches a particular file applies to it.
</para>
<para>
- Exclusions are done by having multiple <varname>Files</varname>
- paragraphs.
+ Exclusions are only supported by adding <varname>Files</varname>
+ paragraphs to override the previous match.
</para>
</section>
@@ -631,7 +629,7 @@
<filename>debian/copyright</filename>, nor any requirements in the
license of the work regarding reproduction of legal notices. This
information must still be included in the <varname>License</varname>
- field, either in a stand-alone License paragraph or in the relevant
+ field, either in a standalone License paragraph or in the relevant
files paragraph.
</para>
<para>
@@ -639,9 +637,9 @@
added, using a dash as a separator. If omitted, the lowest version
number is implied. When the license grant permits using the terms of any
later version of that license, the short name is finished with a plus
- sign. For <link linkend="spdx">SPDX</link> compatibility, trailing
- <emphasis>dot-zeroes</emphasis> are considered to be equal to plainer
- version (e.g., <quote>2.0.0</quote> is considered equal to
+ sign. For <link linkend="spdx">SPDX</link> compatibility, versions with trailing
+ <emphasis>dot-zeroes</emphasis> are considered to be equivalent to
+ versions without (e.g., <quote>2.0.0</quote> is considered equal to
<quote>2.0</quote> and <quote>2</quote>).
</para>
<para>
@@ -974,7 +972,7 @@
matches.
</para>
<para>
- An exception or clarification to a license is signaled in plain text, by appending
+ An exception or clarification to a license is signalled in plain text, by appending
<literal>with <varname><replaceable>keywords</replaceable></varname>
exception</literal> to the short name. This document provides a list of
keywords that must be used when referring to the most frequent
@@ -1082,10 +1080,10 @@
<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-3-clause</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>.
Modified: web/deps/dep5/index.html
URL: http://svn.debian.org/wsvn/dep/web/deps/dep5/index.html?rev=273&op=diff
==============================================================================
--- web/deps/dep5/index.html (original)
+++ web/deps/dep5/index.html Sat Feb 11 07:25:55 2012
@@ -119,9 +119,10 @@
software can switch to it and we have no way to know how much
of Debian should be stripped from such a system.</p>
- <p>A user might want to have a way to avoid software with
- certain licenses they have a problem with, even if the
- licenses are DFSG-free. For example, the Affero GPL.</p>
+ <p>Even where licenses are DFSG-free and mutually compatible,
+ users might want a way to avoid software with certain
+ licenses, for example if they have a problem with the Affero
+ GPL.</p>
</div>
<div class="section">
@@ -165,9 +166,9 @@
paragraph</a> and one <a href="#files-paragraph">Files
paragraph</a>.</p>
- <p>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.</p>
+ <p>There are four types of fields. The definition for each
+ field in this document indicates which type of value it
+ takes.</p>
<div class="section">
<hr>
@@ -175,11 +176,11 @@
<h3 class="section"><a name="single-line" id=
"single-line">Single-line values</a></h3>
- <p>A single-line value means that the whole value of a
- field must fit on a single line. For example, the
- <code class="varname">Format</code> field has a single-line
- value specifying the version of the machine-readable format
- that is used.</p>
+ <p>This means that the whole value of a field must fit on a
+ single line. For example, the <code class=
+ "varname">Format</code> field has a single-line value
+ specifying the version of the machine-readable format that
+ is used.</p>
</div>
<div class="section">
@@ -188,12 +189,11 @@
<h3 class="section"><a name="white-space-lists" id=
"white-space-lists">Whitespace-separated lists</a></h3>
- <p>A whitespace-separated list means that the field value
- may be on one line or many, but values in the list are
- separated by one or more whitespace characters (including
- space, TAB, and newline). For example, the <code class=
- "varname">Files</code> field has a list of filename
- patterns.</p>
+ <p>This means that the field value may be on one line or
+ many, but values in the list are separated by one or more
+ whitespace characters (including space, TAB, and newline).
+ For example, the <code class="varname">Files</code> field
+ has a list of filename patterns.</p>
</div>
<div class="section">
@@ -202,7 +202,7 @@
<h3 class="section"><a name="line-based-lists" id=
"line-based-lists">Line-based lists</a></h3>
- <p>Another kind of list value has one value per line. For
+ <p>This means that the field has one value per line. For
example, <code class="varname">Upstream-Contact</code> can
list contact addresses, one per line.</p>
</div>
@@ -217,7 +217,7 @@
<p>Formatted text fields use the same rules as the long
description in a package's <code class=
"varname">Description</code> field, possibly also using the
- first line as a synopsis, like <code class=
+ first line as a synopsis, just as <code class=
"varname">Description</code> uses it for the short
description. See Debian Policy's section 5.6.13, <a href=
"http://www.debian.org/doc/debian-policy/ch-controlfields#s-f-Description"
@@ -238,7 +238,7 @@
in the file is called the <a href="#header-paragraph">header
paragraph</a>. Every other paragraph is either a <a href=
"#files-paragraph">Files paragraph</a> or a <a href=
- "#stand-alone-license-paragraph">stand-alone License
+ "#stand-alone-license-paragraph">standalone License
paragraph</a>. This is similar to source and binary package
paragraphs in <tt class="filename">debian/control</tt>
files.</p>
@@ -247,7 +247,7 @@
<hr>
<h3 class="section"><a name="header-paragraph" id=
- "header-paragraph">Header paragraph (Once)</a></h3>
+ "header-paragraph">Header paragraph (once)</a></h3>
<p>The following fields may be present in a header
paragraph.</p>
@@ -325,10 +325,10 @@
<hr>
<h3 class="section"><a name="files-paragraph" id=
- "files-paragraph">Files paragraph (Repeatable)</a></h3>
-
- <p>The declaration of copyright and license for files is
- done in one or more paragraphs. In the simplest case, a
+ "files-paragraph">Files paragraph (repeatable)</a></h3>
+
+ <p>The declaration of copyright and license for files may
+ consist of one or more paragraphs. In the simplest case, a
single paragraph can be used which applies to the whole
package. Only the license and copyright information
required by the Debian archive is required to be listed
@@ -395,15 +395,15 @@
<h3 class="section"><a name="stand-alone-license-paragraph"
id="stand-alone-license-paragraph">Stand-alone License
- Paragraph (Optional, Repeatable)</a></h3>
-
- <p>Where a set of files are dual (tri, etc) licensed, or
- when the same license occurs multiple times, you can use a
+ 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
- stand-alone <code class="varname">License</code> paragraphs
+ standalone <code class="varname">License</code> paragraphs
to expand the license short names.</p>
- <p>The following fields may be present in a stand-alone
+ <p>The following fields may be present in a standalone
License paragraph.</p>
<ul>
@@ -507,10 +507,10 @@
<h3 class="section"><a name="source-field" id=
"source-field"><code class="varname">Source</code></a></h3>
- <p>Formatted text, no synopsis: an explanation from where
- the upstream source came from. Typically this would be a
- URL, but it might be a free-form explanation. The Debian
- Policy section <a href=
+ <p>Formatted text, no synopsis: an explanation of where the
+ upstream source came from. Typically this would be a URL,
+ but it might be a free-form explanation. The Debian Policy
+ section <a href=
"http://www.debian.org/doc/debian-policy/ch-docs#s-copyrightfile"
target="_top">12.5</a> requires this information unless
there are no upstream sources, which is mainly the case for
@@ -561,7 +561,7 @@
combination of all the per-file license information. In a
Files paragraph, this field gives the licensing terms for
the files listed in the <code class="varname">Files</code>
- field for this paragraph. In a stand-alone License
+ field for this paragraph. In a standalone License
paragraph, it gives the licensing terms for those
paragraphs which reference it.</p>
@@ -574,10 +574,10 @@
arbitrary names are only guaranteed to be unique within a
single copyright file.</p>
- <p>Remaining lines: if left blank here, the file
+ <p>Remaining lines: if these are omitted, the file
<span class="emphasis"><i class="emphasis">must</i></span>
include a <a href=
- "#stand-alone-license-paragraph">stand-alone License
+ "#stand-alone-license-paragraph">standalone License
paragraph</a> matching each license short name listed on
the first line. Otherwise, this field should either include
the full text of the license(s) or include a pointer to the
@@ -624,8 +624,8 @@
</pre>and file B has:
<pre class="programlisting">
Copyright 2010 Angela Watts
-</pre>the <code class="varname">Copyright</code> field for a
-paragraph covering both file A and file B need contain only:
+</pre>then the <code class="varname">Copyright</code> field for a
+paragraph covering both file A and file B only needs to contain:
<pre class="programlisting">
Copyright 2008 John Smith
Copyright 2009, 2010 Angela Watts
@@ -722,8 +722,9 @@
are allowed. The last paragraph that matches a particular
file applies to it.</p>
- <p>Exclusions are done by having multiple <code class=
- "varname">Files</code> paragraphs.</p>
+ <p>Exclusions are only supported by adding <code class=
+ "varname">Files</code> paragraphs to override the previous
+ match.</p>
</div>
</div>
@@ -767,7 +768,7 @@
requirements in the license of the work regarding
reproduction of legal notices. This information must still
be included in the <code class="varname">License</code>
- field, either in a stand-alone License paragraph or in the
+ field, either in a standalone License paragraph or in the
relevant files paragraph.</p>
<p>For licenses which have multiple versions in use, the
@@ -775,10 +776,10 @@
omitted, the lowest version number is implied. When the
license grant permits using the terms of any later version
of that license, the short name is finished with a plus
- sign. For <a href="#spdx">SPDX</a> compatibility, trailing
- <span class="emphasis"><i class=
- "emphasis">dot-zeroes</i></span> are considered to be equal
- to plainer version (e.g., <span class=
+ sign. For <a href="#spdx">SPDX</a> compatibility, versions
+ with trailing <span class="emphasis"><i class=
+ "emphasis">dot-zeroes</i></span> are considered to be
+ equivalent to versions without (e.g., <span class=
"QUOTE">"2.0.0"</span> is considered equal to <span class=
"QUOTE">"2.0"</span> and <span class=
"QUOTE">"2"</span>).</p>
@@ -1117,7 +1118,7 @@
target="_top">many versions of the MIT license</a>. Please
use Expat instead, when it matches.</p>
- <p>An exception or clarification to a license is signaled
+ <p>An exception or clarification to a license is signalled
in plain text, by appending <tt class="literal">with
<code class="varname"><tt class=
"replaceable"><i>keywords</i></tt></code> exception</tt> to
@@ -1245,11 +1246,11 @@
it:
<pre class="programlisting">
License: GPL-2+ and BSD-3-clause
-</pre>For the most complex cases, the comma is used to disambiguate
-the priority of <tt class="literal">or</tt>s and <tt class=
-"literal">and</tt>s. <tt class="literal">and</tt> has the priority
-over <tt class="literal">or</tt>, unless preceded by a comma. For
-instance:
+</pre>For the most complex cases, commas are used to disambiguate.
+The conjunction <span class="QUOTE">"<tt class=
+"literal">and</tt>"</span> has priority over <span class="QUOTE">
+ "<tt class="literal">or</tt>"</span> unless preceded by a
+ comma. For instance:
<p><tt class="literal">A or B and C</tt> means <tt class=
"literal">A or (B and C)</tt>.</p>
More information about the dep-commits
mailing list