cockroachdb · jseldess · Jan 7, 2019 · Dec 20, 2018 · Dec 27, 2018 · Dec 27, 2018
diff --git a/_includes/sidebar-data-training.json b/_includes/sidebar-data-training.json
@@ -23,7 +23,7 @@
     ]
   },
   {
-    "title": "Ops Basics",
+    "title": "Key Capabilities",
     "items": [
       {
         "title": "Cluster Startup and Scaling",
@@ -43,6 +43,29 @@
           "/${VERSION}/training/locality-and-replication-zones.html"
         ]
       },
+      {
+        "title": "Geo-Partitioning",
+        "urls": [
+          "/${VERSION}/training/geo-partitioning.html"
+        ]
+      },
+      {
+        "title": "Orchestration with Kubernetes",
+        "urls": [
+          "/${VERSION}/training/orchestration-with-kubernetes.html"
+        ]
+      },
+      {
+        "title": "Performance Benchmarking",
+        "urls": [
+          "/${VERSION}/training/performance-benchmarking.html"
+        ]
+      }
+    ]
+  },
+  {
+    "title": "Ops Basics",
+    "items": [
       {
         "title": "Data Import",
         "urls": [

diff --git a/images/v1.1/training-1.png b/images/v1.1/training-1.png
diff --git a/images/v1.1/training-10.png b/images/v1.1/training-10.png
diff --git a/images/v1.1/training-11.png b/images/v1.1/training-11.png
diff --git a/images/v1.1/training-12.png b/images/v1.1/training-12.png
diff --git a/images/v1.1/training-13.png b/images/v1.1/training-13.png
diff --git a/images/v1.1/training-14.png b/images/v1.1/training-14.png
diff --git a/images/v1.1/training-15.png b/images/v1.1/training-15.png
diff --git a/images/v1.1/training-16.png b/images/v1.1/training-16.png
diff --git a/images/v1.1/training-17.png b/images/v1.1/training-17.png
diff --git a/images/v1.1/training-18.png b/images/v1.1/training-18.png
diff --git a/images/v1.1/training-19.png b/images/v1.1/training-19.png
diff --git a/images/v1.1/training-2.png b/images/v1.1/training-2.png
diff --git a/images/v1.1/training-20.png b/images/v1.1/training-20.png
diff --git a/images/v1.1/training-21.png b/images/v1.1/training-21.png
diff --git a/images/v1.1/training-22.png b/images/v1.1/training-22.png
diff --git a/images/v1.1/training-23.png b/images/v1.1/training-23.png
diff --git a/images/v1.1/training-3.png b/images/v1.1/training-3.png
diff --git a/images/v1.1/training-4.png b/images/v1.1/training-4.png
diff --git a/images/v1.1/training-5.png b/images/v1.1/training-5.png
diff --git a/images/v1.1/training-6.png b/images/v1.1/training-6.png
diff --git a/images/v1.1/training-7.png b/images/v1.1/training-7.png
diff --git a/images/v1.1/training-8.png b/images/v1.1/training-8.png
diff --git a/images/v1.1/training-9.png b/images/v1.1/training-9.png
diff --git a/images/v2.0/training-1.png b/images/v2.0/training-1.png
diff --git a/images/v2.0/training-10.png b/images/v2.0/training-10.png
diff --git a/images/v2.0/training-11.png b/images/v2.0/training-11.png
diff --git a/images/v2.0/training-12.png b/images/v2.0/training-12.png
diff --git a/images/v2.0/training-13.png b/images/v2.0/training-13.png
diff --git a/images/v2.0/training-14.png b/images/v2.0/training-14.png
diff --git a/images/v2.0/training-15.png b/images/v2.0/training-15.png
diff --git a/images/v2.0/training-16.png b/images/v2.0/training-16.png
diff --git a/images/v2.0/training-17.png b/images/v2.0/training-17.png
diff --git a/images/v2.0/training-18.png b/images/v2.0/training-18.png
diff --git a/images/v2.0/training-19.png b/images/v2.0/training-19.png
diff --git a/images/v2.0/training-2.png b/images/v2.0/training-2.png
diff --git a/images/v2.0/training-20.png b/images/v2.0/training-20.png
diff --git a/images/v2.0/training-21.png b/images/v2.0/training-21.png
diff --git a/images/v2.0/training-22.png b/images/v2.0/training-22.png
diff --git a/images/v2.0/training-23.png b/images/v2.0/training-23.png
diff --git a/images/v2.0/training-3.png b/images/v2.0/training-3.png
diff --git a/images/v2.0/training-4.png b/images/v2.0/training-4.png
diff --git a/images/v2.0/training-5.png b/images/v2.0/training-5.png
diff --git a/images/v2.0/training-6.1.png b/images/v2.0/training-6.1.png
diff --git a/images/v2.0/training-6.png b/images/v2.0/training-6.png
diff --git a/images/v2.0/training-7.png b/images/v2.0/training-7.png
diff --git a/images/v2.0/training-8.png b/images/v2.0/training-8.png
diff --git a/images/v2.0/training-9.png b/images/v2.0/training-9.png
diff --git a/images/v2.1/training-1.1.png b/images/v2.1/training-1.1.png
diff --git a/images/v2.1/training-1.2.png b/images/v2.1/training-1.2.png
diff --git a/images/v2.1/training-1.png b/images/v2.1/training-1.png
diff --git a/images/v2.2/training-1.1.png b/images/v2.2/training-1.1.png
diff --git a/images/v2.2/training-1.2.png b/images/v2.2/training-1.2.png
diff --git a/images/v2.2/training-1.png b/images/v2.2/training-1.png
diff --git a/releases/v2.0.0.md b/releases/v2.0.0.md
@@ -114,7 +114,7 @@ For information about limitations we've identified in CockroachDB v2.0, with sug
 
 Topic | Description
 ------|------------
-[CockroachDB Training](../v2.0/training/) | This new section of our site introduces you to the fundamentals of CockroachDB, with an emphasis on understanding the architecture and operational basics.
+[CockroachDB Training](../v2.1/training/) | This new section of our site introduces you to the fundamentals of CockroachDB, with an emphasis on understanding the architecture and operational basics.
 [Production Checklist](../v2.0/recommended-production-settings.html) | This topic now provides cloud-specific hardware, security, load balancing, monitoring and alerting, and clock synchronization recommendations as well as expanded cluster topology guidance. Related [deployment tutorials](../v2.0/manual-deployment.html) have been enhanced with much of this information as well.
 [Monitoring and Alerting](../v2.0/monitoring-and-alerting.html) | This new topic explains available tools for monitoring the overall health and performance of a cluster and critical events and metrics to alert on.
 [Common Errors](../v2.0/common-errors.html) | This new topic helps you understand and resolve errors you might encounter, including retryable and ambiguous errors for transactions.

diff --git a/releases/v2.0.5.md b/releases/v2.0.5.md
@@ -48,7 +48,7 @@ Get future release notes emailed to you:
 - Added a [Performance Tuning tutorial](../v2.0/performance-tuning.html) that demonstrates essential techniques for getting fast reads and writes in CockroachDB, starting with a single-region deployment and expanding into multiple regions. [#3378][#3378]
 - Expanded the [Production Checklist](../v2.0/recommended-production-settings.html#networking) to cover a detailed explanation of network flags and scenarios and updated [production deployment tutorials](../v2.0/manual-deployment.html) to encourage the use of `--advertise-host` on node start. [#3352][#3352]
 - Expanded the [Kubernetes tutorials](../v2.0/orchestrate-cockroachdb-with-kubernetes.html) to include setting up monitoring and alerting with Prometheus and Alertmanager. [#3370][#3370]
-- Published a [full set of training modules on CockroachDB fundamentals](../v2.0/training/), including the architecture and operation, troubleshooting, and maintenance basics. [#3385][#3385]
+- Published a [full set of training modules on CockroachDB fundamentals](../v2.1/training/), including the architecture and operation, troubleshooting, and maintenance basics. [#3385][#3385]
 - Updated the [OpenSSL certificate tutorial](../v2.0/create-security-certificates-openssl.html) to allow multiple node certificates with the same subject. [#3423][#3423]
 
 ### Contributors

diff --git a/v1.1/training/architecture-overview.md b/v1.1/training/architecture-overview.md