summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2019-02-05 17:07:33 +0000
committerMatthew Hodgson <matthew@matrix.org>2019-02-05 17:07:33 +0000
commit175f73f1d980468993d96f87ce68173254a6051d (patch)
tree168501d04d3dcaa7f116f8de9bd503425b67c0f7
parentMD tweaks (diff)
downloadsynapse-175f73f1d980468993d96f87ce68173254a6051d.tar.xz
plug fosdem
-rw-r--r--docs/MSC1711_certificates_FAQ.md8
1 files changed, 6 insertions, 2 deletions
diff --git a/docs/MSC1711_certificates_FAQ.md b/docs/MSC1711_certificates_FAQ.md
index 13f01e32f0..9c830d23b1 100644
--- a/docs/MSC1711_certificates_FAQ.md
+++ b/docs/MSC1711_certificates_FAQ.md
@@ -30,8 +30,12 @@ they should retain their SRV record while the federation upgrades over the
 course of the month.  Other SRV records are unaffected.
 
 Full upgrade notes can be found in
-[UPGRADE.rst](https://github.com/matrix-org/synapse/blob/master/UPGRADE.rst),
-what follows is a timeline and some frequently asked questions.
+[UPGRADE.rst](https://github.com/matrix-org/synapse/blob/master/UPGRADE.rst).
+What follows is a timeline and some frequently asked questions.
+
+For more details and context on the release of the r0.1 Server/Server API and
+imminent Matrix 1.0 release, you can also see our main talk from FOSDEM 2019:
+https://matrix.org/blog/2019/02/04/matrix-at-fosdem-2019/
 
 ## Contents
 * Timeline