From 5fdbd9e36c861cb9f2cdb255a1bf693de8876f6b Mon Sep 17 00:00:00 2001 From: Blake Griffith Date: Wed, 3 Feb 2016 12:42:48 +0200 Subject: Changed gypsy to manouche in docs and tests. "Gypsy" is considered a slur by the Romani people whom it refers to. "manouche jazz" is used in place of "gypsy jazz" and is an accepted term for the same genre of music. --- docs/faq/general.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/faq') diff --git a/docs/faq/general.txt b/docs/faq/general.txt index cb31e8b6ab..22d37fe7db 100644 --- a/docs/faq/general.txt +++ b/docs/faq/general.txt @@ -32,7 +32,7 @@ thrilled to be able to give something back to the open-source community. What does "Django" mean, and how do you pronounce it? ===================================================== -Django is named after `Django Reinhardt`_, a gypsy jazz guitarist from the 1930s +Django is named after `Django Reinhardt`_, a jazz manouche guitarist from the 1930s to early 1950s. To this day, he's considered one of the best guitarists of all time. Listen to his music. You'll like it. -- cgit v1.3