License update

sestoft · Dec 15, 2015 · 81df5ad · 81df5ad
1 parent a12f6ea
commit 81df5ad
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/C5/C5.csproj.nuspec b/C5/C5.csproj.nuspec
@@ -5,7 +5,7 @@
     <version>$version$</version>
     <authors>$author$</authors>
     <owners>$author$</owners>
-    <licenseUrl>https://github.com/sestoft/C5/raw/master/LICENSE.txt</licenseUrl>
+    <licenseUrl>http://opensource.org/licenses/MIT</licenseUrl>
     <projectUrl>http://www.itu.dk/research/c5/</projectUrl>
     <iconUrl>https://github.com/sestoft/C5/raw/master/images/icon-nuget.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>

diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,3 +1,5 @@
+C5 is released under the MIT License (http://opensource.org/licenses/MIT):
+
 Copyright (c) 2003-2015 Niels Kokholm, Peter Sestoft, and Rasmus Lystrøm
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

diff --git a/README.rdoc b/README.rdoc
@@ -80,10 +80,10 @@ C5 is a portable library supporting .NET 4.0, Silverlight, Windows Phone 8, and
 
 == Getting Started
 
-1. Get C5 from NuGet[https://www.nuget.org/packages/C5]: <tt>PM> Install-Package C5</tt>
+1. Get C5 from {NuGet}[https://www.nuget.org/packages/C5]: <tt>PM> Install-Package C5</tt>
 
-2. Documentation is available online at https://c5docs.azurewebsites.net/.
-   Documentation was built using Doxygen (http://www.doxygen.org/) and the
+2. Documentation is available online at {c5docs.azurewebsites.net}[https://c5docs.azurewebsites.net/].
+   Documentation was built using Doxygen {www.doxygen.org}[http://www.doxygen.org/] and the
    <tt>Doxyfile</tt> file.
 
 3. Building the unit test project requires NUnit. If you have NuGet installed it 
@@ -100,6 +100,12 @@ C5 is a portable library supporting .NET 4.0, Silverlight, Windows Phone 8, and
 
 == License
 
-C5 is released under the MIT License:
+C5 is released under the {MIT License}[http://opensource.org/licenses/MIT]:
 
-See LICENSE.txt for details.
+Copyright (c) 2003-2015 Niels Kokholm, Peter Sestoft, and Rasmus Lystrøm
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.