Rebuild of everything already merged

YAMLSyntax.html

@@ -275,7 +275,7 @@ languages:
 </p>
 <p>
         &copy; Copyright 2012 Michael DeHaan.<br/>
-      Last updated on May 19, 2012.<br/>
+      Last updated on Jun 19, 2012.<br/>
     </p>
   </div>
 </footer>

api.html

@@ -359,7 +359,7 @@ a conf.d file appropriately or something similar.  Who knows?</p>
 </p>
 <p>
         &copy; Copyright 2012 Michael DeHaan.<br/>
-      Last updated on May 19, 2012.<br/>
+      Last updated on Jun 19, 2012.<br/>
     </p>
   </div>
 </footer>

bestpractices.html

@@ -224,7 +224,7 @@ will require <cite>handlers</cite>, <cite>tasks</cite>, and <cite>templates</cit
   user: root
 
   vars_files
-    - include: vars/main.yml
+    - vars/main.yml
   tasks:
     - include: tasks/setup.yml
   handlers:
@@ -289,7 +289,7 @@ This way you have an audit trail describing when and why you changed the rules a
 </p>
 <p>
         &copy; Copyright 2012 Michael DeHaan.<br/>
-      Last updated on May 19, 2012.<br/>
+      Last updated on Jun 19, 2012.<br/>
     </p>
   </div>
 </footer>

examples.html

@@ -382,7 +382,7 @@ a simplified syntax for this.</p>
 </p>
 <p>
         &copy; Copyright 2012 Michael DeHaan.<br/>
-      Last updated on May 19, 2012.<br/>
+      Last updated on Jun 19, 2012.<br/>
     </p>
   </div>
 </footer>

faq.html

@@ -386,7 +386,7 @@ tasks – whether for a QA sytem, build system, or anything you can think of
 </p>
 <p>
         &copy; Copyright 2012 Michael DeHaan.<br/>
-      Last updated on May 19, 2012.<br/>
+      Last updated on Jun 19, 2012.<br/>
     </p>
   </div>
 </footer>

genindex.html

@@ -190,7 +190,7 @@ s.parentNode.insertBefore(ga, s);
 </p>
 <p>
         &copy; Copyright 2012 Michael DeHaan.<br/>
-      Last updated on May 19, 2012.<br/>
+      Last updated on Jun 19, 2012.<br/>
     </p>
   </div>
 </footer>

gettingstarted.html

@@ -232,7 +232,6 @@ bugs and feature ideas.</p>
 <p>Ansible is trivially easy to run from a checkout, root permissions are not required
 to use it:</p>
 <div class="highlight-python"><pre>$ git clone git://github.com/ansible/ansible.git
-$ git checkout -t origin/devel
 $ cd ./ansible
 $ source ./hacking/env-setup</pre>
 </div>
@@ -249,7 +248,6 @@ $ export ANSIBLE_HOSTS=~/ansible_hosts</pre>
 <p>If you are not working from a distribution where Ansible is packaged yet, you can install Ansible
 using &#8220;make install&#8221;.  This is done through <cite>python-distutils</cite>:</p>
 <div class="highlight-python"><pre>$ git clone git://github.com/ansible/ansible.git
-$ git checkout -t origin/devel
 $ cd ./ansible
 $ sudo make install</pre>
 </div>
@@ -351,7 +349,7 @@ explore, but you already have a fully working infrastructure!</p>
 </p>
 <p>
         &copy; Copyright 2012 Michael DeHaan.<br/>
-      Last updated on May 19, 2012.<br/>
+      Last updated on Jun 19, 2012.<br/>
     </p>
   </div>
 </footer>

index.html

@@ -447,7 +447,7 @@ Puppet Labs, and is now with <a class="reference external" href="http://rpath.co
 </p>
 <p>
         &copy; Copyright 2012 Michael DeHaan.<br/>
-      Last updated on May 19, 2012.<br/>
+      Last updated on Jun 19, 2012.<br/>
     </p>
   </div>
 </footer>

moduledev.html

