Refine yaml examples to reflect updates to the state system

sequoiar · May 18, 2011 · dc04d6c · dc04d6c
1 parent 5ef8e7d
commit dc04d6c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 16 deletions.
diff --git a/doc/example/templates/yaml-jinja.yml b/doc/example/templates/yaml-jinja.yml
@@ -1,4 +1,4 @@
-{% for item in 'vim','emacs','nano','butter' %}
+{% for item in 'vim','emacs','nano' %}
 {{ item }}:
   pkg:
     - installed
@@ -8,14 +8,16 @@ salt:
     - installed
   service: 
     - running
-    - enabled
+    - require:
+      - pkg: salt
     - names: 
       - salt-master
       - salt-minion
-cron:
+cronie:
   pkg:
     - installed
   service:
-    - running
     - enabled
-    - name: cronie
+    - require:
+      - pkg: cronie
+    - name: crond
diff --git a/doc/example/templates/yaml-mako.yml b/doc/example/templates/yaml-mako.yml
@@ -1,4 +1,4 @@
-% for item in 'vim', 'emacs' ,'nano' ,'butter':
+% for item in 'vim', 'emacs', 'nano':
 ${item}:
   pkg:
     - installed
@@ -8,14 +8,16 @@ salt:
     - installed
   service: 
     - running
-    - enabled
+    - require:
+      - pkg: salt
     - names: 
       - salt-master
       - salt-minion
-cron:
+cronie:
   pkg:
     - installed
   service:
     - running
-    - enabled
-    - name: cronie
+    - require:
+      - pkg: cronie
+    - name: crond
diff --git a/doc/example/templates/yaml.yml b/doc/example/templates/yaml.yml
@@ -6,27 +6,22 @@ emacs:
     - installed
 nano:
   pkg:
-    - installed
+    - latest
 salt:
   pkg: 
     - installed
   service: 
     - running
-    - enabled
     - require: 
       - pkg: vim
       - pkg: salt
       - service: cron
     - names: 
       - salt-master
       - salt-minion
-butter:
-  pkg:
-    - installed
 cron:
   pkg:
     - installed
   service:
     - running
-    - enabled
     - name: cronie