mirror of
				https://github.com/zulip/zulip.git
				synced 2025-11-03 21:43:21 +00:00 
			
		
		
		
	docs: Fix a few typos in documentation.
This commit is contained in:
		
				
					committed by
					
						
						Tim Abbott
					
				
			
			
				
	
			
			
			
						parent
						
							e3b4883386
						
					
				
				
					commit
					e16d721921
				
			@@ -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
 | 
					preferred for environments like Zulip Cloud where you might want to
 | 
				
			||||||
export a single organization without disrupting any other users, and
 | 
					export a single organization without disrupting any other users, and
 | 
				
			||||||
the intent is to move hosting of the organization (and forcing users
 | 
					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).
 | 
					anyway).
 | 
				
			||||||
 | 
					
 | 
				
			||||||
We include both options in the instructions below, commented out so
 | 
					We include both options in the instructions below, commented out so
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -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
 | 
					On success, the install script prints a link.  If you're [restoring a
 | 
				
			||||||
backup][zulip-backups] or importing your data from [HipChat][hipchat-import],
 | 
					backup][zulip-backups] or importing your data from [HipChat][hipchat-import],
 | 
				
			||||||
[Slack][slack-import], or another Zulip server, you should stop here
 | 
					[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
 | 
					[hipchat-import]: https://zulipchat.com/help/import-from-hipchat
 | 
				
			||||||
[slack-import]: https://zulipchat.com/help/import-from-slack
 | 
					[slack-import]: https://zulipchat.com/help/import-from-slack
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -196,7 +196,7 @@ command:
 | 
				
			|||||||
```
 | 
					```
 | 
				
			||||||
 | 
					
 | 
				
			||||||
and Zulip will automatically fetch the relevant Git commit and upgrade
 | 
					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
 | 
					By default, this uses the main upstream Zulip server repository
 | 
				
			||||||
(example below), but you can configure any other Git repository by
 | 
					(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
 | 
					it's structurally very unlikely for the `postgres` process to ever
 | 
				
			||||||
develop bugs, whereas the import/export tool requires some work for
 | 
					develop bugs, whereas the import/export tool requires some work for
 | 
				
			||||||
every new feature we add to Zulip, and thus may occasionally have bugs
 | 
					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
 | 
					more human-readable and easier to parse, and doesn't have the
 | 
				
			||||||
requirement that the same set of Zulip organizations exist on the two
 | 
					requirement that the same set of Zulip organizations exist on the two
 | 
				
			||||||
servers (which is critical for migrations to and from Zulip Cloud).
 | 
					servers (which is critical for migrations to and from Zulip Cloud).
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user