From 3b4421b7886662e4c97fe6f2bd5d2ac0db362529 Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Sat, 24 Sep 2016 00:36:32 +0000
Subject: bip-0002: Prohibit the OPL in new BIPs

---
 bip-0002.mediawiki | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'bip-0002.mediawiki')

diff --git a/bip-0002.mediawiki b/bip-0002.mediawiki
index 9d59405..c5274c0 100644
--- a/bip-0002.mediawiki
+++ b/bip-0002.mediawiki
@@ -172,7 +172,10 @@ For a later version (eg, GPL 3.0), you would increase the version number (and re
     License-Code: GPL-3.0   # This refers to GPL v3.0 *only*, no later license versions are acceptable.
     License-Code: GPL-3.0+  # This refers to GPL v3.0 *or later*.
 
-In the event that the text or code is not available under common license terms, the list should instead be replaced with the single term "Complex", and full details provided in the Copyright section of the BIP.
+In the event that the licensing for the text or code is too complicated to express with a simple list of alternatives, the list should instead be replaced with the single term "Complex". In all cases, details of the licensing terms must be provided in the Copyright section of the BIP.
+
+BIPs are not required to be *exclusively* licensed under approved terms, and may also be licensed under unacceptable licenses *in addition to* at least one acceptable license.
+In this case, only the acceptable license(s) should be listed in the License and License-Code headers.
 
 ====Recommended licenses====
 
@@ -194,10 +197,14 @@ In addition, it is recommended that literal code included in the BIP be dual-lic
 * FDL-1.3: [http://www.gnu.org/licenses/fdl-1.3.en.html GNU Free Documentation License, version 1.3]
 * GPL-2.0+: [http://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html GNU General Public License (GPL), version 2 or newer]
 * LGPL-2.1+: [http://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html GNU Lesser General Public License (LGPL), version 2.1 or newer]
-* OPL: [http://opencontent.org/openpub/ Open Publication License, version 1.0]
 
-Additionally, PD is used to express that the work is placed in the public domain.
-This may not be used for new BIPs, and is only defined for use by BIPs predating acceptance of this BIP.
+====Not acceptable licenses====
+
+All licenses not explicitly included in the above lists are not acceptable terms for a Bitcoin Improvement Proposal unless a later BIP extends this one to add them.
+However, BIPs predating the acceptance of this BIP were allowed under other terms, and should use these abbreviation when no other license is granted:
+
+* OPL: [http://opencontent.org/openpub/ Open Publication License, version 1.0]
+* PD: Released into the public domain
 
 ===Rationale===
 
-- 
cgit v1.2.3

