diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2009-01-23 16:54:13 -0500 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2009-01-23 16:54:13 -0500 |
| commit | a471ac68c8332cdee765896581db91c90b5a19e2 (patch) | |
| tree | d375d48e6ce152f318d2a1e52b64b99d4b9bb7d9 | |
| parent | 1c369f144098be90a63033237d75b3e7c9656ea9 (diff) | |
| parent | 54265c655c4ac3ef0899668827a8f757381087bd (diff) | |
| download | ikiwiki-a471ac68c8332cdee765896581db91c90b5a19e2.tar ikiwiki-a471ac68c8332cdee765896581db91c90b5a19e2.tar.gz | |
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
| -rw-r--r-- | doc/ikiwiki/pagespec/discussion.mdwn | 5 | ||||
| -rw-r--r-- | doc/sandbox.mdwn | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/doc/ikiwiki/pagespec/discussion.mdwn b/doc/ikiwiki/pagespec/discussion.mdwn index c8bdea3a0..5788d4aed 100644 --- a/doc/ikiwiki/pagespec/discussion.mdwn +++ b/doc/ikiwiki/pagespec/discussion.mdwn @@ -78,3 +78,8 @@ locks out all users. > describe, and a negated pagespec worked for me; all users except the > listed user (and except wiki admins of course) were locked out. > --[[Joey]] + +>> It must be a local problem, then, cause I've tried it with two separate +>> machines. Both are running the most recent release of ikiwiki in +>> pkgsrc - 2.66. Perhaps an update to a newer version would solve the issue. + diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index f160ad1d5..3fff2f0c5 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -2,6 +2,8 @@ This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!v ---- +[[中文显示]] + Here's a paragraph. The following code block is pre-formatted: |