commit c5f6abcda31cbc5e0be665bb4cb4588f807cb192
author David Pursehouse <dpursehouse@collab.net> Mon Nov 12 17:47:45 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 12 17:47:45 2018 +0000
tree 8cdadf9cab73a5a90ed7b2e3831225adaf65cdcc
parent a85157883c0ae0eeaccb6aa93da878256413b75f
parent b5c22558143d47230afa61a0e6df5b1dca695616

Merge "Bazel: New and noteworthy"

schedule.md

diff --git a/schedule.md b/schedule.md
index e2e8bdd..e03aafe 100644
--- a/schedule.md
+++ b/schedule.md
@@ -18,7 +18,7 @@
 | 12:15 | Lunch & Networking                                                                           |
 | 14:00 | [Gerrit Multi-master & multi-site: an OpenSource solution](sessions/multi-master-multi-site.md)|
 | 14:20 | [Replication and Git LFS](sessions/replication-and-git-lfs.md)                               |
-| 14:45 | [Gerrit 2.16, 3.0 and beyond](sessions/gerrit-beyond.md)
+| 14:45 | [Gerrit 2.16, 3.0, and beyond](sessions/gerrit-beyond.md)
 | 15:30 | Break & Networking                                                                           |
 | 16:00 | [Q&A with the Gerrit Maintainers](sessions/maintainers-qa.md)                                |
 | 17:00 | End of Day 1                                                                                 |

sessions/gerrit-beyond.md

diff --git a/sessions/gerrit-beyond.md b/sessions/gerrit-beyond.md
index b0f87e1..da9353c 100644
--- a/sessions/gerrit-beyond.md
+++ b/sessions/gerrit-beyond.md
@@ -1,4 +1,4 @@
-# Gerrit 2.16, 3.0 and beyond
+# Gerrit 2.16, 3.0, and beyond
 
 Gerrit 3.0 is coming! If you've tried 2.16, you may have already seen our new
 database backend (NoteDb) and UI (PolyGerrit). With 2.16, these features are