diff options
| author | Blake Griffith <blake.a.griffith@gmail.com> | 2016-02-03 12:42:48 +0200 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2016-02-03 09:48:01 -0500 |
| commit | daa80aceeca4f0f2a641c23df70c99013dfe0bf6 (patch) | |
| tree | 7070d1289957afb17ceabe6169e78acc00a05fa0 /docs | |
| parent | a201df396e76875936ba94f704be8a7fd20be576 (diff) | |
[1.9.x] 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.
Backport of 5fdbd9e36c861cb9f2cdb255a1bf693de8876f6b from master
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/faq/general.txt | 2 | ||||
| -rw-r--r-- | docs/ref/applications.txt | 8 | ||||
| -rw-r--r-- | docs/spelling_wordlist | 1 |
3 files changed, 6 insertions, 5 deletions
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. diff --git a/docs/ref/applications.txt b/docs/ref/applications.txt index 5768858dba..3271f494a0 100644 --- a/docs/ref/applications.txt +++ b/docs/ref/applications.txt @@ -132,20 +132,20 @@ For application users --------------------- If you're using "Rock ’n’ roll" in a project called ``anthology``, but you -want it to show up as "Gypsy jazz" instead, you can provide your own +want it to show up as "Jazz Manouche" instead, you can provide your own configuration:: # anthology/apps.py from rock_n_roll.apps import RockNRollConfig - class GypsyJazzConfig(RockNRollConfig): - verbose_name = "Gypsy jazz" + class JazzManoucheConfig(RockNRollConfig): + verbose_name = "Jazz Manouche" # anthology/settings.py INSTALLED_APPS = [ - 'anthology.apps.GypsyJazzConfig', + 'anthology.apps.JazzManoucheConfig', # ... ] diff --git a/docs/spelling_wordlist b/docs/spelling_wordlist index 69f7ff24e4..e75704177c 100644 --- a/docs/spelling_wordlist +++ b/docs/spelling_wordlist @@ -453,6 +453,7 @@ Magee makemessages makemigrations Mako +manouche Mapnik Marczewski Marino |