diff --git a/docs/configuring-playbook-email2matrix.md b/docs/configuring-playbook-email2matrix.md index 6db339b43..7fbd49a76 100644 --- a/docs/configuring-playbook-email2matrix.md +++ b/docs/configuring-playbook-email2matrix.md @@ -35,8 +35,8 @@ It doesn't matter who creates and owns the rooms and who joins later (you or the What matters is that both you and the sender user are part of the same room and that the sender user has enough privileges in the room to be able to send messages there. Inviting additional people to the room is okay too. -Take note of each room's room id (different clients show the room id in a different place). -You'll need the room id when doing [Configuration](#configuration) below. +Take note of each room's room ID (different clients show the room ID in a different place). +You'll need the room ID when doing [Configuration](#configuration) below. ### Obtaining an access token for the sender user diff --git a/roles/custom/matrix-conduit/templates/conduit.toml.j2 b/roles/custom/matrix-conduit/templates/conduit.toml.j2 index b22509cec..be490cd2a 100644 --- a/roles/custom/matrix-conduit/templates/conduit.toml.j2 +++ b/roles/custom/matrix-conduit/templates/conduit.toml.j2 @@ -7,7 +7,7 @@ [global] # The server_name is the pretty name of this server. It is used as a suffix for user -# and room ids. Examples: matrix.org, conduit.rs +# and room IDs. Examples: matrix.org, conduit.rs # The Conduit server needs all /_matrix/ requests to be reachable at # https://your.server.name/ on port 443 (client-server) and 8448 (federation). diff --git a/roles/custom/matrix-synapse/defaults/main.yml b/roles/custom/matrix-synapse/defaults/main.yml index 9659e876e..119f29746 100644 --- a/roles/custom/matrix-synapse/defaults/main.yml +++ b/roles/custom/matrix-synapse/defaults/main.yml @@ -1210,7 +1210,7 @@ matrix_synapse_ext_encryption_disabler_download_url: "https://raw.githubusercont # A list of server domain names for which to deny encryption if the event sender's domain matches the domain in the list. # By default, with the configuration below, we prevent all homeserver users from initiating encryption in ANY room. matrix_synapse_ext_encryption_disabler_deny_encryption_for_users_of: ["{{ matrix_domain }}"] -# A list of server domain names for which to deny encryption if the destination room id's domain matches the domain in the list. +# A list of server domain names for which to deny encryption if the destination room ID's domain matches the domain in the list. # By default, with the configuration below, we prevent locally-created encryption events by ANY user encrypt rooms on the homeserver. # Note: foreign users with enough room privileges will still be able to send an encryption event to your rooms and encrypt them. matrix_synapse_ext_encryption_disabler_deny_encryption_for_rooms_of: ["{{ matrix_domain }}"] diff --git a/roles/custom/matrix-synapse/vars/main.yml b/roles/custom/matrix-synapse/vars/main.yml index c25f30fe7..88edcb187 100644 --- a/roles/custom/matrix-synapse/vars/main.yml +++ b/roles/custom/matrix-synapse/vars/main.yml @@ -8,7 +8,7 @@ matrix_synapse_media_store_directory_name: "{{ matrix_synapse_media_store_path | # Optionally: `false` to fully disable tls on outbound smtp matrix_synapse_email_smtp_enable_tls: true -# Room workers handle any URL that contains a room id, either through the client-server API or the federation API +# Room workers handle any URL that contains a room ID, either through the client-server API or the federation API # - see https://tcpipuk.github.io/synapse/deployment/nginx.html#locationsconf matrix_synapse_workers_room_worker_client_server_endpoints: - ^/_matrix/client/.*?!(?[A-Za-z0-9._=\-\/]+):[A-Za-z0-9.\-]+