svn commit: r155936 - in forrest/trunk/plugins/wiki/src/documentation/content/xdocs: index.xml samples/jspwiki-sample.jspwiki samples/moin-sample.moinwiki samples/wiki-sample.cwiki site.xml

[br...@apache.org]

Author: brondsem
Date: Wed Mar  2 10:08:56 2005
New Revision: 155936

URL: http://svn.apache.org/viewcvs?view=rev&rev=155936
Log:
cwiki is deprecated; give moinmoin example and list current issues

Added:
    forrest/trunk/plugins/wiki/src/documentation/content/xdocs/samples/jspwiki-sample.jspwiki
      - copied unchanged from r155928, forrest/trunk/plugins/wiki/src/documentation/content/xdocs/samples/wiki-sample.cwiki
    forrest/trunk/plugins/wiki/src/documentation/content/xdocs/samples/moin-sample.moinwiki
Removed:
    forrest/trunk/plugins/wiki/src/documentation/content/xdocs/samples/wiki-sample.cwiki
Modified:
    forrest/trunk/plugins/wiki/src/documentation/content/xdocs/index.xml
    forrest/trunk/plugins/wiki/src/documentation/content/xdocs/site.xml

Modified: forrest/trunk/plugins/wiki/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/wiki/src/documentation/content/xdocs/index.xml?view=diff&r1=155935&r2=155936
==============================================================================
--- forrest/trunk/plugins/wiki/src/documentation/content/xdocs/index.xml (original)
+++ forrest/trunk/plugins/wiki/src/documentation/content/xdocs/index.xml Wed Mar  2 10:08:56 2005
@@ -32,9 +32,8 @@
         <p>The following wiki formats are supported:</p>
         
         <ul>
-          <li>MoinMoin</li>
-          <li>JSPWiki</li>
-          <li>CWiki</li>
+          <li>MoinMoin, with files named *.moinwiki</li>
+          <li>JSPWiki, with files named *.jspwiki (*.cwiki is supported for backwards-compatibility)</li>
         </ul>
       </section>
     </section>

Added: forrest/trunk/plugins/wiki/src/documentation/content/xdocs/samples/moin-sample.moinwiki
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/wiki/src/documentation/content/xdocs/samples/moin-sample.moinwiki?view=auto&rev=155936
==============================================================================
--- forrest/trunk/plugins/wiki/src/documentation/content/xdocs/samples/moin-sample.moinwiki (added)
+++ forrest/trunk/plugins/wiki/src/documentation/content/xdocs/samples/moin-sample.moinwiki Wed Mar  2 10:08:56 2005
@@ -0,0 +1,63 @@
+= Current Issues =
+
+ * pragma lines
+
+ * empty line as first line
+
+ * link syntax: [wiki:ApacheGeneral/ Apache Wiki]
+
+ * if paragraphs are first (i.e. no section heading to start) then subsequent paragraphs are rolled into one.
+
+= Sample =
+
+Bonjour je ne {{{sais pas quoi dire}}}
+
+
+'''Tip:''' Shift-click "HelpOnEditing" to open a second window with the help pages.
+----
+Hello!
+What is it?
+== Formatting ==
+
+''italic'' '''bold''' {{{typewriter}}} 
+
+`backtick typewriter` (configurable)
+
+{{{
+preformatted
+}}}
+
+== Linking ==
+
+HelpOnEditing MoinMoin:InterWiki 
+
+http://purl.net/wiki/moin/
+someone@the.inter.net
+
+== Lists ==
+
+=== Bullet ===
+ * first
+   1. nested and numbered
+   1. numbered lists are renumbered
+ * second
+
+ blockquote
+   deeper
+
+=== Glossary ===
+ Term:: Definition
+--------------------------------------------------------------------------------
+This is a page.
+ * point form
+ * second point
+
+ 1. numbered
+ 1. blah
+
+== Hello World ==
+
+Look, ma - I can do it!  Yes I too...
+Mee Too!!
+
+

Modified: forrest/trunk/plugins/wiki/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/wiki/src/documentation/content/xdocs/site.xml?view=diff&r1=155935&r2=155936
==============================================================================
--- forrest/trunk/plugins/wiki/src/documentation/content/xdocs/site.xml (original)
+++ forrest/trunk/plugins/wiki/src/documentation/content/xdocs/site.xml Wed Mar  2 10:08:56 2005
@@ -39,8 +39,10 @@
   </about>
   
   <sample label="Samples" href="samples/" tab="samples">
-    <cwiki label="CWiki" href="wiki-sample.html" 
-      description="Example of a CWiki syntax wiki page"/>
+    <jspwiki label="JSPWiki" href="jspwiki-sample.html" 
+      description="Example of a JSPWiki syntax wiki page"/>
+    <moinwiki label="MoinMoin Wiki" href="moin-sample.html" 
+      description="Example of a MoinMoin Wiki syntax wiki page"/>
   </sample>
 
   <!--