From adcecbe05ef812bc8ff477dec47720a2cfc273e3 Mon Sep 17 00:00:00 2001
From: Rob Pike <r@golang.org>
Date: Sun, 16 Sep 2018 11:14:19 +1000
Subject: [PATCH] doc: add a go/golang entry to the FAQ

It's worth clarifying that the language is called "Go".

Fixes #27616.

Change-Id: Ie4a9cb5e7e6afa437c60e06914125ef7490f27d0
Reviewed-on: https://go-review.googlesource.com/135517
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
---
 doc/go_faq.html | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/doc/go_faq.html b/doc/go_faq.html
index b1c15295d6..7c4263b090 100644
--- a/doc/go_faq.html
+++ b/doc/go_faq.html
@@ -108,6 +108,26 @@ by Renée at Gophercon in 2016.
 He has unique features; he's the <em>Go gopher</em>, not just any old gopher.
 </p>
 
+<h3 id="go_or_golang">
+Is the language called Go or Golang?</h3>
+
+<p>
+The language is called Go.
+The "golang" moniker arose because the web site is
+<a href="https://golang.org">golang.org</a>, not
+go.org, which was not available to us.
+Many use the golang name, though, and it is handy as
+a label.
+For instance, the Twitter tag for the language is "#golang".
+The language's name is just plain Go, regardless.
+</p>
+
+<p>
+A side note: Although the
+<a href="https://blog.golang.org/go-brand">official logo</a>
+has two capital letters, the language name is written Go, not GO.
+</p>
+
 <h3 id="creating_a_new_language">
 Why did you create a new language?</h3>
 
-- 
2.30.9