docs: Sweepfixes II Electric Boogaloo #2083
No reviewers
Labels
No labels
Abandoned
Blocked
Bug
Changelog
Added
Changelog
Missing
Changelog
None
Cherry-picking
Database
Dependencies
Dependencies/Renovate
Difficulty
Easy
Difficulty
Hard
Difficulty
Medium
Documentation
Enhancement
Good first issue
Help wanted
Inherited
Matrix/Administration
Matrix/Appservices
Matrix/Auth
Matrix/Client
Matrix/Core
Matrix/E2EE
Matrix/Federation
Matrix/Hydra
Matrix/MSC
Matrix/Media
Matrix/T&S
Merge
Merge/Manual
Merge/Squash
Meta
Meta/CI
Meta/Packaging
Priority
Blocking
Priority
High
Priority
Low
Security
Status
Confirmed
Status
Duplicate
Status
Invalid
Status
Needs Investigation
Support
bob the builder
No milestone
No project
No assignees
5 participants
Notifications
Due date
No due date set.
Dependencies
No dependencies set.
Reference
continuwuation/continuwuity!2083
Loading…
Add table
Add a link
Reference in a new issue
No description provided.
Delete branch "stratself/continuwuity:stratself/docs-sweepfixes-ii"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
Small changes to various pages of docs to improve wording/clarity/linkage/etc and update some information. https://muc.muoi.me for preview as usual.
Pull request checklist:
mainbranch, and the branch is named something other thanmain.myself, if applicable. This includes ensuring code compiles.
e07b43ee9631b1402aa231b1402aa2fc614e1931fc614e19316cc03c154a@ -55,3 +93,3 @@### For IPv4-only usersIf you don't have IPv6 connectivity, changing `ip_lookup_strategy` to only resolve for IPv4 will reduce unnecessary AAAA queries.If you don't have IPv6 connectivity, change `ip_lookup_strategy` to `1`, in order to only resolve for IPv4 and remove unnecessary AAAA queries.where? ;)
@ -74,11 +112,11 @@ Some values that are commonly tuned include:- Increase `discard-timeout` to something like `4800` to wait longer for upstream resolvers, as recursion can take a long time to respond to some domains. Continuwuity default to `dns_timeout = 10` seconds, so dropping requests early would lead to unnecessary retries and/or failures.s/default/defaults/
@ -130,6 +143,6 @@ management.Built-in S3 support is also planned, but for now using a "S3 filesystem" onMight want to update this as well, we don't plan an S3 backend (verbiage likely from conduwuit era), but do recommend the "S3 Filesystem" solutions if somebody needs that.
@ -131,3 +143,1 @@`media/` works. Continuwuity also sends a `Cache-Control` header of 1 year andimmutable for all media requests (download and thumbnail) to reduce unnecessarymedia requests from browsers, reduce bandwidth usage, and reduce load.While Continuwuity does not implement built-in S3 support, using an "S3 filesystemMissing ending quote?
I would argue there shouldn't be quotes here at all. "an S3 filesystem mount" would be preferred
Agreed
@ -54,0 +58,4 @@### Docker DNSIf you follow the [DNS tuning guide](./guides/dns.mdx#for-docker-users) and mount a custom `/etc/resolv.conf`, you may not be able to connect to appservices containers via hostname. Follow the workaround [there](./guides/dns.mdx#for-docker-users) to connect to your appservice via static IPs."appservices' containers using their hostnames. Follow the workaround in the guide to connect to your appservice using a static IP."
@ -65,3 +64,3 @@:::note Docker DNS PerformanceDocker's default DNS resolver are known to [cause timeout issues](../troubleshooting#dns-issues) for Matrix federation. To bypass it and use a more performant resolver, mount a custom `/etc/resolv.conf` config file into the Continuwuity container.Docker's default DNS resolver are known to [**cause timeout issues**](../troubleshooting#dns-issues) for Matrix federation. To bypass it and use a more performant resolver, we will mount a custom `/etc/resolv.conf` config file into the Continuwuity container."is known to", and I'm not sure why this is bold. Also, the previous version without "we will" was stronger.
+1 here, phrasing without "we will" also follows the grammar used for the rest of the document. I would also remove the "we will be using" on line 39
It is bold because it is quite important.
"We will" is there to say that the example configs will mount the file. Better wording suggestions are welcome.
Fixed "we will", "is known to" and updated preview on muc.muoi.me
@ -90,0 +90,4 @@Create a Caddyfile with the following content:```https://example.com:443, https://example.com:8448 {https:// and :443 need not be specified (unless it does need to be with groups of other domains but I truly do not think so)
@ -187,6 +197,21 @@ Test that your setup works by following these [instructions](./generic.mdx#how-dCheck your container logs using `docker-compose logs --follow` to debug any issues. See the [Troubleshooting](../troubleshooting.mdx) page for common errors and how to fix them.## UpdatingIs a docker compose tutorial really necessary?
A short guide like this does no harm. I would however, if it is to stay, replace
docker-composewithdocker compose, asdocker-composewas deprecated some years agoReplacing all instances of
docker-composewithdocker compose@ -55,3 +55,3 @@- `/.well-known/matrix/client`: for Client-Server discovery- `/.well-known/matrix/server`: for Server-Server (federation) discovery- `/.well-known/matrix/support`: admin contact details (strongly recommended to have)- `/.well-known/matrix/support`: admin contact details (strongly recommended to have). By default, this include members of the admin room."to have" can be dropped while we're at it, and for formatting, I would place "By default, [...]" on its own line with no terminating or separating periods
@ -129,2 +133,2 @@:::warningEven if you choose to serve the well-known files manually, if you are using delegation at all, you **must** still set the `global.well_known.client` configuration option to the domain you're delegating to. Continuwuity needs to know the domain it runs on for OAuth-compatible clients to work correctly.:::warning Warning: always configure [global.well_known]Even if you choose to serve the well-known files manually, you **must** still set the `global.well_known.client` configuration option to the domain you're delegating to. Continuwuity needs to know the domain it runs on, in order to redirect clients properly to email, OAuth, and account management endpoints.There should be no separating comma: "runs on in order to"
@ -196,0 +200,4 @@- [Federation Setup guide by MTRNord](https://connectivity-tester.mtrnord.blog/docs/getting-started/federation-setup)See the following Matrix Specs for full details on client/server resolution mechanisms:"sections of the Matrix Specification for more details on client and server resolution mechanisms:"
@ -196,0 +202,4 @@See the following Matrix Specs for full details on client/server resolution mechanisms:- [Server-to-Server resolution](https://spec.matrix.org/latest/server-server-api/#resolving-server-names) (see this for more information on SRV records)The ending of this can just be ", particularly for more information on SRV records"
Removed entirely as SRV records are in Appendix
@ -196,0 +210,4 @@### Docker Compose examplesThe following Compose files are taken from [Docker instructions](../deploying/docker.mdx) and reconfigured to support split-domain delegation. Note the updated `CONTINUWUITY_WELL_KNOWN` variable and relevant changes in reverse proxy rules."from the [Docker deployment instructions]"
@ -196,0 +220,4 @@``````txt title="Caddyfile"https://matrix.example.com:443 {The same feedback I have given everywhere else about not needing to specify https:// or :443 is relevant here.
@ -197,3 +262,2 @@:::warningThe following methods are **not recommended** due to increased complexity with little benefits. If you have already set up `.well-known` delegation as above, you can safely skip this part.:::The following methods use DNS SRV records, and are **not recommended** due to increased complexity with little benefits. They also work with federation traffic only."due to their increased complexity with few benefits" and "Additionally, they only work for federation traffic"
@ -200,2 +263,3 @@The following methods use DNS SRV records, and are **not recommended** due to increased complexity with little benefits. They also work with federation traffic only.The following methods uses SRV DNS records and only work with federation traffic. They are only included for completeness.If you have already set up `.well-known` delegation as above, you can safely skip this part."
.well-knowndelegation" and "well-known delegation" should be consistent across the docs@ -19,3 +19,3 @@### For Docker usersDocker bridge networks uses a non-performant resolver to intercept and respond to container hostnames, and **this should also be avoided**. Instead, mount a custom `/etc/resolv.conf` file into the container, and hardcode a resolver address to bypass Docker's.By default, Docker bridge networks uses a non-performant resolver to intercept and respond to container hostnames. **This resolver should also be avoided**. Instead, mount a custom `/etc/resolv.conf` file into the container, and hardcode a resolver address to bypass Docker's."non-performant" should be replaced with "poorly performing" while we're here
@ -29,2 +29,3 @@networks:matrix_net:# re-use the `proxy` network, as shown in Docker deployment docs,"in the [...]"
@ -54,1 +60,4 @@:::warning Breaking resolution with container hostnamesBy mounting a custom `/etc/resolv.conf`, you won't be able to connect to other container via their hostnames, such as [appservice](../appservices.mdx) in the same Docker network. To work around this, also force your appservice to use a static IP address, and refer to such IP during registration.@ -55,3 +93,3 @@### For IPv4-only usersIf you don't have IPv6 connectivity, changing `ip_lookup_strategy` to only resolve for IPv4 will reduce unnecessary AAAA queries.If you don't have IPv6 connectivity, change `ip_lookup_strategy` to `1` in Continuwuity's configuration, in order to only resolve for IPv4 and remove unnecessary AAAA queries.Again, there need not be a separating comma: "configuration in order to exclusively resolve IPv4 addresses and remove unnecessary AAAA queries."
i would additionally reword it to
@ -78,2 +115,3 @@### Using a forwarder (optional)Unbound by default employs **recursive resolution** and contacts many servers around the world. While this allows updated and authoritative answers and are generally viable for most users, sometimes these recursive queries can be too slow to fully resolve. As an alternative, you can consider **forwarding** your queries to public resolvers, and benefit from faster responses from their CDNs.Unbound by default employs **recursive resolution** and contacts many nameservers around the world. While this is generally viable for most users, sometimes these recursive queries can be too slow to fully resolve. As an alternative, you may consider **forwarding** your queries to public resolvers, and benefit from faster responses from their CDNs.@ -145,3 +183,3 @@## TestingAs a rough stress test, you can run `!admin query resolver flush-cache -a` or `!admin server clear-caches` to trigger a netburst of DNS queries. If your resolver can handle these loads without problem, then it should be ready for regular Continuwuity activity.As a rough stress test, you can run `!admin query resolver flush-cache -a` or `!admin server clear-caches` to clear your destinations cache - this will then trigger a netburst of DNS queries. If your resolver can handle this load without problem, then it should be ready for regular Continuwuity activity.While we're here, "without problem" should be "without issue" or "without a problem". This is a common malformation.
@ -7,3 +7,3 @@## DNS tuning (recommended)Please see the dedicated [DNS tuning guide](./dns.mdx).For federating servers, DNS tuning is important for a smooth experience. Please see the dedicated [DNS tuning guide](./dns.mdx)."DNS tuning is important to ensure a smooth experience for federated servers."
@ -46,4 +47,4 @@### CompressionSome RocksDB settings can be adjusted such as the compression method chosen. SeeThere should be a separating comma for "adjusted, such as" while we're here
@ -43,3 +43,3 @@via liburing for improved read performance.RocksDB troubleshooting can be found [in the RocksDB section of troubleshooting](troubleshooting.md).RocksDB troubleshooting can be found [in the RocksDB section ofOnce again, inconsistent wrapping.
How would you like it to wrap? It works though
@ -50,1 +51,3 @@the RocksDB section in the [example config](./reference/config.mdx).the RocksDB section in the [example config](./reference/config.mdx), and the[database compression section](./guides/performance.mdx#tuning-database-compression)in the perf-tuning documentation for more."in the performance tuning documentation"
@ -85,1 +88,3 @@same. This is unfortunately a bad design choice by Facebook as we are using the### Database online backupIf you'd like to backup your database online without any downtime, see the@ -86,0 +91,4 @@[`!admin server` command](./reference/admin/server.md) for the backup commandsand the `database_backup_path` config options in the example config.Please note that the format of the database backup is not the exact same.@ -132,2 +143,2 @@immutable for all media requests (download and thumbnail) to reduce unnecessarymedia requests from browsers, reduce bandwidth usage, and reduce load.While Continuwuity does not implement built-in S3 support, using an "S3 filesystemon the `media/` path will works. Continuwuity also sends a `Cache-Control` header"will work"
@ -133,1 +143,3 @@media requests from browsers, reduce bandwidth usage, and reduce load.While Continuwuity does not implement built-in S3 support, using an "S3 filesystemon the `media/` path will works. Continuwuity also sends a `Cache-Control` headerof 1 year and immutable for all media requests (download and thumbnail)"and immutable for all media requests" needs to be rephrased
rephrased
@ -1,3 +1,8 @@## Configuration file referenceThis configuration file reflect latest developments on the `main` branch. To check the file from a specific Continuwuity version, browse the [tags](https://forgejo.ellis.link/continuwuation/continuwuity/tags) and view the `conduwuit-example.toml` file there.I'd argue the ending should be "for that version"
Updated to reflect silver's feedback.
@ -61,1 +61,3 @@## Reverse proxying well-known files to Continuwuity## Serving well-known filesYou can either reverse proxy well-known paths to Continuwuity, or serve static JSON files yourself.Would add a "the", to become "reverse proxy the well-known paths"
@ -30,1 +30,3 @@matrix_net:# re-use the `proxy` network, as shown in Docker deployment docs,# with a custom subnetdo these four words specifically need to reside on a different line? it looks kinda funky
@ -28,3 +28,3 @@```yaml title="docker-compose.yml"networks:matrix_net:stray newline
Approved minus the few comments made
88c1d6cc8d1fadd67e54Changes made
except one outstanding. I took the liberty to dos/docker-compose/docker composefor the livekit docs as well@ -194,2 +200,3 @@## Related Documentation## Using SRV records (not recommended)Community guides:### Community guides, move after the matrix spec stuff (next comment)@ -196,0 +203,4 @@- [Federation Setup guide by MTRNord](https://connectivity-tester.mtrnord.blog/docs/getting-started/federation-setup)See the following sections of the Matrix Specification for more details on client and server resolution mechanisms:Replace line with
### Matrix Specification, move above community guidesSectioned as recommended
@ -54,1 +59,4 @@:::warning Breaking resolution with container hostnamesAfter you mount a custom `/etc/resolv.conf`, you won't be able to connect to other container using their hostnames, such as for [appservices](../appservices.mdx) in the same Docker network. To work around this, force your appservice to use a static IP address, and refer to its static IP during registration."other containers"