From 33db068dac7686e37736f7ecf8abb2aee0345cf2 Mon Sep 17 00:00:00 2001
From: Mariatta <Mariatta@users.noreply.github.com>
Date: Thu, 30 Mar 2017 12:12:18 -0700
Subject: [PATCH] bpo-29928: Add f-string to the Glossary (GH-864)

---
 Doc/glossary.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Doc/glossary.rst b/Doc/glossary.rst
index 495934afe74..81238414efe 100644
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -320,6 +320,11 @@ Glossary
       A module written in C or C++, using Python's C API to interact with the
       core and with user code.
 
+   f-string
+      String literals prefixed with ``'f'`` or ``'F'`` are commonly called
+      "f-strings" which is short for
+      :ref:`formatted string literals <f-strings>`.  See also :pep:`498`.
+
    file object
       An object exposing a file-oriented API (with methods such as
       :meth:`read()` or :meth:`write()`) to an underlying resource.  Depending