<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -111,13 +111,11 @@
             &lt;h4&gt;clouds.rb&lt;/h4&gt;
             &lt;p&gt;
               You can explicitely set them in your clouds.rb like so:
-              &lt;pre&gt;&lt;code&gt;
-                cloud :app do
-                  access_key &quot;AAAAAAAAAABBBBBB&quot;
-                  secret_access_key &quot;NRLSKDM@$@$/4@$%%NNNSN&quot;
-                  # ...
-                end
-              &lt;/code&gt;&lt;/pre&gt;
+              &lt;pre&gt;&lt;code&gt;cloud :app do
+                access_key &quot;AAAAAAAAAABBBBBB&quot;
+                secret_access_key &quot;NRLSKDM@$@$/4@$%%NNNSN&quot;
+                # ...
+              end&lt;/code&gt;&lt;/pre&gt;
               Of course, this works if you are going to keep your spec local and private, but that doesn't really work well for sharing, so instead, let's set them as environment variables.
             &lt;/p&gt;
             &lt;h4&gt;
@@ -132,16 +130,10 @@
             &lt;/p&gt;
             &lt;ul&gt;
               &lt;li&gt;
-                &lt;tt&gt;AWS_ACCESS_KEY&lt;/tt&gt;
+                &lt;tt&gt;EC2_ACCESS_KEY&lt;/tt&gt;
               &lt;/li&gt;
               &lt;li&gt;
-                &lt;tt&gt;AWS_SECRET_ACCESS_KEY&lt;/tt&gt;
-              &lt;/li&gt;
-              &lt;li&gt;
-                &lt;tt&gt;EC2_PRIVATE_KEY&lt;/tt&gt;
-              &lt;/li&gt;
-              &lt;li&gt;
-                &lt;tt&gt;EC2_CERT&lt;/tt&gt;
+                &lt;tt&gt;EC2_SECRET_KEY&lt;/tt&gt;
               &lt;/li&gt;
             &lt;/ul&gt;
             &lt;p&gt;
@@ -163,18 +155,14 @@
               in your
               &lt;tt&gt;~/.profile)&lt;/tt&gt;
             &lt;/p&gt;
-            &lt;pre&gt;&lt;code&gt;
-              #!/bin/sh
-              export AWS_ACCESS_KEY=&quot;AAAAAAAAAABBBBBB&quot;
-              export AWS_SECRET_ACCESS_KEY=&quot;NRLSKDM@$@$/4@$%%NNNSN&quot;
-              export EC2_PRIVATE_KEY=&quot;/path/to/pk-XXX.pem&quot;
-              export EC2_CERT=&quot;/path/to/cert-XXX.pem&quot;
-            &lt;/code&gt;&lt;/pre&gt;
+            &lt;pre&gt;&lt;code&gt;#!/bin/sh
+            export EC2_ACCESS_KEY=&quot;AAAAAAAAAABBBBBB&quot;
+            export EC2_SECRET_KEY=&quot;NRLSKDM@$@$/4@$%%NNNSN&quot;
+            export EC2_PRIVATE_KEY=&quot;/path/to/pk-XXX.pem&quot;
+            export EC2_CERT=&quot;/path/to/cert-XXX.pem&quot;&lt;/code&gt;&lt;/pre&gt;
             &lt;p&gt;
               Be sure to open a new terminal before you continue so that your changes are re-loaded (or reload your profile from the command-line with
-              &lt;code&gt;
-                source ~/.profile
-              &lt;/code&gt;
+              &lt;code&gt;source ~/.profile&lt;/code&gt;
               ).
             &lt;/p&gt;
             &lt;p&gt;&lt;/p&gt;
@@ -183,107 +171,33 @@
             Keypair
           &lt;/h3&gt;
           &lt;p&gt;
-            If you haven't done so already, generate the keypair
-            &lt;br /&gt;
-          &lt;/p&gt;
-          &lt;pre&gt;&lt;code&gt;
-            ec2-add-keypair poolparty-example &gt; ~/.ssh/poolparty-example
-            chmod 600 ~/.ssh/poolparty-example
-          &lt;/code&gt;&lt;/pre&gt;
-          (Hint, this means you will add the following directive to your
-          &lt;tt&gt;clouds.rb)&lt;/tt&gt;
-          &lt;pre class=&quot;blackboard&quot;&gt;keypair &lt;span class=&quot;String&quot;&gt;&lt;span class=&quot;String&quot;&gt;&amp;quot;&lt;/span&gt;poolparty-example&lt;span class=&quot;String&quot;&gt;&amp;quot;&lt;/span&gt;&lt;/span&gt;&amp;#x000A;&lt;/pre&gt;
-          &lt;p&gt;&lt;/p&gt;
-          &lt;h3&gt;Ports&lt;/h3&gt;
-          &lt;div class='tip-box'&gt;&lt;div class='crab-wrapper'&gt;&lt;img src='http://fairchild.github.com/poolparty/images/site/i/examples.png' class='crab'/&gt;&lt;/div&gt;Wondering why do you have to open these ports? No idea what a 'security group' is? Checkout the
-          &lt;a href=&quot;amazon.html&quot;&gt;Amazon EC2 Foundations&lt;/a&gt;
-          page&lt;/div&gt;
-          &lt;p&gt;
-            Finally, make sure the following ports are open in your
-            &lt;a href=&quot;amazon.html#security_groups&quot;&gt;EC2 security group:&lt;/a&gt;
-          &lt;/p&gt;
-          &lt;ol&gt;
-            &lt;li&gt;
-              22
-            &lt;/li&gt;
-            &lt;li&gt;
-              8642
-            &lt;/li&gt;
-          &lt;/ol&gt;
-          &lt;p&gt;
-            If these ports aren't open, your cloud will fail.
-          &lt;/p&gt;
-          &lt;pre&gt;&lt;code&gt;
-            ec2-authorize -p 22 default
-            ec2-authorize -p 8642 default
-          &lt;/code&gt;&lt;/pre&gt;
-          &lt;p&gt;
-            Sometimes it's nice to ping your machine, but ping doesn't need to be open, so this step is optional:
+            Keypairs are generated automatically for you if your keypair does not exist. The naming
+            convention is in the format:
             &lt;br /&gt;
           &lt;/p&gt;
-          &lt;pre&gt;&lt;code&gt;
-            ec2-authorize -P icmp -t -1:-1 default
-          &lt;/code&gt;&lt;/pre&gt;
+          &lt;pre class=&quot;blackboard&quot;&gt;  [poolname]&lt;span class=&quot;Keyword&quot;&gt;-&lt;/span&gt;[cloudname]&amp;#x000A;&lt;/pre&gt;
+          &lt;h3&gt;
+            Security groups
+          &lt;/h3&gt;
           &lt;p&gt;
-            Also, if you plan on using apache, you'll want port 80 to be open:
-            &lt;br /&gt;
+            Security groups are how the clouds distinguish each other. You can specify security groups in your clouds.rb in the format:
+            &lt;pre class=&quot;blackboard&quot;&gt;security_group &lt;span class=&quot;Keyword&quot;&gt;do&lt;/span&gt;&amp;#x000A;  authorize &lt;span class=&quot;Constant&quot;&gt;&lt;span class=&quot;Constant&quot;&gt;:&lt;/span&gt;from_port&lt;/span&gt; =&amp;gt; &lt;span class=&quot;Constant&quot;&gt;22&lt;/span&gt;, &lt;span class=&quot;Constant&quot;&gt;&lt;span class=&quot;Constant&quot;&gt;:&lt;/span&gt;to_port&lt;/span&gt; =&amp;gt; &lt;span class=&quot;Constant&quot;&gt;22&lt;/span&gt;&amp;#x000A;&lt;span class=&quot;Keyword&quot;&gt;end&lt;/span&gt;&amp;#x000A;&lt;/pre&gt;
+            PoolParty will take care of ensuring this security group with the specified ports open as well as it will close the ports that are open that are not specified to keep the security groups
+            &lt;span class='emphasis'&gt;declarative.&lt;/span&gt;
+            You can also provide a name for the security groups:
+            &lt;pre class=&quot;blackboard&quot;&gt;security_group &lt;span class=&quot;String&quot;&gt;&lt;span class=&quot;String&quot;&gt;&amp;quot;&lt;/span&gt;my-custom-named-security-group&lt;span class=&quot;String&quot;&gt;&amp;quot;&lt;/span&gt;&lt;/span&gt; &lt;span class=&quot;Keyword&quot;&gt;do&lt;/span&gt;&amp;#x000A;  authorize &lt;span class=&quot;Constant&quot;&gt;&lt;span class=&quot;Constant&quot;&gt;:&lt;/span&gt;from_port&lt;/span&gt; =&amp;gt; &lt;span class=&quot;Constant&quot;&gt;22&lt;/span&gt;, &lt;span class=&quot;Constant&quot;&gt;&lt;span class=&quot;Constant&quot;&gt;:&lt;/span&gt;to_port&lt;/span&gt; =&amp;gt; &lt;span class=&quot;Constant&quot;&gt;22&lt;/span&gt;&amp;#x000A;&lt;span class=&quot;Keyword&quot;&gt;end&lt;/span&gt;&amp;#x000A;&lt;/pre&gt;
           &lt;/p&gt;
-          &lt;pre&gt;&lt;code&gt;
-            ec2-authorize -p 80 default
-          &lt;/code&gt;&lt;/pre&gt;
-          &lt;p&gt;
-            Old ports
-            &lt;strong&gt;
-              not
-            &lt;/strong&gt;
-            required for release 1.1 and after
+          &lt;p class='emphasis'&gt;
+            Note, to use the anything command that requires ssh access, you must allow port 22 to be opened in your security_group declaration.
           &lt;/p&gt;
-          &lt;ol&gt;
-            &lt;li&gt;
-              4369 (erlang daemon)
-            &lt;/li&gt;
-            &lt;li&gt;
-              8140 (puppet)
-            &lt;/li&gt;
-            &lt;li&gt;
-              7050 (cloud management)
-            &lt;/li&gt;
-          &lt;/ol&gt;
           &lt;h2&gt;clouds.rb file location&lt;/h2&gt;
           &lt;p&gt;
-            If you are going to point to one clouds.rb file more often than any other, you can add it as an environment variable as well, like so
-            &lt;br /&gt;
-          &lt;/p&gt;
-          &lt;pre&gt;&lt;code&gt;
-            export POOL_SPEC=/home/auser/Sites/pp/clouds.rb
-          &lt;/code&gt;&lt;/pre&gt;
-          &lt;p&gt;&lt;/p&gt;
-          &lt;p&gt;
-            This will save a lot of headache if you export this in the file. PoolParty expects to be able to find the clouds.rb in one of several locations.
+            Your clouds.rb must be accessible to the command-line. It will try to require the clouds.rb from the current working directory if the clouds.rb is in the current directory. If it is not, you can specify the location with the -c switch with any cloud command.
+            &lt;pre class=&quot;blackboard&quot;&gt;cloud show &lt;span class=&quot;Keyword&quot;&gt;-&lt;/span&gt;c examples&lt;span class=&quot;Keyword&quot;&gt;/&lt;/span&gt;simple.rb&amp;#x000A;&lt;/pre&gt;
           &lt;/p&gt;
-          &lt;ol&gt;
-            &lt;li&gt;
-              the current directory
-            &lt;/li&gt;
-            &lt;li&gt;
-              the file pointed to by the
-              &lt;tt&gt;POOL_SPEC&lt;/tt&gt;
-              environment variable
-            &lt;/li&gt;
-            &lt;li&gt;
-              &lt;tt&gt;~/.poolparty/clouds.rb&lt;/tt&gt;
-            &lt;/li&gt;
-            &lt;li&gt;
-              &lt;tt&gt;/etc/poolparty/clouds.rb&lt;/tt&gt;
-            &lt;/li&gt;
-          &lt;/ol&gt;
-          You can also explicitly set these when calling
-          &lt;tt&gt;pool&lt;/tt&gt;
-          commands with the
-          &lt;tt&gt;-n&lt;/tt&gt;
-          switch, but that gets old fast.
           &lt;p&gt;
-            Note, that if you are in the same directory as your clouds.rb file, then PoolParty will assume you are working with that file.
+            The clouds.rb is also &quot;requireable&quot; from ruby, so you can operate with the cloud from irb or any other ruby program, i.e.:
+            &lt;pre class=&quot;blackboard&quot;&gt;irb &lt;span class=&quot;Keyword&quot;&gt;-&lt;/span&gt;r poolparty&lt;span class=&quot;Keyword&quot;&gt;/&lt;/span&gt;clouds.rb&amp;#x000A;&lt;/pre&gt;
           &lt;/p&gt;
           &lt;h3&gt;External links&lt;/h3&gt;
           &lt;p&gt;</diff>
      <filename>site/amazon_ec2_setup.html</filename>
    </modified>
    <modified>
      <diff>@@ -66,18 +66,7 @@
         &lt;p&gt;
           Special thanks to
           &lt;ul&gt;
-            &lt;li&gt;
-              AJ Christensen
-              &lt;a href='mailto:aj@junglist.gen.nz'&gt;aj [at] junglist.gen.nz&lt;/a&gt;
-            &lt;/li&gt;
-            &lt;li&gt;Blake Mizerany&lt;/li&gt;
-            &lt;li&gt;Ron &quot;deadprogrammer&quot; Evans&lt;/li&gt;
             &lt;li&gt;AT&amp;T Interactive R&amp;D&lt;/li&gt;
-            &lt;li&gt;
-              The
-              &lt;a href='http://citrusbyte.com'&gt;CitrusByte&lt;/a&gt;
-              team
-            &lt;/li&gt;
           &lt;/ul&gt;
         &lt;/p&gt;
       &lt;/div&gt;</diff>
      <filename>site/community.html</filename>
    </modified>
    <modified>
      <diff>@@ -1,18 +1,80 @@
+&lt;!DOCTYPE html PUBLIC &quot;-//W3C//DTD XHTML 1.0 Transitional//EN&quot; &quot;http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd&quot;&gt;
 &lt;html&gt;
   &lt;head&gt;
