summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-12-04 12:08:07 +0100
committerGitHub <noreply@github.com>2018-12-04 12:08:07 +0100
commitdd27e47b5cacf604f107511f1e3ad4a3be84963f (patch)
treeef932f8c28ffe582712d78d2a46cc86feb65826f
parentAdd an option to disable search for homeservers which may not be interested i... (diff)
parentReplace mentions of Vector with Riot (diff)
downloadsynapse-dd27e47b5cacf604f107511f1e3ad4a3be84963f.tar.xz
Merge pull request #4210 from axelsimon/patch-1
Replace mentions of Vector with Riot
-rw-r--r--README.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/README.rst b/README.rst

index e52b776902..8c55dd7894 100644 --- a/README.rst +++ b/README.rst
@@ -333,7 +333,7 @@ content served to web browsers a matrix API from being able to attack webapps ho on the same domain. This is particularly true of sharing a matrix webclient and server on the same domain. -See https://github.com/vector-im/vector-web/issues/1977 and +See https://github.com/vector-im/riot-web/issues/1977 and https://developer.github.com/changes/2014-04-25-user-content-security for more details. @@ -828,7 +828,7 @@ Password reset ============== If a user has registered an email address to their account using an identity -server, they can request a password-reset token via clients such as Vector. +server, they can request a password-reset token via clients such as Riot. A manual password reset can be done via direct database access as follows.