From 9d5ea44bec0e923bf2ff9c7092e1dd929865200d Mon Sep 17 00:00:00 2001
From: Robert Griesemer <gri@golang.org>
Date: Wed, 29 Jan 2020 21:18:16 -0800
Subject: [PATCH] doc/go1.14: document overlapping interfaces change (update
 release notes)

Updates #6977.
Updates #36878.

Change-Id: I40594be85ee0a0d4b35bacc90104568d2b8a4761
Reviewed-on: https://go-review.googlesource.com/c/go/+/216997
Reviewed-by: Ian Lance Taylor <iant@golang.org>
---
 doc/go1.14.html | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/doc/go1.14.html b/doc/go1.14.html
index 0d9b2b9e84c946..b62fb9e16163ef 100644
--- a/doc/go1.14.html
+++ b/doc/go1.14.html
@@ -41,11 +41,13 @@ <h2 id="introduction">DRAFT RELEASE NOTES — Introduction to Go 1.14</h2>
 <h2 id="language">Changes to the language</h2>
 
 <p>
-TODO
-</p>
-
-<p><!-- CL 187519 -->
-  TODO: <a href="https://golang.org/cl/187519">https://golang.org/cl/187519</a>: allow embedding overlapping interfaces
+  Per the <a href="https://github.com/golang/proposal/blob/master/design/6977-overlapping-interfaces.md">overlapping interfaces proposal</a>,
+  Go 1.14 now permits embedding of interfaces with overlapping method sets:
+  methods from an embedded interface may have the same names and identical signatures
+  as methods already present in the (embedding) interface. This solves problems that typically
+  (but not exclusively) occur with diamond-shaped embedding graphs.
+  Explicitly declared methods in an interface must remain
+  <a href="https://tip.golang.org/ref/spec#Uniqueness_of_identifiers">unique</a>, as before.
 </p>
 
 <h2 id="ports">Ports</h2>