Author: wikier
Date: Tue Apr 16 07:20:46 2013
New Revision: 1468320

URL: http://svn.apache.org/r1468320
Log:
added acknowledgements

Modified:
    incubator/marmotta/site/trunk/content/markdown/acknowledgements.md
    incubator/marmotta/site/trunk/content/site.xml

Modified: incubator/marmotta/site/trunk/content/markdown/acknowledgements.md
URL: 
http://svn.apache.org/viewvc/incubator/marmotta/site/trunk/content/markdown/acknowledgements.md?rev=1468320&r1=1468319&r2=1468320&view=diff
==============================================================================
--- incubator/marmotta/site/trunk/content/markdown/acknowledgements.md 
(original)
+++ incubator/marmotta/site/trunk/content/markdown/acknowledgements.md Tue Apr 
16 07:20:46 2013
@@ -1,4 +1,15 @@
 # Acknowledgements
 
-@@TODO@@
+Apache Marmotta is a long-time effort to be thanking to many people and
+organizations:
+
+* The Apache Marmotta project was initiated by Salzburg Research and the 
"Salzburg NewMediaLab - The Next Generation" 
([SNML-TNG](http://www.newmedialab.at/)), a K-Project in the Austrian 
COMET-programme. Since 2010, SNML-TNG has developed the "Linked Media 
Framework" ([LMF](http://lmf.googlecode.com)) as a media centred management 
platform for Linked Data: parts of LMF related to Linked Data management were 
later extracted and transferred to Apache Marmotta. Some people working on 
Marmotta are core developers of the "Linked Media Framework" and researchers in 
SNML-TNG, which is partially funded by the Austrian Federal  Ministry of 
Economy, Family and Youth (BMWFJ) and by the State of Salzburg.
+
+* The KiWi Triple Store is an outcome of the [KiWi 
Project](http://kiwi-project.eu), partially funded the European Community‘s 
Seventh Framework Programme (FP7/2007-2013) under grant agreement No. 211932.
+
+* We would like to specially thank our mentors in incubation (Andy Seaborne, 
Fabian Christ and Nandana Mihindukulasooriya) for all their kindly support.
+
+* Thanks to [Atlassian](http://www.atlassian.com/) for granting the license 
that allows us to use Jira as issue tracker for the project.
+
+* The Apache Software Foundation could not exist without the continued 
generous support from the community. Therefore, of course, we would like to 
take this opportunity to thank all [ASF 
sponsors](http://www.apache.org/foundation/thanks.html).
 

Modified: incubator/marmotta/site/trunk/content/site.xml
URL: 
http://svn.apache.org/viewvc/incubator/marmotta/site/trunk/content/site.xml?rev=1468320&r1=1468319&r2=1468320&view=diff
==============================================================================
--- incubator/marmotta/site/trunk/content/site.xml (original)
+++ incubator/marmotta/site/trunk/content/site.xml Tue Apr 16 07:20:46 2013
@@ -127,16 +127,6 @@
                 Apache, Marmotta and the Apache feather and Marmotta logos are 
trademarks 
                 of The Apache Software Foundation.
             </p>
-            <p>
-                The Apache Marmotta project was initiated by the "Salzburg 
NewMediaLab - 
-                The Next Generation" (SNML-TNG), a K-Project in the Austrian 
COMET-programme. 
-                Since 2010, SNML-TNG has developed the "Linked Media 
Framework" (LMF) as a media 
-                centred management platform for Linked Data: parts of LMF 
related to Linked Data 
-                management were later extracted and transferred to Apache 
Marmotta. Some people 
-                working on Marmotta are core developers of the "Linked Media 
Framework" and 
-                researchers in SNML-TNG, which is partially funded by the 
Austrian Federal 
-                Ministry of Economy, Family and Youth (BMWFJ) and by the State 
of Salzburg.
-            </p>
         </footer>
 
     </body> 


Reply via email to