Merge pull request #2707 from dnephin/add_stop_signal_to_docs

Add stop signal to the docs

docs/compose-file.md

@@ -498,6 +498,14 @@ Override the default labeling scheme for each container.
       - label:user:USER
       - label:role:ROLE
 
+### stop_signal
+
+Sets an alternative signal to stop the container. By default `stop` uses
+SIGTERM. Setting an alternative signal using `stop_signal` will cause
+`stop` to send that signal instead.
+
+    stop_signal: SIGUSR1
+
 ### ulimits
 
 Override the default ulimits for a container. You can either specify a single

docs/index.md

@@ -45,8 +45,7 @@ A `docker-compose.yml` looks like this:
       redis:
         image: redis
     volumes:
-      logvolume01:
+      logvolume01: {}
-        driver: default
 
 For more information about the Compose file, see the
 [Compose file reference](compose-file.md)