merged trail3-integrated

[ikiwiki.git] / doc / sandbox.mdwn

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 06cb4f25cd05a8fdb2947b7931d3ecc4101c95dd..502bc4feca5d4d46a41452feb4eef70d4d973085 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,22 +1,30 @@
 # Sandbox
 
 [[!pagestats  pages="/tags/*"]]
-
+<<<<<<< HEAD
+ttt
 [[!sidebar  content="dfdsfsf""
 This is my custom sidebar for this page.
 
 \[[!calendar pages="posts/*"]]
 """]]
 
+
+asdfasdf asdfasldkfj asdf
+
 [[!sidebar ]]
 
+
 ## number 2
+### number 3
 
 This is the [[SandBox]], a page anyone can edit to try out ikiwiki
 (version [[!version  ]]).
 
 [[!toc levels=1 startlevel=2 ]]
 
+See, online editing :-p
+
 Let's try this~!
 
 w00t, how does this look on the **git** end? Well, as a commit of course.
@@ -115,6 +123,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.
 
 
@@ -167,5 +182,10 @@ module vc_Mux2 #( parameter W = 1 )
 endmodule
 """]]
 
+#<asd>
 
 This is simple enough for now [[sandbocen]] no?
+
+    Do code tags work?
+
+test by max