From d9d17eb87eecfb687d9f3e1ee41df5a96b457bf3 Mon Sep 17 00:00:00 2001
From: Lauryn Menard <lauryn.menard@gmail.com>
Date: Fri, 15 Oct 2021 12:27:32 +0200
Subject: [PATCH] help: Add article for supported browsers.

Creates new help article for supported web browsers. Also updates
links in the `/apps` landing page as well as the unsupported-browser
template and the `set-up-your-account` article.

Fixes #14732.
---
 help/include/set-up-your-account.md       |  3 ++-
 help/include/sidebar_index.md             |  1 +
 help/supported-browsers.md                | 25 +++++++++++++++++++++++
 templates/corporate/apps.html             |  5 +++--
 templates/zerver/unsupported_browser.html |  6 +++---
 5 files changed, 34 insertions(+), 6 deletions(-)
 create mode 100644 help/supported-browsers.md

diff --git a/help/include/set-up-your-account.md b/help/include/set-up-your-account.md
index e57339e18b..c32df3b7ac 100644
--- a/help/include/set-up-your-account.md
+++ b/help/include/set-up-your-account.md
@@ -3,7 +3,8 @@
     If this is your first time using Zulip, we recommend starting with the web
     or desktop experience to set up your account and get oriented.
 
-- Get the [mobile and desktop apps](/apps). Zulip also works great in a browser.
+- Get the [mobile and desktop apps](/apps). Zulip also works great in a
+  [browser](/help/supported-browsers).
 
 - [Add a profile picture](/help/change-your-profile-picture) and
   [edit your profile information](/help/edit-your-profile) to tell others
diff --git a/help/include/sidebar_index.md b/help/include/sidebar_index.md
index db6202c712..d2f2cf29ff 100644
--- a/help/include/sidebar_index.md
+++ b/help/include/sidebar_index.md
@@ -131,6 +131,7 @@
 ## Apps
 * [Desktop installation guides](/help/desktop-app-install-guide)
 * [Zulip in a Terminal](/help/zulip-in-a-terminal)
+* [Supported browsers](/help/supported-browsers)
 * [Connect through a proxy](/help/connect-through-a-proxy)
 * [Use a custom certificate](/help/custom-certificates)
 
diff --git a/help/supported-browsers.md b/help/supported-browsers.md
new file mode 100644
index 0000000000..c2d3969a81
--- /dev/null
+++ b/help/supported-browsers.md
@@ -0,0 +1,25 @@
+# Supported browsers
+
+In addition to the [mobile and desktop apps](https://zulip.com/apps/),
+Zulip works great in all major modern web browsers. We recommend
+pinning the Zulip tab in your favorite browser, so that it's always
+easy to find.
+
+For the best user experience, the latest stable versions of the
+browsers below are recommended.
+
+* [Chrome](https://www.google.com/chrome/)
+* [Firefox](https://mozilla.org/en-US/firefox/browsers/)
+* [Edge](https://microsoft.com/en-us/edge/)
+* [Safari](https://apple.com/safari/)
+
+## Cross-protocol apps
+
+Zulip is supported by most multi-protocol desktop chat apps like
+[Rambox](https://rambox.pro) and [Ferdium](https://ferdium.org/).
+
+We recommend choosing a product in this space that regularly releases
+security updates; several popular cross-protocol Electron apps have
+gone defunct over the years. Using a poorly maintained Electron app is
+a major security risk similar to using an old version of Chrome with
+dozens of published security vulnerabilities.
diff --git a/templates/corporate/apps.html b/templates/corporate/apps.html
index aa91385c3f..daf06f8666 100644
--- a/templates/corporate/apps.html
+++ b/templates/corporate/apps.html
@@ -67,8 +67,9 @@
             </a>
         </div>
         <div id="third-party-apps">
-            Zulip also works great in pinned browser tabs and
-            multi-protocol desktop chat apps
+            Zulip also works great in pinned
+            <a href="/help/supported-browsers">browser tabs</a>
+            and multi-protocol desktop chat apps
             like <a href="https://rambox.pro">Rambox</a>
             and <a href="https://ferdium.org/">Ferdium</a>.
         </div>
diff --git a/templates/zerver/unsupported_browser.html b/templates/zerver/unsupported_browser.html
index c14fd50d26..efa1c28b90 100644
--- a/templates/zerver/unsupported_browser.html
+++ b/templates/zerver/unsupported_browser.html
@@ -19,9 +19,9 @@
                         {% endtrans %}
                     </p>
                     <p>
-                        {% trans %}
-                        Zulip supports modern browsers like Firefox,
-                        Chrome, and Edge.
+                        {% trans supported_browsers_page_link="/help/supported-browsers" %}
+                        Zulip supports <a href="{{ supported_browsers_page_link }}">modern browsers</a>
+                        like Firefox, Chrome, and Edge.
                         {% endtrans %}
                     </p>
                     <p>