diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/basewiki.mdwn | 1 | ||||
| -rw-r--r-- | doc/bugs/login_page_non-obvious_with_openid.mdwn | 3 | ||||
| -rw-r--r-- | doc/openid.mdwn | 9 | ||||
| -rw-r--r-- | doc/passwordauth.mdwn | 24 | ||||
| -rw-r--r-- | doc/todo/conditional_underlay_files.mdwn | 1 |
5 files changed, 1 insertions, 37 deletions
diff --git a/doc/basewiki.mdwn b/doc/basewiki.mdwn index 912508c9e..acc1b3a60 100644 --- a/doc/basewiki.mdwn +++ b/doc/basewiki.mdwn @@ -11,7 +11,6 @@ It currently includes these pages: * [[markdown]] * [[openid]] * [[pagespec]] -* [[passwordauth]] * [[PreprocessorDirective]] * [[shortcuts]] * [[smileys]] diff --git a/doc/bugs/login_page_non-obvious_with_openid.mdwn b/doc/bugs/login_page_non-obvious_with_openid.mdwn index 3978bc526..5cffde7f4 100644 --- a/doc/bugs/login_page_non-obvious_with_openid.mdwn +++ b/doc/bugs/login_page_non-obvious_with_openid.mdwn @@ -43,6 +43,3 @@ If you want to keep it as one form, then perhaps using some javascript to disabl > I've improved the form, I think it's more obvious now that the openid > stuff is separate. Good enough to call this [[done]]. I think. --[[Joey]] - -> I put the [[passwordauth]] fields in a fieldset as well, which should help -> for login forms with both OpenID and passwordauth enabled. --[[JoshTriplett]] diff --git a/doc/openid.mdwn b/doc/openid.mdwn index 9624b6c3f..f02a0a62c 100644 --- a/doc/openid.mdwn +++ b/doc/openid.mdwn @@ -2,11 +2,7 @@ [[if test="enabled(openid)" then="This wiki has OpenID **enabled**." - else=""" -This wiki has OpenID **disabled**. -[[if test="enabled(passwordauth) and passwordauth" - then="You can sign into this wiki using [[passwordauth]]."]] -"""]] + else="This wiki has OpenID **disabled**."]] [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 @@ -27,9 +23,6 @@ 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 deleted file mode 100644 index cc7eab2a2..000000000 --- a/doc/passwordauth.mdwn +++ /dev/null @@ -1,24 +0,0 @@ -[[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 you have an account, but you have -forgotten your password, you can hit the "Mail Password" button to receive your -password via an email to the address you supplied when you registered. - -[[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. -"""]] diff --git a/doc/todo/conditional_underlay_files.mdwn b/doc/todo/conditional_underlay_files.mdwn index fc721de08..87f70696b 100644 --- a/doc/todo/conditional_underlay_files.mdwn +++ b/doc/todo/conditional_underlay_files.mdwn @@ -2,7 +2,6 @@ I'd like to see some way to include certain files from the underlay only when th * Only include smileys.mdwn and the smileys subdirectory if you enable the [[plugins/smiley]] plugin. * Exclude openid.mdwn if you disable the [[plugins/openid]] plugin. -* Exclude passwordauth.mdwn if you disable the [[plugins/passwordauth]] plugin. * Include shortcuts.mdwn only if you enable the [[plugins/shortcut]] plugin. * Include blog.mdwn only if you don't disable the [[plugins/inline]] plugin. * Include favicon.ico only if you enable the [[plugins/favicon]] plugin. |