Fixed #23868 -- Added support for non-unique django-admin-options in docs.

Also documented missing short command line options to fix #24134. This bumps
the minimum sphinx version required to build the docs to 1.3.4.

Thanks Simon Charette for review.

1 files changed, 2 insertions, 2 deletions

diff --git a/django/core/management/commands/showmigrations.py b/django/core/management/commands/showmigrations.py
index b3a4725b12..254b9c5d4c 100644
--- a/django/core/management/commands/showmigrations.py
+++ b/django/core/management/commands/showmigrations.py
@@ -10,7 +10,7 @@ class Command(BaseCommand):
     help = "Shows all available migrations for the current project"
 
     def add_arguments(self, parser):
-        parser.add_argument('app_labels', nargs='*',
+        parser.add_argument('app_label', nargs='*',
             help='App labels of applications to limit the output to.')
         parser.add_argument('--database', action='store', dest='database', default=DEFAULT_DB_ALIAS,
             help='Nominates a database to synchronize. Defaults to the "default" database.')
@@ -33,7 +33,7 @@ class Command(BaseCommand):
         if options['format'] == "plan":
             return self.show_plan(connection)
         else:
-            return self.show_list(connection, options['app_labels'])
+            return self.show_list(connection, options['app_label'])
 
     def show_list(self, connection, app_names=None):
         """