Skip to content

Commit

Permalink
change 'Home Server' to one word 'homeserver' (matrix-org#11320)
Browse files Browse the repository at this point in the history
Signed-off-by: Ashwin S. Nair <[email protected]>
  • Loading branch information
ashwinair authored Nov 16, 2021
1 parent e605e4b commit e72135b
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 15 deletions.
8 changes: 4 additions & 4 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -8678,14 +8678,14 @@ General:

Federation:

- Add key distribution mechanisms for fetching public keys of unavailable remote home servers. See [Retrieving Server Keys](https://github.com/matrix-org/matrix-doc/blob/6f2698/specification/30_server_server_api.rst#retrieving-server-keys) in the spec.
- Add key distribution mechanisms for fetching public keys of unavailable remote homeservers. See [Retrieving Server Keys](https://github.com/matrix-org/matrix-doc/blob/6f2698/specification/30_server_server_api.rst#retrieving-server-keys) in the spec.

Configuration:

- Add support for multiple config files.
- Add support for dictionaries in config files.
- Remove support for specifying config options on the command line, except for:
- `--daemonize` - Daemonize the home server.
- `--daemonize` - Daemonize the homeserver.
- `--manhole` - Turn on the twisted telnet manhole service on the given port.
- `--database-path` - The path to a sqlite database to use.
- `--verbose` - The verbosity level.
Expand Down Expand Up @@ -8890,7 +8890,7 @@ This version adds support for using a TURN server. See docs/turn-howto.rst on ho
Homeserver:

- Add support for redaction of messages.
- Fix bug where inviting a user on a remote home server could take up to 20-30s.
- Fix bug where inviting a user on a remote homeserver could take up to 20-30s.
- Implement a get current room state API.
- Add support specifying and retrieving turn server configuration.

Expand Down Expand Up @@ -8980,7 +8980,7 @@ Changes in synapse 0.2.3 (2014-09-12)

Homeserver:

- Fix bug where we stopped sending events to remote home servers if a user from that home server left, even if there were some still in the room.
- Fix bug where we stopped sending events to remote homeservers if a user from that homeserver left, even if there were some still in the room.
- Fix bugs in the state conflict resolution where it was incorrectly rejecting events.

Webclient:
Expand Down
1 change: 1 addition & 0 deletions changelog.d/11320.doc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Changed the word 'Home server' as one word 'homeserver' in documentation.
6 changes: 3 additions & 3 deletions docs/ancient_architecture_notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

## Server to Server Stack

To use the server to server stack, home servers should only need to
To use the server to server stack, homeservers should only need to
interact with the Messaging layer.

The server to server side of things is designed into 4 distinct layers:
Expand All @@ -23,7 +23,7 @@ Server with a domain specific API.

1. **Messaging Layer**

This is what the rest of the Home Server hits to send messages, join rooms,
This is what the rest of the homeserver hits to send messages, join rooms,
etc. It also allows you to register callbacks for when it get's notified by
lower levels that e.g. a new message has been received.

Expand All @@ -45,7 +45,7 @@ Server with a domain specific API.

For incoming PDUs, it has to check the PDUs it references to see
if we have missed any. If we have go and ask someone (another
home server) for it.
homeserver) for it.

3. **Transaction Layer**

Expand Down
16 changes: 8 additions & 8 deletions docs/turn-howto.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# Overview

This document explains how to enable VoIP relaying on your Home Server with
This document explains how to enable VoIP relaying on your homeserver with
TURN.

The synapse Matrix Home Server supports integration with TURN server via the
The synapse Matrix homeserver supports integration with TURN server via the
[TURN server REST API](<https://tools.ietf.org/html/draft-uberti-behave-turn-rest-00>). This
allows the Home Server to generate credentials that are valid for use on the
TURN server through the use of a secret shared between the Home Server and the
allows the homeserver to generate credentials that are valid for use on the
TURN server through the use of a secret shared between the homeserver and the
TURN server.

The following sections describe how to install [coturn](<https://github.com/coturn/coturn>) (which implements the TURN REST API) and integrate it with synapse.
Expand Down Expand Up @@ -165,18 +165,18 @@ This will install and start a systemd service called `coturn`.
## Synapse setup
Your home server configuration file needs the following extra keys:
Your homeserver configuration file needs the following extra keys:
1. "`turn_uris`": This needs to be a yaml list of public-facing URIs
for your TURN server to be given out to your clients. Add separate
entries for each transport your TURN server supports.
2. "`turn_shared_secret`": This is the secret shared between your
Home server and your TURN server, so you should set it to the same
homeserver and your TURN server, so you should set it to the same
string you used in turnserver.conf.
3. "`turn_user_lifetime`": This is the amount of time credentials
generated by your Home Server are valid for (in milliseconds).
generated by your homeserver are valid for (in milliseconds).
Shorter times offer less potential for abuse at the expense of
increased traffic between web clients and your home server to
increased traffic between web clients and your homeserver to
refresh credentials. The TURN REST API specification recommends
one day (86400000).
4. "`turn_allow_guests`": Whether to allow guest users to use the
Expand Down

0 comments on commit e72135b

Please sign in to comment.