summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-02-02 23:41:33 -0500
committerJoey Hess <joey@kodama.kitenet.net>2008-02-02 23:41:33 -0500
commit06841ed6b3559ea6c2ef37f80e7676b7181492a1 (patch)
tree101bc9c279b07d0260961789ce4b65872835997b
parent6a7c3d1209ab15094c390fe56da0e5d56220c555 (diff)
parent23068244e796f2cc0108b18affaa4272d718400a (diff)
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
-rw-r--r--doc/sandbox.mdwn6
-rw-r--r--doc/sandbox/testsubpage.mdwn3
2 files changed, 9 insertions, 0 deletions
diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index a5c44f109..bb9b2fc53 100644
--- 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
index 000000000..3db7aaaab
--- /dev/null
+++ b/doc/sandbox/testsubpage.mdwn
@@ -0,0 +1,3 @@
+# Test subpage
+
+This is a test subpage. Isn't that special?