Merge pull request #1351 from mchasal/1301-alphabetize_usage

Fix for #1301, Alphabetize Commands

compose/cli/main.py

@@ -75,10 +75,10 @@ class TopLevelCommand(Command):
       docker-compose -h|--help
 
     Options:
-      --verbose                 Show more output
-      --version                 Print version and exit
       -f, --file FILE           Specify an alternate compose file (default: docker-compose.yml)
       -p, --project-name NAME   Specify an alternate project name (default: directory name)
+      --verbose                 Show more output
+      -v, --version             Print version and exit
 
     Commands:
       build     Build or rebuild services
@@ -88,12 +88,12 @@ class TopLevelCommand(Command):
       port      Print the public port for a port binding
       ps        List containers
       pull      Pulls service images
+      restart   Restart services
       rm        Remove stopped containers
       run       Run a one-off command
       scale     Set number of containers for a service
       start     Start services
       stop      Stop services
-      restart   Restart services
       up        Create and start containers
 
     """

docs/cli.md

@@ -47,6 +47,10 @@ Lists containers.
 
 Pulls service images.
 
+### restart
+
+Restarts services.
+
 ### rm
 
 Removes stopped service containers.
@@ -130,7 +134,7 @@ By default, if there are existing containers for a service, `docker-compose up`
 
  Shows more output
 
-### --version
+### -v, --version
 
  Prints version and exits