Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index a5c44f1090c973b47afc8e5a2e3ab128b9841a04..bb9b2fc5370567d77f1ea2f90f80074916877bf5 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -12,6 +12,8 @@ Hupple hupple hupple hupple snork.
 
 There are Polish diacritical characters: ą, ć, ę, ł, ń, ó, ś, ż, ź.
 
+Korean characters test : 한글테스트입니다.
+
 # Header
 
 ## Subheader
@@ -71,3 +73,7 @@ Bulleted list
 This sandbox is also a [[ikiwiki/blog]]!
 
 [[inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]
+
+-----
+
+This is a test of the emergency broadcast system...

diff --git a/doc/sandbox/testsubpage.mdwn b/doc/sandbox/testsubpage.mdwn
new file mode 100644 (file)
index 0000000..3db7aaa
--- /dev/null
+++ b/doc/sandbox/testsubpage.mdwn
@@ -0,0 +1,3 @@
+# Test subpage
+
+This is a test subpage. Isn't that special?