You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by st...@apache.org on 2004/02/02 20:29:01 UTC
cvs commit: cocoon-2.1/src/blocks/chaperon/samples/wiki broken.txt index.txt rules.txt selftest.txt
stephan 2004/02/02 11:29:01
Modified: src/blocks/chaperon/samples/wiki broken.txt index.txt
rules.txt selftest.txt
Log:
Revert change in the headings.
!!! -> !
! -> !!!
Revision Changes Path
1.3 +3 -3 cocoon-2.1/src/blocks/chaperon/samples/wiki/broken.txt
Index: broken.txt
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/chaperon/samples/wiki/broken.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- broken.txt 23 Jan 2004 01:19:25 -0000 1.2
+++ broken.txt 2 Feb 2004 19:29:01 -0000 1.3
@@ -1,7 +1,7 @@
-! Boken page
+!!! Boken page
Here comes a text with __an inclomplete element.
-! Next section
+!!! Next section
-Stephan.
\ No newline at end of file
+Stephan.
1.3 +1 -1 cocoon-2.1/src/blocks/chaperon/samples/wiki/index.txt
Index: index.txt
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/chaperon/samples/wiki/index.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.txt 23 Jan 2004 01:19:25 -0000 1.2
+++ index.txt 2 Feb 2004 19:29:01 -0000 1.3
@@ -1,4 +1,4 @@
-! Introduction
+!!! Introduction
This is a little example how easy it is to write a wiki engine
using the Chaperon parser and Apache Cocoon.
1.2 +18 -18 cocoon-2.1/src/blocks/chaperon/samples/wiki/rules.txt
Index: rules.txt
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/chaperon/samples/wiki/rules.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rules.txt 20 Jan 2004 15:23:59 -0000 1.1
+++ rules.txt 2 Feb 2004 19:29:01 -0000 1.2
@@ -1,7 +1,7 @@
When you've figured out how the editor works, then you should read [WikiEtiquette] so that you would know how to use
your newly acquired skills...
-!Quick reference
+!!!Quick reference
{{{
---- = Make a horizontal ruler. Extra '-' is ignored.
@@ -30,7 +30,7 @@
;term:ex = makes a definition for 'term' with the explanation 'ex'
}}}
-!Writing text
+!!!Writing text
You don't need to know anything about the Wiki text formatting rules to use Wiki. Just write normal text, and then use
an empty line to mark a paragraph.
@@ -39,7 +39,7 @@
You can always Edit this page (look at the left sidebar) to see how the different
effects on this page are used.
-!Hyperlinks
+!!!Hyperlinks
The link can also be a direct URL starting with http:, ftp:, mailto:, https:, or news:, in which case the link points to
an external entity. For example, to point at the java.sun.com home page, use [[http://java.sun.com], which becomes
[http://java.sun.com/] or [[Java home page|http://java.sun.com], which becomes [Java home page|http://java.sun.com].
@@ -55,7 +55,7 @@
should be a link). It's off by default, but if your friendly administrator has turned it on, then well, CamelCase all
you want =).
-!Footnotes
+!!!Footnotes
These are a special kind of hyperlink. By using nothing but a number inside
a hyperlink you create a reference to a footnote, like this [[1], which
@@ -65,7 +65,7 @@
You can also make a named footnote, just as if you were doing a normal hyperlink. For example, this refers to the same
footnote[Footnote number 1|1] as the footnote above, but this refers to another footnote[2].
-!InterWiki links
+!!!InterWiki links
You can also do links between different Wikis without knowing the URL. Just use a link in the form [[Wiki:WikiPage] and
JSPWiki will create a link for you. For example, this link points to the [JSPWiki TextFormatting
@@ -74,7 +74,7 @@
If an InterWiki link is not supported, you'll get a notification of it on the page when
you save your page.
-!Adding pictures
+!!!Adding pictures
For security reasons uploading images is not permitted, but you can embed
any image in the wiki code by putting the image available somewhere on the web in one of the allowed formats, and then
@@ -87,7 +87,7 @@
The list of accepted image types depends on the Wiki. See the [SystemInfo]
page for a list of the different image types.
-!Bulleted lists
+!!!Bulleted lists
Use an asterisk (*) in the first column to make bulleted lists. Use more asterisks for deeper indentation. For example:
{{{
* One
@@ -101,7 +101,7 @@
* Three
** Three.One
-!Numbered lists
+!!!Numbered lists
Just like with bulleted lists, but use a hash (#) instead of the asterisk. Like this:
{{{
# One
@@ -127,7 +127,7 @@
Notice, however, as all these sentences get put inside a single item!
* The third line is again a single-line item for your convinience.
-!Definition lists and comments
+!!!Definition lists and comments
A simple way to make definition lists is to use the ';:' -construct:
@@ -141,19 +141,19 @@
Which would be seen as
;:''Comment here.''
-!Text effects
+!!!Text effects
You may use __bold__ text or ''italic'' text, by using two underscores (_) and two single quotes ('), respectively. If
you're on a Windows computer, make sure that you are using the correct quote sign, as there is one that looks the same,
but really isn't.
-!Preformatted text
+!!!Preformatted text
If you want to add preformatted text (like code) just use three consecutive braces ({) to open a block, and three
consecutive braces (}) to close a block. Edit this page for an example.
-!Tables
+!!!Tables
You can do simple tables by using using pipe signs ('|'). Use double pipe
signs to start the heading of a table, and single pipe signs to then
@@ -174,7 +174,7 @@
| [Main] | [SandBox]
-!Conflicts
+!!!Conflicts
If someone happens to edit the same page as you at the same time, JSPWiki will prevent you from doing changes and show a
conflict page instead. Sorry to say, but the first one to make changes wins...
@@ -182,23 +182,23 @@
__A word of warning:__ If you use the Back button of your browser to go into the Edit page, you will almost certainly
get a conflict. This is because the browser thinks its still editing an earlier copy of the page.
-!Deleting pages
+!!!Deleting pages
This is not possible. You can, of course, remove all the links to that page, which makes it inaccesible. Or you can
email the administrator, and I'll remove the page.
-!Adding new pages
+!!!Adding new pages
Create a link that points to a new (not existing) page using its [WikiName].
Click that new link, which should now have a question mark (?) suffix and
you will get an editor for the new page. -- [Asser]
-!Attaching files
+!!!Attaching files
If the administrator of the wiki has configured it, there is a "Attach file..." link at the bottom of every page.
Clicking it allows you to attach files into pages. For more information, please see [WikiAttachments].
-!Inserting variables
+!!!Inserting variables
There are many possible variables you can insert on a page. The basic form is:
@@ -209,7 +209,7 @@
You can see the list of available of variables at [WikiVariables].
-!Inserting plugins
+!!!Inserting plugins
The basic incantation to insert a plugin looks like this:
1.3 +6 -6 cocoon-2.1/src/blocks/chaperon/samples/wiki/selftest.txt
Index: selftest.txt
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/chaperon/samples/wiki/selftest.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- selftest.txt 23 Jan 2004 01:19:25 -0000 1.2
+++ selftest.txt 2 Feb 2004 19:29:01 -0000 1.3
@@ -13,7 +13,7 @@
This must be followed by a section title and a bullet list with some items.
-! KNOWN PROBLEMS
+!!! KNOWN PROBLEMS
Currently this test shows the following problems:
* 0.1 This bullet list is invisible in the html output if there is no section title (3 bangs) before it
@@ -24,24 +24,24 @@
Test 1.1 headings in the usual order (from big to small): below you should see 3 headings, big, medium, small:
-! big heading #1
+!!! big heading #1
!! medium heading #1
-!!! small heading #1
+! small heading #1
Test 1.2 same headings with text in-between
-! big heading #2
+!!! big heading #2
Text after big heading.
!! medium heading #2
Text after medium heading.
-!!! small heading #2
+! small heading #2
Text after small heading.
-! new big heading
+!!! new big heading
The above heading starts a new section in the xdocs version of this document.
-- 2.NUMBERED LISTS --