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

2009-01-07 12:29:18 -05:00 · 2009-01-07 12:29:18 -05:00 · f01a5c9df7
parent 551544663d 29c05eaff8
commit f01a5c9df7
4 changed files with 9 additions and 0 deletions
--- a/doc/examples/softwaresite/bugs/test1.mdwn
+++ b/doc/examples/softwaresite/bugs/test1.mdwn
@ -0,0 +1,2 @@
+blah blah blah
+
--- 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"]]
+
+-----
+[[한글]]
--- a/doc/sandbox/한글.mdwn
+++ b/doc/sandbox/한글.mdwn
@ -0,0 +1 @@
+~를 어떻게 할까~
--- a/doc/sandbox/한글페이지.mdwn
+++ b/doc/sandbox/한글페이지.mdwn
@ -0,0 +1,2 @@
+
+Wow test