Merge pull request #26 from NLog/fix-license

Fix LICENSE
NLog · Apr 19, 2016 · d9b3cf0 · d9b3cf0
2 parents 123f2f7 + 9b9a75f
commit d9b3cf0
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 77 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,31 +1,29 @@
+BSD 3-Clause License
 
-Copyright (c) 2004-2011 Jaroslaw Kowalski <[email protected]>
-
+Copyright (c) 2015-2016, Jaroslaw Kowalski <[email protected]>, Kim Christensen, Julian Verdurmen
 All rights reserved.
 
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions 
-are met:
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
 
-* Redistributions of source code must retain the above copyright notice, 
-  this list of conditions and the following disclaimer. 
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
 
 * Redistributions in binary form must reproduce the above copyright notice,
   this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution. 
+  and/or other materials provided with the distribution.
 
-* Neither the name of Jaroslaw Kowalski nor the names of its 
-  contributors may be used to endorse or promote products derived from this
-  software without specific prior written permission. 
+* Neither the name of NLog nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
-THE POSSIBILITY OF SUCH DAMAGE.
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/NLog.Windows.Forms.Tests/Properties/AssemblyInfo.cs b/NLog.Windows.Forms.Tests/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Microsoft")]
 [assembly: AssemblyProduct("NLog.Windows.Forms.Tests")]
-[assembly: AssemblyCopyright("Copyright © Kim Christensen 2015")]
+[assembly: AssemblyCopyright("Copyright © Jaroslaw Kowalski, Kim Christensen, Julian Verdurmen 2015-2016")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

diff --git a/NLog.Windows.Forms.Tests/RichTextBoxTargetTests.cs b/NLog.Windows.Forms.Tests/RichTextBoxTargetTests.cs
@@ -1,17 +1,4 @@
-// Copyright 2013 Kim Christensen, et. al.
-//  
-// Licensed under the Apache License, Version 2.0 (the "License"); you may not use 
-// this file except in compliance with the License. You may obtain a copy of the 
-// License at 
-// 
-//     http://www.apache.org/licenses/LICENSE-2.0 
-// 
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-using System.Drawing;
+using System.Drawing;
 using System.IO;
 using System.Text;
 using System.Windows.Forms;

diff --git a/NLog.Windows.Forms/FormControlTarget.cs b/NLog.Windows.Forms/FormControlTarget.cs
@@ -1,17 +1,4 @@
-// Copyright 2013 Kim Christensen, et. al.
-//  
-// Licensed under the Apache License, Version 2.0 (the "License"); you may not use 
-// this file except in compliance with the License. You may obtain a copy of the 
-// License at 
-// 
-//     http://www.apache.org/licenses/LICENSE-2.0 
-// 
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-using System;
+using System;
 using System.ComponentModel;
 using System.Windows.Forms;
 using NLog.Common;

diff --git a/NLog.Windows.Forms/FormHelper.cs b/NLog.Windows.Forms/FormHelper.cs
@@ -1,16 +1,3 @@
-// Copyright 2013 Kim Christensen, et. al.
-//  
-// Licensed under the Apache License, Version 2.0 (the "License"); you may not use 
-// this file except in compliance with the License. You may obtain a copy of the 
-// License at 
-// 
-//     http://www.apache.org/licenses/LICENSE-2.0 
-// 
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
 using System;
 using System.Drawing;
 using System.Runtime.InteropServices;

diff --git a/NLog.Windows.Forms/Properties/AssemblyInfo.cs b/NLog.Windows.Forms/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("NLog")]
 [assembly: AssemblyProduct("NLog.Windows.Forms")]
-[assembly: AssemblyCopyright("Copyright © NLog 2015")]
+[assembly: AssemblyCopyright("Copyright © Jaroslaw Kowalski, Kim Christensen, Julian Verdurmen 2015-2016")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

diff --git a/NLog.Windows.Forms/RichTextBoxTarget.cs b/NLog.Windows.Forms/RichTextBoxTarget.cs
@@ -1,16 +1,3 @@
-// Copyright 2013 Kim Christensen, et. al.
-//  
-// Licensed under the Apache License, Version 2.0 (the "License"); you may not use 
-// this file except in compliance with the License. You may obtain a copy of the 
-// License at 
-// 
-//     http://www.apache.org/licenses/LICENSE-2.0 
-// 
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;