From daa80aceeca4f0f2a641c23df70c99013dfe0bf6 Mon Sep 17 00:00:00 2001 From: Blake Griffith Date: Wed, 3 Feb 2016 12:42:48 +0200 Subject: [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 --- docs/ref/applications.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'docs/ref') 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', # ... ] -- cgit v1.3