TAVERNA-868 NOTICE juggle
diff --git a/NOTICE b/NOTICE
index 4f7536c..16e61a8 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,13 +1,13 @@
Apache Taverna Workbench
Copyright 2014-2016 The Apache Software Foundation
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
Portions of this software were originally based on the following:
- Copyright 2007-2014 University of Manchester, UK
These have been licensed to the Apache Software Foundation under a software grant.
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
---------------------------------------------------------
TODO: check license for
@@ -25,22 +25,22 @@
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
-
-
+
+
1 Redistribution of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
-
-
+
+
2 Redistribution 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.
-
-
+
+
Neither the name of Sun Microsystems, Inc. or the names of contributors
may be used to endorse or promote products derived from this software
without specific prior written permission.
-
-
+
+
This software is provided "AS IS," without a warranty of any kind. ALL
EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING
ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE
@@ -52,9 +52,9 @@
INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE
THEORY OF LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS
SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-
-
+
+
+
You acknowledge that this software is not designed, licensed or intended
for use in the design, construction, operation or maintenance of any
nuclear facility.
