X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/0bc682c918312adc3137f823b7d09e2d271b7b11..36518a3a1110eed1d115a798048a9d8bb84b5517:/doc/sandbox.mdwn

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 3f9214deb..47785d0bf 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,7 +1,8 @@
 # Sandbox
 
 [[!pagestats  pages="/tags/*"]]
-
+<<<<<<< HEAD
+ttt
 [[!sidebar  content="dfdsfsf""
 This is my custom sidebar for this page.
 
@@ -11,6 +12,7 @@ This is my custom sidebar for this page.
 [[!sidebar ]]
 
 ## number 2
+### number 3
 
 This is the [[SandBox]], a page anyone can edit to try out ikiwiki
 (version [[!version  ]]).
@@ -41,6 +43,15 @@ Testing this sandbox thing.
 >>> ...and different font colors.
 >>>> ...but it's nothing a little CSS can't fix.
 
+# Pointless heading
+
+Let's see a table:
+
+[[!table data="""
+Heading 1|Heading 2|Heading 3
+Item 1| Item 2| Item 3"""]]
+
+
 Numbered list 
 
 1. First item.
@@ -96,6 +107,7 @@ Bulleted list
 _italic_
 
 
+Umcacaumca
 
 ### this shows a problem with the list and the verbatim 
 
@@ -105,6 +117,13 @@ Now we try to write a "code" block starting with a hash sign
     $ another test
 
 
+Oh, let's try to do the same thing using sane syntax instead:
+
+~~~
+# test 1,2,3
+$ another test
+~~~
+
 Now let's write the same block, with a bullest list preceding it.
 
 
@@ -157,4 +176,8 @@ module vc_Mux2 #( parameter W = 1 )
 endmodule
 """]]
 
+#<asd>
+
+This is simple enough for now [[sandbocen]] no?
 
+    Do code tags work?