From 519534bf03fc50d9176a857e3f4de5cfe1d0fa66 Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Wed, 20 Apr 2011 16:28:02 +0000 Subject: [PATCH] Fixed #15846 -- Fixed unfinished sentence in django-admin.txt. Thanks, follower git-svn-id: http://code.djangoproject.com/svn/django/trunk@16049 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- docs/ref/django-admin.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt index 9b3f66d39d..f7fd2d9a7d 100644 --- a/docs/ref/django-admin.txt +++ b/docs/ref/django-admin.txt @@ -383,14 +383,14 @@ installation will be aborted, and any data installed in the call to Database-specific fixtures ~~~~~~~~~~~~~~~~~~~~~~~~~~ -If you are in a multi-database setup, you may have fixture data that +If you're in a multi-database setup, you might have fixture data that you want to load onto one database, but not onto another. In this -situation, you can add database identifier into . If your -:setting:`DATABASES` setting has a 'master' database defined, you can -define the fixture ``mydata.master.json`` or -``mydata.master.json.gz``. This fixture will only be loaded if you -have specified that you want to load data onto the ``master`` -database. +situation, you can add database identifier into the names of your fixtures. + +For example, if your :setting:`DATABASES` setting has a 'master' database +defined, name the fixture ``mydata.master.json`` or +``mydata.master.json.gz`` and the fixture will only be loaded when you +specify you want to load data into the ``master`` database. makemessages ------------