@@ -455,7 +455,7 @@ Stop by the mailing list to inquire about requirements.</p>
 </p>
 <p>
         &copy; Copyright 2012 Michael DeHaan.<br/>
-      Last updated on May 19, 2012.<br/>
+      Last updated on Jun 19, 2012.<br/>
     </p>
   </div>
 </footer>

modules.html

@@ -789,7 +789,7 @@ yum pkg=httpd state=installed</pre>
 </p>
 <p>
         &copy; Copyright 2012 Michael DeHaan.<br/>
-      Last updated on May 19, 2012.<br/>
+      Last updated on Jun 19, 2012.<br/>
     </p>
   </div>
 </footer>

patterns.html

@@ -269,28 +269,31 @@ proxy=proxy.atlanta.example.com</pre>
 <h2>Groups of Groups, and Group Variables<a class="headerlink" href="#groups-of-groups-and-group-variables" title="Permalink to this headline">¶</a></h2>
 <p>Using Ansible 0.4, it is possible to make groups of groups and assign
 variables to groups.  These variables can be used by /usr/bin/ansible-playbook, but not
-/usr/bin/ansible.</p>
-<blockquote>
-<div><p>[atlanta]
+/usr/bin/ansible:</p>
+<div class="highlight-python"><pre>[atlanta]
 host1
-host2</p>
-<p>[raleigh]
 host2
-host3</p>
-<p>[southeast:children]
+
+[raleigh]
+host2
+host3
+
+[southeast:children]
 atlanta
-raleigh</p>
-<p>[southeast:vars]
+raleigh
+
+[southeast:vars]
 some_server=foo.southeast.example.com
 halon_system_timeout=30
 self_destruct_countdown=60
-escape_pods=2</p>
-<p>[usa:children]
+escape_pods=2
+
+[usa:children]
 southeast
 northeast
 southwest
-southeast</p>
-</div></blockquote>
+southeast</pre>
+</div>
 </div>
 <div class="section" id="yaml-inventory-format">
 <h2>YAML Inventory Format<a class="headerlink" href="#yaml-inventory-format" title="Permalink to this headline">¶</a></h2>
@@ -363,7 +366,7 @@ YAML:</p>
 </p>
 <p>
         &copy; Copyright 2012 Michael DeHaan.<br/>
-      Last updated on May 19, 2012.<br/>
+      Last updated on Jun 19, 2012.<br/>
     </p>
   </div>
 </footer>

playbooks.html

@@ -268,8 +268,9 @@ Just <cite>Control-C</cite> to kill it and run it again with <cite>-K</cite>.</p
      other: 'magic'</pre>
 </div>
 <p>These variables can be used later in the playbook like this:</p>
-<div class="highlight-python"><pre>$varname</pre>
+<div class="highlight-python"><pre>$varname or ${varname}</pre>
 </div>
+<p>The later is useful in the event you need to do something like ${other}_concatenated_value.</p>
 <p>In templates, the full power of the Jinja2 templating language is also available, which looks like this:</p>
 <div class="highlight-python"><pre>{{ varname }}</pre>
 </div>
@@ -471,7 +472,7 @@ Let&#8217;s run a playbook using a parallelism level of 10:</p>
 </p>
 <p>
         &copy; Copyright 2012 Michael DeHaan.<br/>
-      Last updated on May 19, 2012.<br/>
+      Last updated on Jun 19, 2012.<br/>
     </p>
   </div>
 </footer>

playbooks2.html

@@ -501,7 +501,7 @@ logs from ansible-pull runs would be an excellent way to gather and analyze remo
 </p>
 <p>
         &copy; Copyright 2012 Michael DeHaan.<br/>
-      Last updated on May 19, 2012.<br/>
+      Last updated on Jun 19, 2012.<br/>
     </p>
   </div>
 </footer>

search.html

@@ -207,7 +207,7 @@ s.parentNode.insertBefore(ga, s);
 </p>
 <p>
         &copy; Copyright 2012 Michael DeHaan.<br/>
-      Last updated on May 19, 2012.<br/>
+      Last updated on Jun 19, 2012.<br/>
     </p>
   </div>
 </footer>