Merge branch '1.1'

site/systemd.md

@@ -23,8 +23,7 @@ normally place it in `/etc/systemd/system/weave.service`.
     [Service]
     EnvironmentFile=-/etc/sysconfig/weave
     ExecStartPre=/usr/local/bin/weave launch $PEERS
-    ExecStart=/usr/bin/docker logs -f weave
-    SuccessExitStatus=2
+    ExecStart=/usr/bin/docker attach -f weave
     ExecStop=/usr/local/bin/weave stop
     [Install]
     WantedBy=multi-user.target