svn commit: r1778712 - /infrastructure/site/trunk/content/legal/resolved.mdtext

[jo...@apache.org]

Author: johndament
Date: Sat Jan 14 03:11:49 2017
New Revision: 1778712

URL: http://svn.apache.org/viewvc?rev=1778712&view=rev
Log:
CMS commit to www by johndament

Modified:
    infrastructure/site/trunk/content/legal/resolved.mdtext

Modified: infrastructure/site/trunk/content/legal/resolved.mdtext
URL: http://svn.apache.org/viewvc/infrastructure/site/trunk/content/legal/resolved.mdtext?rev=1778712&r1=1778711&r2=1778712&view=diff
==============================================================================
--- infrastructure/site/trunk/content/legal/resolved.mdtext (original)
+++ infrastructure/site/trunk/content/legal/resolved.mdtext Sat Jan 14 03:11:49 2017
@@ -94,12 +94,7 @@ as the *Category A* list.
 - [QPL](https://opensource.org/licenses/QPL-1.0)
 - [Sleepycat License](http://www.opensource.org/licenses/sleepycat.php)
 - [Code Project Open License (CPOL)](http://www.codeproject.com/info/cpol10.aspx)
-- Field of use restrictions:
-    - [Microsoft Limited Public License](https://www.openhub.net/licenses/mslpl)
-    - [Amazon Software License (ASL)](https://aws.amazon.com/asl/)
-    - [JSON License](http://www.json.org/license.html)
-- Non-commercial licenses:
-    - [Creative Commons Non-Commercial](https://en.wikipedia.org/wiki/Creative_Commons_license#Non-commercial_licenses) variants
+- [BSD-4-Clause](https://spdx.org/licenses/BSD-4-Clause.html)/[BSD-4-Clause (University of California-Specific)](https://spdx.org/licenses/BSD-4-Clause-UC.html)
 
 This list is colloquially known as the *Category X* list.  Further discussion of disallowed licenses:
 



---------------------------------------------------------------------
To unsubscribe, e-mail: legal-discuss-unsubscribe@apache.org
For additional commands, e-mail: legal-discuss-help@apache.org