summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-01-10 14:59:33 +0000
committerGitHub <noreply@github.com>2019-01-10 14:59:33 +0000
commit8c818af38eab5adf0167b1de5662d165d7cf5f52 (patch)
tree21d16179efd27ec85a4bf955aac7d6136745b0ee
parentMerge branch 'master' into develop (diff)
parentREADME.rst: fix hash_password path (diff)
downloadsynapse-8c818af38eab5adf0167b1de5662d165d7cf5f52.tar.xz
Merge pull request #4342 from aaronraimist/new-virtualenv
Update README to use new virtualenv (#4328)
Diffstat (limited to '')
-rw-r--r--README.rst5
-rw-r--r--changelog.d/4342.misc1
2 files changed, 3 insertions, 3 deletions
diff --git a/README.rst b/README.rst
index 4901e0464e..8bff55e78e 100644
--- a/README.rst
+++ b/README.rst
@@ -184,7 +184,7 @@ Configuring Synapse
 Before you can start Synapse, you will need to generate a configuration
 file. To do this, run (in your virtualenv, as before)::
 
-    cd ~/.synapse
+    cd ~/synapse
     python -m synapse.app.homeserver \
         --server-name my.domain.name \
         --config-path homeserver.yaml \
@@ -796,8 +796,7 @@ A manual password reset can be done via direct database access as follows.
 
 First calculate the hash of the new password::
 
-    $ source ~/.synapse/bin/activate
-    $ ./scripts/hash_password
+    $ ~/synapse/env/bin/hash_password
     Password:
     Confirm password:
     $2a$12$xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
diff --git a/changelog.d/4342.misc b/changelog.d/4342.misc
new file mode 100644
index 0000000000..a4fda47c20
--- /dev/null
+++ b/changelog.d/4342.misc
@@ -0,0 +1 @@
+Update README to use the new virtualenv everywhere
\ No newline at end of file