summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/content/doc/help/faq.en-us.md17
-rw-r--r--docs/content/doc/usage/email-setup.en-us.md (renamed from docs/content/doc/usage/email-setup.md)0
2 files changed, 16 insertions, 1 deletions
diff --git a/docs/content/doc/help/faq.en-us.md b/docs/content/doc/help/faq.en-us.md
index 856e756db1..8a65b522f5 100644
--- a/docs/content/doc/help/faq.en-us.md
+++ b/docs/content/doc/help/faq.en-us.md
@@ -43,6 +43,8 @@ Also see [Support Options]({{< relref "doc/help/seek-help.en-us.md" >}})
* [Missing releases after migration repository with tags](#missing-releases-after-migrating-repository-with-tags)
* [LFS Issues](#lfs-issues)
* [How can I create users before starting Gitea](#how-can-i-create-users-before-starting-gitea)
+* [How can I enable password reset](#how-can-i-enable-password-reset)
+* [How can a user's password be changed](#how-can-a-user-s-password-be-changed)
## Difference between 1.x and 1.x.x downloads
@@ -275,4 +277,17 @@ By default, your LFS token will expire after 20 minutes. If you have a slow conn
You may want to set this value to `60m` or `120m`.
## How can I create users before starting Gitea
-Gitea provides a sub-command `gitea migrate` to initialize the database, after which you can use the [admin CLI commands]({{< relref "doc/usage/command-line.en-us.md" >}}) to add users like normal.
+Gitea provides a sub-command `gitea migrate` to initialize the database, after which you can use the [admin CLI commands]({{< relref "doc/usage/command-line.en-us.md#admin" >}}) to add users like normal.
+
+## How can I enable password reset
+There is no setting for password resets. It is enabled when a [mail service]({{< relref "doc/usage/email-setup.en-us.md" >}}) is configured, and disabled otherwise.
+
+## How can a user's password be changed
+- As an **admin**, you can change any user's password (and optionally force them to change it on next login)...
+ - By navigating to your `Site Administration -> User Accounts` page and editing a user.
+ - By using the [admin CLI commands]({{< relref "doc/usage/command-line.en-us.md#admin" >}}).
+ Keep in mind most commands will also need a [global flag]({{< relref "doc/usage/command-line.en-us.md#global-options" >}}) to point the CLI at the correct configuration.
+- As a **user** you can change it...
+ - In your account `Settings -> Account` page (this method **requires** you to know your current password).
+ - By using the `Forgot Password` link.
+ If the `Forgot Password/Account Recovery` page is disabled, please contact your administrator to configure a [mail service]({{< relref "doc/usage/email-setup.en-us.md" >}}).
diff --git a/docs/content/doc/usage/email-setup.md b/docs/content/doc/usage/email-setup.en-us.md
index 6fc9de81dd..6fc9de81dd 100644
--- a/docs/content/doc/usage/email-setup.md
+++ b/docs/content/doc/usage/email-setup.en-us.md