Merge pull request #309 from UtahDave/patch-1

Kenneth Reitz · Kenneth Reitz · commit 036c8031d7ad · 2013-08-23T16:52:09.000-07:00
Correct Salt Docs url. Ensure apache service is enabled and set proper require
diff --git a/docs/scenarios/admin.rst b/docs/scenarios/admin.rst
@@ -115,10 +115,13 @@ and start the Apache server:
         - installed
       service:
         - running
+        - enable: True
+        - require:
+          - pkg: apache
 
 State files can be written using YAML, the Jinja2 template system or pure python.
 
-    `Salt Documentation <http://docs.saltstack.org/en/latest/index.html>`_
+    `Salt Documentation <http://docs.saltstack.com>`_
 
 
 Psutil
