diff options
author | Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | 2019-03-05 09:47:14 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-05 09:47:14 +0000 |
commit | 3887e0cd80d99a527e2ba699e2f5eceae757e95c (patch) | |
tree | e6fa209b8d15763ee4986ff2b1377a5a0f4ab838 | |
parent | Merge pull request #4794 from matrix-org/anoa/erroneous_dollahs (diff) | |
parent | Add changelog (diff) | |
download | synapse-3887e0cd80d99a527e2ba699e2f5eceae757e95c.tar.xz |
Merge pull request #4795 from matrix-org/anoa/configinatoractoring
Remove reference to that no longer exists in README
-rw-r--r-- | README.rst | 6 | ||||
-rw-r--r-- | changelog.d/4795.misc | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/README.rst b/README.rst index 8e22109973..c04fb4d19a 100644 --- a/README.rst +++ b/README.rst @@ -117,9 +117,9 @@ recommended to also set up CAPTCHA - see `<docs/CAPTCHA_SETUP.rst>`_.) Once ``enable_registration`` is set to ``true``, it is possible to register a user via `riot.im <https://riot.im/app/#/register>`_ or other Matrix clients. -Your new user name will be formed partly from the ``server_name`` (see -`Configuring synapse`_), and partly from a localpart you specify when you -create the account. Your name will take the form of:: +Your new user name will be formed partly from the ``server_name``, and partly +from a localpart you specify when you create the account. Your name will take +the form of:: @localpart:my.domain.name diff --git a/changelog.d/4795.misc b/changelog.d/4795.misc new file mode 100644 index 0000000000..03995f42fe --- /dev/null +++ b/changelog.d/4795.misc @@ -0,0 +1 @@ +Remove link to deleted title in README. \ No newline at end of file |