Add password reset to FAQ (#8883)

* Add password reset to FAQ

Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Add links to email setup docs

Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Add en-us to email setup

Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Update docs/content/doc/help/faq.en-us.md

Co-Authored-By: guillep2k <18600385+guillep2k@users.noreply.github.com>
* Manually merge changes from @guillep2k and add small changes

Signed-off-by: jolheiser <john.olheiser@gmail.com>

diff --git a/docs/content/doc/help/faq.en-us.md b/docs/content/doc/help/faq.en-us.md
index 856e756db1d71a1afad20e2ac7019f878484699a..8a65b522f52a1ae6177e9aa1d2d0bf4262d84d4b 100644 (file)
--- 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.en-us.md b/docs/content/doc/usage/email-setup.en-us.md
new file mode 100644 (file)
index 0000000..6fc9de8
--- /dev/null
+++ b/docs/content/doc/usage/email-setup.en-us.md
@@ -0,0 +1,33 @@
+---
+date: "2019-10-15T10:10:00+05:00"
+title: "Usage: Email setup"
+slug: "email-setup"
+weight: 12
+toc: true
+draft: false
+menu:
+  sidebar:
+    parent: "usage"
+    name: "Email setup"
+    weight: 12
+    identifier: "email-setup"
+---
+
+# Email setup
+
+- To use Gitea's built-in Email support, update the `app.ini` config file [mailer] section:
+
+```ini
+[mailer]
+ENABLED = true
+HOST    = mail.mydomain.com:587
+FROM    = gitea@mydomain.com
+USER    = gitea@mydomain.com
+PASSWD  = `password`
+```
+
+- Restart Gitea for the configuration changes to take effect.
+
+- To send a test email to validate the settings, go to Gitea > Site Administration > Configuration > SMTP Mailer Configuration.
+
+For the full list of options check the [Config Cheat Sheet]({{< relref "doc/advanced/config-cheat-sheet.en-us.md" >}})
\ No newline at end of file

diff --git a/docs/content/doc/usage/email-setup.md b/docs/content/doc/usage/email-setup.md
deleted file mode 100644 (file)
index 6fc9de8..0000000
--- a/docs/content/doc/usage/email-setup.md
+++ /dev/null
@@ -1,33 +0,0 @@
----
-date: "2019-10-15T10:10:00+05:00"
-title: "Usage: Email setup"
-slug: "email-setup"
-weight: 12
-toc: true
-draft: false
-menu:
-  sidebar:
-    parent: "usage"
-    name: "Email setup"
-    weight: 12
-    identifier: "email-setup"
----
-
-# Email setup
-
-- To use Gitea's built-in Email support, update the `app.ini` config file [mailer] section:
-
-```ini
-[mailer]
-ENABLED = true
-HOST    = mail.mydomain.com:587
-FROM    = gitea@mydomain.com
-USER    = gitea@mydomain.com
-PASSWD  = `password`
-```
-
-- Restart Gitea for the configuration changes to take effect.
-
-- To send a test email to validate the settings, go to Gitea > Site Administration > Configuration > SMTP Mailer Configuration.
-
-For the full list of options check the [Config Cheat Sheet]({{< relref "doc/advanced/config-cheat-sheet.en-us.md" >}})
\ No newline at end of file