r42 - in /web/deps: ./ dep5.mdwn

[vorlon at users.alioth.debian.org]

Author: vorlon
Date: Thu Apr  2 04:41:49 2009
New Revision: 42

URL: http://svn.debian.org/wsvn/dep/?sc=1&rev=42
Log:
Replaced pipes and commas by `or`s and `and`s.

Modified:
    web/deps/   (props changed)
    web/deps/dep5.mdwn

Propchange: web/deps/
------------------------------------------------------------------------------
--- bzr:revision-id:v4 (original)
+++ bzr:revision-id:v4 Thu Apr  2 04:41:49 2009
@@ -1,3 +1,4 @@
 13 vorlon at debian.org-20090319204420-kitadc6ipd3gp5rz
 14 plessy at debian.org-20090326140515-0bqh597cxtii1lcb
 15 plessy at debian.org-20090326140956-53gtzw5sr691utey
+16 plessy at debian.org-20090326143300-a1rwc4h5xcd8zfay

Propchange: web/deps/
------------------------------------------------------------------------------
--- bzr:revision-info (original)
+++ bzr:revision-info Thu Apr  2 04:41:49 2009
@@ -1,4 +1,4 @@
-timestamp: 2009-03-26 23:09:56.522000074 +0900
+timestamp: 2009-03-26 23:33:00.516000032 +0900
 committer: Charles Plessy <plessy at debian.org>
 properties: 
 	branch-nick: dep5-bzr

Modified: web/deps/dep5.mdwn
URL: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=42&op=diff
==============================================================================
--- web/deps/dep5.mdwn (original)
+++ web/deps/dep5.mdwn Thu Apr  2 04:41:49 2009
@@ -138,7 +138,7 @@
 	Files: src/js/editline/*
 	Copyright: © 1993, John Doe
 	           © 1993, Joe Average
-	License: MPL-1.1 | GPL-2 | LGPL-2.1
+	License: MPL-1.1 or GPL-2 or LGPL-2.1
         
 	License: MPL-1.1
 	 [LICENSE TEXT]
@@ -430,10 +430,9 @@
 #### Syntax
 License names are case-insensitive.
 
-The pipe character "|"
-is used when the user chan chose between different licenses.
-The comma "," is used for code whose use must comply with the terms of
-multiple licenses.
+In case of multi-licensing, the license short names are separated by `or` for
+code where the user can chose between different licenses, and by `and` for code
+whose use must comply with the terms of multiple licenses.
 
 For instance, this is a simple, "GPL version 2 or later" field:
 
@@ -441,15 +440,22 @@
 
 This is a dual-licensed GPL/Artistic work such as Perl:
 
-		License: GPL-2+ | Artistic-2.0
+		License: GPL-2+ or Artistic-2.0
 
 This is for a file that has both GPL and classic BSD code in it:
 
-		License: GPL-2+, BSD-C2
-
-And this is for a file that has Perl code and classic BSD code in it:
-
-		License: GPL-2+ | Artistic-2.0, BSD-C3
+		License: GPL-2+ and BSD-C2
+
+For the most complex cases, the comma is used to disambiguate the priority of
+`or`s and `and`s: `and` has the priority over `or`, unless preceded by a comma.
+For instance:
+
+  `A or B and C` means `A or (B and C)`.
+  `A or B, and C` means `(A or B), and C`.
+
+This is for a file that has Perl code and classic BSD code in it:
+
+		License: GPL-2+ or Artistic-2.0, and BSD-C3
 
 A GPL-2+ work with the OpenSSL exception is in effect a dual-licensed
 work that can be redistributed either under the GPL-2+, or under the