From 9ed88e76086774fc88c51b5e790aa03a553c0d72 Mon Sep 17 00:00:00 2001
From: Bridget Kromhout <bridget@kromhout.org>
Date: Mon, 9 Apr 2018 14:19:16 -0500
Subject: [PATCH 1/2] Clarifications for tmux and mosh

---
 slides/common/prereqs.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/slides/common/prereqs.md b/slides/common/prereqs.md
index c4225431..64d02623 100644
--- a/slides/common/prereqs.md
+++ b/slides/common/prereqs.md
@@ -125,7 +125,7 @@ class: in-person
   works pretty well
 
 - Nice-to-have: [Mosh](https://mosh.org/) instead of SSH, if your internet connection tends to lose packets
-  <br/>(available with `(apt|yum|brew) install mosh`; then connect with `mosh user@host`)
+  <br/>(available with `(apt|yum|brew) install mosh`; then connect with `mosh user@host`; requires UDP ports to be open - by default, mosh uses a UDP port between 60000 and 61000)
 
 ---
 
@@ -135,7 +135,7 @@ class: in-person
 
 .exercise[
 
-- Log into the first VM (`node1`) with SSH or MOSH
+- Log into the first VM (`node1`) with your SSH client
 
 <!--
 ```bash
@@ -246,6 +246,8 @@ You are welcome to use the method that you feel the most comfortable with.
 
 ## Tmux cheatsheet
 
+[Tmux](https://en.wikipedia.org/wiki/Tmux) is an alternate terminal multiplexer like `screen`; it's installed on your workshop nodes.
+
 - Ctrl-b c → creates a new window
 - Ctrl-b n → go to next window
 - Ctrl-b p → go to previous window

From 403d4c6408e15c442b677d9d1312ea9ed304d70d Mon Sep 17 00:00:00 2001
From: Jerome Petazzoni <jerome.petazzoni@gmail.com>
Date: Mon, 9 Apr 2018 14:52:21 -0500
Subject: [PATCH 2/2] Add even more info about mosh and tmux

---
 slides/common/prereqs.md | 53 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 51 insertions(+), 2 deletions(-)

diff --git a/slides/common/prereqs.md b/slides/common/prereqs.md
index 64d02623..85729d7f 100644
--- a/slides/common/prereqs.md
+++ b/slides/common/prereqs.md
@@ -125,7 +125,50 @@ class: in-person
   works pretty well
 
 - Nice-to-have: [Mosh](https://mosh.org/) instead of SSH, if your internet connection tends to lose packets
-  <br/>(available with `(apt|yum|brew) install mosh`; then connect with `mosh user@host`; requires UDP ports to be open - by default, mosh uses a UDP port between 60000 and 61000)
+
+---
+
+class: in-person, extra-details
+
+## What is this Mosh thing?
+
+*You don't have to use Mosh or even know about it to follow along.
+<br/>
+We're just telling you about it because some of us think it's cool!*
+
+- Mosh is "the mobile shell"
+
+- It is essentially SSH over UDP, with roaming features
+
+- It retransmits packets quickly, so it works great even on lossy connections
+
+  (Like hotel or conference WiFi)
+
+- It has intelligent local echo, so it works great even in high-latency connections
+
+  (Like hotel or conference WiFi)
+
+- It supports transparent roaming when your client IP address changes
+
+  (Like when you hop from hotel to conference WiFi)
+
+---
+
+class: in-person, extra-details
+
+## Using Mosh
+
+- To install it: `(apt|yum|brew) install mosh`
+
+- It has been pre-installed on the VMs that we are using
+
+- To connect to a remote machine: `mosh user@host`
+
+  (It is going to establish an SSH connection, then hand off to UDP)
+
+- It requires UDP ports to be open
+
+  (By default, it uses a UDP port between 60000 and 61000)
 
 ---
 
@@ -246,7 +289,13 @@ You are welcome to use the method that you feel the most comfortable with.
 
 ## Tmux cheatsheet
 
-[Tmux](https://en.wikipedia.org/wiki/Tmux) is an alternate terminal multiplexer like `screen`; it's installed on your workshop nodes.
+[Tmux](https://en.wikipedia.org/wiki/Tmux) is a terminal multiplexer like `screen`.
+
+*You don't have to use it or even know about it to follow along.
+<br/>
+But some of us like to use it to switch between terminals.
+<br/>
+It has been preinstalled on your workshop nodes.*
 
 - Ctrl-b c → creates a new window
 - Ctrl-b n → go to next window