summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/howto/initial-data.txt7
-rw-r--r--docs/man/django-admin.19
-rw-r--r--docs/ref/django-admin.txt35
3 files changed, 3 insertions, 48 deletions
diff --git a/docs/howto/initial-data.txt b/docs/howto/initial-data.txt
index 36306d476e..557935f266 100644
--- a/docs/howto/initial-data.txt
+++ b/docs/howto/initial-data.txt
@@ -124,10 +124,9 @@ Each SQL file, if given, is expected to contain valid SQL statements
which will insert the desired data (e.g., properly-formatted
``INSERT`` statements separated by semicolons).
-The SQL files are read by the :djadmin:`sqlcustom`, :djadmin:`sqlreset`,
-:djadmin:`sqlall` and :djadmin:`reset` commands in :doc:`manage.py
-</ref/django-admin>`. Refer to the :doc:`manage.py documentation
-</ref/django-admin>` for more information.
+The SQL files are read by the :djadmin:`sqlcustom` and :djadmin:`sqlall`
+commands in :doc:`manage.py </ref/django-admin>`. Refer to the :doc:`manage.py
+documentation </ref/django-admin>` for more information.
Note that if you have multiple SQL data files, there's no guarantee of
the order in which they're executed. The only thing you can assume is
diff --git a/docs/man/django-admin.1 b/docs/man/django-admin.1
index 1f693b8975..d336da0f7b 100644
--- a/docs/man/django-admin.1
+++ b/docs/man/django-admin.1
@@ -65,11 +65,6 @@ Runs over the entire source tree of the current directory and pulls out all
strings marked for translation. It creates (or updates) a message file in the
conf/locale (in the django tree) or locale (for project and application) directory.
.TP
-.BI "reset [" "appname ..." "]"
-Executes
-.B sqlreset
-for the given app(s) in the current database.
-.TP
.BI "runfcgi [" "KEY=val" "] [" "KEY=val" "] " "..."
Runs this project as a FastCGI application. Requires flup. Use
.B runfcgi help
@@ -107,10 +102,6 @@ Prints the CREATE INDEX SQL statements for the given model module name(s).
.BI "sqlinitialdata [" "appname ..." "]"
Prints the initial INSERT SQL statements for the given app name(s).
.TP
-.BI "sqlreset [" "appname ..." "]"
-Prints the DROP TABLE SQL, then the CREATE TABLE SQL, for the given app
-name(s).
-.TP
.BI "sqlsequencereset [" "appname ..." "]"
Prints the SQL statements for resetting PostgreSQL sequences for the
given app name(s).
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
index 5ea72803fb..845db15500 100644
--- a/docs/ref/django-admin.txt
+++ b/docs/ref/django-admin.txt
@@ -484,25 +484,6 @@ Use the ``--no-location`` option to not write '``#: filename:line``'
comment lines in language files. Note that using this option makes it harder
for technically skilled translators to understand each message's context.
-reset <appname appname ...>
----------------------------
-
-.. deprecated:: 1.3
- This command has been deprecated. The ``flush`` can be used to delete
- everything. You can also use ALTER TABLE or DROP TABLE statements manually.
-
-.. django-admin:: reset
-
-Executes the equivalent of ``sqlreset`` for the given app name(s).
-
-The :djadminopt:`--noinput` option may be provided to suppress all user
-prompts.
-
-.. versionadded:: 1.2
-
-The :djadminopt:`--database` option can be used to specify the alias
-of the database to reset.
-
runfcgi [options]
-----------------
@@ -874,22 +855,6 @@ Prints the CREATE INDEX SQL statements for the given app name(s).
The :djadminopt:`--database` option can be used to specify the database for
which to print the SQL.
-sqlreset <appname appname ...>
-------------------------------
-
-.. deprecated:: 1.3
- This command has been deprecated. The ``sqlflush`` can be used to delete
- everything. You can also use ALTER TABLE or DROP TABLE statements manually.
-
-.. django-admin:: sqlreset
-
-Prints the DROP TABLE SQL, then the CREATE TABLE SQL, for the given app name(s).
-
-.. versionadded:: 1.2
-
-The :djadminopt:`--database` option can be used to specify the database for
-which to print the SQL.
-
sqlsequencereset <appname appname ...>
--------------------------------------