Merge remote-tracking branch 'origin/series/2.0' into merge

2016-12-19 21:59:00 -04:00
parent 0801682569 c71a8f4e13
commit 90de742deb
1310 changed files with 7832 additions and 7818 deletions
--- a/docs/topics/deploying.rst
+++ b/docs/topics/deploying.rst
@@ -196,8 +196,9 @@ Make the installation directory readable and writable by the webserver user::

 Restart the services::

-    /etc/init.d/nginx restart
-    /etc/init.d/supervisor restart
+    systemctl enable supervisor
+    systemctl restart supervisor
+    systemctl restart nginx

 Docker method
 =============