From ae71aa6084f4c9f94cddf26e661116b492fd7720 Mon Sep 17 00:00:00 2001 From: Rhea Parekh Date: Thu, 31 May 2018 20:15:35 +0530 Subject: [PATCH] docs: Add macro for import docs "logging in" section. Fixes #9550. --- .../zerver/help/import-data-from-slack.md | 23 +------------------ .../import-or-export-a-zulip-organization.md | 23 +------------------ templates/zerver/help/include/import-login.md | 22 ++++++++++++++++++ 3 files changed, 24 insertions(+), 44 deletions(-) create mode 100644 templates/zerver/help/include/import-login.md diff --git a/templates/zerver/help/import-data-from-slack.md b/templates/zerver/help/import-data-from-slack.md index 2f80159a41..22e1b1d38b 100644 --- a/templates/zerver/help/import-data-from-slack.md +++ b/templates/zerver/help/import-data-from-slack.md @@ -60,28 +60,7 @@ cd /home/zulip/deployments/current ./manage.py import --import-into-nonempty converted_slack_data ``` -## Logging in - -Once the import completes, all your users will have accounts in your -new Zulip organization, but those accounts won't have passwords yet -(since for very good security reasons, passwords are not exported). -Your users will need to either authenticate using something like -Google auth, or start by resetting their passwords. - -You can use the `./manage.py send_password_reset_email` command to -send password reset emails to your users. We -recommend starting with sending one to yourself for testing: - -``` -./manage.py send_password_reset_email -u username@example.com -``` - -and then once you're ready, you can email them to everyone using e.g. -``` -./manage.py send_password_reset_email -r '' --all-users -``` - -(replace `''` with your subdomain if you're using one). +{!import-login.md!} ## Caveats diff --git a/templates/zerver/help/import-or-export-a-zulip-organization.md b/templates/zerver/help/import-or-export-a-zulip-organization.md index 11164da270..115b590d1d 100644 --- a/templates/zerver/help/import-or-export-a-zulip-organization.md +++ b/templates/zerver/help/import-or-export-a-zulip-organization.md @@ -78,25 +78,4 @@ cd /home/zulip/deployments/current ./manage reactivate_realm -r '' # Reactivates the organization ``` -## Logging in - -Once the import completes, all your users will have accounts in your -new Zulip organization, but those accounts won't have passwords yet -(since for very good security reasons, passwords are not exported). -Your users will need to either authenticate using something like -Google auth, or start by resetting their passwords. - -You can use the `./manage.py send_password_reset_email` command to -send password reset emails to your users. We -recommend starting with sending one to yourself for testing: - -``` -./manage.py send_password_reset_email -u username@example.com -``` - -and then once you're ready, you can email them to everyone using e.g. -``` -./manage.py send_password_reset_email -r '' --all-users -``` - -(replace `''` with your subdomain if you're using one). +{!import-login.md!} diff --git a/templates/zerver/help/include/import-login.md b/templates/zerver/help/include/import-login.md new file mode 100644 index 0000000000..9472d18be0 --- /dev/null +++ b/templates/zerver/help/include/import-login.md @@ -0,0 +1,22 @@ +## Logging in + +Once the import completes, all your users will have accounts in your +new Zulip organization, but those accounts won't have passwords yet +(since for very good security reasons, passwords are not exported). +Your users will need to either authenticate using something like +Google auth, or start by resetting their passwords. + +You can use the `./manage.py send_password_reset_email` command to +send password reset emails to your users. We +recommend starting with sending one to yourself for testing: + +``` +./manage.py send_password_reset_email -u username@example.com +``` + +and then once you're ready, you can email them to everyone using e.g. +``` +./manage.py send_password_reset_email -r '' --all-users +``` + +(replace `''` with your subdomain if you're using one).