emails: Update followup_day1.

templates/zerver/emails/followup_day1.source.html

@@ -7,38 +7,45 @@
 {% block content %}
 <p>Hi there,</p>
 
-<p>Welcome to Zulip!</p>
+<p>Welcome to Zulip! A few tips to get you started:</p>
 <p>
-    Zulip is the team communication solution that combines the real-time
-    ease of chat with the threaded organization of email. At its core, Zulip
-    is about productivity&mdash;making communication fun and easy, while
-    avoiding the distracting and disorganized conversations of chatrooms.
-</p>
-
-<p>
-    We hope you love using Zulip as much as we do. Zulip works best when
-    it's always open, so we suggest pinning a browser tab or downloading
+    &bull; Zulip works best when it's always open, so we suggest downloading
     our <a href="https://zulipchat.com/apps">desktop and mobile apps</a>.
-    If you're new to Zulip's threading, we recommend starting with the
-    desktop or browser experience, and using mobile for notifications on the
-    go.
+    <br/><br/>
+    You'll need an Organization URL when first starting the app. That's
+    <br/><b>{{ realm_uri }}</b>
+</p>
+<p>
+    &bull; Become a Zulip pro with a few
+    <a href="{{ keyboard_shortcuts_link }}">keyboard shortcuts</a>:
+    <br/>
+    <b>n</b>: Next unread thread<br/>
+    <b>r</b>: Reply to message under the blue box<br/>
+    <b>c</b>: Start a new topic
+</p>
+<p>
+    &bull; Give our
     {% if is_realm_admin %}
-    If this is your first Zulip organization, we also recommend giving
-    our <a href="{{ organization_setup_advice_link }}">guide for new
-    admins</a> a spin.
+    <a href="{{ organization_setup_advice_link }}">guide for new admins</a>
+    {% else %}
+    <a href="{{ getting_started_with_zulip_link }}">guide for new users</a>
+    a spin.
     {% endif %}
 </p>
-
 <p>
-    If you have any feedback, or want to see how we use Zulip for managing
-    the Zulip project itself, swing by
-    <a href="chat.zulip.org">chat.zulip.org</a> and say hi!
+    <br/>
+    Zulip combines the real-time ease of chat with the threaded organization
+    of email. Zulip is about productivity&mdash;making communication fun and
+    easy, while avoiding the distracting and disorganized conversations of
+    chatrooms. We hope you love using Zulip as much as we do.
 </p>
 
 <p>Cheers,<br/>Team Zulip</p>
 
 <p>
-    PS: Check us out on <a href="https://twitter.com/zulip">Twitter</a>
-    or star us on <a href="https://github.com/zulip/zulip">GitHub</a>!
+    PS: Follow us on <a href="https://twitter.com/zulip">Twitter</a>,
+    star us on <a href="https://github.com/zulip/zulip">GitHub</a>, or
+    chat with us live on the
+    <a href="https://chat.zulip.org">Zulip community server</a>!
 </p>
 {% endblock %}

templates/zerver/emails/followup_day1.txt

@@ -1,25 +1,33 @@
 Hi there,
 
-Welcome to Zulip!
+Welcome to Zulip! A few tips to get you started:
 
-Zulip is the team communication solution that combines the real-time ease of
-chat with the threaded organization of email. At its core, Zulip is about
-productivity -- making communication fun and easy, while avoiding the
-distracting and disorganized conversations of chatrooms.
+* Zulip works best when it's always open, so we suggest pinning a browser
+tab or downloading our desktop and mobile apps (https://zulipchat.com/apps).
 
-We hope you love using Zulip as much as we do. Zulip works best when it's
-always open, so we suggest pinning a browser tab or downloading our desktop
-and mobile apps (https://zulipchat.com/apps). If you're new to Zulip's
-threading, we recommend starting with the desktop or browser experience, and
-using mobile for notifications on the go.
+You'll need an Organization URL when installing the apps. That's
+{{ realm_uri }}
 
-If you have any feedback, or want to see how we use Zulip for managing the
-Zulip project itself, swing by https://chat.zulip.org and say hi! {% if is_realm_admin %}If this is
-your first Zulip organization, we also recommend checking out
-{{ organization_setup_advice_link }}.{% endif %}
+* Become a Zulip pro with a few keyboard shortcuts:
+  n: Next unread thread
+  r: Reply to message under the blue box
+  c: Start a new topic
+
+* Check out our guide for new users:
+{% if is_realm_admin %}
+{{ organization_setup_advice_link }}.
+{% else %}
+{{ getting_started_with_zulip_link }}.
+{% endif %}
+
+* Zulip combines the real-time ease of chat with the threaded organization
+  of email. Zulip is about productivity---making communication fun and
+  easy, while avoiding the distracting and disorganized conversations of
+  chatrooms. We hope you love using Zulip as much as we do.
 
 Cheers,
 Team Zulip
 
-PS: Check us out on Twitter (@zulip) or star us on GitHub
-(https://github.com/zulip/zulip)!
+PS: Check us out on Twitter (@zulip), star us on GitHub
+(https://github.com/zulip/zulip), or chat with us live on the
+Zulip community server (https://chat.zulip.org)!

zerver/lib/notifications.py

@@ -500,6 +500,9 @@ def enqueue_welcome_emails(user: UserProfile) -> None:
         'unsubscribe_link': unsubscribe_link,
         'organization_setup_advice_link':
         user.realm.uri + '/help/getting-your-organization-started-with-zulip',
+        'getting_started_with_zulip_link':
+        user.realm.uri + '/help/getting-started-with-zulip',
+        'keyboard_shortcuts_link': user.realm.uri + '/help/keyboard-shortcuts',
         'is_realm_admin': user.is_realm_admin,
     })
     send_future_email(