Update NOTICE file to new layout, update documentation to match new style, delete redundant NOTICE and LICENSE files, prepare changelog for 1.0.4 release, and update dependencies to 1.1.0-SNAPSHOT.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@650315 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/framework/NOTICE b/framework/NOTICE
index 1d2e21f..f57eb88 100644
--- a/framework/NOTICE
+++ b/framework/NOTICE
@@ -1,10 +1,26 @@
Apache Felix Framework
Copyright 2008 The Apache Software Foundation
+
+I. Included Software
+
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
This product includes software developed at
The OSGi Alliance (http://www.osgi.org/).
Copyright 2006 The OSGi Alliance.
Licensed under the Apache License 2.0.
+
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright 2006 The OSGi Alliance.
+Licensed under the Apache License 2.0.
+
+
+III. License Summary
+- Apache License 2.0