From ec6758d47253fd6f0cee567f38c8996e35a4de7a Mon Sep 17 00:00:00 2001
From: Dirk Klimpel <5740567+dklimpel@users.noreply.github.com>
Date: Wed, 3 Aug 2022 10:41:57 +0200
Subject: Fix wrong headline for `url_preview_accept_language` in docs (#13437)

Fixes: #13433
---
 docs/usage/configuration/config_documentation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/usage/configuration/config_documentation.md')

diff --git a/docs/usage/configuration/config_documentation.md b/docs/usage/configuration/config_documentation.md
index 6f8d7b7d26..d072240abf 100644
--- a/docs/usage/configuration/config_documentation.md
+++ b/docs/usage/configuration/config_documentation.md
@@ -1859,7 +1859,7 @@ Example configuration:
 max_spider_size: 8M
 ```
 ---
-### `url_preview_language`
+### `url_preview_accept_language`
 
 A list of values for the Accept-Language HTTP header used when
 downloading webpages during URL preview generation. This allows
-- 
cgit 1.5.1


From 5eccfdfafdf957739697d667c05fde829cc0f8bc Mon Sep 17 00:00:00 2001
From: Dirk Klimpel <5740567+dklimpel@users.noreply.github.com>
Date: Wed, 3 Aug 2022 11:19:20 +0200
Subject: Remove 'Contents' section from the Configuration Manual (#13438)

Fixes: #13053
---
 changelog.d/13438.doc                            |  1 +
 docs/usage/configuration/config_documentation.md | 43 ------------------------
 2 files changed, 1 insertion(+), 43 deletions(-)
 create mode 100644 changelog.d/13438.doc

(limited to 'docs/usage/configuration/config_documentation.md')

diff --git a/changelog.d/13438.doc b/changelog.d/13438.doc
new file mode 100644
index 0000000000..163b63ffc6
--- /dev/null
+++ b/changelog.d/13438.doc
@@ -0,0 +1 @@
+Remove redundant 'Contents' section from the Configuration Manual. Contributed by @dklimpel.
diff --git a/docs/usage/configuration/config_documentation.md b/docs/usage/configuration/config_documentation.md
index d072240abf..2e2e59195b 100644
--- a/docs/usage/configuration/config_documentation.md
+++ b/docs/usage/configuration/config_documentation.md
@@ -72,49 +72,6 @@ apply if you want your config file to be read properly. A few helpful things to
   In addition, each setting has an example of its usage, with the proper indentation
   shown.
 
-## Contents
-[Modules](#modules)
-
-[Server](#server)
-
-[Homeserver Blocking](#homeserver-blocking)
-
-[TLS](#tls)
-
-[Federation](#federation)
-
-[Caching](#caching)
-
-[Database](#database)
-
-[Logging](#logging)
-
-[Ratelimiting](#ratelimiting)
-
-[Media Store](#media-store)
-
-[Captcha](#captcha)
-
-[TURN](#turn)
-
-[Registration](#registration)
-
-[API Configuration](#api-configuration)
-
-[Signing Keys](#signing-keys)
-
-[Single Sign On Integration](#single-sign-on-integration)
-
-[Push](#push)
-
-[Rooms](#rooms)
-
-[Opentracing](#opentracing)
-
-[Workers](#workers)
-
-[Background Updates](#background-updates)
-
 ## Modules
 
 Server admins can expand Synapse's functionality with external modules.
-- 
cgit 1.5.1


From fb7a2cc4cc7f0b49cabeec08d4ceb2dd2350e945 Mon Sep 17 00:00:00 2001
From: Dirk Klimpel <5740567+dklimpel@users.noreply.github.com>
Date: Wed, 3 Aug 2022 11:41:19 +0200
Subject: Update doc for setting `macaroon_secret_key` (#13443)

* Update doc for setting `macaroon_secret_key`

* newsfile
---
 changelog.d/13443.doc                            |  1 +
 docs/usage/configuration/config_documentation.md | 10 +++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 changelog.d/13443.doc

(limited to 'docs/usage/configuration/config_documentation.md')

diff --git a/changelog.d/13443.doc b/changelog.d/13443.doc
new file mode 100644
index 0000000000..0db5d1b3b4
--- /dev/null
+++ b/changelog.d/13443.doc
@@ -0,0 +1 @@
+Update documentation for config setting `macaroon_secret_key`.
\ No newline at end of file
diff --git a/docs/usage/configuration/config_documentation.md b/docs/usage/configuration/config_documentation.md
index 2e2e59195b..3a9466a837 100644
--- a/docs/usage/configuration/config_documentation.md
+++ b/docs/usage/configuration/config_documentation.md
@@ -2495,9 +2495,13 @@ track_appservice_user_ips: true
 ---
 ### `macaroon_secret_key`
 
-A secret which is used to sign access tokens. If none is specified,
-the `registration_shared_secret` is used, if one is given; otherwise,
-a secret key is derived from the signing key.
+A secret which is used to sign
+- access token for guest users,
+- short-term login token used during SSO logins (OIDC or SAML2) and
+- token used for unsubscribing from email notifications.
+
+If none is specified, the `registration_shared_secret` is used, if one is given;
+otherwise, a secret key is derived from the signing key.
 
 Example configuration:
 ```yaml
-- 
cgit 1.5.1