Skip to content
This repository was archived by the owner on Aug 17, 2023. It is now read-only.

Commit 13881f6

Browse files
committed
Docs updates
1 parent 31497d3 commit 13881f6

File tree

3 files changed

+15
-2
lines changed

3 files changed

+15
-2
lines changed

docs/process/Branching.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@ branches.
2020
This lowers maintenance overheads, but requires that we always keep
2121
`master` in a releaseable state.
2222

23+
### Release preparation branches
24+
25+
According to the [[Release-Checklist]], these are of the form
26+
`your-name/bump-release/YYYY-MM-DD`.
27+
2328
## Mainline branch
2429

2530
Mainline branch is `master` - for consistency.

docs/process/Matrix.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ Our team's homeserver is [adrestia.iohkdev.io](https://matrix.adrestia.iohkdev.i
66

77
You can log in immediately with your web browser, without installing any client software by visiting:
88

9-
:::{class=""}
10-
[element.adrestia.iohkdev.io](https://element.adrestia.iohkdev.io/)
9+
:::{.m-8}
10+
[element.adrestia.iohkdev.io](https://element.adrestia.iohkdev.io/){class="py-4 px-8 bg-indigo-200 text-white font-semibold rounded-lg shadow-md hover:bg-indigo-300 focus:outline-none focus:ring-2 focus:ring-indigo-400 focus:ring-opacity-75"}
1111
:::
1212

1313
## Authentication
@@ -177,6 +177,7 @@ The following things would be nice to have in Matrix, but currently aren't imple
177177
1. [The Matrix Web Site][matrix.org]
178178
2. [Element Blog: E2E Encryption by Default & Cross-signing is here](https://element.io/blog/e2e-encryption-by-default-cross-signing-is-here/)
179179
3. [Matrix Implementers Guide: E2EE](https://matrix.org/docs/guides/implementing-more-advanced-e-2-ee-features-such-as-cross-signing)
180+
4. [Matrix and E2E Encryption (or: how not to lose your messages)](https://gerstner.it/2021/02/matrix-and-e2e-encryption-or-how-not-to-lose-your-messages/)
180181

181182
[matrix.org]: https://matrix.org
182183
[synapse]: https://github.com/matrix-org/synapse

docs/process/Meetings.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,13 @@ Meetings... everyone loves them. Here is the weekly list of meetings for our pro
1010
| Thursday | [Hello](#hello), [Problem Management](#problem-management) |
1111
| Friday | [Hello](#hello), [Dev meeting](#dev-meeting) |
1212

13+
:::{.highlight-block}
14+
💡 **Firefox Users**
15+
16+
WebRTC calls seem to work much better in Chrome than Firefox.
17+
Consider using Chrome _just_ for Google Meet and Jitsi Meet.
18+
:::
19+
1320
## Iteration Planning
1421

1522
- **Participants**: Whole team

0 commit comments

Comments
 (0)