diff --git a/content/about.md b/content/about.md
index 5f3e473..e4b7151 100644
--- a/content/about.md
+++ b/content/about.md
@@ -33,7 +33,7 @@ Check out what people are saying below.
 
 {{< testimonials >}}
 
-## Officially supported platforms
+## Officially supported languages and platforms
 
 {{< supported-platforms >}}
 
diff --git a/content/faq.md b/content/faq.md
index 20e0461..d88c27e 100644
--- a/content/faq.md
+++ b/content/faq.md
@@ -31,7 +31,9 @@ Google has been using a lot of the underlying technologies and concepts in gRPC
 
 ### Which programming languages are supported?
 
-C++, Java (including support for Android), Objective-C (for iOS), Python, Ruby, Go, C#, Node.js are in GA and follow semantic versioning.
+See [Officially supported languages and platforms][].
+
+[Officially supported languages and platforms]: /about#officially-supported-languages-and-platforms
 
 ### How do I get started using gRPC?
 
diff --git a/layouts/shortcodes/supported-platforms.html b/layouts/shortcodes/supported-platforms.html
index d61d7e0..b8a83fe 100644
--- a/layouts/shortcodes/supported-platforms.html
+++ b/layouts/shortcodes/supported-platforms.html
@@ -1,4 +1,3 @@
-<!-- Generated using the data in data/platforms.yaml -->
 {{ $platforms := site.Data.platforms }}
 <table>
   <thead>
@@ -10,7 +9,7 @@
         Platform
       </th>
       <th>
-        Compilers
+        Compilers / SDK
       </th>
     </tr>
   </thead>