summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/django-admin.txt1
-rw-r--r--docs/releases/1.4.txt10
2 files changed, 10 insertions, 1 deletions
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
index 8fea699c1b..7ca1ee5ddd 100644
--- a/docs/ref/django-admin.txt
+++ b/docs/ref/django-admin.txt
@@ -668,6 +668,7 @@ Example usage::
.. versionadded:: 1.4
+Since version 1.4, the development server is multithreaded by default.
Use the ``--nothreading`` option to disable the use of threading in the
development server.
diff --git a/docs/releases/1.4.txt b/docs/releases/1.4.txt
index 51766dc2f5..a091869645 100644
--- a/docs/releases/1.4.txt
+++ b/docs/releases/1.4.txt
@@ -1145,6 +1145,15 @@ field. This was something that should not have worked, and in 1.4 loading such
incomplete fixtures will fail. Because fixtures are a raw import, they should
explicitly specify all field values, regardless of field options on the model.
+Development Server Multithreading
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The development server is now is multithreaded by default. Use the
+:djadminopt:`--nothreading` option to disable the use of threading in the
+development server::
+
+ django-admin.py runserver --nothreading
+
Attributes disabled in markdown when safe mode set
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1338,4 +1347,3 @@ Versions of Python-Markdown earlier than 2.1 do not support the option to
disable attributes. As a security issue, earlier versions of this library will
not be supported by the markup contrib app in 1.5 under an accelerated
deprecation timeline.
-