X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/6e68a48b63a532369d97709dd189d233c5fd0298..32a3d8efaa64077892f5124982174d5985254935:/doc/sandbox.mdwn?ds=inline
diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 4c8621f1c..b9f68de5a 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,45 +1,85 @@
-This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version ]]).
+[[!osm ]]
+[[!waypoint lat="45°30N" lon="73°40W" name="My city" tag="city"]]
-<<<<<<< HEAD
-Test conflict.
-=======
-Testing 123.
->>>>>>> 8cc8bb52f7913e429be7e14203177ef374645718
-# Header
+[[!meta date="Thu Jun 16 22:04:33 2005" updated="Thu Dec 22 01:23:20 2011"]]
-## Subheader2
+This is the [[SandBox]], a page anyone can edit to try out ikiwiki
+(version [[!version ]]).
+
+CamelCase ?
+
+What about [[this page]]?
+
+hello world (right back at ya)
+
+wait how does versioning work
+
+test, is it being saved? Probably. I will check. This seems really straightforward.
+
+~~~
+pre formated text?
+~~~
> This is a blockquote.
>
> This is the first level of quoting.
+A block of text
>
-> > This is nested blockquote.
+> > This is a nested blockquote.
>
>> Without a space works too.
>>> to three levels
+
+
+Azerty
+** Qsdf **
+
>
> Back to the first level.
+>
+> added a line in level 1
+> and another
+
Numbered list
1. First item.
- 1. Sub item.
+ 1. Sub item.
+ 1. Number 2
1. Another.
1. And another..
- 1. foo
- 2. bar
+ 1. foo
+ 2. bar
+ 3. quz
+ 3. quze
Bulleted list
* item
-* *item*
+* *italic item*
* item
* one
* footballs; runner; unices
* Cool !
-
-
+ * test
+ * this
+* something else
+ * some more
+ * and more
+ * and
+ * this
+> a blockquote
+> in a list
+> how is this handled
+ *this _ _ _
+ * this 2
+ * this 3
+
+test _this_ out.
+
+`test this code block`
+[[!wikipedia War_of_1812]]
----
[[!template id=note text="this is generated by the [[plugins/haiku]] plugin"]]
@@ -54,9 +94,61 @@ Bulleted list
* [[different_name_for_a_WikiLink|ikiwiki/WikiLink]]
*
+This is an email link: + +Send Mail +
+ +What follows is some preformatted text. Each line is proceeded by four spaces. + + Test + +