diff --git a/docs/production/export-and-import.md b/docs/production/export-and-import.md index 6ccaf05a00..df449522ec 100644 --- a/docs/production/export-and-import.md +++ b/docs/production/export-and-import.md @@ -47,7 +47,7 @@ accounts in the from logging in or accessing the API. This is preferred for environments like Zulip Cloud where you might want to export a single organization without disrupting any other users, and the intent is to move hosting of the organization (and forcing users -to re-login would be required as part of the hosting migrateion +to re-login would be required as part of the hosting migration anyway). We include both options in the instructions below, commented out so diff --git a/docs/production/install.md b/docs/production/install.md index 5b5c1488ca..5965ad5ed2 100644 --- a/docs/production/install.md +++ b/docs/production/install.md @@ -85,7 +85,7 @@ If the script gives an error, consult [Troubleshooting](#troubleshooting) below. On success, the install script prints a link. If you're [restoring a backup][zulip-backups] or importing your data from [HipChat][hipchat-import], [Slack][slack-import], or another Zulip server, you should stop here -and return to the the import instructions. +and return to the import instructions. [hipchat-import]: https://zulipchat.com/help/import-from-hipchat [slack-import]: https://zulipchat.com/help/import-from-slack diff --git a/docs/production/maintain-secure-upgrade.md b/docs/production/maintain-secure-upgrade.md index ae84545287..252692690b 100644 --- a/docs/production/maintain-secure-upgrade.md +++ b/docs/production/maintain-secure-upgrade.md @@ -196,7 +196,7 @@ command: ``` and Zulip will automatically fetch the relevant Git commit and upgrade -to the that version of Zulip. +to that version of Zulip. By default, this uses the main upstream Zulip server repository (example below), but you can configure any other Git repository by @@ -353,7 +353,7 @@ the `manage.py backup` system over the export/import process is that it's structurally very unlikely for the `postgres` process to ever develop bugs, whereas the import/export tool requires some work for every new feature we add to Zulip, and thus may occasionally have bugs -aroun corner cases. The export tool's advantage is that the export is +around corner cases. The export tool's advantage is that the export is more human-readable and easier to parse, and doesn't have the requirement that the same set of Zulip organizations exist on the two servers (which is critical for migrations to and from Zulip Cloud).