X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/0726ac642068429d86f548c66904f087f7b2ffa6..f4d1f6f8daac6e74dba17aabf76a2e576362108c:/doc/sandbox.mdwn

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 47785d0bf..3d0fba4b3 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,30 +1,28 @@
 # Sandbox
 
 [[!pagestats  pages="/tags/*"]]
-<<<<<<< HEAD
-ttt
-[[!sidebar  content="dfdsfsf""
-This is my custom sidebar for this page.
 
-\[[!calendar pages="posts/*"]]
-"""]]
+Hello, ikiwiki.
+
+Testing.
+
+Testing. One Two Three.
 
 [[!sidebar ]]
 
+Here's a hr:
+
+---------------------------------------------------------
+
 ## number 2
 ### number 3
+#### number 4
 
-This is the [[SandBox]], a page anyone can edit to try out ikiwiki
+This is the SandBox, a page anyone can edit to try out ikiwiki
 (version [[!version  ]]).
 
 [[!toc levels=1 startlevel=2 ]]
 
-Let's try this~!
-
-w00t, how does this look on the **git** end? Well, as a commit of course.
-
-Testing this sandbox thing.
-
 ## Blockquotes
 
 > This is a blockquote.
@@ -51,6 +49,15 @@ Let's see a table:
 Heading 1|Heading 2|Heading 3
 Item 1| Item 2| Item 3"""]]
 
+    location / {
+     proxy_pass http://test.ashep:80;
+     proxy_cache default;
+     proxy_cache_valid 200 302 10m;
+     proxy_cache_valid 404 1m;
+    }
+
+
+
 
 Numbered list 
 
@@ -176,8 +183,6 @@ module vc_Mux2 #( parameter W = 1 )
 endmodule
 """]]
 
-#<asd>
-
-This is simple enough for now [[sandbocen]] no?
+testing the ikiwiki sandbox.
+Testing 1, 2, 3.....
 
-    Do code tags work?