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

diff --git a/doc/news/server_speed.mdwn b/doc/news/server_speed.mdwn
index 3dcf1a9c655f20bac1f12ad4f76b5225baa68a10..55f9c2488922e47f342145363aa7ff44230d5389 100644 (file)
--- 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 65a2af960358c16c85274320cf27716c87df24b8..8b137891791fe96927ad78e64b0aad7bded08bdc 100644 (file)
--- 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]].)