You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by mi...@apache.org on 2003/11/17 00:03:17 UTC

cvs commit: cocoon-lenya/src/webapp/lenya/pubs/oscom/content/authoring home.xml navigation.xml

michi       2003/11/16 15:03:17

  Modified:    src/webapp/lenya/pubs/oscom/config/menus home.xsp
               src/webapp/lenya/pubs/oscom/content/authoring home.xml
                        navigation.xml
  Log:
  cleaned
  
  Revision  Changes    Path
  1.27      +3 -28     cocoon-lenya/src/webapp/lenya/pubs/oscom/config/menus/home.xsp
  
  Index: home.xsp
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/oscom/config/menus/home.xsp,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- home.xsp	22 Oct 2003 15:24:27 -0000	1.26
  +++ home.xsp	16 Nov 2003 23:03:17 -0000	1.27
  @@ -59,24 +59,15 @@
           <item><xsp:attribute name="href">http://www.google.com</xsp:attribute>Google</item>
           <item href="http://dict.leo.org">Translate&#160;E2G&#160;or&#160;G2E</item>
         </block>
  -      <separator>
  -        <item>-----------</item>
  -      </separator>
         <block>
  -        <item href="/lenya/lucene/create">Create&#160;Lucene&#160;Index</item>
  -        <item href="/lenya/lucene/search">Search&#160;with&#160;Lucene</item>
  +        <item href="../search-live/lucene">Search&#160;with&#160;Lucene</item>
         </block>
       </menu>
   
       <menu name="Help" label="Help">
         <block>
  -        <item><xsp:attribute name="href"><xsp:expr>xsp_lenya_context</xsp:expr>/docs/index.html#user-guide</xsp:attribute>User's&#160;Guide</item>
  -        <item><xsp:attribute name="href"><xsp:expr>xsp_lenya_context</xsp:expr>/docs/index.html#administrator-guide</xsp:attribute>Administrator's&#160;Guide</item>
  -        <item><xsp:attribute name="href"><xsp:expr>xsp_lenya_context</xsp:expr>/docs/index.html#developer-guide</xsp:attribute>Developer's&#160;Guide</item>
  +        <item><xsp:attribute name="href"><xsp:expr>xsp_lenya_context</xsp:expr>/docs-new/docs/index.html</xsp:attribute>Documentation</item>
         </block>
  -      <separator>
  -        <item>-----------------</item>
  -      </separator>
         <block>
           <item href="http://cocoon.apache.org/lenya/">About&#160;Lenya</item>
         </block>
  @@ -84,23 +75,7 @@
   
       <menu name="Debug" label="Debug">
         <block>
  -        <item href="index.xml">View&#160;Page&#160;XML</item>
  -        <item href="../bitflux/home.xml">View&#160;Body&#160;XML</item>
  -      </block>
  -      <separator>
  -        <item>-----------------</item>
  -      </separator>
  -      <block>
  -        <item href="../xopus/home.xsl">View&#160;Xopus&#160;XSLT</item>
  -        <item href="../xopus/home.xsd">View&#160;Xopus&#160;XSD</item>
  -      </block>
  -      <separator>
  -        <item>-----------------</item>
  -      </separator>
  -      <block>
  -        <item href="../bitflux/home.xsl">View&#160;Bitflux&#160;XSLT</item>
  -        <item href="../bitflux/home.xsd">View&#160;Bitflux&#160;XSD</item>
  -        <item href="../bitflux/home.css">View&#160;Bitflux&#160;CSS</item>
  +        <item href="home.xml">XML</item>
         </block>
       </menu>
     </menus>
  
  
  
  1.9       +0 -81     cocoon-lenya/src/webapp/lenya/pubs/oscom/content/authoring/home.xml
  
  Index: home.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/oscom/content/authoring/home.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- home.xml	23 Jul 2003 13:21:36 -0000	1.8
  +++ home.xml	16 Nov 2003 23:03:17 -0000	1.9
  @@ -25,88 +25,7 @@
   open source content management solutions out there.
   </p>
   
  -<!--
  -<h3>Third Open Source Content Management Conference</h3>
  -<p>
  -Due to the great success of the first and second conference
  -we are organizing another conference at Harvard University, Cambridge/Boston,
  -from Wednesday, 28 May to Friday, 30 May, 2003. To stay informed please subscribe at our <a href="http://www.oscom.org/mailman/listinfo/participants">Participants</a> mailing list.
  -</p>
  -
  -<h3>Second Open Source Content Management Conference</h3>
  -<p>
  -The quality and atmosphere of the conference at Berkeley was great.
  -For more details please see <a href="conferences/berkeley2002/index.html">the conference website</a>.
  -Peace and respects to everyone who helped to organize and attended the conference.
  -</p>
  -
  -<p>
  -<table>
  -<tr><td width="50%">
  -<font size="-2">
  -The second Open Source Content Management Conference has been sponsored by
  -</font>
  -</td><td>
  -<a href="http://www.samspublishing.com"><img src="/lenya/oscom/images/Sams-Black.gif" border="0"/></a>
  -</td></tr>
  -</table>
  -</p>
  -
  -<h3>First Open Source Content Management Conference</h3>
  -<p>
  -The conference was a great success.
  -More than a hundred people were attending.
  -The conference was organized by <a href="http://cocoon.apache.org/lenya/">lenya</a> at the
  -Swiss Federal Institute of Technology (<a href="http://www.ethz.ch">ETH</a>), Z&#252;rich, Switzerland.
  -The presentations can be downloaded from <a href="http://www.oscom.org/conferences/zurich2002/agenda.html">here</a>.
  -Peace and respects to everyone who helped to organize and attended the conference.
  -</p>
  --->
   </font>
   </body>
   </html>
  -
  -
  -<about>
  -<p>
  -OSCOM is an international, not-for-profit organization
  -dedicated to Open Source Content Management.
  -</p>
  -<p>
  -The goal is to bring together as many great brains as possible
  -to build a network and grow the community of open source 
  -content management.
  -</p>
  -<p>
  -We want to show the world that there are already great and easy-to-use
  -open source content management solutions out there.
  -</p>
  -</about>
  -
  -<features>
  -
  -<feature>
  -<title>Second Open Source Content Management Conference</title>
  -<p>
  -Due to the great success of the first conference
  -we are organizing another conference at Berkeley, California 
  -from Wednesday, 25 September to Friday, 27 September 2002.
  -For more details please see <a href="conferences/berkeley2002/program.html">program</a>.
  -Looking forward to seeing you.
  -</p>
  -</feature>
  -
  -<feature>
  -<title>First Open Source Content Management Conference</title>
  -<p>
  -The conference was a great success.
  -More than a hundred people were attending.
  -The conference was organized by <a href="http://cocoon.apache.org/lenya/">lenya.org</a> at the
  -Swiss Federal Institute of Technology (<a href="http://www.ethz.ch">ETH</a>), Z&#252;rich, Switzerland.
  -The presentations can be downloaded from <a href="http://www.oscom.org/conferences/zurich2002/agenda.html">here</a>.
  -Peace and respects to everyone who helped to organize and attended the conference.
  -</p>
  -</feature>
  -
  -</features>
   </home>
  
  
  
  1.18      +4 -0      cocoon-lenya/src/webapp/lenya/pubs/oscom/content/authoring/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/oscom/content/authoring/navigation.xml,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- navigation.xml	2 Apr 2003 12:44:48 -0000	1.17
  +++ navigation.xml	16 Nov 2003 23:03:17 -0000	1.18
  @@ -10,8 +10,12 @@
   </branch>
   -->
   <leaf name="CMF/S&#160;Overview" href="matrix/index.html"/>
  +<!--
   <leaf name="Editor&#160;Overview" href="editor-matrix/index.html"/>
   <leaf name="Search&#160;Engine&#160;Overview" href="http://www.searchtools.com/tools/tools.html"/>
  +-->
  +
  +
   <!--
   <leaf name="Glossary" href="glossary.html"/>
   <branch name="Interop" href="interop.html">
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org