diff --git a/django/core/management.py b/django/core/management.py
index 9df34bd4b2..327796dc14 100644
--- a/django/core/management.py
+++ b/django/core/management.py
@@ -578,7 +578,7 @@ def syncdb(verbosity=1, interactive=True):
     # Install the 'initialdata' fixture, using format discovery
     load_data(['initial_data'], verbosity=verbosity)
 syncdb.help_doc = "Create the database tables for all apps in INSTALLED_APPS whose tables haven't already been created."
-syncdb.args = '[--verbosity] [--interactive]'
+syncdb.args = '[--verbosity] [--noinput]'
 
 def get_admin_index(app):
     "Returns admin-index template snippet (in list form) for the given app."
@@ -672,7 +672,7 @@ The full error: """ % (app_name, app_name)) + style.ERROR_OUTPUT(str(e)) + '\n')
     else:
         print "Reset cancelled."
 reset.help_doc = "Executes ``sqlreset`` for the given app(s) in the current database."
-reset.args = '[--interactive]' + APP_ARGS
+reset.args = '[--noinput]' + APP_ARGS
 
 def flush(verbosity=1, interactive=True):
     "Returns all tables in the database to the same state they were in immediately after syncdb."
@@ -733,7 +733,7 @@ The full error: """ % settings.DATABASE_NAME + style.ERROR_OUTPUT(str(e)) + '\n'
     else:
         print "Flush cancelled."
 flush.help_doc = "Executes ``sqlflush`` on the current database."
-flush.args = '[--verbosity] [--interactive]'
+flush.args = '[--verbosity] [--noinput]'
 
 def _start_helper(app_or_project, name, directory, other_name=''):
     other = {'project': 'app', 'app': 'project'}[app_or_project]
@@ -1452,7 +1452,7 @@ def dump_data(app_labels, format='json', indent=None):
     except Exception, e:
         sys.stderr.write(style.ERROR("Unable to serialize database: %s\n" % e))
 dump_data.help_doc = 'Output the contents of the database as a fixture of the given format'
-dump_data.args = '[--format]' + APP_ARGS
+dump_data.args = '[--format] [--indent]' + APP_ARGS
 
 # Utilities for command-line script
 
diff --git a/extras/django_bash_completion b/extras/django_bash_completion
index 64d8961ca7..8906609a68 100644
--- a/extras/django_bash_completion
+++ b/extras/django_bash_completion
@@ -42,13 +42,13 @@ _django_completion()
     prev="${COMP_WORDS[COMP_CWORD-1]}"
 
     # Standalone options
-    opts="--help --settings --pythonpath --version"
+    opts="--help --settings --pythonpath --noinput --noreload --format --indent --verbosity --adminmedia --version"
     # Actions
     actions="adminindex createcachetable dbshell diffsettings \
-             inspectdb install reset runfcgi runserver \
-             shell sql sqlall sqlclear sqlindexes sqlinitialdata \
+             dumpdata flush inspectdb loaddata reset runfcgi runserver \
+             shell sql sqlall sqlclear sqlcustom sqlflush sqlindexes \
              sqlreset sqlsequencereset startapp startproject \
-             syncdb validate"
+             syncdb test validate"
     # Action's options
     action_shell_opts="--plain"
     action_runfcgi_opts="host port socket method maxspare minspare maxchildren daemonize pidfile workdir"
@@ -84,33 +84,33 @@ _django_completion()
         esac
     else
         case ${prev} in
-            adminindex|install|reset| \
-            sql|sqlall|sqlclear|sqlindexes| \
-            sqlinitialdata|sqlreset|sqlsequencereset)
-            # App completion
-            settings=""
-            # If settings.py in the PWD, use that
-            if [ -e settings.py ] ; then
-                settings="$PWD/settings.py"
-            else
-                # Use the ENV variable if it is set
-                if [ $DJANGO_SETTINGS_MODULE ] ; then
-                    settings=$DJANGO_SETTINGS_MODULE
+            adminindex|dumpdata|reset| \
+            sql|sqlall|sqlclear|sqlcustom|sqlindexes| \
+            sqlreset|sqlsequencereset|test)
+                # App completion
+                settings=""
+                # If settings.py in the PWD, use that
+                if [ -e settings.py ] ; then
+                    settings="$PWD/settings.py"
+                else
+                    # Use the ENV variable if it is set
+                    if [ $DJANGO_SETTINGS_MODULE ] ; then
+                        settings=$DJANGO_SETTINGS_MODULE
+                    fi
                 fi
-            fi
-            # Couldn't find settings so return nothing
-            if [ -z $settings ] ; then
-                COMPREPLY=()
-            # Otherwise inspect settings.py file
-            else
-                apps=`sed -n "/INSTALLED_APPS = (/,/)/p" $settings | \
-                      grep -v "django.contrib" | 
-                      sed -n "s/^[ ]*'\(.*\.\)*\(.*\)'.*$/\2 /pg" | \
-                      tr -d "\n"`
-                COMPREPLY=( $(compgen -W "${apps}" -- ${cur}) )
-            fi
-            return 0
-            ;;
+                # Couldn't find settings so return nothing
+                if [ -z $settings ] ; then
+                    COMPREPLY=()
+                # Otherwise inspect settings.py file
+                else
+                    apps=`sed -n "/INSTALLED_APPS = (/,/)/p" $settings | \
+                          grep -v "django.contrib" | 
+                          sed -n "s/^[ ]*'\(.*\.\)*\(.*\)'.*$/\2 /pg" | \
+                          tr -d "\n"`
+                    COMPREPLY=( $(compgen -W "${apps}" -- ${cur}) )
+                fi
+                return 0
+                ;;
 
             createcachetable|dbshell|diffsettings| \
             inspectdb|runserver|startapp|startproject|syncdb| \