From 25fd4d9f2c7f99b0932ae9468c1141669e1999cc Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Wed, 19 Nov 2014 15:25:23 -0800 Subject: [PATCH] typoe --- UPGRADE.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UPGRADE.rst b/UPGRADE.rst index 8c70ae2765..961f4da31c 100644 --- a/UPGRADE.rst +++ b/UPGRADE.rst @@ -18,7 +18,7 @@ rooms the home server was a member of and room alias mappings. If you would like to keep your history, please take a copy of your database file and ask for help in #matrix:matrix.org. The upgrade process is, unfortunately, non trivial and requires human intervention to resolve any -resutling conflicts during the upgrade process. +resulting conflicts during the upgrade process. Before running the command the homeserver should be first completely shutdown. To run it, simply specify the location of the database, e.g.: