Merge branch 'master' into dependency-types

doc/plugins/lockedit/discussion.mdwn

@@ -1,21 +1,8 @@
-This plugin not only locks pages but ensures too a user is logged in. This seems to me redundant with signedit. I propose :
+This plugin not only locks pages but ensures too a user is logged in. This
+seems to me redundant with signedit. I propose [removing the if block that
+calls needsignin ].
 
-    sub canedit ($$) {
-    	my $page=shift;
-    	my $cgi=shift;
-    	my $session=shift;
-    
-    	my $user=$session->param("name");
-    	return undef if defined $user && IkiWiki::is_admin($user);
-    
-    	if (defined $config{locked_pages} && length $config{locked_pages} &&
-    	    pagespec_match($page, $config{locked_pages},
-    		    user => $session->param("name"),
-    		    ip => $ENV{REMOTE_ADDR},
-    	    )) {
-    		return sprintf(gettext("%s is locked and cannot be edited"),
-    			htmllink("", "", $page, noimageinline => 1));
-    	}
-    
-    	return undef;
-    }
+> That was added because the most typical reason for being unable to edit a
+> page is that you are not logged in. And without the jump to logging the
+> user in, there is no way for the user to log in, without navigating away
+> from the page they were trying to edit. --[[Joey]]