[Osr-101] rev 17954 - public/osr-101/trunk

[andi at wyona.com]

Author: andi
Date: 2006-09-14 01:52:00 +0200 (Thu, 14 Sep 2006)
New Revision: 17954

Modified:
   public/osr-101/trunk/index.html
   public/osr-101/trunk/xml2006-handson-proposal.txt
Log:
Updated Yulup URI and added CMSConnector.


Modified: public/osr-101/trunk/index.html
===================================================================
--- public/osr-101/trunk/index.html	2006-09-13 23:26:59 UTC (rev 17953)
+++ public/osr-101/trunk/index.html	2006-09-13 23:52:00 UTC (rev 17954)
@@ -14,7 +14,8 @@
 <h3>Applications</h3>
 <h4>Clients supporting Neutron/OSR-101</h4>
 <ul>
-<li><a href="http://ulysses.wyona.org">Ulysses</a></li>
+<li><a href="http://yanel.wyona.org">Yanel</a></li>
+<li><a href="http://lenya.apache.org">Apache Lenya</a></li>
 </ul>
 
 <h4>Servers supporting Neutron/OSR-101</h4>

Modified: public/osr-101/trunk/xml2006-handson-proposal.txt
===================================================================
--- public/osr-101/trunk/xml2006-handson-proposal.txt	2006-09-13 23:26:59 UTC (rev 17953)
+++ public/osr-101/trunk/xml2006-handson-proposal.txt	2006-09-13 23:52:00 UTC (rev 17954)
@@ -1,6 +1,10 @@
+<<<<<<< .mine
+Neutron is a vendor-neutral, open, XML-based Content Management System interface, enabling client applications to access CMS in a programmatical way. Neutron offers introspection, file operations and workflow functionality.
+=======
  
 NEUTRON - Open Content Management User Interface
 ------------------------------------------------
+>>>>>>> .r14417
 
 
 Neutron is a vendor-neutral, open, XML-based Content Management User Interface, enabling client applications to access Content Management Systems in a programmatical way. Neutron offers introspection, resource operations and other content management functionality.