From 923a4fb20abf449aa677995f108a15999b9d7d2a Mon Sep 17 00:00:00 2001
From: Tim Graham <timograham@gmail.com>
Date: Tue, 22 Dec 2015 09:56:25 -0500
Subject: [PATCH] [1.9.x] Fixed #25965 -- Added removal of sql* commands to 1.9
 release notes.

Backport of d52b0c5b38cce633a75420a703a15f03aabd70dd from master
---
 docs/internals/deprecation.txt | 3 +++
 docs/man/django-admin.1        | 2 +-
 docs/ref/django-admin.txt      | 2 +-
 docs/releases/1.9.txt          | 3 +++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt
index d356ecb2f3..3694ea286d 100644
--- a/docs/internals/deprecation.txt
+++ b/docs/internals/deprecation.txt
@@ -303,6 +303,9 @@ details on these changes.
   become compulsory for all apps unless you pass the ``--run-syncdb`` option to
   ``migrate``.
 
+* The SQL management commands for apps without migrations, ``sql``, ``sqlall``,
+  ``sqlclear``, ``sqldropindexes``, and ``sqlindexes``, will be removed.
+
 * Support for automatic loading of ``initial_data`` fixtures and initial SQL
   data will be removed.
 
diff --git a/docs/man/django-admin.1 b/docs/man/django-admin.1
index 94bc40525c..a93f504acc 100644
--- a/docs/man/django-admin.1
+++ b/docs/man/django-admin.1
@@ -2069,7 +2069,7 @@ Example usage:
 .sp
 .nf
 .ft C
-django\-admin sqlall \-\-no\-color
+django\-admin runserver \-\-no\-color
 .ft P
 .fi
 .UNINDENT
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
index 661857c7b8..9e1441dde3 100644
--- a/docs/ref/django-admin.txt
+++ b/docs/ref/django-admin.txt
@@ -1564,7 +1564,7 @@ that ``django-admin`` should print to the console.
 
 Example usage::
 
-    django-admin sqlall --no-color
+    django-admin runserver --no-color
 
 By default, ``django-admin`` will format the output to be colorized. For
 example, errors will be printed to the console in red and SQL statements will
diff --git a/docs/releases/1.9.txt b/docs/releases/1.9.txt
index 46bc0e7371..fbf461312d 100644
--- a/docs/releases/1.9.txt
+++ b/docs/releases/1.9.txt
@@ -1404,6 +1404,9 @@ removed in Django 1.9 (please see the :ref:`deprecation timeline
   compulsory for all apps unless you pass the :djadminopt:`--run-syncdb`
   option to ``migrate``.
 
+* The SQL management commands for apps without migrations, ``sql``, ``sqlall``,
+  ``sqlclear``, ``sqldropindexes``, and ``sqlindexes``, are removed.
+
 * Support for automatic loading of ``initial_data`` fixtures and initial SQL
   data is removed.