Merge "Ian's talk proposal."
diff --git a/index.md b/index.md
index 074d9b6..9429b3e 100644
--- a/index.md
+++ b/index.md
@@ -8,7 +8,7 @@
## A Virtual Summit
-The Gerrit Virtual User Summit & Hackathon 2021 will be held online only,
+The Gerrit Virtual User Summit 2021 will be held online only,
to allow most of the community around the globe to attend and share their
experience and ideas, and avoid the problems with the travelling restrictions
due to the [COVID-19 pandemic](https://en.wikipedia.org/wiki/COVID-19).
diff --git a/schedule.md b/schedule.md
index dd620de..f787735 100644
--- a/schedule.md
+++ b/schedule.md
@@ -2,29 +2,29 @@
### Thursday, 2nd December
-| Time | Session |
-|-----------------------|--------------------------------------------------------------|
-| 8:00 PST / 17:00 CET | Welcome to the Virtual User Summit - KeyNote introduction |
-| 8:10 PST / 17:10 CET | What's new in Gerrit v3.4/v3.5 |
-| 8:40 PST / 17:40 CET | Session 1 - __available for proposals__ (may include 1 poll) |
-| 9:10 PST / 18:10 CET | Submit Requirements: Waving goodbye to Prolog |
-| 9:40 PST / 18:40 CET | Code Owners: Demo of the `code-owners` plugin |
-| 10:10 PST / 19:10 CET | Using GitHub Actions with GerritHub |
-| 10:20 PDT / 19:20 CET | Lightning talk 2 - __available for proposals__ |
-| 10:30 PDT / 19:30 CET | Lightning talk 3 - __available for proposals__ |
-| 10:40 PDT / 19:40 CET | Lightning talk 4 - __available for proposals__ |
-| 10:50 PDT / 19:50 CET | Lightning talk 5 - __available for proposals__ |
-| 11:00 PDT / 20:00 CET | End of Day 1 |
+| Time | Session |
+|-----------------------|-----------------------------------------------------------------------------------------|
+| 8:00 PST / 17:00 CET | Welcome to the Virtual User Summit - KeyNote introduction |
+| 8:10 PST / 17:10 CET | [What's new in Gerrit v3.4/v3.5](sessions/gerrit-3.4-3.5.md) |
+| 8:40 PST / 17:40 CET | Session 1 - __available for proposals__ (may include 1 poll) |
+| 9:10 PST / 18:10 CET | [Submit Requirements: Waving goodbye to Prolog](sessions/submit-requirements.md) |
+| 9:40 PST / 18:40 CET | [Code Owners: Demo of the `code-owners` plugin](sessions/code-owners.md) |
+| 10:10 PST / 19:10 CET | [Using GitHub Actions with GerritHub](lightning-talks/gerrithub-and-github-actions.md) |
+| 10:20 PDT / 19:20 CET | Lightning talk 2 - __available for proposals__ |
+| 10:30 PDT / 19:30 CET | Lightning talk 3 - __available for proposals__ |
+| 10:40 PDT / 19:40 CET | Lightning talk 4 - __available for proposals__ |
+| 10:50 PDT / 19:50 CET | Lightning talk 5 - __available for proposals__ |
+| 11:00 PDT / 20:00 CET | End of Day 1 |
### Friday, 3rd December
-| Time | Session |
-|-----------------------|--------------------------------------------------------------|
-| 8:00 PST / 17:00 CET | Session 4 - __available for proposals__ (may include 1 poll) |
-| 8:30 PST / 17:30 CET | Session 5 - __available for proposals__ (may include 1 poll) |
-| 9:00 PST / 18:00 CET | Session 6 - __available for proposals__ (may include 1 poll) |
-| 9:30 PST / 18:30 CET | Q&A with the maintainers (may include 1-2 polls) |
-| 10:30 PST / 19:30 CET | Lightning talk 6 - __available for proposals__ |
-| 10:40 PDT / 19:40 CET | Lightning talk 7 - __available for proposals__ |
-| 10:50 PDT / 19:50 CET | Final Q&A (may include a final poll) |
-| 11:00 PDT / 20:00 CET | End of Day 2 |
+| Time | Session |
+|-----------------------|-----------------------------------------------------------------------------------------|
+| 8:00 PST / 17:00 CET | [How to survive with mono-repos in Gerrit](sessions/mono-repo-with-gerrit.md) |
+| 8:30 PST / 17:30 CET | [Promoting Situational Awareness in Code Review Platforms](sessions/promoting-situational-awareness-in-code-review.md) |
+| 9:00 PST / 18:00 CET | Session 6 - __available for proposals__ (may include 1 poll) |
+| 9:30 PST / 18:30 CET | Q&A with the maintainers (may include 1-2 polls) |
+| 10:30 PST / 19:30 CET | Lightning talk 6 - __available for proposals__ |
+| 10:40 PDT / 19:40 CET | Lightning talk 7 - __available for proposals__ |
+| 10:50 PDT / 19:50 CET | Final Q&A (may include a final poll) |
+| 11:00 PDT / 20:00 CET | End of Day 2 |
diff --git a/sessions/gerrit-3.4-3.5.md b/sessions/gerrit-3.4-3.5.md
new file mode 100644
index 0000000..a04b640
--- /dev/null
+++ b/sessions/gerrit-3.4-3.5.md
@@ -0,0 +1,36 @@
+# What's new in Gerrit v3.4/v3.5
+
+Gerrit v3.4 and v3.5 have been released with remote
+cooperation across the globe, creating and merging
+around 8k changes with the cooperation of 65 contributors
+from 21 different organisations.
+
+Luca gives an overview of the major improvements introduced:
+
+- Java 11
+- SSH server and client stacks
+- Performance improvements
+- Requests deadlines and cancellations
+
+# Polls
+
+> ## What version are you currently running in production?
+> - older than v2.16
+> - v2.16 on ReviewDb
+> - v2.16 on NoteDb
+> - v3.0
+> - v3.1
+> - v3.2
+> - v3.3
+> - v3.4
+> - v3.5
+> - master
+
+> ## What is currently blocking you from upgrading?
+> - Plugins not available in the new releases
+> - Outage window too large for upgrading
+> - Tried many times but always failed
+> - Lack of support during the upgrade
+> - Breaking changes
+
+*[Luca Milanesio, GerritForge, Gerrit Maintainer - Release Manager - Member of the ESC](../speakers.md#lmilanesio)*
diff --git a/sessions/mono-repo-with-gerrit.md b/sessions/mono-repo-with-gerrit.md
index 1fda030..b96210f 100644
--- a/sessions/mono-repo-with-gerrit.md
+++ b/sessions/mono-repo-with-gerrit.md
@@ -29,4 +29,4 @@
> - long replication times
> - batch reindexing tasks piling up
-*[Luca Milanesio, GerritForge, Gerrit Maintainer - Release Manager - Member of the ESC](/summit/2021/+/refs/heads/master/speakers.md#lmilanesio)*
+*[Luca Milanesio, GerritForge, Gerrit Maintainer - Release Manager - Member of the ESC](../speakers.md#lmilanesio)*
