FELIX-1667: Fixes issues with NOTICE files

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@820478 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/http/whiteboard/NOTICE b/http/whiteboard/NOTICE
index f2b9f72..56727d2 100644
--- a/http/whiteboard/NOTICE
+++ b/http/whiteboard/NOTICE
@@ -1,4 +1,4 @@
-Apache Felix Http Whiteboard
+Apache Felix Http Service Whiteboard
 Copyright 2009 The Apache Software Foundation
 
 I. Included Software
@@ -7,11 +7,6 @@
 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 (c) OSGi Alliance (2000, 2007).
-Licensed under the Apache License 2.0.
-
 II. Used Software
 
 This product uses software developed at
@@ -19,5 +14,9 @@
 Copyright (c) OSGi Alliance (2000, 2007).
 Licensed under the Apache License 2.0.
 
+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