From a9dfced50e621fc3b5406947bea1f88b4fc775f2 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Mon, 27 May 2019 16:30:05 +0800
Subject: [PATCH] update resource page: forum, doc links

---
 artiq/resources.page | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/artiq/resources.page b/artiq/resources.page
index dc7b384..8f33f89 100644
--- a/artiq/resources.page
+++ b/artiq/resources.page
@@ -4,10 +4,11 @@
 <p>
 <ul>
 <li>Beta (development) version: <a href="https://m-labs.hk/artiq/manual-beta.pdf">PDF</a> | <a href="https://m-labs.hk/artiq/manual-beta">HTML</a></li>
-<li>Older manuals (HTML only): <a href="manual-release-4/">ARTIQ-4</a> | <a href="manual-release-3/">ARTIQ-3</a> | <a href="manual-release-2/">ARTIQ-2</a></li>
+<li>Stable version: <a href="https://m-labs.hk/artiq/manual">HTML</a></li>
+<li>Older manuals (HTML only): <a href="manual-release-3/">ARTIQ-3</a> | <a href="manual-release-2/">ARTIQ-2</a></li>
 <li><a href="artiq_overview.pdf">Slides: Overview</a></li>
 <li><a href="slides_timing.pdf">Slides: Timing control in ARTIQ</a></li>
-<li><a href="https://ssl.serverraum.org/lists/listinfo/artiq">Public mailing list</a> - use for community technical support, questions, discussions, announcements</li>
+<li>Announcements, community support and discussions: <ul><li><a href="http://chat.m-labs.hk/">Mattermost live chat</a> (bridged to IRC)</li><li><a href="https://forum.m-labs.hk/">Forum</a> (new!)</li><li>IRC: #m-labs on Freenode</li><li><a href="https://ssl.serverraum.org/lists/listinfo/artiq">Public mailing list</a></li></ul></li>
 <li><a href="https://github.com/m-labs/artiq">Source code repository</a></li>
 <li>Commercial support available (Sinara hardware purchases, ports to your hardware, feature development, technical support, bugfixing) - contact sales@m-***s.hk. We welcome inquiries from research groups of all sizes. <a href="https://github.com/m-labs/artiq/issues?q=is%3Aissue+is%3Aopen+label%3Atype%3Afor-contract">Proposed extensions</a>.</li>
 <li>NIST press release: <a href="https://www.nist.gov/news-events/news/2015/01/open-source-software-quantum-information">Open-Source Software for Quantum Information</a></li>