-    &lt;style type='text/css'&gt;
-      body { font-family: helvetica, verdana, arial; font-size: 10pt;}
-    &lt;/style&gt;
+    &lt;title&gt;PoolParty!&lt;/title&gt;
+    &lt;link href=&quot;../stylesheets/application.css&quot; media=&quot;all&quot; rel=&quot;stylesheet&quot; type=&quot;text/css&quot;/&gt;&lt;link href=&quot;../stylesheets/blackboard.css&quot; media=&quot;all&quot; rel=&quot;stylesheet&quot; type=&quot;text/css&quot;/&gt;&lt;link href=&quot;../stylesheets/classes.css&quot; media=&quot;all&quot; rel=&quot;stylesheet&quot; type=&quot;text/css&quot;/&gt;&lt;link href=&quot;../stylesheets/header.css&quot; media=&quot;all&quot; rel=&quot;stylesheet&quot; type=&quot;text/css&quot;/&gt;&lt;link href=&quot;../stylesheets/navmenu.css&quot; media=&quot;all&quot; rel=&quot;stylesheet&quot; type=&quot;text/css&quot;/&gt;&lt;link href=&quot;../stylesheets/sunburst.css&quot; media=&quot;all&quot; rel=&quot;stylesheet&quot; type=&quot;text/css&quot;/&gt;
+    &lt;script language=&quot;javascript&quot; src=&quot;../javascripts/jquery-1.3.2.min.js&quot; type=&quot;text/javascript&quot;&gt;&lt;/script&gt;&lt;script language=&quot;javascript&quot; src=&quot;../javascripts/jquery.pageslide-0.2.js&quot; type=&quot;text/javascript&quot;&gt;&lt;/script&gt;&lt;script language=&quot;javascript&quot; src=&quot;../javascripts/poolparty.js&quot; type=&quot;text/javascript&quot;&gt;&lt;/script&gt;
   &lt;/head&gt;
   &lt;body&gt;
