From dc04d6cc2c5195d2019fcb99f220b0e060e848ac Mon Sep 17 00:00:00 2001
From: Thomas S Hatch <thatch45@gmail.com>
Date: Tue, 17 May 2011 23:45:11 -0600
Subject: [PATCH] Refine yaml examples to reflect updates to the state system

---
 doc/example/templates/yaml-jinja.yml | 12 +++++++-----
 doc/example/templates/yaml-mako.yml  | 12 +++++++-----
 doc/example/templates/yaml.yml       |  7 +------
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/doc/example/templates/yaml-jinja.yml b/doc/example/templates/yaml-jinja.yml
index f9e7a3f043b0..3beb89b8d0f3 100644
--- 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
index fdc0d41a9ccb..a621089bc4a3 100644
--- 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
index 0429ac6d164c..72873e2758f8 100644
--- a/doc/example/templates/yaml.yml
+++ b/doc/example/templates/yaml.yml
@@ -6,13 +6,12 @@ emacs:
     - installed
 nano:
   pkg:
-    - installed
+    - latest
 salt:
   pkg: 
     - installed
   service: 
     - running
-    - enabled
     - require: 
       - pkg: vim
       - pkg: salt
@@ -20,13 +19,9 @@ salt:
     - names: 
       - salt-master
       - salt-minion
-butter:
-  pkg:
-    - installed
 cron:
   pkg:
     - installed
   service:
     - running
-    - enabled
     - name: cronie