You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2011/02/10 20:59:14 UTC
svn commit: r1069548 - in /karaf/sandbox/website/src/main/webapp:
index/community/articles.page site/navigation.page
Author: gnodet
Date: Thu Feb 10 19:59:14 2011
New Revision: 1069548
URL: http://svn.apache.org/viewvc?rev=1069548&view=rev
Log:
Import latest confluence changes
Modified:
karaf/sandbox/website/src/main/webapp/index/community/articles.page
karaf/sandbox/website/src/main/webapp/site/navigation.page
Modified: karaf/sandbox/website/src/main/webapp/index/community/articles.page
URL: http://svn.apache.org/viewvc/karaf/sandbox/website/src/main/webapp/index/community/articles.page?rev=1069548&r1=1069547&r2=1069548&view=diff
==============================================================================
--- karaf/sandbox/website/src/main/webapp/index/community/articles.page (original)
+++ karaf/sandbox/website/src/main/webapp/index/community/articles.page Thu Feb 10 19:59:14 2011
@@ -1,11 +1,10 @@
---
title: Articles
-page_version: 1
+page_version: 4
page_creator: jgoodyear
-page_modifier: jgoodyear
+page_modifier: gnodet
--- pipeline:conf
-h3. Articles
+h2. Presentations
-h3. Books
-
-h3. Presentations
\ No newline at end of file
+* [JUG Poitou Charents - Apache, OSGi and Karaf|http://www.slideshare.net/gnodet/jug-poitou-charentes-apache-osgi-and-karaf]
+* [OSGi with Apache Felix Karaf|http://www.anova.be/files/OSGi%20with%20Apache%20Felix%20Karaf.pdf]
\ No newline at end of file
Modified: karaf/sandbox/website/src/main/webapp/site/navigation.page
URL: http://svn.apache.org/viewvc/karaf/sandbox/website/src/main/webapp/site/navigation.page?rev=1069548&r1=1069547&r2=1069548&view=diff
==============================================================================
--- karaf/sandbox/website/src/main/webapp/site/navigation.page (original)
+++ karaf/sandbox/website/src/main/webapp/site/navigation.page Thu Feb 10 19:59:14 2011
@@ -1,6 +1,6 @@
---
title: Navigation
-page_version: 10
+page_version: 11
page_creator: gnodet
page_modifier: gnodet
--- pipeline:conf
@@ -47,3 +47,10 @@ h3. [Developers]
- [Source]
- [Building]
- [IRC Room]
+
+h3. [ASF|http://www.apache.org/]
+
+- [License|http://www.apache.org/licenses/]
+- [Sponsorship|http://www.apache.org/foundation/sponsorship.html]
+- [Thanks|http://www.apache.org/foundation/thanks.html]
+- [Security|http://www.apache.org/security/]