qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rob...@apache.org
Subject qpid-site git commit: update LICENCE+NOTICE to remove cruft
Date Mon, 08 May 2017 09:25:46 GMT
Repository: qpid-site
Updated Branches:
  refs/heads/asf-site 5b465c8bf -> d03960c7e


update LICENCE+NOTICE to remove cruft


Project: http://git-wip-us.apache.org/repos/asf/qpid-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-site/commit/d03960c7
Tree: http://git-wip-us.apache.org/repos/asf/qpid-site/tree/d03960c7
Diff: http://git-wip-us.apache.org/repos/asf/qpid-site/diff/d03960c7

Branch: refs/heads/asf-site
Commit: d03960c7e5fb81b528c975a5e15895ffd6745ae0
Parents: 5b465c8
Author: Robert Gemmell <robbie@apache.org>
Authored: Mon May 8 10:25:12 2017 +0100
Committer: Robert Gemmell <robbie@apache.org>
Committed: Mon May 8 10:25:12 2017 +0100

----------------------------------------------------------------------
 LICENSE | 32 --------------------------------
 NOTICE  | 18 ++++--------------
 2 files changed, 4 insertions(+), 46 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-site/blob/d03960c7/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index cff2a5e..d645695 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,3 @@
-=========================================================================
-==  Apache License                                                     ==
-=========================================================================
 
                                  Apache License
                            Version 2.0, January 2004
@@ -203,32 +200,3 @@
    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.
-
-=========================================================================
-==  Boost License                                                      ==
-=========================================================================
-
-Boost Software License - Version 1.0 - August 17th, 2003
-
-Permission is hereby granted, free of charge, to any person or organization
-obtaining a copy of the software and accompanying documentation covered by
-this license (the "Software") to use, reproduce, display, distribute,
-execute, and transmit the Software, and to prepare derivative works of the
-Software, and to permit third-parties to whom the Software is furnished to
-do so, all subject to the following:
-
-The copyright notices in the Software and this entire statement, including
-the above license grant, this restriction and the following disclaimer,
-must be included in all copies of the Software, in whole or in part, and
-all derivative works of the Software, unless such copies or derivative
-works are solely in the form of machine-executable object code generated by
-a source language processor.
-
-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, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/d03960c7/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index f221a27..7f43892 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,15 +1,5 @@
-=========================================================================
-==  NOTICE file corresponding to the section 4 d of                    ==
-==  the Apache License, Version 2.0,                                   ==
-==  in this case for the Apache Qpid distribution.                     ==
-=========================================================================
+Apache Qpid Site
+Copyright 2017 The Apache Software Foundation
 
-This product includes software developed by the Apache Software Foundation
-(http://www.apache.org/).
-
-Please read the LICENSE file present in the root directory of this
-distribution.
-
-Aside from contributions to the Apache Qpid project, this software also 
-includes (binary only):
-	- None at this time
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message