Correctly handle filenames starting with a dash in add/rm/mv.

[git.ikiwiki.info.git] / doc / sandbox.mdwn

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 502bc4feca5d4d46a41452feb4eef70d4d973085..8dcd648bee32830e641ef8bc2b195034f6b2a9fe 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,16 +1,10 @@
 # Sandbox
 
 [[!pagestats  pages="/tags/*"]]
 # Sandbox
 
 [[!pagestats  pages="/tags/*"]]

-<<<<<<< HEAD
-ttt
-[[!sidebar  content="dfdsfsf""
-This is my custom sidebar for this page.
-
-\[[!calendar pages="posts/*"]]
-"""]]

 
 

+Hello, ikiwiki.

 
 

-asdfasdf asdfasldkfj asdf
+Testing.

 
 [[!sidebar ]]
 
 
 [[!sidebar ]]
 


@@ -18,7 +12,7 @@ asdfasdf asdfasldkfj asdf
 ## number 2
 ### number 3
 
 ## number 2
 ### number 3
 

-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 ]]
 (version [[!version  ]]).
 
 [[!toc levels=1 startlevel=2 ]]


@@ -31,6 +25,8 @@ w00t, how does this look on the **git** end? Well, as a commit of course.
 
 Testing this sandbox thing.
 
 
 Testing this sandbox thing.
 

+Awesome :P
+

 ## Blockquotes
 
 > This is a blockquote.
 ## Blockquotes
 
 > This is a blockquote.


@@ -189,3 +185,8 @@ This is simple enough for now [[sandbocen]] no?
     Do code tags work?
 
 test by max
     Do code tags work?
 
 test by max

+
+test by bbb
+
+
+Can I make a [[NewPage]]?