Please apply the following patches for copyright-format.xml.
user debian-policy@packages.debian.org
usertags 649674 informative
tag 649674 patch
usertags 649679 normative issue
thanks
Le Mon, Nov 28, 2011 at 12:26:33PM +0100, Bill Allombert a écrit :
>
> As I said previously, my plan was to upload 3.9.3 as soon as the DEP issues are resolved.
> Unfortunately the DEP-related issues are becoming confusing.
Thanks for the clarification.
I am sorry for the mess around the DEP. I know I share the responsability for
it. But let's take an optimistic point of view: there are no major blocker
reported, and the recent resolution of #633797 shows that we can cooperate and
converge on a consensus when tackling new issues.
So I would like to propose to apply the following patches, and after this to
call for either reporting new issues or declaring the DEP accepted.
Correction of the examples
http://bugs.debian.org/649674
This is a patch that bring the examples in compliance with the DEP, by
correcting one typo and adding two missing license short names.
Making the examples more informative would be a plus, but unless
Steve directly supports this I would propose to not touch them further.
Specification of “with <keywords> exception”.
http://bugs.debian.org/633797
This is a normative change that has a very broad consensus, that limits the
use of license exceptions to one keyword, and only for granting additional
permissions. I have updated the patch to fully reflect Steve's changes
(including the commit message).
URL is http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
http://bugs.debian.org/640737
Consensus is reached and David from the WWW team started to work on installing
the documents on www.debian.org at this URL.
Correction of Python license name and SPDX URLs.
http://bugs.debian.org/641071
The SPDX website is back ! URL corrections are not normative, and correction
of Python license name was agreed earlier.
English proofreading.
http://bugs.debian.org/648387
This patch had mostly positive opinions. Steve questionned the timing and
noted “arbitrary preferences of word choice”. I think that it is unavoidable,
and that following choices coming from debian-l10n-english gives us chances
that they are consistent with other texts in Debian.
I needed to lift this patch in order to apply it, and took the opportunity
to correct trivial typos, and to update it to Justins' proposed addition
at http://lists.debian.org/20111111120524.GA13642@xibalba.demon.co.uk
For your convenience if you like, I have attached the patches to this email in
the git-format-patch format. I will update #633797 and #648387 shortly.
The issue left open are:
Clarify what distinguishes files and stand-alone license paragraphs
http://bugs.debian.org/649679
This would indeed clarify the syntax but the problem is a corner case, so
I would tend to avoid to make a normative change at that moment.
Clearer definitions and more consistent License: stanza specification
http://bugs.debian.org/649530
The current version of the DEP is indeed vague on that topic as it allows
to have different contents in License fields that have the same short name.
But at this stage I find it rather a convenience than a problem. I think
that further work on that side is more in the scope of a next version of
the spec.
Reporting new issues is still very welcome. But my personal point of view is
that if no precise objections are raised by the next weeks, then it means that
the version 1.0 of the DEP is ready. I understand that it is in direct
contradiction with Steve's position, and I do not seek confrontation for the
sake of it. He wrote that there are real problems and that it is nearly
impossible for implementors to get things right. I think that the existence of
parsers in Lintian and config-model attenuate this point of view, but I do not
negate the possibility of problems. The sooner they are explained, the sooner
we will finish our work.
Have a nice day,
--
Charles Plessy
Tsurumi, Kanagawa, Japan
>From f001eee7e8a9adf0ebf995477185ec7022626afa Mon Sep 17 00:00:00 2001
From: Charles Plessy <plessy@debian.org>
Date: Mon, 28 Nov 2011 22:27:56 +0900
Subject: [PATCH 1/5] copyright-format: syntax correction of examples.
Wording: Jonathan Nieder <jrnieder@gmail.com>
Closes: #649674
---
copyright-format/copyright-format.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/copyright-format/copyright-format.xml b/copyright-format/copyright-format.xml
index d6790aa..1cf1acf 100644
--- a/copyright-format/copyright-format.xml
+++ b/copyright-format/copyright-format.xml
@@ -488,7 +488,7 @@ License: GPL-2
[LICENSE TEXT]
License: LGPL-2.1
- LICENSE TEXT]</programlisting>
+ [LICENSE TEXT]</programlisting>
</example>
<example>
@@ -1090,7 +1090,7 @@ License: GPL-2+
Files: debian/*
Copyright: Copyright 1998 Jane Smith <jsmith@example.net>
-License:
+License: GPL-2+
[LICENSE TEXT]]]></programlisting>
</para>
</example>
@@ -1116,7 +1116,7 @@ License: PSF-2
Files: debian/*
Copyright: 2008, Dan Developer <dan@debian.example.com>
-License:
+License: permissive
Copying and distribution of this package, with or without
modification, are permitted in any medium without royalty
provided the copyright notice and this notice are
--
1.7.5.4
>From 7b26846119617963303fad22ff4a1a4cb6fac924 Mon Sep 17 00:00:00 2001
From: Charles Plessy <plessy@debian.org>
Date: Mon, 28 Nov 2011 22:41:12 +0900
Subject: [PATCH 2/5] copyright-format: only one exception per license, for
additional permissions.
document that only one exception is allowed per license in a license
specification, and also that exception syntax may not be used when
additional restrictions are imposed, only when additional permissions are
being granted.
Wording: Steve Langasek <vorlon@debian.org>
Seconded: Ben Finney <ben+debian@benfinney.id.au>
Seconded: Craig Small <csmall@debian.org>
Closes: #633797
---
copyright-format/copyright-format.xml | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/copyright-format/copyright-format.xml b/copyright-format/copyright-format.xml
index 1cf1acf..c9b5568 100644
--- a/copyright-format/copyright-format.xml
+++ b/copyright-format/copyright-format.xml
@@ -885,10 +885,22 @@ License: MPL-1.1
matches.
</para>
<para>
- Exceptions and clarifications are signaled in plain text, by appending
+ An exception or clarification to a license is signaled 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 refer to the most frequent exceptions.
+ keywords that must be used when referring to the most frequent
+ exceptions. When exceptions other than these are in effect that modify
+ a common license by granting additional permissions, you may use an
+ arbitrary keyword not taken from the below list of keywords. When a
+ license differs from a common license because of added restrictions
+ rather than because of added permissions, a distinct short name should
+ be used instead of <literal>with
+ <varname><replaceable>keywords</replaceable></varname>exception</literal>.
+ </para>
+ <para>
+ Only one exception may be specified for each license within a given
+ license specification. If more than one exception applies to a single
+ license, an arbitrary short name must be used instead.
</para>
<para>
The GPL <literal>Font</literal> exception refers to the text added to the
--
1.7.5.4
>From 8910150d4f61e7c540a8e640d72914643287a051 Mon Sep 17 00:00:00 2001
From: Charles Plessy <plessy@debian.org>
Date: Mon, 28 Nov 2011 23:08:01 +0900
Subject: [PATCH 3/5] copyright-format: URL on www.debian.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Wording: Charles Plessy <plessy@debian.org>
Seconded: David Prévot <taffit@debian.org>
Seconded: gregor herrmann <gregoa@debian.org>
Closes: #640737
---
README.org | 2 +-
copyright-format/copyright-format.xml | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/README.org b/README.org
index b2c4b6f..2be9c51 100644
--- a/README.org
+++ b/README.org
@@ -138,7 +138,7 @@ published at [[http://www.debian.org/doc/]].
In addition to the main technical manual, the team currently also maintains:
-+ [[http://www.debian.org/doc/packaging-manuals/copyright-format/1.0][Machine-readable debian/copyright format]]
++ [[http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/][Machine-readable debian/copyright format]]
+ [[http://www.debian.org/doc/packaging-manuals/menu-policy/][Debian Menu sub-policy]]
+ [[http://www.debian.org/doc/packaging-manuals/perl-policy/][Debian Perl Policy]]
+ [[http://www.debian.org/doc/packaging-manuals/mime-policy/][Debian MIME support sub-policy]]
diff --git a/copyright-format/copyright-format.xml b/copyright-format/copyright-format.xml
index c9b5568..6eede2c 100644
--- a/copyright-format/copyright-format.xml
+++ b/copyright-format/copyright-format.xml
@@ -185,7 +185,7 @@
<title><varname>Format</varname></title>
<para>
Required single line: URI of the format specification, such as:
- <literal>http://www.debian.org/doc/copyright-format/1.0</literal>
+ <literal>http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/</literal>
</para>
</section>
@@ -278,7 +278,7 @@
<section id="example-header-paragraph">
<title>Example header paragraph</title>
-<programlisting>Format: <VERSIONED_FORMAT_URL>
+<programlisting>Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/;
Upstream-Name: SOFTware
Upstream-Contact: John Doe <john.doe@example.com>
Source: http://www.example.com/software/project</programlisting>
@@ -1072,7 +1072,7 @@ also delete it here.</programlisting>
A possible <filename>debian/copyright</filename> file for the program
<quote>X Solitaire</quote> distributed in the Debian source package
<literal>xsol</literal>:
-<programlisting><![CDATA[Format: <VERSIONED_FORMAT_URL>
+<programlisting><![CDATA[Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: X Solitaire
Source: ftp://ftp.example.com/pub/games
@@ -1113,7 +1113,7 @@ License: GPL-2+
A possible <filename>debian/copyright</filename> file for the program
<quote>Planet Venus</quote>, distributed in the Debian source
package <literal>planet-venus</literal>:
-<programlisting><![CDATA[Format: <VERSIONED_FORMAT_URL>
+<programlisting><![CDATA[Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Planet Venus
Upstream-Contact: John Doe <jdoe@example.com>
Source: http://www.example.com/code/venus
--
1.7.5.4
>From fe5e68886518497cfc0aac1b3963196c3edc8f68 Mon Sep 17 00:00:00 2001
From: Charles Plessy <plessy@debian.org>
Date: Mon, 28 Nov 2011 23:15:50 +0900
Subject: [PATCH 4/5] copyright-format: correct or add links to SPDX.
Wording: Charles Plessy <plessy@debian.org>
Seconded: gregor herrmann <gregoa@debian.org>
Closes: #641071
---
copyright-format/copyright-format.xml | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/copyright-format/copyright-format.xml b/copyright-format/copyright-format.xml
index 6eede2c..43194e5 100644
--- a/copyright-format/copyright-format.xml
+++ b/copyright-format/copyright-format.xml
@@ -580,8 +580,8 @@ License: MPL-1.1
</entry>
<entry>
Apache license
- <ulink url="http://spdx.org/licenses/ASL-1.0";>1.0</ulink>,
- <ulink url="http://spdx.org/licenses/ASL-2.0";>2.0</ulink>.
+ <ulink url="http://spdx.org/licenses/Apache-1.0";>1.0</ulink>,
+ <ulink url="http://spdx.org/licenses/Apache-2.0";>2.0</ulink>.
</entry>
</row>
<row>
@@ -710,9 +710,8 @@ License: MPL-1.1
CC0
</entry>
<entry>
- Creative Commons <ulink
- url="http://creativecommons.org/license/zero/";>Universal
- waiver</ulink>.
+ Creative Common Universal
+ <ulink url="http://spdx.org/licenses/CC0-1.0";>1.0</ulink>.
</entry>
</row>
<row>
@@ -720,7 +719,7 @@ License: MPL-1.1
CDDL
</entry>
<entry>
- <ulink url="http://spdx.org/licenses/CDDL";>Common Development
+ <ulink url="http://spdx.org/licenses/CDDL-1.0";>Common Development
and Distribution License</ulink>.
</entry>
</row>
@@ -772,7 +771,6 @@ License: MPL-1.1
<ulink url="http://spdx.org/licenses/LGPL-2.1";>2.1</ulink>,
<ulink url="http://spdx.org/licenses/LGPL-3.0";>3.0</ulink>, or
GNU Library General Public License
- <ulink url="http://spdx.org/licenses/LGPL-1.0";>1.0</ulink>,
<ulink url="http://spdx.org/licenses/LGPL-2.0";>2.0</ulink>.
</entry>
</row>
@@ -781,8 +779,8 @@ License: MPL-1.1
GFDL
</entry>
<entry>
- <ulink url="http://spdx.org/licenses/FDL-1.0";>GNU Free
- Documentation License</ulink>.
+ GNU Free Documentation License 1.0, or
+ <ulink url="http://spdx.org/licenses/GFDL-1.1";>1.1</ulink>.
</entry>
</row>
<row>
@@ -827,12 +825,13 @@ License: MPL-1.1
</row>
<row>
<entry>
- Python-CNRI
+ Python
</entry>
<entry>
- <ulink url="http://spdx.org/licenses/Python-CNRI";>Python
- license</ulink>.
+ Python license
+ <ulink url="http://spdx.org/licenses/Python-2.0";>2.0</ulink>.
</entry>
+ <!-- See https://fossbazaar.org/pipermail/spdx-legal/2011-February/000010.html -->
</row>
<row>
<entry>
@@ -869,8 +868,8 @@ License: MPL-1.1
Zope
</entry>
<entry>
- Zope Public License
- <ulink url="http://spdx.org/licenses/ZPL-1.0";>1.0</ulink>,
+ Zope Public License 1.0,
+ <ulink url="http://spdx.org/licenses/ZPL-1.1";>1.1</ulink>,
<ulink url="http://spdx.org/licenses/ZPL-2.0";>2.0</ulink>,
<ulink url="http://spdx.org/licenses/ZPL-2.1";>2.1</ulink>.
</entry>
--
1.7.5.4
>From 305b732ef692000f47b02fece94b037bdf75a676 Mon Sep 17 00:00:00 2001
From: Charles Plessy <plessy@debian.org>
Date: Mon, 28 Nov 2011 23:42:15 +0900
Subject: [PATCH 5/5] copyright-format: English proofreading by
debian-l10n-english.
Wording: Justin B Rye <jbr@edlug.org.uk>
Seconded: Charles Plessy <plessy@debian.org>
Closes: #648387
---
copyright-format/copyright-format.xml | 80 ++++++++++++++++----------------
1 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/copyright-format/copyright-format.xml b/copyright-format/copyright-format.xml
index 43194e5..90cab96 100644
--- a/copyright-format/copyright-format.xml
+++ b/copyright-format/copyright-format.xml
@@ -25,10 +25,10 @@
</legalnotice>
<abstract>
<para>
- This specification was drafted as <ulink
+ This specification was drawn up as <ulink
url="http://dep.debian.net/deps/dep5/";>DEP-5</ulink>, to establish a
standard, machine-readable format for
- <filename>debian/copyright</filename> files within packages and
+ <filename>debian/copyright</filename> files within packages and to
facilitate automated checking and reporting of licenses for packages and
sets of packages.
</para>
@@ -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>
@@ -121,32 +121,32 @@
avoid conflicting specifications for widely used extra fields.
</para>
<para>
- There are four kinds values for fields. Each field specifies which kind
- is allowed.
+ Each field must have one of the following four types of value,
+ as specified in the field's definition.
</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
+ 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
+ single-line value specifying the version of the machine-readable format
that is used.
</para>
</section>
<section id="white-space-lists">
- <title>White space separated lists</title>
+ <title>Whitespace-separated lists</title>
<para>
- A white space 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 white
- space characters (including space, TAB, and newline). For example, the
+ 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>
+ <title>Line-based lists</title>
<para>
Another kind of list value has one value per line. For example,
<varname>Copyright</varname> can list many copyright statements, one per
@@ -159,7 +159,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
@@ -174,17 +174,17 @@
There are three kinds of paragraphs: the first one is called the
<link linkend="header-paragraph">header paragraph</link>. Every other
paragraph is either a <link linkend="files-paragraph">Files</link>
- paragraph or a <link linkend="stand-alone-license-paragraph">stand-alone
+ paragraph or a <link linkend="stand-alone-license-paragraph">standalone
license</link> paragraph. 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>
<section id="format-header-field">
<title><varname>Format</varname></title>
<para>
- Required single line: URI of the format specification, such as:
+ Required single line: URI of the format specification, such as
<literal>http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/</literal>
</para>
</section>
@@ -199,7 +199,7 @@
<section id="upstream-contact-header-field">
<title><varname>Upstream-Contact</varname></title>
<para>
- Optional line based list: the preferred address(es) to reach the
+ Optional line-based list: the preferred address(es) to reach the
upstream project. May be free-form text, but by convention will
usually be written as a list of RFC5322 addresses or URIs.
</para>
@@ -208,7 +208,7 @@
<section id="source-header-field">
<title><varname>Source</varname></title>
<para>
- Optional formatted text, no synopsis: an explanation from where the
+ Optional 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>
@@ -247,7 +247,7 @@
(no <varname>Files</varname> specification), this field gives the
license information for the package as a whole, which may be different
or simplified from a combination of all the per-file license
- information. <varname>License</varname> below in the <link
+ information. See also <varname>License</varname> below in the <link
linkend="files-paragraph">Files paragraph</link> section.
</para>
</section>
@@ -255,7 +255,7 @@
<section id="copyright-header-field">
<title><varname>Copyright</varname></title>
<para>
- Optional line based list: in the header paragraph (no
+ Optional line-based list: in the header paragraph (no
<varname>Files</varname> specification), this field gives the
copyright information for the package as a whole, which may be
different or simplified from a combination of all the per-file
@@ -286,9 +286,9 @@ Source: http://www.example.com/software/project</programlisting>
</section>
<section id="files-paragraph">
- <title>Files paragraph (Repeatable)</title>
+ <title>Files paragraph (repeatable)</title>
<para>
- The declaration of copyright and license for files is done in one or
+ 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 all files and lists all applicable copyrights and
licenses.
@@ -297,7 +297,7 @@ Source: http://www.example.com/software/project</programlisting>
<section id="files-files-field">
<title><varname>Files</varname></title>
<para>
- Required white space separated list: list of patterns indicating files
+ Required whitespace-separated list: list of patterns indicating files
covered by the license and copyright specified in this paragraph.
</para>
<para>
@@ -360,15 +360,15 @@ Source: http://www.example.com/software/project</programlisting>
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>
<section id="copyright-files-field">
<title><varname>Copyright</varname></title>
<para>
- Required line based list: one or more free-form copyright
+ Required line-based list: one or more free-form copyright
statement(s), one per line, that apply to the files matched by the
above pattern. If a work has no copyright holder (i.e., it is in
the public domain), that information should be recorded here.
@@ -413,8 +413,8 @@ Copyright 2009, 2010 Angela Watts</programlisting>
copyright file.
</para>
<para>
- Remaining lines: if left blank here, the file
- <emphasis>must</emphasis> include a stand-alone
+ Remaining lines: if these are omitted, the file
+ <emphasis>must</emphasis> include a standalone
<varname>License</varname> paragraph matching each license short
name listed on the first line (see the <link
linkend="stand-alone-license-paragraph">Standalone License
@@ -467,10 +467,10 @@ License: GPL-2+</programlisting>
</section>
<section id="stand-alone-license-paragraph">
- <title>Standalone License Paragraph (Optional, Repeatable)</title>
+ <title>Standalone license paragraph (optional, repeatable)</title>
<para>
- Where a set of files are dual (tri, etc) licensed, or when the same
- license occurs multiple times, you can use a single line
+ 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.
</para>
@@ -541,7 +541,7 @@ License: MPL-1.1
<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>
@@ -549,9 +549,9 @@ License: MPL-1.1
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>
@@ -884,7 +884,7 @@ License: MPL-1.1
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
@@ -921,7 +921,7 @@ statement from your version.</programlisting>
The GPL <literal>OpenSSL</literal> exception gives permission to link GPL-licensed
code with the OpenSSL library, which contains GPL-incompatible clauses.
For more information, see <ulink
-url="http://www.gnome.org/~markmc/openssl-and-the-gpl";>The -OpenSSL License and
+url="http://www.gnome.org/~markmc/openssl-and-the-gpl";>The OpenSSL License and
The GPL</ulink> by Mark
McLoughlin and the message <ulink
url="http://lists.debian.org/debian-legal/2004/05/msg00595.html";>middleman
@@ -992,7 +992,7 @@ also delete it here.</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
+ 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:
</para>
--
1.7.5.4
Reply to: