Merge pull request #4 from indieopensource/restructure-public-licenses

Public Licenses: Restructure to emphasize Blue Oak default

Author: kemitchell

terms.cform

@@ -78,11 +78,13 @@
 
         \Public Licenses\  <Developer> licenses work that they create doing work under this agreement to the public at large, including <Client>.  The license terms for each separately licensable work are as follows:
 
-            \\  If the terms of a <Public License>, such as a copyleft license, require the work be licensed under particular terms, the terms for that work are the most permissive terms possible that meet that requirement.
+            \Blue Oak By Default\  In general, with the exceptions of {Copyleft When Required} and {Match Existing Licenses}, the terms will be those of the latest version of The Blue Oak Model License published on blueoakcouncil.org.
 
-            \\  Otherwise, if the work is made up of changes or additions to existing software made available under a standardized <Public License>, the terms are those of that <Public License>.
+            \Copyleft When Required\  If the terms of a <Public License>, such as a copyleft license, require the work be licensed under particular terms, the terms for that work are the terms required.
 
-            \\  As a fallback, the terms are those of the latest version of The Blue Oak Model License published on blueoakcouncil.org.
+            \Match Existing Licenses\  If the work is made up of changes or additions to existing software made available under a standardized <Public License>, the terms are those of that <Public License>.
+
+            \Client Licensed Projects\  {Copyleft When Required} and {Match Existing Licenses} do not apply when <Client> grants the relevant <Public License>, and that <Public License> is a copyleft license.
 
         \Separate Licenses\  Terms under which <Developer> grants licenses under {Public Licenses} will be interpreted as entirely independent legal documents, without reference to these terms or the circumstances of <Developer> and <Client>'s agreement.  The purpose of this rule is to allow <Developer> and <Client> to rely on guidance about standardized terms.
 

terms.md

@@ -124,11 +124,21 @@ This agreement does not assign any _Intellectual Property Right_, and no work un
 
 _Developer_ licenses work that they create doing work under this agreement to the public at large, including _Client_. The license terms for each separately licensable work are as follows:
 
-1.  If the terms of a _Public License_, such as a copyleft license, require the work be licensed under particular terms, the terms for that work are the most permissive terms possible that meet that requirement.
+#### <a id="Blue_Oak_By_Default"></a>Blue Oak By Default
 
-2.  Otherwise, if the work is made up of changes or additions to existing software made available under a standardized _Public License_, the terms are those of that _Public License_.
+In general, with the exceptions of [Copyleft When Required](#Copyleft_When_Required) and [Match Existing Licenses](#Match_Existing_Licenses), the terms will be those of the latest version of The Blue Oak Model License published on blueoakcouncil.org.
 
-3.  As a fallback, the terms are those of the latest version of The Blue Oak Model License published on blueoakcouncil.org.
+#### <a id="Copyleft_When_Required"></a>Copyleft When Required
+
+If the terms of a _Public License_, such as a copyleft license, require the work be licensed under particular terms, the terms for that work are the terms required.
+
+#### <a id="Match_Existing_Licenses"></a>Match Existing Licenses
+
+If the work is made up of changes or additions to existing software made available under a standardized _Public License_, the terms are those of that _Public License_.
+
+#### <a id="Client_Licensed_Projects"></a>Client Licensed Projects
+
+[Copyleft When Required](#Copyleft_When_Required) and [Match Existing Licenses](#Match_Existing_Licenses) do not apply when _Client_ grants the relevant _Public License_, and that _Public License_ is a copyleft license.
 
 ### <a id="Separate_Licenses"></a>Separate Licenses