merged the recentchanges branch

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

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index ae243c54233ecb5cc9affd576a2cbf50533242b6..c44657fd1ae34f4fee69aa61a0956cd461c88b83 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,19 +1,4 @@
-This is the SandBox, a page anyone can edit to try out ikiwiki.
-
-Foobar.
-
-----
-geht das?
-<http://www.orf.at/>
-Hellas zusammen!
-
-<h2>testhead</h2>
-----
-Do re me fa so la te... git?
-
-i see. i see. lalala hmmmmmmmm.
-
-[[sandbox]] does that work? yep. yay!
+This is the SandBox, a page anyone can edit to try out this fab ikiwiki.

 
 # テスト。
 
 
 # テスト。
 


@@ -43,6 +28,8 @@ Exactly my point!
 
 Test..
 
 
 Test..
 

+A [[nonexistingpage]]
+

 There are Polish diacritical characters: ą, ć, ę, ł, ń, ó, ś, ż, ź.
 
 # Header
 There are Polish diacritical characters: ą, ć, ę, ł, ń, ó, ś, ż, ź.
 
 # Header


@@ -92,33 +79,15 @@ Bulleted list
 
 ## Different sorts of links:
 
 
 ## Different sorts of links:
 

-* [[WikiLink]]
-* [[different_name_for_a_WikiLink|WikiLink]]
+* [[Features]]
+* [[different_name_for_a_WikiLink|ikiwiki/WikiLink]]

 * <http://www.gnu.org/>
 * [GNU](http://www.gnu.org/)
 * [Email](mailto:noone@invalid)
 * [![ikiwiki logo](http://ikiwiki.info/logo/ikiwiki.png)](http://ikiwiki.info)
 * <http://www.gnu.org/>
 * [GNU](http://www.gnu.org/)
 * [Email](mailto:noone@invalid)
 * [![ikiwiki logo](http://ikiwiki.info/logo/ikiwiki.png)](http://ikiwiki.info)

-
+* <a href="http://www.google.com/>do html links work?</a>

 -----
 
 -----
 

-<div class="whatever">
-
-Try putting divs around a list doesn't work:
-
-* first item
-* second item
-
-</div>
-
-span also doesn't work:
-
-<span class="whatever">
-* first item
-* second item
-</span>
-
-----
-
-This sandbox is also a [[blog]]!
+This sandbox is also a [[ikiwiki/blog]]!

 
 [[inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]
 
 [[inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]