r125 - /web/deps/dep5.mdwn

[vorlon at users.alioth.debian.org]

Author: vorlon
Date: Thu Dec 17 15:25:14 2009
New Revision: 125

URL: http://svn.debian.org/wsvn/dep/?sc=1&rev=125
Log:
BSD-C2/BSD-C3 -> BSD, consistent with the current shortname list

Modified:
    web/deps/dep5.mdwn

Modified: web/deps/dep5.mdwn
URL: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=125&op=diff
==============================================================================
--- web/deps/dep5.mdwn (original)
+++ web/deps/dep5.mdwn Thu Dec 17 15:25:14 2009
@@ -361,7 +361,7 @@
 
 This is for a file that has both GPL and classic BSD code in it:
 
-		License: GPL-2+ and BSD-C2
+		License: GPL-2+ and BSD
 
 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.
@@ -372,7 +372,7 @@
 
 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
+		License: GPL-2+ or Artistic-2.0, and BSD
 
 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