Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

server-server-api: Fix grammar #1665

Merged
merged 4 commits into from
Oct 25, 2023
+3 −2
Merged

server-server-api: Fix grammar #1665

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
42d33d4
server-server-api: Fix grammar
progval Oct 20, 2023
3ba8255
Rephrase more naturally
progval Oct 24, 2023
b70c2f7
remove unnecessary word
uhoreg Oct 25, 2023
7762dd8
Add changelog
uhoreg Oct 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion content/server-server-api.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ to send. The process overall is as follows:
for `<hostname>`.

6. If the `/.well-known` request returned an error response, and the
uhoreg marked this conversation as resolved.
Show resolved Hide resolved
SRV record was not found, an IP address is resolved using CNAME, AAAA and A
SRV records were not found, an IP address is resolved using CNAME, AAAA and A
Copy link
Contributor

@MTRNord MTRNord Oct 20, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't matrix set up in a way where there is only one SRV record at any given time? (Though on a quick search I didn't see anything not allowing multiple)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Standard SRV resolution allows for multiple records, and Matrix never forbade it. But also, steps 4 and 5 refer to different SRV records (_matrix-fed._tcp.<hostname> and _matrix._tcp.<hostname>), so it really should be plural.

On the other hand "the SRV records were not found" sounds like SRV records exist but could not be found for whatever reason. So maybe something like "... and no SRV records are present ...", or "... and no SRV records are found ..." might be better?

records. Requests are made to the resolved IP address using port
8448 and a `Host` header containing the `<hostname>`. The target
server must present a valid certificate for `<hostname>`.
Expand Down
Loading