summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2014-03-25 09:43:51 -0400
committerTim Graham <timograham@gmail.com>2014-03-25 09:44:59 -0400
commite3c4205b79cff2be809c3698df2e9d53303b5070 (patch)
treea5f6ca146feee028a23caa3d1cf00694b35e473c
parent16afffffe87bf8b7de6403329937433ac5096697 (diff)
flake8 and doc fixes for refs #22257.
-rw-r--r--django/core/management/commands/dumpdata.py2
-rw-r--r--docs/ref/django-admin.txt4
-rw-r--r--docs/releases/1.8.txt4
3 files changed, 5 insertions, 5 deletions
diff --git a/django/core/management/commands/dumpdata.py b/django/core/management/commands/dumpdata.py
index 045bc96397..c54ccc1c58 100644
--- a/django/core/management/commands/dumpdata.py
+++ b/django/core/management/commands/dumpdata.py
@@ -36,7 +36,7 @@ class Command(BaseCommand):
help="Only dump objects with given primary keys. "
"Accepts a comma separated list of keys. "
"This option will only work when you specify one model."),
- make_option('-o' ,'--output', default=None, dest='output',
+ make_option('-o', '--output', default=None, dest='output',
help='Specifies file to which the output is written.'),
)
help = ("Output the contents of the database as a fixture of the given "
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
index fc36e138e9..275d7e53c1 100644
--- a/docs/ref/django-admin.txt
+++ b/docs/ref/django-admin.txt
@@ -277,10 +277,10 @@ you can use the ``--pks`` option to specify a comma separated list of
primary keys on which to filter. This is only available when dumping
one model.
-.. versionadded:: 1.8
-
.. django-admin-option:: --output
+.. versionadded:: 1.8
+
By default ``dumpdata`` will output all the serialized data to standard output.
This options allows to specify the file to which the data is to be written.
diff --git a/docs/releases/1.8.txt b/docs/releases/1.8.txt
index ba17a07cca..ca67403f9e 100644
--- a/docs/releases/1.8.txt
+++ b/docs/releases/1.8.txt
@@ -124,8 +124,8 @@ Internationalization
Management Commands
^^^^^^^^^^^^^^^^^^^
-* :djadmin:`dumpdata` now has the option ``--output`` which allows to specify the
-file to which the serialized data is to be written.
+* :djadmin:`dumpdata` now has the option :djadminopt:`--output` which allows
+ specifying the file to which the serialized data is written.
Models
^^^^^^