X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/a812692a50de69215a8267c7b0b1d7bf62bdfa32..d13ba9e818abf1f3bf46a7605ef9f6ca17ae22b7:/doc/sandbox.mdwn

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 502bc4fec..0a5af6a25 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,36 +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.
 
-asdfasdf asdfasldkfj asdf
+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 ]]
 
-See, online editing :-p
-
-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.
@@ -57,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 
 
@@ -181,11 +182,3 @@ module vc_Mux2 #( parameter W = 1 )
 
 endmodule
 """]]
-
-#<asd>
-
-This is simple enough for now [[sandbocen]] no?
-
-    Do code tags work?
-
-test by max