From dd32ca0277032ac1c0e16745208eaa9cc25385ec Mon Sep 17 00:00:00 2001 From: Frank Dana (FeRD) Date: Apr 24 2019 02:48:40 +0000 Subject: Update guidelines/modules/ROOT/pages/LicensingGuidelines.adoc The description for the first example was inadvertently placed inside its code block. --- diff --git a/guidelines/modules/ROOT/pages/LicensingGuidelines.adoc b/guidelines/modules/ROOT/pages/LicensingGuidelines.adoc index 89c4617..2feb42c 100644 --- a/guidelines/modules/ROOT/pages/LicensingGuidelines.adoc +++ b/guidelines/modules/ROOT/pages/LicensingGuidelines.adoc @@ -76,10 +76,9 @@ Since compatibility of code and library linking is especially complex with GPL a If your package is dual licensed (or triple licensed, etc.), the spec must reflect this by using "or" as a separator. Note that this only applies when the contents of the package are actually under a dual license, and not when the package contains items under multiple, distinct, and independent licenses. Example: - -.... Package libfoo is dual licensed as Mozilla Public License v1.1 and GNU General Public License v2 or later. The package spec must have: +.... License: MPLv1.1 or GPLv2+ ....