diff --git a/README.rst b/README.rst index 8974990ed1..92854f631c 100644 --- a/README.rst +++ b/README.rst @@ -8,7 +8,7 @@ Synapse is an open source `Matrix `__ homeserver implementation, written and maintained by `Element `_. `Matrix `__ is the open standard for -secure and interoperable real time communications. You can directly run +secure and interoperable real-time communications. You can directly run and manage the source code in this repository, available under an AGPL license (or alternatively under a commercial license from Element). There is no support provided by Element unless you have a @@ -23,13 +23,13 @@ ESS builds on Synapse to offer a complete Matrix-based backend including the ful `Admin Console product `_, giving admins the power to easily manage an organization-wide deployment. It includes advanced identity management, auditing, -moderation and data retention options as well as Long Term Support and -SLAs. ESS can be used to support any Matrix-based frontend client. +moderation and data retention options as well as Long-Term Support and +SLAs. ESS supports any Matrix-compatible client. .. contents:: -🛠️ Installing and configuration -=============================== +🛠️ Installation and configuration +================================== The Synapse documentation describes `how to install Synapse `_. We recommend using `Docker images `_ or `Debian packages from Matrix.org @@ -133,7 +133,7 @@ connect from a client: see An easy way to get started is to login or register via Element at https://app.element.io/#/login or https://app.element.io/#/register respectively. You will need to change the server you are logging into from ``matrix.org`` -and instead specify a Homeserver URL of ``https://:8448`` +and instead specify a homeserver URL of ``https://:8448`` (or just ``https://`` if you are using a reverse proxy). If you prefer to use another client, refer to our `client breakdown `_. @@ -162,16 +162,15 @@ the public internet. Without it, anyone can freely register accounts on your hom This can be exploited by attackers to create spambots targeting the rest of the Matrix federation. -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:: +Your new Matrix ID will be formed partly from the ``server_name``, and partly +from a localpart you specify when you create the account in the form of:: @localpart:my.domain.name (pronounced "at localpart on my dot domain dot name"). As when logging in, you will need to specify a "Custom server". Specify your -desired ``localpart`` in the 'User name' box. +desired ``localpart`` in the 'Username' box. 🎯 Troubleshooting and support ============================== @@ -209,10 +208,10 @@ Identity servers have the job of mapping email addresses and other 3rd Party IDs (3PIDs) to Matrix user IDs, as well as verifying the ownership of 3PIDs before creating that mapping. -**They are not where accounts or credentials are stored - these live on home -servers. Identity Servers are just for mapping 3rd party IDs to matrix IDs.** +**Identity servers do not store accounts or credentials - these are stored and managed on homeservers. +Identity Servers are just for mapping 3rd Party IDs to Matrix IDs.** -This process is very security-sensitive, as there is obvious risk of spam if it +This process is highly security-sensitive, as there is an obvious risk of spam if it is too easy to sign up for Matrix accounts or harvest 3PID data. In the longer term, we hope to create a decentralised system to manage it (`matrix-doc #712 `_), but in the meantime, @@ -238,9 +237,9 @@ email address. We welcome contributions to Synapse from the community! The best place to get started is our `guide for contributors `_. -This is part of our larger `documentation `_, which includes - +This is part of our broader `documentation `_, which includes information for Synapse developers as well as Synapse administrators. + Developers might be particularly interested in: * `Synapse's database schema `_, diff --git a/build_rust.py b/build_rust.py index d2726cee26..1328420287 100644 --- a/build_rust.py +++ b/build_rust.py @@ -19,17 +19,17 @@ def build(setup_kwargs: Dict[str, Any]) -> None: # This flag is a no-op in the latest versions. Instead, we need to # specify this in the `bdist_wheel` config below. py_limited_api=True, - # We force always building in release mode, as we can't tell the - # difference between using `poetry` in development vs production. + # We always build in release mode, as we can't distinguish + # between using `poetry` in development vs production. debug=False, ) setup_kwargs.setdefault("rust_extensions", []).append(extension) setup_kwargs["zip_safe"] = False - # We lookup the minimum supported python version by looking at - # `python_requires` (e.g. ">=3.9.0,<4.0.0") and finding the first python + # We look up the minimum supported Python version with + # `python_requires` (e.g. ">=3.9.0,<4.0.0") and finding the first Python # version that matches. We then convert that into the `py_limited_api` form, - # e.g. cp39 for python 3.9. + # e.g. cp39 for Python 3.9. py_limited_api: str python_bounds = SpecifierSet(setup_kwargs["python_requires"]) for minor_version in itertools.count(start=8): diff --git a/changelog.d/18700.doc b/changelog.d/18700.doc new file mode 100644 index 0000000000..4b1f868c84 --- /dev/null +++ b/changelog.d/18700.doc @@ -0,0 +1 @@ +Minor improvements to README.