summary refs log tree commit diff
path: root/UPGRADE.rst
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2014-11-19 15:25:23 -0800
committerMatthew Hodgson <matthew@matrix.org>2014-11-19 15:25:23 -0800
commit25fd4d9f2c7f99b0932ae9468c1141669e1999cc (patch)
tree03e617a9d614414ee3603a138f86613d003a90b0 /UPGRADE.rst
parentAdd note about rerunning setup.py develop (diff)
downloadsynapse-25fd4d9f2c7f99b0932ae9468c1141669e1999cc.tar.xz
typoe
Diffstat (limited to '')
-rw-r--r--UPGRADE.rst2
1 files changed, 1 insertions, 1 deletions
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.: