summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/faq/general.txt2
-rw-r--r--docs/ref/applications.txt8
-rw-r--r--docs/spelling_wordlist1
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