Commit the documentation of core, ant task, maven plugin and arch
Change the NOTICE file format
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@657197 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/manipulator/NOTICE b/ipojo/manipulator/NOTICE
index 4b88b44..f323c11 100644
--- a/ipojo/manipulator/NOTICE
+++ b/ipojo/manipulator/NOTICE
@@ -1,16 +1,22 @@
Apache Felix iPOJO Manipulator
Copyright 2008 The Apache Software Foundation
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
+I. Included Software
This product includes software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Copyright 2006 The OSGi Alliance.
+The Apache Software Foundation (http://www.apache.org/).
Licensed under the Apache License 2.0.
This product includes software developed at
-The OW2 Consortium
-Copyright 2000-2005 INRIA, France Telecom
-All rights reserved.
+Copyright (c) 2000-2005 INRIA, France Telecom
+Licensed under BSD License.
+II. Used Software
+
+This product uses software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+III. License Summary
+- Apache License 2.0
+- BSD Licence