diff options
| author | Joey Hess <joey@kitenet.net> | 2007-12-19 17:32:18 -0500 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2007-12-19 17:32:18 -0500 |
| commit | e9a40c8716afd6076c630a140186ee7b2ec9cfb4 (patch) | |
| tree | 7d4fd69aad5e358444a9cbc25aa577ded7744e45 | |
| parent | 852999c5e1d62ce9302e6e7c8a14b8ac4741d802 (diff) | |
| parent | 71d1fb4326d59a1179578244da1ac6d91aedf79d (diff) | |
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
| -rw-r--r-- | doc/news/server_speed.mdwn | 2 | ||||
| -rw-r--r-- | doc/plugins/shortcut/discussion.mdwn | 7 |
2 files changed, 1 insertions, 8 deletions
diff --git a/doc/news/server_speed.mdwn b/doc/news/server_speed.mdwn index 3dcf1a9c6..55f9c2488 100644 --- a/doc/news/server_speed.mdwn +++ b/doc/news/server_speed.mdwn @@ -1,7 +1,7 @@ Quick poll: Do you feel that ikiwiki is fast enough on this server, or should I move it to my much beefier auxillary server? -[[poll 36 "It's fast enough" 4 "It's too slow!" 4 "No opinion"]] +[[poll 37 "It's fast enough" 4 "It's too slow!" 4 "No opinion"]] If you have specifics on performance issues, you might mention them on the [[discussion]] page. diff --git a/doc/plugins/shortcut/discussion.mdwn b/doc/plugins/shortcut/discussion.mdwn index 65a2af960..8b1378917 100644 --- a/doc/plugins/shortcut/discussion.mdwn +++ b/doc/plugins/shortcut/discussion.mdwn @@ -1,8 +1 @@ -I'd like to use a shortcut like \[[gnumach-1-branch ddb/db_expr.h]] to link to -<http://cvs.savannah.gnu.org/viewvc/gnumach/ddb/db_expr.h?view=log&root=hurd&pathrev=gnumach-1-branch>. -* Dashes are not allowed in shortcut identifiers. Why? - -> No reason. Fixed in git. --[[Joey]] - -> (Moved other issue to [[bugs/shortcut_encoding]].) |