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

diff --git a/doc/examples/softwaresite/bugs/test1.mdwn b/doc/examples/softwaresite/bugs/test1.mdwn
new file mode 100644 (file)
index 0000000..00fd786
--- /dev/null
+++ b/doc/examples/softwaresite/bugs/test1.mdwn
@@ -0,0 +1,2 @@
+blah blah blah
+

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 582d46e846252e1a419e3e48982eca1243f6c90d..92899ea47fb71dd8a865b52262fa36dd5089181a 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -2,6 +2,7 @@ This is the SandBox, a page anyone can edit to try out ikiwiki.
 
 testing 1..2..3!!
 
+[[한글페이지]]
 ----
 
 Here's a paragraph.
@@ -83,3 +84,6 @@ The haiku will change after every save, mind you.
 This SandBox is also a [[blog]]!
 
 [[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]
+
+-----
+[[한글]]

diff --git a/doc/sandbox/한글.mdwn b/doc/sandbox/한글.mdwn
new file mode 100644 (file)
index 0000000..e0ba326
--- /dev/null
+++ b/doc/sandbox/한글.mdwn
@@ -0,0 +1 @@
+~를 어떻게 할까~

diff --git a/doc/sandbox/한글페이지.mdwn b/doc/sandbox/한글페이지.mdwn
new file mode 100644 (file)
index 0000000..4fac797
--- /dev/null
+++ b/doc/sandbox/한글페이지.mdwn
@@ -0,0 +1,2 @@
+
+Wow test