summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-01-07 12:29:18 -0500
committerJoey Hess <joey@gnu.kitenet.net>2009-01-07 12:29:18 -0500
commitf01a5c9df70ad1e001685dc24b8d2cd2df0d05af (patch)
tree79f9da1ec448d3d5316b463619971bfb59e2617d
parent551544663db939c8eb32dd78ad74e1514589be25 (diff)
parent29c05eaff8155b1937c90f05a6ab0b881a136488 (diff)
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
-rw-r--r--doc/examples/softwaresite/bugs/test1.mdwn2
-rw-r--r--doc/sandbox.mdwn4
-rw-r--r--doc/sandbox/한글.mdwn1
-rw-r--r--doc/sandbox/한글페이지.mdwn2
4 files changed, 9 insertions, 0 deletions
diff --git a/doc/examples/softwaresite/bugs/test1.mdwn b/doc/examples/softwaresite/bugs/test1.mdwn
new file mode 100644
index 000000000..00fd786fc
--- /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 582d46e84..92899ea47 100644
--- 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
index 000000000..e0ba32639
--- /dev/null
+++ b/doc/sandbox/한글.mdwn
@@ -0,0 +1 @@
+~를 어떻게 할까~
diff --git a/doc/sandbox/한글페이지.mdwn b/doc/sandbox/한글페이지.mdwn
new file mode 100644
index 000000000..4fac7976c
--- /dev/null
+++ b/doc/sandbox/한글페이지.mdwn
@@ -0,0 +1,2 @@
+
+Wow test