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

doc/bugs/support_for_openid2_logins.mdwn

@@ -20,3 +20,5 @@ However both Perl OpenID 2.x implementations have not been released and are inco
 
 > I've tested with yahoo, and it works with the updated module. Sweet and
 > [[done]] --[[Joey]] 
+
+## A quick fix for the impatient running stable is simply `sudo apt-get install libnet-openid-consumer-perl -t unstable`

doc/tips/howto_limit_to_admin_users.mdwn

@@ -0,0 +1,9 @@
+Enable [[plugins/lockedit]] in your setup file.
+
+For example:
+
+    add_plugins => [qw{goodstuff table rawhtml template embed typography sidebar img remove lockedit}],
+
+And to only allow admin users to edit the page, simply specify a pagespec for everything in the .setup:
+
+    locked_pages => '*',