Merge f0affdfa3c into 4cafe7d9f4

2026-05-01 14:44:09 +02:00 · 2025-10-31 11:55:57 +01:00
4 changed files with 6 additions and 8 deletions
--- a/changelogs/internal/newsfragments/2241.clarification
+++ b/changelogs/internal/newsfragments/2241.clarification
@ -1 +0,0 @@
-Inline Olm & Megolm specifications.
--- a/changelogs/internal/newsfragments/2242.clarification
+++ b/changelogs/internal/newsfragments/2242.clarification
@ -1 +0,0 @@
-Inline Olm & Megolm specifications.
--- a/content/client-server-api/modules/end_to_end_encryption.md
+++ b/content/client-server-api/modules/end_to_end_encryption.md
@ -1459,8 +1459,8 @@ readers without adding any useful extra information.
 ##### `m.olm.v1.curve25519-aes-sha2`

 The name `m.olm.v1.curve25519-aes-sha2` corresponds to version 1 of the
-Olm ratchet, as defined by the [Olm specification](/olm-megolm/olm).
-This uses:
+Olm ratchet, as defined by the [Olm
+specification](http://matrix.org/docs/spec/olm.html). This uses:

 -   Curve25519 for the initial key agreement.
 -   HKDF-SHA-256 for ratchet key derivation.
@ -1633,8 +1633,8 @@ This is due to a deprecation of the fields. See
 {{% changed-in v="1.3" %}}

 The name `m.megolm.v1.aes-sha2` corresponds to version 1 of the Megolm
-ratchet, as defined by the [Megolm specification](/olm-megolm/megolm).
-This uses:
+ratchet, as defined by the [Megolm
+specification](http://matrix.org/docs/spec/megolm.html). This uses:

 -   HMAC-SHA-256 for the hash ratchet.
 -   HKDF-SHA-256, AES-256 in CBC mode, and 8 byte truncated HMAC-SHA-256
--- a/layouts/docs/baseof.html
+++ b/layouts/docs/baseof.html
@ -13,8 +13,8 @@
  <head>
    {{ partial "head.html" . }}
    {{ if .Page.Store.Get "hasMath" }}
-      <link href="{{ relURL "css/katex.min.css" }}" rel="preload" as="style">
-      <link href="{{ relURL "css/katex.min.css" }}" rel="stylesheet">
+      <link href="/css/katex.min.css" rel="preload" as="style">
+      <link href="/css/katex.min.css" rel="stylesheet">
    {{ end }}
  </head>
  <body class="td-{{ .Kind }}{{ with .Page.Params.body_class }} {{ . }}{{ end }}">