2 files changed, 30 insertions, 1 deletions
diff --git a/doc/openid.mdwn b/doc/openid.mdwn
index a8ce46f08..7e46bdf64 100644
--- a/doc/openid.mdwn
+++ b/doc/openid.mdwn
@@ -2,7 +2,11 @@
 
 [[if test="enabled(openid)"
      then="This wiki has OpenID **enabled**."
-     else="This wiki has OpenID **disabled**."]]
+     else="""
+This wiki has OpenID **disabled**.
+[[if test="enabled(passwordauth) and passwordauth"
+     then="You can sign into this wiki using [[passwordauth]]."]]
+"""]]
 
 [OpenID](http://openid.net) is a decentralized authentication mechanism
 that allows you to have one login that you can use on a growing number of
@@ -23,6 +27,9 @@ signin form. You do not need to give this wiki a password or go through any
 registration process when using OpenID.
 """]]
 
+[[if test="enabled(openid) and enabled(passwordauth) and passwordauth"
+     then="You can also sign into this wiki using [[passwordauth]]."]]
+
 ---
 
 It's also possible to make a page in the wiki usable as an OpenID url,
diff --git a/doc/passwordauth.mdwn b/doc/passwordauth.mdwn
new file mode 100644
index 000000000..1c1358277
--- /dev/null
+++ b/doc/passwordauth.mdwn
@@ -0,0 +1,22 @@
+[[meta title="Password Authentication"]]
+
+[[if test="enabled(passwordauth)"
+     then="""
+This wiki has passwordauth **enabled**.
+
+You can sign into this wiki by entering a username and password in the login
+form.  If you don't have an account, you can register for one from the login
+form by hitting the "Register" button.
+
+[[if test="enabled(openid) and openid"
+     then="You can also sign into this wiki using [[OpenID]]."]]
+"""
+else="""
+This wiki has passwordauth **disabled**.
+[[if test="enabled(openid) and openid"
+     then="You can sign into this wiki using [[OpenID]]."]]
+
+If this wiki had passwordauth enabled, you could sign into this wiki by
+entering the username and password for your account, or create an account from
+the login form by hitting the "Register" button.
+"""]]