-    &lt;h1&gt;
-      StaticMatic::TemplateError
-      in
-      ./src/pages/docs/chef.haml
-    &lt;/h1&gt;
-    &lt;p&gt;Illegal nesting: content can't be both given on the same line as %tt and nested within it.&lt;/p&gt;
-    60: in&lt;br/&gt;61: %tt /tmp/poolparty/dr_configure/chef&lt;br/&gt;62: &lt;br/&gt;63:   $ tree /tmp/poolparty/dr_configure/chef/&lt;br/&gt;64:     |-- cookbooks&lt;br/&gt;65:     |   |-- poolparty&lt;br/&gt;66:     |       |-- attributes&lt;br/&gt;
-    &lt;h2&gt;Backtrace&lt;/h2&gt;
-    (haml):63&lt;br/&gt;/Users/alerner/.gem/ruby/1.8/gems/haml-2.0.9/lib/haml/precompiler.rb:585:in `render_tag'&lt;br/&gt;/Users/alerner/.gem/ruby/1.8/gems/haml-2.0.9/lib/haml/precompiler.rb:192:in `process_line'&lt;br/&gt;/Users/alerner/.gem/ruby/1.8/gems/haml-2.0.9/lib/haml/precompiler.rb:156:in `precompile'&lt;br/&gt;/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/1.8/fileutils.rb:243:in `each_with_index'&lt;br/&gt;/Users/alerner/.gem/ruby/1.8/gems/haml-2.0.9/lib/haml/precompiler.rb:122:in `each'&lt;br/&gt;/Users/alerner/.gem/ruby/1.8/gems/haml-2.0.9/lib/haml/precompiler.rb:122:in `each_with_index'&lt;br/&gt;/Users/alerner/.gem/ruby/1.8/gems/haml-2.0.9/lib/haml/precompiler.rb:122:in `precompile'&lt;br/&gt;/Users/alerner/.gem/ruby/1.8/gems/haml-2.0.9/lib/haml/engine.rb:100:in `initialize'&lt;br/&gt;/Library/Ruby/Gems/1.8/gems/staticmatic-0.10.1/bin/../lib/staticmatic/mixins/render.rb:96:in `new'&lt;br/&gt;/Library/Ruby/Gems/1.8/gems/staticmatic-0.10.1/bin/../lib/staticmatic/mixins/render.rb:96:in `generate_html_from_template_source'&lt;br/&gt;/Library/Ruby/Gems/1.8/gems/staticmatic-0.10.1/bin/../lib/staticmatic/mixins/render.rb:21:in `generate_html'&lt;br/&gt;/Library/Ruby/Gems/1.8/gems/staticmatic-0.10.1/bin/../lib/staticmatic/mixins/render.rb:37:in `generate_html_with_layout'&lt;br/&gt;/Library/Ruby/Gems/1.8/gems/staticmatic-0.10.1/bin/../lib/staticmatic/mixins/build.rb:13:in `build_html'&lt;br/&gt;/Library/Ruby/Gems/1.8/gems/staticmatic-0.10.1/bin/../lib/staticmatic/mixins/build.rb:10:in `each'&lt;br/&gt;/Library/Ruby/Gems/1.8/gems/staticmatic-0.10.1/bin/../lib/staticmatic/mixins/build.rb:10:in `build_html'&lt;br/&gt;/Library/Ruby/Gems/1.8/gems/staticmatic-0.10.1/bin/../lib/staticmatic/mixins/build.rb:5:in `build'&lt;br/&gt;/Library/Ruby/Gems/1.8/gems/staticmatic-0.10.1/bin/../lib/staticmatic/base.rb:58:in `send'&lt;br/&gt;/Library/Ruby/Gems/1.8/gems/staticmatic-0.10.1/bin/../lib/staticmatic/base.rb:58:in `run'&lt;br/&gt;/Library/Ruby/Gems/1.8/gems/staticmatic-0.10.1/bin/staticmatic:23&lt;br/&gt;/usr/bin/staticmatic:19:in `load'&lt;br/&gt;/usr/bin/staticmatic:19
+    &lt;div id='ribbon'&gt;
+      &amp;nbsp;
+      &lt;a href='../why.html' id='pageslide_anchor' rel='pageslide'&gt;
+        &lt;img alt=&quot;Why pp ribbon&quot; border=&quot;0&quot; height=&quot;150&quot; id=&quot;ribbon-img&quot; src=&quot;../images/why_pp_ribbon.gif&quot; width=&quot;150&quot;/&gt;
+      &lt;/a&gt;
+      &amp;nbsp;
+    &lt;/div&gt;
+    &lt;div id='wrapper'&gt;
+      &lt;div id='masthead'&gt;
+        &lt;h2&gt;AT&amp;T Interactive R&amp;D&lt;/h2&gt;
+        &lt;div id='external_links'&gt;
+          &lt;!-- =link (img(&quot;attir_and_d_logo.gif&quot;), &quot;http://poolpartyrb.com&quot;) --&gt;
+        &lt;/div&gt;
+      &lt;/div&gt;
+      &lt;div class='spacer clear'&gt;
+        &amp;nbsp;
+      &lt;/div&gt;
+      &lt;div id='sidebar'&gt;
+        &lt;h3 id='pplogo'&gt;&lt;a href=&quot;../index.html&quot;&gt;&lt;img alt=&quot;Pplogo2&quot; src=&quot;../images/site/pplogo2.png&quot;/&gt;&lt;/a&gt;&lt;/h3&gt;
+        &lt;ul class='left'&gt;&lt;/ul&gt;
+        &lt;ul class='left'&gt;
+          &lt;li class='docs'&gt;
+            &lt;a href=&quot;../docs/index.html&quot;&gt;Docs&lt;/a&gt;
+          &lt;/li&gt;
+          &lt;li class='examples'&gt;
+            &lt;a href=&quot;../examples.html&quot;&gt;Examples&lt;/a&gt;
+          &lt;/li&gt;
+          &lt;li class='community'&gt;
+            &lt;a href=&quot;../community.html&quot;&gt;Community&lt;/a&gt;
+          &lt;/li&gt;
+        &lt;/ul&gt;
+      &lt;/div&gt;
+      &lt;div class='spacer clear'&gt;
+        &amp;nbsp;
+      &lt;/div&gt;
+      &lt;div id='content'&gt;
+        &lt;h2&gt;Chef Itself&lt;/h2&gt;
+        &lt;p&gt;
+          From the Chef website:
+          &lt;blockquote&gt;
+            Chef is a systems integration framework, built to bring the benefits of configuration management to your entire infrastructure.
+          &lt;/blockquote&gt;
+        &lt;/p&gt;
+        Chef Links:
+        &lt;ul&gt;
+          &lt;li&gt;
+            Chef homepage:
+            &lt;a href=&quot;http://wiki.opscode.com/display/chef/Home&quot;&gt;http://wiki.opscode.com/display/chef/Home&lt;/a&gt;
+          &lt;/li&gt;
+          &lt;li&gt;
+            Github repo:
+            &lt;a href=&quot;http://github.com/opscode/chef/tree/master&quot;&gt;http://github.com/opscode/chef/tree/master&lt;/a&gt;
+          &lt;/li&gt;
+        &lt;/ul&gt;
+        &lt;h2&gt;
+          Chef and PoolParty
+        &lt;/h2&gt;
+        &lt;p&gt;
+          Lets start off with a basic example:
+          &lt;pre class=&quot;blackboard&quot;&gt;&lt;span class=&quot;line-numbers&quot;&gt;   1 &lt;/span&gt; chef_repo &lt;span class=&quot;String&quot;&gt;&lt;span class=&quot;String&quot;&gt;&amp;quot;&lt;/span&gt;basic/chef-repo&lt;span class=&quot;String&quot;&gt;&amp;quot;&lt;/span&gt;&lt;/span&gt;&amp;#x000A;&lt;span class=&quot;line-numbers&quot;&gt;   2 &lt;/span&gt; recipe &lt;span class=&quot;String&quot;&gt;&lt;span class=&quot;String&quot;&gt;&amp;quot;&lt;/span&gt;apache2&lt;span class=&quot;String&quot;&gt;&amp;quot;&lt;/span&gt;&lt;/span&gt;&amp;#x000A;&lt;span class=&quot;line-numbers&quot;&gt;   3 &lt;/span&gt; chef_attributes &lt;span class=&quot;Constant&quot;&gt;&lt;span class=&quot;Constant&quot;&gt;:&lt;/span&gt;apache2&lt;/span&gt; =&amp;gt; {&lt;span class=&quot;Constant&quot;&gt;&lt;span class=&quot;Constant&quot;&gt;:&lt;/span&gt;listen_ports&lt;/span&gt; =&amp;gt; [&lt;span class=&quot;String&quot;&gt;&lt;span class=&quot;String&quot;&gt;&amp;quot;&lt;/span&gt;80&lt;span class=&quot;String&quot;&gt;&amp;quot;&lt;/span&gt;&lt;/span&gt;, &lt;span class=&quot;String&quot;&gt;&lt;span class=&quot;String&quot;&gt;&amp;quot;&lt;/span&gt;8080&lt;span class=&quot;String&quot;&gt;&amp;quot;&lt;/span&gt;&lt;/span&gt;]}&lt;/pre&gt;
+        &lt;/p&gt;
+        &lt;p&gt;
+          You can specify the location for your chef repository. This must be local or an absolute path to the chef repository you are referring to. PoolParty will build the dna.json based on the chef_attributes that you supply as well as the recipes that you use.
+        &lt;/p&gt;
+      &lt;/div&gt;
+      &lt;div id='footer'&gt;
+        Copyright &amp;copy; 2008-2009 - Ari Lerner and Cloudteam at AT&amp;T Interactive
+        &lt;a href=&quot;../sitemap.html&quot;&gt;sitemap&lt;/a&gt;
+      &lt;/div&gt;
+    &lt;/div&gt;
   &lt;/body&gt;
 &lt;/html&gt;</diff>
      <filename>site/docs/chef.html</filename>
    </modified>
    <modified>
      <diff>@@ -48,34 +48,21 @@
         &lt;/p&gt;
         &lt;h2&gt;Cloud&lt;/h2&gt;
         &lt;p&gt;
-          All of the cloud binaries are labeled with
+          All of the cloud binaries have the following switches available
+          &lt;pre class=&quot;blackboard&quot;&gt;&lt;span class=&quot;Keyword&quot;&gt;-&lt;/span&gt;n [name of the cloud]&amp;#x000A;&lt;span class=&quot;Keyword&quot;&gt;-&lt;/span&gt;c [path&lt;span class=&quot;Keyword&quot;&gt;/&lt;/span&gt;to&lt;span class=&quot;Keyword&quot;&gt;/&lt;/span&gt;clouds.&lt;span class=&quot;Entity&quot;&gt;rb&lt;/span&gt;]&amp;#x000A;&lt;span class=&quot;Keyword&quot;&gt;-&lt;/span&gt;h&amp;#x000A;&lt;/pre&gt;
         &lt;/p&gt;
-        &lt;p&gt;
-          -n [name of the cloud]
-        &lt;/p&gt;
-        &lt;div class='binary_list'&gt;
-          &lt;ul&gt;
-            &lt;li&gt;&lt;div class='title'&gt;&lt;a&gt;List&lt;/a&gt;&lt;/div&gt;&lt;div class='desc'&gt;List the current running and pending instances for the cloud&lt;/div&gt;&lt;/li&gt;
-            &lt;li&gt;&lt;div class='title'&gt;&lt;a&gt;Start&lt;/a&gt;&lt;/div&gt;&lt;div class='desc'&gt;Start the cloud&lt;/div&gt;&lt;/li&gt;
-            &lt;li&gt;&lt;div class='title'&gt;&lt;a&gt;Ssh&lt;/a&gt;&lt;/div&gt;&lt;div class='desc'&gt;Ssh into the cloud (specify the node with -i [defaults to the master 0])&lt;/div&gt;&lt;/li&gt;
-            &lt;li&gt;&lt;div class='title'&gt;&lt;a&gt;Terminate&lt;/a&gt;&lt;/div&gt;&lt;div class='desc'&gt;Terminate the cloud&lt;/div&gt;&lt;/li&gt;
-            &lt;li&gt;&lt;div class='title'&gt;&lt;a&gt;Refresh&lt;/a&gt;&lt;/div&gt;&lt;div class='desc'&gt;Reconfigure the cloud quickly. Useful if you want the cloud to refresh from the configuration&lt;/div&gt;&lt;/li&gt;
-            &lt;li&gt;&lt;div class='title'&gt;&lt;a&gt;Provision&lt;/a&gt;&lt;/div&gt;&lt;div class='desc'&gt;Provision the cloud. When you make a change to your manifest, use this to push the changes to the cloud&lt;/div&gt;&lt;/li&gt;
-            &lt;li&gt;&lt;div class='title'&gt;&lt;a&gt;Osxcopy&lt;/a&gt;&lt;/div&gt;&lt;div class='desc'&gt;Copy the master ip to the pasteboard (on osx)&lt;/div&gt;&lt;/li&gt;
-            &lt;li&gt;&lt;div class='title'&gt;&lt;a&gt;Maintain&lt;/a&gt;&lt;/div&gt;&lt;div class='desc'&gt;Run the maintenance script to ensure the cloud is maintaining status&lt;/div&gt;&lt;/li&gt;
-            &lt;li&gt;&lt;div class='title'&gt;&lt;a&gt;Expand&lt;/a&gt;&lt;/div&gt;&lt;div class='desc'&gt;Expands the cloud if it can expand&lt;/div&gt;&lt;/li&gt;
-            &lt;li&gt;&lt;div class='title'&gt;&lt;a&gt;Contract&lt;/a&gt;&lt;/div&gt;&lt;div class='desc'&gt;Contract the cloud if it can contract&lt;/div&gt;&lt;/li&gt;
-            &lt;li&gt;&lt;div class='title'&gt;&lt;a&gt;Configure&lt;/a&gt;&lt;/div&gt;&lt;div class='desc'&gt;Configure the cloud&lt;/div&gt;&lt;/li&gt;
-            &lt;li&gt;&lt;div class='title'&gt;&lt;a&gt;Add-keypair&lt;/a&gt;&lt;/div&gt;&lt;div class='desc'&gt;Helper method to create a new keypair for the instances&lt;/div&gt;&lt;/li&gt;
-          &lt;/ul&gt;
-        &lt;/div&gt;
-        &lt;h2&gt;Pool&lt;/h2&gt;
         &lt;div class='binary_list'&gt;
           &lt;ul&gt;
-            &lt;li&gt;&lt;div class='title'&gt;&lt;a&gt;Console&lt;/a&gt;&lt;/div&gt;&lt;div class='desc'&gt;PoolParty console (useful for testing)&lt;/div&gt;&lt;/li&gt;
-            &lt;li&gt;&lt;div class='title'&gt;&lt;a&gt;Describe&lt;/a&gt;&lt;/div&gt;&lt;div class='desc'&gt;Describe the pool&lt;/div&gt;&lt;/li&gt;
-            &lt;li&gt;&lt;div class='title'&gt;&lt;a&gt;List&lt;/a&gt;&lt;/div&gt;&lt;div class='desc'&gt;List the pools&lt;/div&gt;&lt;/li&gt;
-            &lt;li&gt;&lt;div class='title'&gt;&lt;a&gt;Spec&lt;/a&gt;&lt;/div&gt;&lt;div class='desc'&gt;Spec generator&lt;/div&gt;&lt;/li&gt;
+            &lt;li&gt;&lt;div class='title'&gt;&lt;a&gt;List&lt;/a&gt;&lt;/div&gt;&lt;pre class='desc'&gt;List the current running and pending instances for the cloud&lt;/pre&gt;&lt;/li&gt;
+            &lt;li&gt;&lt;div class='title'&gt;&lt;a&gt;Start&lt;/a&gt;&lt;/div&gt;&lt;pre class='desc'&gt;Start the cloud&lt;/pre&gt;&lt;/li&gt;
+            &lt;li&gt;&lt;div class='title'&gt;&lt;a&gt;Ssh&lt;/a&gt;&lt;/div&gt;&lt;pre class='desc'&gt;Ssh into the cloud (specify the node with -i [defaults to the master 0])&lt;/pre&gt;&lt;/li&gt;
+            &lt;li&gt;&lt;div class='title'&gt;&lt;a&gt;Terminate&lt;/a&gt;&lt;/div&gt;&lt;pre class='desc'&gt;Terminate the cloud&lt;/pre&gt;&lt;/li&gt;
+            &lt;li&gt;&lt;div class='title'&gt;&lt;a&gt;Expand&lt;/a&gt;&lt;/div&gt;&lt;pre class='desc'&gt;Expands the cloud if it can expand&lt;/pre&gt;&lt;/li&gt;
+            &lt;li&gt;&lt;div class='title'&gt;&lt;a&gt;Contract&lt;/a&gt;&lt;/div&gt;&lt;pre class='desc'&gt;Contract the cloud if it can contract&lt;/pre&gt;&lt;/li&gt;
+            &lt;li&gt;&lt;div class='title'&gt;&lt;a&gt;Configure&lt;/a&gt;&lt;/div&gt;&lt;pre class='desc'&gt;Configure the cloud&lt;/pre&gt;&lt;/li&gt;
+            &lt;li&gt;&lt;div class='title'&gt;&lt;a&gt;Console&lt;/a&gt;&lt;/div&gt;&lt;pre class='desc'&gt;Give an irb console with the clouds.rb loaded&lt;/pre&gt;&lt;/li&gt;
+            &lt;li&gt;&lt;div class='title'&gt;&lt;a&gt;Reboot&lt;/a&gt;&lt;/div&gt;&lt;pre class='desc'&gt;Restart each node in the cloud (one-by-one) to refresh the user-data and the nodes&lt;/pre&gt;&lt;/li&gt;
+            &lt;li&gt;&lt;div class='title'&gt;&lt;a&gt;Show&lt;/a&gt;&lt;/div&gt;&lt;pre class='desc'&gt;Describe the cloud setup&lt;/pre&gt;&lt;/li&gt;
           &lt;/ul&gt;
         &lt;/div&gt;
       &lt;/div&gt;</diff>
      <filename>site/docs/cloud_speak.html</filename>
    </modified>
    <modified>
      <diff>@@ -63,33 +63,10 @@
               Understanding the language of PoolParty is an important step in being able to deploy clouds. Checkout this page to learn about a few common terms used in PP.
             &lt;/li&gt;
             &lt;li&gt;
-              &lt;a href=&quot;../provisioning_process.html&quot;&gt;Understanding the bootstrap and provisioning process:&lt;/a&gt;
-              What happens when I type
-              &lt;tt&gt;cloud-start&lt;/tt&gt;
-              ? What is the difference between
-              &lt;tt&gt;cloud-bootstrap&lt;/tt&gt;
-              ,
-              &lt;tt&gt;cloud-provision&lt;/tt&gt;
-              , and
-              &lt;tt&gt;cloud-configure&lt;/tt&gt;
-              ? PP translates these simple commands into a large number of commands that are executed on your nodes. Read this to learn about the bootstrap and provisioning process.
-            &lt;/li&gt;
-            &lt;li&gt;
-              &lt;a href=&quot;../docs/resources/index.html&quot;&gt;Understanding Resources:&lt;/a&gt;
-              Resources are the meat and most interesting part of any deployment. This page will help you understand what resources are and how to use them.
-            &lt;/li&gt;
-            &lt;li&gt;
               &lt;a href=&quot;../docs/chef.html&quot;&gt;What is Chef?:&lt;/a&gt;
-              Chef is PP's default
-              &lt;a href=&quot;../language.html#dependency%20resolver&quot;&gt;dependency resolver.&lt;/a&gt;
               Your
               &lt;tt&gt;clouds.rb&lt;/tt&gt;
               is translated by PP into Chef
-              &lt;a href=&quot;../language.html#recipe&quot;&gt;recipes.&lt;/a&gt;
-              Chef then uses those recipes to
-              &lt;a href=&quot;../language.html#provision&quot;&gt;provision&lt;/a&gt;
-              your
-              &lt;a href=&quot;../language.html#instance&quot;&gt;instances.&lt;/a&gt;
             &lt;/li&gt;
             &lt;li&gt;
               &lt;a href=&quot;../docs/cloud_speak.html&quot;&gt;Using the &lt;tt&gt;cloud&lt;/tt&gt; and &lt;tt&gt;pool&lt;/tt&gt; binaries:&lt;/a&gt;</diff>
      <filename>site/docs/index.html</filename>
    </modified>
    <modified>
      <diff>@@ -43,13 +43,11 @@
       &lt;/div&gt;
       &lt;div id='content'&gt;
         &lt;h2&gt;Examples&lt;/h2&gt;
+        &lt;!-- %p --&gt;
+        &lt;!-- Example: --&gt;
+        &lt;!-- ~file_to_code(&quot;basic.rb&quot;) --&gt;
         &lt;p&gt;
-          We've created a git repo containing a number of working and tested examples:
-          &lt;a href=&quot;http://github.com/auser/poolparty-examples/tree/master&quot;&gt;http://github.com/auser/poolparty-examples/tree/master&lt;/a&gt;
-        &lt;/p&gt;
-        &lt;p&gt;
-          Example:
-          &lt;script src='http://gist.github.com/69121.js'&gt;&lt;/script&gt;
+          &lt;pre class=&quot;blackboard&quot;&gt;pool &lt;span class=&quot;String&quot;&gt;&lt;span class=&quot;String&quot;&gt;&amp;quot;&lt;/span&gt;my_twitter&lt;span class=&quot;String&quot;&gt;&amp;quot;&lt;/span&gt;&lt;/span&gt; &lt;span class=&quot;Keyword&quot;&gt;do  &lt;/span&gt;&amp;#x000A;  cloud &lt;span class=&quot;String&quot;&gt;&lt;span class=&quot;String&quot;&gt;&amp;quot;&lt;/span&gt;app&lt;span class=&quot;String&quot;&gt;&amp;quot;&lt;/span&gt;&lt;/span&gt; &lt;span class=&quot;Keyword&quot;&gt;do&lt;/span&gt;&amp;#x000A;    using &lt;span class=&quot;Constant&quot;&gt;&lt;span class=&quot;Constant&quot;&gt;:&lt;/span&gt;ec2&lt;/span&gt;&amp;#x000A;    instances &lt;span class=&quot;Constant&quot;&gt;1&lt;/span&gt;..&lt;span class=&quot;Constant&quot;&gt;4&lt;/span&gt;&amp;#x000A;    image_id &lt;span class=&quot;String&quot;&gt;&lt;span class=&quot;String&quot;&gt;&amp;quot;&lt;/span&gt;ami-ccf615a5&lt;span class=&quot;String&quot;&gt;&amp;quot;&lt;/span&gt;&lt;/span&gt; &lt;span class=&quot;Comment&quot;&gt;&lt;span class=&quot;Comment&quot;&gt;#&lt;/span&gt;alestic jaunty&lt;/span&gt;&amp;#x000A;    availability_zones [&lt;span class=&quot;String&quot;&gt;&lt;span class=&quot;String&quot;&gt;'&lt;/span&gt;us-east-1c&lt;span class=&quot;String&quot;&gt;'&lt;/span&gt;&lt;/span&gt;]&amp;#x000A;    security_group &lt;span class=&quot;Keyword&quot;&gt;do&lt;/span&gt;&amp;#x000A;      &lt;span class=&quot;String&quot;&gt;&lt;span class=&quot;String&quot;&gt;%w(&lt;/span&gt;22 80&lt;span class=&quot;String&quot;&gt;)&lt;/span&gt;&lt;/span&gt;.&lt;span class=&quot;Entity&quot;&gt;each&lt;/span&gt; {|&lt;span class=&quot;Variable&quot;&gt;port&lt;/span&gt;|  authorize &lt;span class=&quot;Constant&quot;&gt;&lt;span class=&quot;Constant&quot;&gt;:&lt;/span&gt;from_port&lt;/span&gt; =&amp;gt; port, &lt;span class=&quot;Constant&quot;&gt;&lt;span class=&quot;Constant&quot;&gt;:&lt;/span&gt;to_port&lt;/span&gt; =&amp;gt; port}&amp;#x000A;    &lt;span class=&quot;Keyword&quot;&gt;end&lt;/span&gt;&amp;#x000A;    autoscale&amp;#x000A;  &lt;span class=&quot;Keyword&quot;&gt;end&lt;/span&gt;&amp;#x000A;  &amp;#x000A;  cloud &lt;span class=&quot;String&quot;&gt;&lt;span class=&quot;String&quot;&gt;&amp;quot;&lt;/span&gt;database&lt;span class=&quot;String&quot;&gt;&amp;quot;&lt;/span&gt;&lt;/span&gt; &lt;span class=&quot;Keyword&quot;&gt;do&lt;/span&gt;&amp;#x000A;    using &lt;span class=&quot;Constant&quot;&gt;&lt;span class=&quot;Constant&quot;&gt;:&lt;/span&gt;ec2&lt;/span&gt;&amp;#x000A;    instances &lt;span class=&quot;Constant&quot;&gt;1&lt;/span&gt;..&lt;span class=&quot;Constant&quot;&gt;4&lt;/span&gt;&amp;#x000A;    image_id &lt;span class=&quot;String&quot;&gt;&lt;span class=&quot;String&quot;&gt;&amp;quot;&lt;/span&gt;ami-ccf615a5&lt;span class=&quot;String&quot;&gt;&amp;quot;&lt;/span&gt;&lt;/span&gt; &lt;span class=&quot;Comment&quot;&gt;&lt;span class=&quot;Comment&quot;&gt;#&lt;/span&gt;alestic jaunty&lt;/span&gt;&amp;#x000A;    availability_zones [&lt;span class=&quot;String&quot;&gt;&lt;span class=&quot;String&quot;&gt;'&lt;/span&gt;us-east-1a&lt;span class=&quot;String&quot;&gt;'&lt;/span&gt;&lt;/span&gt;]&amp;#x000A;    security_group &lt;span class=&quot;Keyword&quot;&gt;do&lt;/span&gt;&amp;#x000A;      &lt;span class=&quot;String&quot;&gt;&lt;span class=&quot;String&quot;&gt;%w(&lt;/span&gt;22 80&lt;span class=&quot;String&quot;&gt;)&lt;/span&gt;&lt;/span&gt;.&lt;span class=&quot;Entity&quot;&gt;each&lt;/span&gt; {|&lt;span class=&quot;Variable&quot;&gt;port&lt;/span&gt;|  authorize &lt;span class=&quot;Constant&quot;&gt;&lt;span class=&quot;Constant&quot;&gt;:&lt;/span&gt;from_port&lt;/span&gt; =&amp;gt; port, &lt;span class=&quot;Constant&quot;&gt;&lt;span class=&quot;Constant&quot;&gt;:&lt;/span&gt;to_port&lt;/span&gt; =&amp;gt; port}&amp;#x000A;    &lt;span class=&quot;Keyword&quot;&gt;end&lt;/span&gt;&amp;#x000A;  &lt;span class=&quot;Keyword&quot;&gt;end&lt;/span&gt;&amp;#x000A;  &amp;#x000A;&lt;span class=&quot;Keyword&quot;&gt;end&lt;/span&gt;&amp;#x000A;&lt;/pre&gt;
         &lt;/p&gt;
       &lt;/div&gt;
       &lt;div id='footer'&gt;</diff>
      <filename>site/examples.html</filename>
    </modified>
    <modified>
      <diff>@@ -49,27 +49,25 @@
               &lt;span&gt;Simplified.&lt;/span&gt;
             &lt;/p&gt;
             &lt;p class='intro'&gt;
-              PoolParty is a
-              &lt;span class='emphasis'&gt;cloud management system.&lt;/span&gt;
-              PoolParty makes it easy
-              to manage powerful and
-              &lt;span class='emphasis'&gt;complex deployments&lt;/span&gt;
-              on
+              PoolParty is a declarative
+              &lt;span class='emphasis'&gt;cloud infrastructure.&lt;/span&gt;
+              PoolParty provides an executable
+              description of a
               &lt;span class='emphasis'&gt;cloud computing&lt;/span&gt;
-              services such as Amazon EC2.
+              infrastructure in a single file.
             &lt;/p&gt;
           &lt;/div&gt;
           &lt;div class='intro-right'&gt;
-            &lt;img alt=&quot;Syntax sample 2&quot; src=&quot;images/syntax_sample_2.png&quot;/&gt;
+            &lt;img alt=&quot;Syntax sample 3&quot; src=&quot;images/syntax_sample_3.png&quot;/&gt;
           &lt;/div&gt;
         &lt;/div&gt;
         &lt;div class='features'&gt;
           &lt;h2&gt;Features:&lt;/h2&gt;
           &lt;ul&gt;
-            &lt;li&gt;built-in scaling, self-healing, monitoring, and load-balancing&lt;/li&gt;
-            &lt;li&gt;support for VMware, for testing clouds&lt;/li&gt;
+            &lt;li&gt;Git-style binaries&lt;/li&gt;
+            &lt;li&gt;support for ec2, load-balancers, autoscalers, security groups&lt;/li&gt;
             &lt;li&gt;
-              dependency resolution is based on
+              dependency resolution support built-in for
               &lt;a href='docs/chef.html'&gt;Chef&lt;/a&gt;
             &lt;/li&gt;
             &lt;li&gt;clear and extensible configuration&lt;/li&gt;
@@ -80,8 +78,6 @@
         &lt;p class='step'&gt;
           Setup
           &lt;a href=&quot;amazon_ec2_setup.html&quot;&gt;Amazon EC2&lt;/a&gt;
-          or
-          &lt;a href=&quot;vmware_setup.html&quot;&gt;VMware (Fusion)&lt;/a&gt;
         &lt;/p&gt;
         &lt;h2&gt;1. Install PoolParty gem&lt;/h2&gt;
         &lt;div class='tip-box'&gt;&lt;div class='crab-wrapper'&gt;&lt;img src='http://fairchild.github.com/poolparty/images/site/i/examples.png' class='crab'/&gt;&lt;/div&gt;Interested in developing PoolParty? Checkout
@@ -91,17 +87,22 @@
           &lt;pre class=&quot;blackboard&quot;&gt;  gem install --source http://gems.github.com auser-poolparty&amp;#x000A;&lt;/pre&gt;
         &lt;/p&gt;
         &lt;h2&gt;
-          2. Run the installer
+          2. Write your clouds.rb
         &lt;/h2&gt;
         &lt;p class='step'&gt;
-          Now run the PoolParty installer
-          &lt;pre class=&quot;blackboard&quot;&gt;  install-poolparty&amp;#x000A;&lt;/pre&gt;
+          &lt;pre class=&quot;blackboard&quot;&gt;pool &lt;span class=&quot;String&quot;&gt;&lt;span class=&quot;String&quot;&gt;&amp;quot;&lt;/span&gt;myapp&lt;span class=&quot;String&quot;&gt;&amp;quot;&lt;/span&gt;&lt;/span&gt; &lt;span class=&quot;Keyword&quot;&gt;do&lt;/span&gt;&amp;#x000A;  cloud &lt;span class=&quot;String&quot;&gt;&lt;span class=&quot;String&quot;&gt;&amp;quot;&lt;/span&gt;app&lt;span class=&quot;String&quot;&gt;&amp;quot;&lt;/span&gt;&lt;/span&gt; &lt;span class=&quot;Keyword&quot;&gt;do&lt;/span&gt;&amp;#x000A;    using &lt;span class=&quot;Constant&quot;&gt;&lt;span class=&quot;Constant&quot;&gt;:&lt;/span&gt;ec2&lt;/span&gt;&amp;#x000A;    instances &lt;span class=&quot;Constant&quot;&gt;1&lt;/span&gt;..&lt;span class=&quot;Constant&quot;&gt;1&lt;/span&gt;&amp;#x000A;    security_group &lt;span class=&quot;Keyword&quot;&gt;do&lt;/span&gt;&amp;#x000A;      authorize &lt;span class=&quot;Constant&quot;&gt;&lt;span class=&quot;Constant&quot;&gt;:&lt;/span&gt;from_port&lt;/span&gt; =&amp;gt; &lt;span class=&quot;Constant&quot;&gt;22&lt;/span&gt;, &lt;span class=&quot;Constant&quot;&gt;&lt;span class=&quot;Constant&quot;&gt;:&lt;/span&gt;to_port&lt;/span&gt; =&amp;gt; &lt;span class=&quot;Constant&quot;&gt;22&lt;/span&gt;&amp;#x000A;    &lt;span class=&quot;Keyword&quot;&gt;end&lt;/span&gt;&amp;#x000A;  &lt;span class=&quot;Keyword&quot;&gt;end&lt;/span&gt;&amp;#x000A;&lt;span class=&quot;Keyword&quot;&gt;end&lt;/span&gt;&amp;#x000A;&lt;/pre&gt;
         &lt;/p&gt;
         &lt;h2&gt;
-          3. Start your cloud!
+          3. View your cloud
         &lt;/h2&gt;
         &lt;p class='step'&gt;
-          &lt;pre class=&quot;blackboard&quot;&gt;  cloud start -v&amp;#x000A;&lt;/pre&gt;
+          &lt;pre class=&quot;blackboard&quot;&gt;  cloud show&amp;#x000A;&lt;/pre&gt;
+        &lt;/p&gt;
+        &lt;h2&gt;
+          4. Start your cloud!
+        &lt;/h2&gt;
+        &lt;p class='step'&gt;
+          &lt;pre class=&quot;blackboard&quot;&gt;  cloud start&amp;#x000A;&lt;/pre&gt;
         &lt;/p&gt;
         &lt;h2&gt;
           What next?</diff>
      <filename>site/index.html</filename>
    </modified>
    <modified>
      <diff>@@ -49,17 +49,14 @@
           into the cloud computing space.
         &lt;/p&gt;
         &lt;h2&gt;Terminology&lt;/h2&gt;
-        &lt;div class='term'&gt;&lt;a name='remoter base' class='term-name'&gt;remoter base&lt;/a&gt;
+        &lt;div class='term'&gt;&lt;a name='cloud_provider' class='term-name'&gt;cloud_provider&lt;/a&gt;
         &lt;div class='term-def'&gt;a
         &lt;em&gt;remoter base&lt;/em&gt;
         is also known as Cloud Provider, such as Amazon EC2. Remoter bases are
         responsible for creating and destroying instances. Currently, support exists
         for
         &lt;a href=&quot;amazon_ec2_setup.html&quot;&gt;Amazon EC2&lt;/a&gt;
-        and
-        &lt;a href=&quot;vmware_setup.html&quot;&gt;VMware&lt;/a&gt;
-        instances. Support is planned for disk images and other backends (Slicehost,
-        Eucalyptus, libvirt, etc.). Please update
+        Please update
         &lt;a href=&quot;http://wiki.github.com/auser/poolparty/requested-features&quot;&gt;Requested features&lt;/a&gt;
         with specific requests.&lt;/div&gt;&lt;/div&gt;
         &lt;div class='term'&gt;&lt;a name='instance' class='term-name'&gt;instance&lt;/a&gt;
@@ -68,44 +65,10 @@
         (or
         &lt;em&gt;node&lt;/em&gt;
         ) is a logical self-contained machine. Each instance has its own copy of the operating system and its own memory space.&lt;/div&gt;&lt;/div&gt;
-        &lt;div class='term'&gt;&lt;a name='provision' class='term-name'&gt;provision&lt;/a&gt;
-        &lt;div class='term-def'&gt;&lt;em&gt;provisioning&lt;/em&gt;
-        is the process of transfering all software and assets to an
-        &lt;a href=&quot;#instance&quot;&gt;instance&lt;/a&gt;&lt;/div&gt;&lt;/div&gt;
-        &lt;div class='term'&gt;&lt;a name='provisioner' class='term-name'&gt;provisioner&lt;/a&gt;
-        &lt;div class='term-def'&gt;A
-        &lt;em&gt;provisioner&lt;/em&gt;
-        allows communication between the host where the cloud commands
-        are being run (i.e. your laptop) and the
-        &lt;a href=&quot;#instance&quot;&gt;instances&lt;/a&gt;
-        created using
-        &lt;a href=&quot;#remoter_base&quot;&gt;remoter bases.&lt;/a&gt;
-        Examples include Capistrano and SSH. Their primary use is transfer
-        dependency files, templates, deploy_directory (if being used) and chef
-        recipes to the cloud.&lt;/div&gt;&lt;/div&gt;
         &lt;div class='term'&gt;&lt;a name='dependency resolver' class='term-name'&gt;dependency resolver&lt;/a&gt;
         &lt;div class='term-def'&gt;These are host configuration management tools such as Chef and Puppet. The
         default dependency resolver for PoolParty is
         &lt;a href=&quot;docs/chef.html&quot;&gt;Chef.&lt;/a&gt;&lt;/div&gt;&lt;/div&gt;
-        &lt;div class='term'&gt;&lt;a name='resources' class='term-name'&gt;resources&lt;/a&gt;
-        &lt;div class='term-def'&gt;entities that can be addressed and manipulated such as files, directories and
-        packages.&lt;/div&gt;&lt;/div&gt;
-        &lt;div class='term'&gt;&lt;a name='plugin' class='term-name'&gt;plugin&lt;/a&gt;
-        &lt;div class='term-def'&gt;Plugins are collections of resources. Use of PoolParty plugins and resources ensures that the cloud configuration does not change when the
-        &lt;a href=&quot;#dependency resolver&quot;&gt;dependency resolver&lt;/a&gt;
-        changes.&lt;/div&gt;&lt;/div&gt;
-        &lt;div class='term'&gt;&lt;a name='monitors' class='term-name'&gt;monitors&lt;/a&gt;
-        &lt;div class='term-def'&gt;This is set of monitoring services written as a Rack application running on
-        port 8642. In the near future Monitors will support a plugin interface that
-        will allow users to write cloud-specific or application-specific monitors.&lt;/div&gt;&lt;/div&gt;
-        &lt;div class='term'&gt;&lt;a name='cookbook' class='term-name'&gt;cookbook&lt;/a&gt;
-        &lt;div class='term-def'&gt;todo&lt;/div&gt;&lt;/div&gt;
-        &lt;div class='term'&gt;&lt;a name='recipe' class='term-name'&gt;recipe&lt;/a&gt;
-        &lt;div class='term-def'&gt;todo&lt;/div&gt;&lt;/div&gt;
-        &lt;div class='term'&gt;&lt;a name='bootstrap' class='term-name'&gt;bootstrap&lt;/a&gt;
-        &lt;div class='term-def'&gt;todo&lt;/div&gt;&lt;/div&gt;
-        &lt;div class='term'&gt;&lt;a name='configure' class='term-name'&gt;configure&lt;/a&gt;
-        &lt;div class='term-def'&gt;todo&lt;/div&gt;&lt;/div&gt;
       &lt;/div&gt;
       &lt;div id='footer'&gt;
         Copyright &amp;copy; 2008-2009 - Ari Lerner and Cloudteam at AT&amp;T Interactive</diff>
      <filename>site/language.html</filename>
    </modified>
    <modified>
      <diff>@@ -42,10 +42,9 @@
       gem install --source http://gems.github.com auser-poolparty
 
 %h2 
-  2. Run the installer
+  2. Write your clouds.rb
 
 %p.step 
-  Write your clouds.rb
   :syntaxhighlighter
     pool &quot;myapp&quot; do
       cloud &quot;app&quot; do</diff>
      <filename>src/pages/index.haml</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>1cd6366aaff7176c3662baacd5ad612c866fa5af</id>
    </parent>
  </parents>
  <author>
    <name>Ari Lerner</name>
    <email>arilerner@mac.com</email>
  </author>
  <url>http://github.com/auser/poolparty-website/commit/597455678e1c06d93611e01b80459c3a5f537857</url>
  <id>597455678e1c06d93611e01b80459c3a5f537857</id>
  <committed-date>2009-10-27T17:07:59-07:00</committed-date>
  <authored-date>2009-10-27T17:07:59-07:00</authored-date>
  <message>Quick fix for the header</message>
  <tree>30559839a50d5927dd874f6305f315bfac4df80c</tree>
  <committer>
    <name>Ari Lerner</name>
    <email>arilerner@mac.com</email>
  </committer>
</commit>
