You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by na...@apache.org on 2013/09/13 16:05:18 UTC

svn commit: r1522939 [6/7] - in /incubator/jclouds/site-content: ./ documentation/ documentation/community/ documentation/devguides/ documentation/devguides/continuous-integration/ documentation/devguides/contributing-to-documentation/ documentation/de...

Modified: incubator/jclouds/site-content/documentation/userguide/google-app-engine/index.html
URL: http://svn.apache.org/viewvc/incubator/jclouds/site-content/documentation/userguide/google-app-engine/index.html?rev=1522939&r1=1522938&r2=1522939&view=diff
==============================================================================
--- incubator/jclouds/site-content/documentation/userguide/google-app-engine/index.html (original)
+++ incubator/jclouds/site-content/documentation/userguide/google-app-engine/index.html Fri Sep 13 14:05:16 2013
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 
 <head>
-  <title>Using jclouds with Google App Engine</title>
+  <title>Apache jclouds&reg; :: Deploying to Google App Engine</title>
   <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
 
   <!-- **** jclouds stylesheet **** -->
@@ -41,7 +41,7 @@
 <li><a href="/documentation/">Documentation</a></li>
 <li><a href="/documentation/community/">Community</a></li>
 <li><a href="/documentation/devguides/">Development</a></li>
-<li><a href="http://groups.google.com/group/jclouds">Contact</a></li>
+<li><a href="http://incubator.apache.org/projects/jclouds.html">Contact</a></li>
 </ul>
 
  <!-- This bit of liquid lets us render the template components as markdown -->
@@ -49,7 +49,7 @@
     </div>
     <div id="content">
       <div id="column2">
-		<h1>Using jclouds with Google App Engine</h1>
+		<h1>Using Apache jclouds&reg; with Google App Engine</h1>
 
 <h2>Introduction</h2>
 
@@ -87,7 +87,8 @@ There are only a couple things you need 
                       <span class="o">.</span><span class="na">credentials</span><span class="o">(</span><span class="n">accesskey</span><span class="o">,</span> <span class="n">sceret</span><span class="o">)</span>
                       <span class="o">.</span><span class="na">modules</span><span class="o">(</span><span class="n">modules</span><span class="o">)</span>
                       <span class="o">.</span><span class="na">buildView</span><span class="o">(</span><span class="n">ComputeServiceContext</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <ul>
@@ -114,7 +115,8 @@ Google App Engine config only when runni
                       <span class="o">.</span><span class="na">credentials</span><span class="o">(</span><span class="n">accesskey</span><span class="o">,</span> <span class="n">sceret</span><span class="o">)</span>
                       <span class="o">.</span><span class="na">overrides</span><span class="o">(</span><span class="n">overrides</span><span class="o">)</span>
                       <span class="o">.</span><span class="na">buildView</span><span class="o">(</span><span class="n">ComputeServiceContext</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <h3>Usage with Clojure</h3>
@@ -128,7 +130,8 @@ org.jclouds/jclouds-gae if &lt; beta-9, 
 <div class="highlight"><pre><code class="clojure">  <span class="p">(</span><span class="k">def </span><span class="nv">compute</span>
     <span class="p">(</span><span class="nf">compute-service</span>
       <span class="s">&quot;aws-ec2&quot;</span> <span class="s">&quot;accessKey&quot;</span> <span class="s">&quot;secret&quot;</span> <span class="ss">:gae-async</span><span class="p">))</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <ul>
@@ -147,7 +150,8 @@ your WEB-INF directory, e.g., here are t
 <div class="highlight"><pre><code class="text">jclouds.blobstore=filesystem
 jclouds.filesystem.basedir=/tmp/blobstore
 filesystem.identity=foo
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <p>Edit or create <code>WEB-INF/jclouds-gae.properties</code></p>
@@ -159,7 +163,8 @@ jclouds.filesystem.basedir=/tmp/blobstor
 jclouds.modules=org.jclouds.gae.config.AsyncGoogleAppEngineConfigurationModule
 googlestorage.identity=accessKey
 googlestorage.credential=secret
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <h4>Configuring servlet listener</h4>
@@ -218,7 +223,8 @@ googlestorage.credential=secret
       <span class="k">return</span> <span class="n">props</span><span class="o">;</span>
    <span class="o">}</span>
 <span class="o">}</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <h3>Logging</h3>
@@ -254,7 +260,8 @@ You do not have luxury to synchronously 
 <div class="highlight"><pre><code class="java"><span class="n">computeService</span> <span class="o">=</span> <span class="n">context</span><span class="o">.</span><span class="na">getComputeService</span><span class="o">();</span>
 <span class="n">options</span> <span class="o">=</span> <span class="n">computeService</span><span class="o">.</span><span class="na">templateOptions</span><span class="o">().</span><span class="na">blockUntilRunning</span><span class="o">(</span><span class="kc">false</span><span class="o">);</span>
 <span class="n">template</span> <span class="o">=</span> <span class="n">computeService</span><span class="o">.</span><span class="na">templateBuilder</span><span class="o">().</span><span class="na">options</span><span class="o">(</span><span class="n">options</span><span class="o">).</span><span class="na">build</span><span class="o">();</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <ul>
@@ -279,7 +286,8 @@ You do not have luxury to synchronously 
                                   <span class="k">new</span> <span class="nf">AsyncGoogleAppEngineConfigurationModule</span><span class="o">()))</span>
                       <span class="o">.</span><span class="na">overrides</span><span class="o">(</span><span class="n">overrides</span><span class="o">)</span>
                       <span class="o">.</span><span class="na">buildView</span><span class="o">(</span><span class="n">ComputeServiceContext</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <h3>FAQ</h3>
@@ -296,7 +304,8 @@ java.lang.reflect.InvocationTargetExcept
     at com.google.appengine.runtime.Request.process-8e3e8ebfb87d6827(Request.java)
     at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
     at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
-</code></pre></div>
+</code></pre>
+</div>
 
 
 
@@ -306,11 +315,11 @@ java.lang.reflect.InvocationTargetExcept
     <div id="footer">
        <p>Copyright &copy; 2011-2013 <a href="http://www.apache.org">The Apache Software Foundation</a>. All Rights Reserved.</p>
 
-<p>jclouds is licensed under <a href="https://github.com/jclouds/jclouds/blob/master/resources/LICENSE.txt">the Apache License, Version 2.0</a>.</p>
-
 <p>Apache, jclouds, Apache jclouds, the jclouds logo, and the Apache feather logos are registered trademarks or trademarks of the Apache Software Foundation.</p>
+
+<p><a href="http://www.apache.org/licenses/">License</a> | <a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a> | <a href="http://www.apache.org/foundation/thanks.html">Thanks</a> | <a href="http://www.apache.org/security/">Security</a></p>
  <!-- This bit of liquid lets us render the template components as markdown -->
-     <img src="http://incubator.apache.org/images/egg-logo.png"/>
+     <a href="http://www.apache.org"><img src="http://incubator.apache.org/images/egg-logo.png"/></a>
     </div>
   </div>
 </body>

Modified: incubator/jclouds/site-content/documentation/userguide/index.html
URL: http://svn.apache.org/viewvc/incubator/jclouds/site-content/documentation/userguide/index.html?rev=1522939&r1=1522938&r2=1522939&view=diff
==============================================================================
--- incubator/jclouds/site-content/documentation/userguide/index.html (original)
+++ incubator/jclouds/site-content/documentation/userguide/index.html Fri Sep 13 14:05:16 2013
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 
 <head>
-  <title>User Guides Index</title>
+  <title>Apache jclouds&reg; :: User Guides Index</title>
   <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
 
   <!-- **** jclouds stylesheet **** -->
@@ -41,7 +41,7 @@
 <li><a href="/documentation/">Documentation</a></li>
 <li><a href="/documentation/community/">Community</a></li>
 <li><a href="/documentation/devguides/">Development</a></li>
-<li><a href="http://groups.google.com/group/jclouds">Contact</a></li>
+<li><a href="http://incubator.apache.org/projects/jclouds.html">Contact</a></li>
 </ul>
 
  <!-- This bit of liquid lets us render the template components as markdown -->
@@ -81,11 +81,11 @@
     <div id="footer">
        <p>Copyright &copy; 2011-2013 <a href="http://www.apache.org">The Apache Software Foundation</a>. All Rights Reserved.</p>
 
-<p>jclouds is licensed under <a href="https://github.com/jclouds/jclouds/blob/master/resources/LICENSE.txt">the Apache License, Version 2.0</a>.</p>
-
 <p>Apache, jclouds, Apache jclouds, the jclouds logo, and the Apache feather logos are registered trademarks or trademarks of the Apache Software Foundation.</p>
+
+<p><a href="http://www.apache.org/licenses/">License</a> | <a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a> | <a href="http://www.apache.org/foundation/thanks.html">Thanks</a> | <a href="http://www.apache.org/security/">Security</a></p>
  <!-- This bit of liquid lets us render the template components as markdown -->
-     <img src="http://incubator.apache.org/images/egg-logo.png"/>
+     <a href="http://www.apache.org"><img src="http://incubator.apache.org/images/egg-logo.png"/></a>
     </div>
   </div>
 </body>

Modified: incubator/jclouds/site-content/documentation/userguide/init-builder/index.html
URL: http://svn.apache.org/viewvc/incubator/jclouds/site-content/documentation/userguide/init-builder/index.html?rev=1522939&r1=1522938&r2=1522939&view=diff
==============================================================================
--- incubator/jclouds/site-content/documentation/userguide/init-builder/index.html (original)
+++ incubator/jclouds/site-content/documentation/userguide/init-builder/index.html Fri Sep 13 14:05:16 2013
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 
 <head>
-  <title>Design and Usage of the InitBuilder components</title>
+  <title>Apache jclouds&reg; :: Design and Usage of the InitBuilder components</title>
   <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
 
   <!-- **** jclouds stylesheet **** -->
@@ -41,7 +41,7 @@
 <li><a href="/documentation/">Documentation</a></li>
 <li><a href="/documentation/community/">Community</a></li>
 <li><a href="/documentation/devguides/">Development</a></li>
-<li><a href="http://groups.google.com/group/jclouds">Contact</a></li>
+<li><a href="http://incubator.apache.org/projects/jclouds.html">Contact</a></li>
 </ul>
 
  <!-- This bit of liquid lets us render the template components as markdown -->
@@ -58,7 +58,8 @@ the lifecycle of your applications at a 
 you to setup something like Tomcat on your Windows laptop and move it to a remote Linux machine.</p>
 
 <div class="highlight"><pre><code class="text">TODO example
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <p>InitBuilder introduces standard system variables, directory structures and
@@ -207,11 +208,11 @@ In Windows, we execute</code>net start %
     <div id="footer">
        <p>Copyright &copy; 2011-2013 <a href="http://www.apache.org">The Apache Software Foundation</a>. All Rights Reserved.</p>
 
-<p>jclouds is licensed under <a href="https://github.com/jclouds/jclouds/blob/master/resources/LICENSE.txt">the Apache License, Version 2.0</a>.</p>
-
 <p>Apache, jclouds, Apache jclouds, the jclouds logo, and the Apache feather logos are registered trademarks or trademarks of the Apache Software Foundation.</p>
+
+<p><a href="http://www.apache.org/licenses/">License</a> | <a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a> | <a href="http://www.apache.org/foundation/thanks.html">Thanks</a> | <a href="http://www.apache.org/security/">Security</a></p>
  <!-- This bit of liquid lets us render the template components as markdown -->
-     <img src="http://incubator.apache.org/images/egg-logo.png"/>
+     <a href="http://www.apache.org"><img src="http://incubator.apache.org/images/egg-logo.png"/></a>
     </div>
   </div>
 </body>

Modified: incubator/jclouds/site-content/documentation/userguide/installation-guide/index.html
URL: http://svn.apache.org/viewvc/incubator/jclouds/site-content/documentation/userguide/installation-guide/index.html?rev=1522939&r1=1522938&r2=1522939&view=diff
==============================================================================
--- incubator/jclouds/site-content/documentation/userguide/installation-guide/index.html (original)
+++ incubator/jclouds/site-content/documentation/userguide/installation-guide/index.html Fri Sep 13 14:05:16 2013
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 
 <head>
-  <title>Installation</title>
+  <title>Apache jclouds&reg; :: Installation</title>
   <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
 
   <!-- **** jclouds stylesheet **** -->
@@ -41,7 +41,7 @@
 <li><a href="/documentation/">Documentation</a></li>
 <li><a href="/documentation/community/">Community</a></li>
 <li><a href="/documentation/devguides/">Development</a></li>
-<li><a href="http://groups.google.com/group/jclouds">Contact</a></li>
+<li><a href="http://incubator.apache.org/projects/jclouds.html">Contact</a></li>
 </ul>
 
  <!-- This bit of liquid lets us render the template components as markdown -->
@@ -73,7 +73,8 @@
 
 
 <div class="highlight"><pre><code class="clojure"><span class="p">(</span><span class="kd">defproject </span><span class="nv">deps</span> <span class="s">&quot;1&quot;</span> <span class="ss">:dependencies</span> <span class="p">[[</span><span class="nv">org.apache.jclouds/jclouds-all</span> <span class="s">&quot;1.6.1-incubating&quot;</span><span class="p">]</span> <span class="p">[</span><span class="nv">org.apache.jclouds.driver/jclouds-sshj</span> <span class="s">&quot;1.6.1-incubating&quot;</span><span class="p">]])</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <ul>
@@ -95,7 +96,8 @@ the following your project's <strong>pom
     <span class="nt">&lt;version&gt;</span>1.6.1-incubating<span class="nt">&lt;/version&gt;</span>
   <span class="nt">&lt;/dependency&gt;</span>
 <span class="nt">&lt;/dependencies&gt;</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <h2><a id="ant"></a>Getting the binaries using Apache Ant</h2>
@@ -130,19 +132,22 @@ the following your project's <strong>pom
              <span class="na">classpathref=</span><span class="s">&quot;maven-ant-tasks.classpath&quot;</span><span class="nt">/&gt;</span>
   <span class="nt">&lt;/target&gt;</span>
 <span class="nt">&lt;/project&gt;</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <p>To only fetch the jars for a particular provider replace</p>
 
 <div class="highlight"><pre><code class="xml">      <span class="nt">&lt;dependency</span> <span class="na">groupId=</span><span class="s">&quot;org.apache.jclouds&quot;</span> <span class="na">artifactId=</span><span class="s">&quot;jclouds-all&quot;</span> <span class="na">version=</span><span class="s">&quot;1.6.1-incubating&quot;</span> <span class="nt">/&gt;</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <p>with</p>
 
 <div class="highlight"><pre><code class="xml">      <span class="nt">&lt;dependency</span> <span class="na">groupId=</span><span class="s">&quot;org.apache.jclouds.provider&quot;</span> <span class="na">artifactId=</span><span class="s">&quot;the-provider-id&quot;</span> <span class="na">version=</span><span class="s">&quot;1.6.1-incubating&quot;</span> <span class="nt">/&gt;</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <p>You can see the list of supported providers and their ids in the <a href="/documentation/reference/supported-providers">Supported Providers</a>.</p>
@@ -160,7 +165,8 @@ Then, add jclouds to your <strong>build.
               <span class="na">artifactId=</span><span class="s">&quot;jclouds-allblobstore&quot;</span>
               <span class="na">version=</span><span class="s">&quot;1.6.1-incubating&quot;</span> <span class="nt">/&gt;</span>
 <span class="nt">&lt;/artifact:dependencies&gt;</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <h2><a id="clojure-project"></a>Adding jclouds to your Clojure project using leiningen</h2>
@@ -172,7 +178,8 @@ Then, add jclouds to your <strong>build.
                <span class="p">[</span><span class="nv">org.clojure/tools.logging</span> <span class="s">&quot;0.2.3&quot;</span><span class="p">]</span>
                <span class="p">[</span><span class="nv">org.apache.jclouds/jclouds-allcompute</span> <span class="s">&quot;1.6.1-incubating&quot;</span><span class="p">]</span>
                <span class="p">[</span><span class="nv">org.apache.jclouds/jclouds-allblobstore</span> <span class="s">&quot;1.6.1-incubating&quot;</span><span class="p">]]</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <h2><a id="lib"></a>Making your own lib dir</h2>
@@ -228,7 +235,8 @@ Then, add jclouds to your <strong>build.
     <span class="nt">&lt;version&gt;</span>1.6.2-SNAPSHOT<span class="nt">&lt;/version&gt;</span>
   <span class="nt">&lt;/dependency&gt;</span>
 <span class="nt">&lt;/dependencies&gt;</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <h2><a id="snapshot-ant"></a>Adding jclouds snapshot to your Apache Ant project</h2>
@@ -248,7 +256,8 @@ Then, add jclouds to your <strong>build.
               <span class="na">version=</span><span class="s">&quot;1.6.2-SNAPSHOT&quot;</span> <span class="nt">/&gt;</span>
   <span class="nt">&lt;remoteRepository</span> <span class="na">refid=</span><span class="s">&quot;jclouds.snapshot.repository&quot;</span> <span class="nt">/&gt;</span>
 <span class="nt">&lt;/artifact:dependencies&gt;</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <h2><a id="snapshot-lein"></a>Adding jclouds snapshots to your leiningen (clojure) project</h2>
@@ -261,7 +270,8 @@ Then, add jclouds to your <strong>build.
                  <span class="p">[</span><span class="nv">org.apache.jclouds/jclouds-allcompute</span> <span class="s">&quot;1.6.2-SNAPSHOT&quot;</span><span class="p">]</span>
                  <span class="p">[</span><span class="nv">org.apache.jclouds/jclouds-allblobstore</span> <span class="s">&quot;1.6.2-SNAPSHOT&quot;</span><span class="p">]]</span>
   <span class="ss">:repositories</span> <span class="p">{</span> <span class="s">&quot;jclouds-snapshot&quot;</span> <span class="s">&quot;https://oss.sonatype.org/content/repositories/snapshots&quot;</span><span class="p">}</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 
@@ -271,11 +281,11 @@ Then, add jclouds to your <strong>build.
     <div id="footer">
        <p>Copyright &copy; 2011-2013 <a href="http://www.apache.org">The Apache Software Foundation</a>. All Rights Reserved.</p>
 
-<p>jclouds is licensed under <a href="https://github.com/jclouds/jclouds/blob/master/resources/LICENSE.txt">the Apache License, Version 2.0</a>.</p>
-
 <p>Apache, jclouds, Apache jclouds, the jclouds logo, and the Apache feather logos are registered trademarks or trademarks of the Apache Software Foundation.</p>
+
+<p><a href="http://www.apache.org/licenses/">License</a> | <a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a> | <a href="http://www.apache.org/foundation/thanks.html">Thanks</a> | <a href="http://www.apache.org/security/">Security</a></p>
  <!-- This bit of liquid lets us render the template components as markdown -->
-     <img src="http://incubator.apache.org/images/egg-logo.png"/>
+     <a href="http://www.apache.org"><img src="http://incubator.apache.org/images/egg-logo.png"/></a>
     </div>
   </div>
 </body>

Modified: incubator/jclouds/site-content/documentation/userguide/karaf/index.html
URL: http://svn.apache.org/viewvc/incubator/jclouds/site-content/documentation/userguide/karaf/index.html?rev=1522939&r1=1522938&r2=1522939&view=diff
==============================================================================
--- incubator/jclouds/site-content/documentation/userguide/karaf/index.html (original)
+++ incubator/jclouds/site-content/documentation/userguide/karaf/index.html Fri Sep 13 14:05:16 2013
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 
 <head>
-  <title>jclouds on Apache Karaf</title>
+  <title>Apache jclouds&reg; :: On Apache Karaf</title>
   <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
 
   <!-- **** jclouds stylesheet **** -->
@@ -41,7 +41,7 @@
 <li><a href="/documentation/">Documentation</a></li>
 <li><a href="/documentation/community/">Community</a></li>
 <li><a href="/documentation/devguides/">Development</a></li>
-<li><a href="http://groups.google.com/group/jclouds">Contact</a></li>
+<li><a href="http://incubator.apache.org/projects/jclouds.html">Contact</a></li>
 </ul>
 
  <!-- This bit of liquid lets us render the template components as markdown -->
@@ -49,7 +49,7 @@
     </div>
     <div id="content">
       <div id="column2">
-		<h1>Installation Instructions for jclouds on Apache Karaf</h1>
+		<h1>Installation Instructions for Apache jclouds&reg; on Apache Karaf</h1>
 
 <h2>Introduction</h2>
 
@@ -105,7 +105,8 @@ source and building it and go directly t
 <div class="highlight"><pre><code class="sh">git clone git://github.com/jclouds/jclouds-karaf.git
 <span class="nb">cd </span>jclouds-karaf
 mvn clean install
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <ol>
@@ -115,7 +116,8 @@ mvn clean install
 
 <div class="highlight"><pre><code class="text">features:addurl mvn:org.jclouds.karaf/feature/1.0/xml/features
 features:install jclouds
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <ol>
@@ -124,7 +126,8 @@ features:install jclouds
 
 
 <div class="highlight"><pre><code class="text">features:list | grep jclouds
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <p><em><em>Example</em></em></p>
@@ -135,7 +138,8 @@ features:install jclouds
 
 
 <div class="highlight"><pre><code class="text">features:install jclouds-aws-s3
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <h2>Running the examples</h2>
@@ -149,13 +153,15 @@ can change dynamically, and they may be 
 <div class="highlight"><pre><code class="text">git clone https://iocanel@github.com/jclouds/jclouds-examples.git
 cd jclouds-examples/blobstore-karaf-shell
 mvn clean install
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <p>Then from Karaf shell you can install the example:</p>
 
 <div class="highlight"><pre><code class="text">osgi:install -s mvn:org.jclouds.examples/blobstore-karaf-shell/1.0-SNAPSHOT
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <p>The command above installs in Karaf two new commands:</p>
@@ -176,14 +182,16 @@ config:propset provider aws-s3
 config:propset accessKeyId XXXXXX 
 config:propset secretKey XXXXXX 
 config:update
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <p>Now you are ready to use the commands</p>
 
 <div class="highlight"><pre><code class="text">jclouds:blobstore-write mybucket myblob JCloudsRocks
 jclouds:blobstore-write mybucket myblob
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <p>At any point in time, you can edit the configuration, either using the shell or
@@ -197,11 +205,11 @@ This way you can even switch providers.<
     <div id="footer">
        <p>Copyright &copy; 2011-2013 <a href="http://www.apache.org">The Apache Software Foundation</a>. All Rights Reserved.</p>
 
-<p>jclouds is licensed under <a href="https://github.com/jclouds/jclouds/blob/master/resources/LICENSE.txt">the Apache License, Version 2.0</a>.</p>
-
 <p>Apache, jclouds, Apache jclouds, the jclouds logo, and the Apache feather logos are registered trademarks or trademarks of the Apache Software Foundation.</p>
+
+<p><a href="http://www.apache.org/licenses/">License</a> | <a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a> | <a href="http://www.apache.org/foundation/thanks.html">Thanks</a> | <a href="http://www.apache.org/security/">Security</a></p>
  <!-- This bit of liquid lets us render the template components as markdown -->
-     <img src="http://incubator.apache.org/images/egg-logo.png"/>
+     <a href="http://www.apache.org"><img src="http://incubator.apache.org/images/egg-logo.png"/></a>
     </div>
   </div>
 </body>

Modified: incubator/jclouds/site-content/documentation/userguide/terremark/index.html
URL: http://svn.apache.org/viewvc/incubator/jclouds/site-content/documentation/userguide/terremark/index.html?rev=1522939&r1=1522938&r2=1522939&view=diff
==============================================================================
--- incubator/jclouds/site-content/documentation/userguide/terremark/index.html (original)
+++ incubator/jclouds/site-content/documentation/userguide/terremark/index.html Fri Sep 13 14:05:16 2013
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 
 <head>
-  <title>Overview of the Terremark Compute Offerings</title>
+  <title>Apache jclouds&reg; :: Overview of the Terremark Compute Offerings</title>
   <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
 
   <!-- **** jclouds stylesheet **** -->
@@ -41,7 +41,7 @@
 <li><a href="/documentation/">Documentation</a></li>
 <li><a href="/documentation/community/">Community</a></li>
 <li><a href="/documentation/devguides/">Development</a></li>
-<li><a href="http://groups.google.com/group/jclouds">Contact</a></li>
+<li><a href="http://incubator.apache.org/projects/jclouds.html">Contact</a></li>
 </ul>
 
  <!-- This bit of liquid lets us render the template components as markdown -->
@@ -110,7 +110,8 @@ description of the vApp template. Please
    echo p4ssw0rd|sudo -S echo hello
    echo nameserver 208.67.222.222 |sudo tee -a /etc/resolv.conf
    echo nameserver 208.67.220.220 |sudo tee -a /etc/resolv.conf
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <h2>Extension Guide</h2>
@@ -135,7 +136,8 @@ You must have a default ssh key, althoug
 <div class="highlight"><pre><code class="java"><span class="c1">// null for default org</span>
 <span class="n">TerremarkOrg</span> <span class="n">org</span> <span class="o">=</span> <span class="n">vCloudExpressClient</span><span class="o">.</span><span class="na">findOrgNamed</span><span class="o">(</span><span class="kc">null</span><span class="o">);</span>
 <span class="n">key</span> <span class="o">=</span> <span class="n">vCloudExpressClient</span><span class="o">.</span><span class="na">generateKeyPairInOrg</span><span class="o">(</span><span class="n">org</span><span class="o">.</span><span class="na">getHref</span><span class="o">(),</span> <span class="s">&quot;livetest&quot;</span><span class="o">,</span> <span class="kc">false</span><span class="o">);</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <h3>Listing Keys</h3>
@@ -143,7 +145,8 @@ You must have a default ssh key, althoug
 <div class="highlight"><pre><code class="java"><span class="c1">// null for default org,  note that the private part of the key is not stored at terremark</span>
 <span class="n">Set</span><span class="o">&lt;</span><span class="n">KeyPair</span><span class="o">&gt;</span> <span class="n">response</span> <span class="o">=</span> <span class="n">vCloudExpressClient</span><span class="o">.</span><span class="na">listKeyPairsInOrg</span><span class="o">(</span><span class="kc">null</span><span class="o">);</span>
     
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <h3>Password management</h3>
@@ -161,7 +164,8 @@ You must have a default ssh key, althoug
 <span class="n">CustomizationParameters</span> <span class="n">customizationOptions</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">getCustomizationOptions</span><span class="o">(</span><span class="n">item</span><span class="o">.</span><span class="na">getCustomizationOptions</span><span class="o">().</span><span class="na">getHref</span><span class="o">());</span>
 <span class="k">if</span> <span class="o">(</span><span class="n">customizationOptions</span><span class="o">.</span><span class="na">canCustomizePassword</span><span class="o">())</span>
          <span class="c1">// you can set it</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <ul>
@@ -176,7 +180,8 @@ Here's is how you can get the descriptio
 <span class="n">TerremarkCatalogItem</span> <span class="n">item</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">findCatalogItemInOrgCatalogNamed</span><span class="o">(</span><span class="kc">null</span><span class="o">,</span> <span class="kc">null</span><span class="o">,</span> <span class="s">&quot;Ubuntu 8.04 LTS (x86)&quot;</span><span class="o">);</span>
 
 <span class="n">String</span> <span class="n">description</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">getVAppTemplate</span><span class="o">(</span><span class="n">item</span><span class="o">.</span><span class="na">getHref</span><span class="o">()).</span><span class="na">getDescription</span><span class="o">();</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <h3>Instantiating vApp Templates</h3>
@@ -213,7 +218,8 @@ Even though this happens, you need to ca
      <span class="c1">// block until poweron task shows success</span>
      <span class="k">if</span> <span class="o">(!</span><span class="n">taskTester</span><span class="o">.</span><span class="na">apply</span><span class="o">(</span><span class="n">onTask</span><span class="o">.</span><span class="na">getHref</span><span class="o">()))</span> 
           <span class="k">throw</span> <span class="k">new</span> <span class="nf">Exception</span><span class="o">(</span><span class="s">&quot;could not turn on &quot;</span><span class="o">+</span><span class="n">vApp</span><span class="o">.</span><span class="na">getHref</span><span class="o">());</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <ul>
@@ -240,7 +246,8 @@ Static import <code>processorCount</code
 <span class="o">...</span>
 
 <span class="n">vApp</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">instantiateVAppTemplateInVDC</span><span class="o">(</span><span class="n">vdc</span><span class="o">.</span><span class="na">getHref</span><span class="o">(),</span> <span class="n">vAppTemplate</span><span class="o">.</span><span class="na">getHref</span><span class="o">(),</span> <span class="n">serverName</span><span class="o">,</span> <span class="n">processorCount</span><span class="o">(</span><span class="mi">2</span><span class="o">).</span><span class="na">memory</span><span class="o">(</span><span class="mi">1024</span><span class="o">));</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <ul>
@@ -253,7 +260,8 @@ Static import <code>processorCount</code
 <div class="highlight"><pre><code class="java"><span class="kn">import</span> <span class="nn">static</span> <span class="n">org</span><span class="o">.</span><span class="na">jclouds</span><span class="o">.</span><span class="na">vcloud</span><span class="o">.</span><span class="na">terremark</span><span class="o">.</span><span class="na">options</span><span class="o">.</span><span class="na">TerremarkInstantiateVAppTemplateOptions</span><span class="o">.</span><span class="na">Builder</span><span class="o">.</span><span class="na">sshKeyFingerprint</span><span class="o">;</span>
 
 <span class="n">vApp</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">instantiateVAppTemplateInVDC</span><span class="o">(</span><span class="n">vdc</span><span class="o">.</span><span class="na">getHref</span><span class="o">(),</span> <span class="n">vAppTemplate</span><span class="o">.</span><span class="na">getHref</span><span class="o">(),</span> <span class="n">serverName</span><span class="o">,</span> <span class="n">sshKeyFingerprint</span><span class="o">(</span><span class="n">key</span><span class="o">.</span><span class="na">getFingerPrint</span><span class="o">()));</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <ul>
@@ -270,7 +278,8 @@ Note that if a password is sent and not 
 
 <span class="o">...</span>
       <span class="n">vApp</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">instantiateVAppTemplateInVDC</span><span class="o">(</span><span class="n">vdc</span><span class="o">.</span><span class="na">getHref</span><span class="o">(),</span> <span class="n">vAppTemplate</span><span class="o">.</span><span class="na">getHref</span><span class="o">(),</span> <span class="n">serverName</span><span class="o">,</span> <span class="n">withPassword</span><span class="o">(</span><span class="s">&quot;robotsarefun&quot;</span><span class="o">));</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <h3>Configuring vApps</h3>
@@ -286,7 +295,8 @@ Note that if a password is sent and not 
 ...
 
    Task task = client.configureVApp(vApp, changeNameTo(&quot;eduardo&quot;));
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <ul>
@@ -298,7 +308,8 @@ Note that if a password is sent and not 
 <span class="o">...</span>
 
    <span class="n">Task</span> <span class="n">task</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">configureVApp</span><span class="o">(</span><span class="n">vApp</span><span class="o">,</span> <span class="n">changeProcessorCountTo</span><span class="o">(</span><span class="mi">2</span><span class="o">));</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <ul>
@@ -310,7 +321,8 @@ Note that if a password is sent and not 
 <span class="o">...</span>
 
 <span class="n">Task</span> <span class="n">task</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">configureVApp</span><span class="o">(</span><span class="n">vApp</span><span class="o">,</span> <span class="n">changeMemoryTo</span><span class="o">(</span><span class="mi">1024</span><span class="o">));</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <ul>
@@ -321,7 +333,8 @@ Note that if a password is sent and not 
 <div class="highlight"><pre><code class="java"><span class="kn">import</span> <span class="nn">static</span> <span class="n">org</span><span class="o">.</span><span class="na">jclouds</span><span class="o">.</span><span class="na">vcloud</span><span class="o">.</span><span class="na">terremark</span><span class="o">.</span><span class="na">domain</span><span class="o">.</span><span class="na">VAppConfiguration</span><span class="o">.</span><span class="na">Builder</span><span class="o">.</span><span class="na">addDisk</span><span class="o">;</span>
 <span class="o">...</span>
    <span class="n">Task</span> <span class="n">task</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">configureVApp</span><span class="o">(</span><span class="n">vApp</span><span class="o">,</span> <span class="n">addDisk</span><span class="o">(</span><span class="mi">1048576</span><span class="o">));</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <ul>
@@ -341,7 +354,8 @@ Get a reference to your vApp and select 
  
 <span class="c1">// delete the second disk</span>
 <span class="n">Task</span> <span class="n">task</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">configureVApp</span><span class="o">(</span><span class="n">vApp</span><span class="o">,</span> <span class="n">deleteDiskWithAddressOnParent</span><span class="o">(</span><span class="n">disks</span><span class="o">.</span><span class="na">get</span><span class="o">(</span><span class="mi">1</span><span class="o">).</span><span class="na">getAddressOnParent</span><span class="o">()));</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <h3>IP Addresses</h3>
@@ -387,7 +401,8 @@ Here's how:</p>
 <span class="c1">// Everything is setup!</span>
 <span class="n">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">printf</span><span class="o">(</span><span class="s">&quot;you can now connect to ssh://%s:22%n&quot;</span><span class="o">,</span> <span class="n">publicIp</span><span class="o">.</span><span class="na">getHostAddress</span><span class="o">());</span>
 <span class="n">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">printf</span><span class="o">(</span><span class="s">&quot;when you start a webserver it will be at http://%s%n&quot;</span><span class="o">,</span> <span class="n">publicIp</span><span class="o">.</span><span class="na">getHostAddress</span><span class="o">());</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <ul>
@@ -411,7 +426,8 @@ Here's how:</p>
   <span class="n">ip</span> <span class="o">=</span> <span class="n">TerremarkECloudClient</span><span class="o">.</span><span class="na">class</span><span class="o">.</span><span class="na">cast</span><span class="o">(</span><span class="n">client</span><span class="o">).</span><span class="na">activatePublicIpInVDC</span><span class="o">(</span>
           <span class="n">vdc</span><span class="o">.</span><span class="na">getHref</span><span class="o">());</span>
 <span class="o">}</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <ul>
@@ -429,7 +445,8 @@ For example, if you want to open SSH and
 <span class="c1">// a Node is a connection to a public IP on a particular port.</span>
 <span class="n">Node</span> <span class="n">node</span> <span class="o">=</span> <span class="n">tmClient</span>
        <span class="o">.</span><span class="na">addNode</span><span class="o">(</span><span class="n">is</span><span class="o">.</span><span class="na">getHref</span><span class="o">(),</span> <span class="n">privateAddress</span><span class="o">,</span> <span class="n">vApp</span><span class="o">.</span><span class="na">getName</span><span class="o">()</span> <span class="o">+</span> <span class="s">&quot;-&quot;</span> <span class="o">+</span> <span class="n">port</span><span class="o">,</span> <span class="n">port</span><span class="o">);</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <h2>Troubleshooting</h2>
@@ -444,7 +461,8 @@ For example, if you want to open SSH and
 The list of available networks is in the exception message.  For example:</p>
 
 <div class="highlight"><pre><code class="text">1) Error in custom provider, java.lang.IllegalStateException: you must specify the property jclouds.vcloud.defaults.network as one of [10.1.1.160/27, 10.1.1.192/27, 10.1.1.224/27, 10.1.1.0/28]
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <p>`</p>
@@ -459,7 +477,8 @@ The list of available networks is in the
                       <span class="o">.</span><span class="na">modules</span><span class="o">(</span><span class="n">ImmutableSet</span><span class="o">.&lt;</span><span class="n">Module</span><span class="o">&gt;</span> <span class="n">of</span><span class="o">(</span><span class="k">new</span> <span class="n">Log4JLoggingModule</span><span class="o">(),</span>
                                                         <span class="k">new</span> <span class="nf">SshjSshClientModule</span><span class="o">()))</span>
                       <span class="o">.</span><span class="na">buildView</span><span class="o">(</span><span class="n">ComputeServiceContext</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 
@@ -469,11 +488,11 @@ The list of available networks is in the
     <div id="footer">
        <p>Copyright &copy; 2011-2013 <a href="http://www.apache.org">The Apache Software Foundation</a>. All Rights Reserved.</p>
 
-<p>jclouds is licensed under <a href="https://github.com/jclouds/jclouds/blob/master/resources/LICENSE.txt">the Apache License, Version 2.0</a>.</p>
-
 <p>Apache, jclouds, Apache jclouds, the jclouds logo, and the Apache feather logos are registered trademarks or trademarks of the Apache Software Foundation.</p>
+
+<p><a href="http://www.apache.org/licenses/">License</a> | <a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a> | <a href="http://www.apache.org/foundation/thanks.html">Thanks</a> | <a href="http://www.apache.org/security/">Security</a></p>
  <!-- This bit of liquid lets us render the template components as markdown -->
-     <img src="http://incubator.apache.org/images/egg-logo.png"/>
+     <a href="http://www.apache.org"><img src="http://incubator.apache.org/images/egg-logo.png"/></a>
     </div>
   </div>
 </body>

Modified: incubator/jclouds/site-content/documentation/userguide/using-abiquo/index.html
URL: http://svn.apache.org/viewvc/incubator/jclouds/site-content/documentation/userguide/using-abiquo/index.html?rev=1522939&r1=1522938&r2=1522939&view=diff
==============================================================================
--- incubator/jclouds/site-content/documentation/userguide/using-abiquo/index.html (original)
+++ incubator/jclouds/site-content/documentation/userguide/using-abiquo/index.html Fri Sep 13 14:05:16 2013
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 
 <head>
-  <title>Using the Abiquo cloud</title>
+  <title>Apache jclouds&reg; :: Using the Abiquo cloud</title>
   <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
 
   <!-- **** jclouds stylesheet **** -->
@@ -41,7 +41,7 @@
 <li><a href="/documentation/">Documentation</a></li>
 <li><a href="/documentation/community/">Community</a></li>
 <li><a href="/documentation/devguides/">Development</a></li>
-<li><a href="http://groups.google.com/group/jclouds">Contact</a></li>
+<li><a href="http://incubator.apache.org/projects/jclouds.html">Contact</a></li>
 </ul>
 
  <!-- This bit of liquid lets us render the template components as markdown -->
@@ -61,7 +61,8 @@
     <span class="o">.</span><span class="na">endpoint</span><span class="o">(</span><span class="s">&quot;http://localhost/api&quot;</span><span class="o">)</span>
     <span class="o">.</span><span class="na">credentials</span><span class="o">(</span><span class="s">&quot;user&quot;</span><span class="o">,</span> <span class="s">&quot;password&quot;</span><span class="o">)</span>
     <span class="o">.</span><span class="na">buildView</span><span class="o">(</span><span class="n">AbiquoContext</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <h2>Context root services</h2>
@@ -75,7 +76,8 @@
 <span class="c1">// Get access to the cloud API</span>
 <span class="n">CloudService</span> <span class="n">cloud</span> <span class="o">=</span> <span class="n">context</span><span class="o">.</span><span class="na">getCloudService</span><span class="o">()</span>
 <span class="n">List</span><span class="o">&lt;</span><span class="n">VirtualMachine</span><span class="o">&gt;</span> <span class="n">vms</span> <span class="o">=</span> <span class="n">cloud</span><span class="o">.</span><span class="na">listVirtualMachines</span><span class="o">()</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <h2>Using the domain objects to perform operations</h2>
@@ -93,7 +95,8 @@
 <span class="n">datacenter</span><span class="o">.</span><span class="na">update</span><span class="o">();</span>
 <span class="c1">// Delete the datacenter        </span>
 <span class="n">datacenter</span><span class="o">.</span><span class="na">delete</span><span class="o">();</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <h2>A more complete example</h2>
@@ -116,7 +119,8 @@
 <span class="o">{</span>
    <span class="n">context</span><span class="o">.</span><span class="na">close</span><span class="o">();</span>
 <span class="o">}</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <h1>The Administration API by example</h1>
@@ -161,7 +165,8 @@
 
 <span class="c1">// At this point the compute infrastructure is ready and users will be able to start</span>
 <span class="c1">// deploying virtual machines</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <h2>Configuring the storage infrastructure</h2>
@@ -205,7 +210,8 @@
 
 <span class="c1">// At this point the infrastructure is ready with one storage tier and users will be</span>
 <span class="c1">// able to create volumes on demand.</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <h2>Configuring the network infrastructure</h2>
@@ -264,7 +270,8 @@
 
 <span class="c1">// At this point the infrastructure is ready with a public network that can be used by anyone, and an external</span>
 <span class="c1">// and unmanaged network that have been assigned to a tenant.</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <p>The default network creation enables all IP addresses inside the network range. To customize this, and disable a set of IPs so they cannot be used, or to put them in quarantine, you can iterate the available IPs and update them accordingly as shown in the example:</p>
@@ -275,7 +282,8 @@
     <span class="n">publicIp</span><span class="o">.</span><span class="na">setAvailable</span><span class="o">(</span><span class="kc">false</span><span class="o">);</span>
     <span class="n">publicIp</span><span class="o">.</span><span class="na">update</span><span class="o">();</span>
 <span class="o">}</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <h2>Managing tenants</h2>
@@ -316,7 +324,8 @@
 
 <span class="c1">// At this point, the new Enterprise is created and ready to begin consuming the resources</span>
 <span class="c1">// of the cloud</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <h1>The Cloud API by example</h1>
@@ -378,7 +387,8 @@
 
 <span class="c1">// At this point the virtual infrastructure is ready and users will be able to start</span>
 <span class="c1">// deploying virtual machines</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <h2>Deploying virtual machines</h2>
@@ -414,7 +424,8 @@
 
 <span class="c1">// At this point a deployment job has been started asynchronously and the </span>
 <span class="c1">// virtual machine will be deployed in the background</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <h3>Monitoring virtual machine deployments</h3>
@@ -434,7 +445,8 @@
 
 <span class="c1">// At this point the deployment has finished and the virtual machine will provide detailed</span>
 <span class="c1">// information about the status of the deployment.</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <h4>Deploy a virtual machine and wait asynchronously</h4>
@@ -455,7 +467,8 @@
         <span class="c1">// Handle timeout here</span>
     <span class="o">}</span>
 <span class="o">}</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <p>Once the handler has been defined, it only needs to be registered to start receiving events. It will receive <strong>ALL</strong> events from all objects, so if you only want to handle the events of a particular object, make sure to check against the <strong>event.getTarget()</strong> method in your handler code to ensure you are handling the right event.</p>
@@ -475,14 +488,16 @@
 <span class="c1">// The &#39;monitor&#39; method will not block and the program execution will continue</span>
 <span class="c1">// normally. Events will be dispatched to handlers when the monitor completes, fails</span>
 <span class="c1">// or reaches timeout.</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <p>Do not forget to <strong>unregister</strong> your handler so you stop receiving events when you are done. This can be done by invoking the monitoring service as follows:</p>
 
 <div class="highlight"><pre><code class="java"><span class="n">VirtualMachineMonitor</span> <span class="n">monitor</span> <span class="o">=</span> <span class="n">context</span><span class="o">.</span><span class="na">getMonitoringService</span><span class="o">().</span><span class="na">getVirtualMachineMonitor</span><span class="o">();</span>
 <span class="n">monitor</span><span class="o">.</span><span class="na">unregister</span><span class="o">(</span><span class="n">handler</span><span class="o">);</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <p>You may want to unregister the handler inside the event handler methods. There is no limitation on that. Feel free to code your handlers however you like.</p>
@@ -528,7 +543,8 @@
 
 <span class="c1">// At this point the virtual machine is configured with an additional 2GB hard</span>
 <span class="c1">// disk, and a 20GB additional persistent iscsi volume.</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <h2>Configuring networking in virtual machines</h2>
@@ -563,7 +579,7 @@
 <span class="n">Datacenter</span> <span class="n">datacenter</span> <span class="o">=</span> <span class="n">vdc</span><span class="o">.</span><span class="na">getDatacenter</span><span class="o">();</span>
 <span class="n">ExternalNetwork</span> <span class="n">extNet</span> <span class="o">=</span>
     <span class="n">enterprise</span><span class="o">.</span><span class="na">findExternalNetwork</span><span class="o">(</span><span class="n">datacenter</span><span class="o">,</span>
-        <span class="n">NetworkPredicates</span><span class="o">.&lt;</span><span class="n">ExternalIp</span><span class="o">&gt;</span> <span class="nf">name</span><span class="o">(</span><span class="s">&quot;ExternalNetwork&quot;</span><span class="o">));</span>
+        <span class="n">NetworkPredicates</span><span class="o">.&lt;</span><span class="n">ExternalIp</span><span class="o">&gt;</span> <span class="n">name</span><span class="o">(</span><span class="s">&quot;ExternalNetwork&quot;</span><span class="o">));</span>
 <span class="n">ExternalIp</span> <span class="n">extIp</span> <span class="o">=</span> <span class="n">extNet</span><span class="o">.</span><span class="na">listUnusedIps</span><span class="o">().</span><span class="na">get</span><span class="o">(</span><span class="mi">0</span><span class="o">);</span>
 
 <span class="c1">// Get an unused public IP from the public network</span>
@@ -571,7 +587,7 @@
 
 <span class="c1">// Get a private IP from the privateNetwork</span>
 <span class="n">PrivateNetwork</span> <span class="n">privNet</span> <span class="o">=</span> <span class="n">vdc</span><span class="o">.</span><span class="na">findPrivateNetwork</span><span class="o">(</span>
-    <span class="n">NetworkPredicates</span><span class="o">.&lt;</span><span class="n">PrivateIp</span><span class="o">&gt;</span> <span class="nf">name</span><span class="o">(</span><span class="s">&quot;PrivateNetwork&quot;</span><span class="o">));</span>
+    <span class="n">NetworkPredicates</span><span class="o">.&lt;</span><span class="n">PrivateIp</span><span class="o">&gt;</span> <span class="n">name</span><span class="o">(</span><span class="s">&quot;PrivateNetwork&quot;</span><span class="o">));</span>
 <span class="n">PrivateIp</span> <span class="n">privIp</span> <span class="o">=</span> <span class="n">privNet</span><span class="o">.</span><span class="na">listUnusedIps</span><span class="o">().</span><span class="na">get</span><span class="o">(</span><span class="mi">0</span><span class="o">);</span>
 
 <span class="c1">// At this point we have everything we need to attach the IPs to the virtual machine.</span>
@@ -581,7 +597,8 @@
 <span class="n">vm</span><span class="o">.</span><span class="na">setNics</span><span class="o">(</span><span class="n">ips</span><span class="o">);</span>
 
 <span class="c1">// At this point we have the virtual machine with the IP addresses attached to it.</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <h3>Configuring the default gateway</h3>
@@ -595,7 +612,8 @@
 <span class="c1">// Option 2: Configure the network when configuring the NICs</span>
 <span class="n">PublicNetwork</span> <span class="n">gateway</span> <span class="o">=</span> <span class="n">pubIp</span><span class="o">.</span><span class="na">getNetwork</span><span class="o">();</span>
 <span class="n">vm</span><span class="o">.</span><span class="na">setNics</span><span class="o">(</span><span class="n">gateway</span><span class="o">,</span> <span class="n">extIp</span><span class="o">,</span> <span class="n">pubIp</span><span class="o">,</span> <span class="n">privIp</span><span class="o">);</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <h3>Attaching IPs from unmanaged networks</h3>
@@ -605,15 +623,16 @@
 <p>To do that, we can call the <strong>setNics</strong> method providing as many unmanaged networks as we want, to indicate that an IP address in each network (or many IP addresses if an unmanaged network is provided more than once) must be attached to the virtual machine.</p>
 
 <div class="highlight"><pre><code class="java"><span class="n">Unmanagednetwork</span> <span class="n">unmanagedNet</span> <span class="o">=</span> <span class="n">enterprise</span><span class="o">.</span><span class="na">findUnmanagedNetwork</span><span class="o">(</span><span class="n">datacenter</span><span class="o">,</span>
-    <span class="n">NetworkPredicates</span><span class="o">.&lt;</span><span class="n">UnmanagedIp</span><span class="o">&gt;</span> <span class="nf">name</span><span class="o">(</span><span class="s">&quot;UnmanagedNetwork&quot;</span><span class="o">));</span>
+    <span class="n">NetworkPredicates</span><span class="o">.&lt;</span><span class="n">UnmanagedIp</span><span class="o">&gt;</span> <span class="n">name</span><span class="o">(</span><span class="s">&quot;UnmanagedNetwork&quot;</span><span class="o">));</span>
 
 <span class="n">List</span><span class="o">&lt;</span><span class="n">UnmanagedNetwork</span><span class="o">&gt;</span> <span class="n">unmanagedNicsFromNet</span> <span class="o">=</span>
-    <span class="n">Lists</span><span class="o">.&lt;</span><span class="n">UnmanagedNetwork</span><span class="o">&gt;</span> <span class="nf">newArrayList</span><span class="o">(</span><span class="n">unmanagedNet</span><span class="o">);</span>
+    <span class="n">Lists</span><span class="o">.&lt;</span><span class="n">UnmanagedNetwork</span><span class="o">&gt;</span> <span class="n">newArrayList</span><span class="o">(</span><span class="n">unmanagedNet</span><span class="o">);</span>
 
 <span class="c1">// This will attach the IPs provided in the first list, and the corresponding</span>
 <span class="c1">// unmanaged IPs from the given unmanaged networks.</span>
 <span class="n">vm</span><span class="o">.</span><span class="na">setNics</span><span class="o">(</span><span class="n">ips</span><span class="o">,</span> <span class="n">unmanagedNicsFromNet</span><span class="o">);</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <h1>Miscellaneous examples</h1>
@@ -697,7 +716,8 @@
         <span class="o">}</span>
     <span class="o">}</span>
 <span class="o">}</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <h3>VmEventHandler.java</h3>
@@ -800,7 +820,8 @@
         <span class="n">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="s">&quot;Terminating monitoring thread&quot;</span><span class="o">);</span>
     <span class="o">}</span>
 <span class="o">}</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 
@@ -810,11 +831,11 @@
     <div id="footer">
        <p>Copyright &copy; 2011-2013 <a href="http://www.apache.org">The Apache Software Foundation</a>. All Rights Reserved.</p>
 
-<p>jclouds is licensed under <a href="https://github.com/jclouds/jclouds/blob/master/resources/LICENSE.txt">the Apache License, Version 2.0</a>.</p>
-
 <p>Apache, jclouds, Apache jclouds, the jclouds logo, and the Apache feather logos are registered trademarks or trademarks of the Apache Software Foundation.</p>
+
+<p><a href="http://www.apache.org/licenses/">License</a> | <a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a> | <a href="http://www.apache.org/foundation/thanks.html">Thanks</a> | <a href="http://www.apache.org/security/">Security</a></p>
  <!-- This bit of liquid lets us render the template components as markdown -->
-     <img src="http://incubator.apache.org/images/egg-logo.png"/>
+     <a href="http://www.apache.org"><img src="http://incubator.apache.org/images/egg-logo.png"/></a>
     </div>
   </div>
 </body>

Modified: incubator/jclouds/site-content/documentation/userguide/using-ec2/index.html
URL: http://svn.apache.org/viewvc/incubator/jclouds/site-content/documentation/userguide/using-ec2/index.html?rev=1522939&r1=1522938&r2=1522939&view=diff
==============================================================================
--- incubator/jclouds/site-content/documentation/userguide/using-ec2/index.html (original)
+++ incubator/jclouds/site-content/documentation/userguide/using-ec2/index.html Fri Sep 13 14:05:16 2013
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 
 <head>
-  <title>Using the EC2 Api</title>
+  <title>Apache jclouds&reg; :: Using the EC2 Api</title>
   <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
 
   <!-- **** jclouds stylesheet **** -->
@@ -41,7 +41,7 @@
 <li><a href="/documentation/">Documentation</a></li>
 <li><a href="/documentation/community/">Community</a></li>
 <li><a href="/documentation/devguides/">Development</a></li>
-<li><a href="http://groups.google.com/group/jclouds">Contact</a></li>
+<li><a href="http://incubator.apache.org/projects/jclouds.html">Contact</a></li>
 </ul>
 
  <!-- This bit of liquid lets us render the template components as markdown -->
@@ -93,7 +93,8 @@ if you need this, you'll have to revise 
 
 <div class="highlight"><pre><code class="java"><span class="c1">// use the m1 small with amazon linux</span>
 <span class="n">Template</span> <span class="n">template</span> <span class="o">=</span> <span class="n">compute</span><span class="o">.</span><span class="na">templateBuilder</span><span class="o">().</span><span class="na">hardwareId</span><span class="o">(</span><span class="n">InstanceType</span><span class="o">.</span><span class="na">M1_SMALL</span><span class="o">).</span><span class="na">osFamily</span><span class="o">(</span><span class="n">OsFamily</span><span class="o">.</span><span class="na">AMZN_LINUX</span><span class="o">).</span><span class="na">build</span><span class="o">();</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <p>In order to match an Ubuntu, or CentOs image, you'll need to see the Image Parsing section.</p>
@@ -111,7 +112,8 @@ ec2 across all 4 regions. We now by defa
 <span class="c1">// pick version 10.04 of ubuntu from canonical</span>
 <span class="n">Template</span> <span class="n">template</span> <span class="o">=</span> <span class="n">compute</span><span class="o">.</span><span class="na">templateBuilder</span><span class="o">().</span><span class="na">hardwareId</span><span class="o">(</span><span class="n">InstanceType</span><span class="o">.</span><span class="na">M1_SMALL</span><span class="o">)</span>
                   <span class="o">.</span><span class="na">osVersionMatches</span><span class="o">(</span><span class="s">&quot;10.04&quot;</span><span class="o">).</span><span class="na">imageDescriptionMatches</span><span class="o">(</span><span class="s">&quot;ubuntu-images&quot;</span><span class="o">).</span><span class="na">osFamily</span><span class="o">(</span><span class="n">OsFamily</span><span class="o">.</span><span class="na">UBUNTU</span><span class="o">).</span><span class="na">build</span><span class="o">();</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <h3>Image Filters [v1.1.0+]</h3>
@@ -128,15 +130,19 @@ ec2 across all 4 regions. We now by defa
                       <span class="o">.</span><span class="na">modules</span><span class="o">(</span><span class="n">ImmutableSet</span><span class="o">.&lt;</span><span class="n">Module</span><span class="o">&gt;</span> <span class="n">of</span><span class="o">(</span><span class="k">new</span> <span class="n">Log4JLoggingModule</span><span class="o">(),</span>
                                                         <span class="k">new</span> <span class="nf">SshjSshClientModule</span><span class="o">()))</span>
                       <span class="o">.</span><span class="na">buildView</span><span class="o">(</span><span class="n">ComputeServiceContext</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <h4>Properties to set cluster compute images</h4>
 
 <p>Cluster compute images are assigned the following default query, corresponding to the property key constant AWSEC2Constants.PROPERTY_EC2_CC_AMI_QUERY
-<code>
-    virtualization-type=hvm;architecture=x86_64;owner-id=137112412989,099720109477;hypervisor=xen;state=available;image-type=machine;root-device-type=ebs
-</code>
+```</p>
+
+<pre><code>virtualization-type=hvm;architecture=x86_64;owner-id=137112412989,099720109477;hypervisor=xen;state=available;image-type=machine;root-device-type=ebs
+</code></pre>
+
+<p>```
 In order to save time, we only look for cluster compute images in regions that support them.  In order to change the default for this, affect the property PROPERTY_EC2_CC_REGIONS, currently set to "us-east-1"</p>
 
 <h3>Lazy Image Fetching</h3>
@@ -157,7 +163,8 @@ We now provide the option to lazy-fetch 
 
 <span class="n">Template</span> <span class="n">template</span> <span class="o">=</span> <span class="n">context</span><span class="o">.</span><span class="na">getComputeService</span><span class="o">().</span><span class="na">templateBuilder</span><span class="o">().</span><span class="na">imageId</span><span class="o">(</span>
          <span class="s">&quot;ami-ccb35ea5&quot;</span><span class="o">).</span><span class="na">build</span><span class="o">();</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <h4>Release 1.1.0 to 1.5.x</h4>
@@ -173,7 +180,8 @@ We now provide the option to lazy-fetch 
 
    <span class="n">Template</span> <span class="n">template</span> <span class="o">=</span> <span class="n">context</span><span class="o">.</span><span class="na">getComputeService</span><span class="o">().</span><span class="na">templateBuilder</span><span class="o">().</span><span class="na">imageId</span><span class="o">(</span>
             <span class="s">&quot;ami-ccb35ea5&quot;</span><span class="o">).</span><span class="na">build</span><span class="o">();</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <h4>Release 1.6.0 and above</h4>
@@ -193,7 +201,8 @@ We now provide the option to lazy-fetch 
 
    <span class="n">Template</span> <span class="n">template</span> <span class="o">=</span> <span class="n">context</span><span class="o">.</span><span class="na">getComputeService</span><span class="o">().</span><span class="na">templateBuilder</span><span class="o">().</span><span class="na">imageId</span><span class="o">(</span>
             <span class="s">&quot;ami-ccb35ea5&quot;</span><span class="o">).</span><span class="na">build</span><span class="o">();</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <h3>Private Images</h3>
@@ -219,8 +228,9 @@ managing image curation, and others usin
 
 
 <span class="n">ComputeServiceContext</span> <span class="n">context</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ComputeServiceContextFactory</span><span class="o">().</span><span class="na">createContext</span><span class="o">(</span><span class="s">&quot;aws-ec2&quot;</span><span class="o">,</span> <span class="s">&quot;accesss&quot;</span><span class="o">,</span> <span class="s">&quot;secret&quot;</span><span class="o">,</span>
-                                        <span class="n">ImmutableSet</span><span class="o">.&lt;</span><span class="n">Module</span><span class="o">&gt;</span> <span class="nf">of</span><span class="o">(</span><span class="k">new</span> <span class="n">JschSshClientModule</span><span class="o">()),</span> <span class="n">props</span><span class="o">);</span>
-</code></pre></div>
+                                        <span class="n">ImmutableSet</span><span class="o">.&lt;</span><span class="n">Module</span><span class="o">&gt;</span> <span class="n">of</span><span class="o">(</span><span class="k">new</span> <span class="n">JschSshClientModule</span><span class="o">()),</span> <span class="n">props</span><span class="o">);</span>
+</code></pre>
+</div>
 
 
 <h4>Releases 1.1.0 through 1.5.x</h4>
@@ -235,8 +245,9 @@ managing image curation, and others usin
 
 
 <span class="n">ComputeServiceContext</span> <span class="n">context</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ComputeServiceContextFactory</span><span class="o">().</span><span class="na">createContext</span><span class="o">(</span><span class="s">&quot;aws-ec2&quot;</span><span class="o">,</span> <span class="s">&quot;accesss&quot;</span><span class="o">,</span> <span class="s">&quot;secret&quot;</span><span class="o">,</span>
-                                        <span class="n">ImmutableSet</span><span class="o">.&lt;</span><span class="n">Module</span><span class="o">&gt;</span> <span class="nf">of</span><span class="o">(</span><span class="k">new</span> <span class="n">JschSshClientModule</span><span class="o">()),</span> <span class="n">props</span><span class="o">);</span>
-</code></pre></div>
+                                        <span class="n">ImmutableSet</span><span class="o">.&lt;</span><span class="n">Module</span><span class="o">&gt;</span> <span class="n">of</span><span class="o">(</span><span class="k">new</span> <span class="n">JschSshClientModule</span><span class="o">()),</span> <span class="n">props</span><span class="o">);</span>
+</code></pre>
+</div>
 
 
 <h4>Release 1.6.0 and abovex</h4>
@@ -256,7 +267,8 @@ managing image curation, and others usin
                       <span class="o">.</span><span class="na">modules</span><span class="o">(</span><span class="n">ImmutableSet</span><span class="o">.&lt;</span><span class="n">Module</span><span class="o">&gt;</span> <span class="n">of</span><span class="o">(</span><span class="k">new</span> <span class="n">Log4JLoggingModule</span><span class="o">(),</span>
                                                         <span class="k">new</span> <span class="nf">SshjSshClientModule</span><span class="o">()))</span>
                       <span class="o">.</span><span class="na">buildView</span><span class="o">(</span><span class="n">ComputeServiceContext</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <p>You can then create nodes using the templateBuilder.imageId() method.</p>
@@ -318,7 +330,8 @@ OsFamily.UNRECOGNIZED, with no image ver
       <span class="n">builder</span><span class="o">.</span><span class="na">defaultCredentials</span><span class="o">(</span><span class="k">new</span> <span class="n">Credentials</span><span class="o">(</span><span class="s">&quot;foo-user&quot;</span><span class="o">,</span> <span class="s">&quot;password&quot;</span><span class="o">));</span>
    <span class="o">}</span>
 <span class="o">}</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <h4>Create a test for your parser</h4>
@@ -367,7 +380,8 @@ OsFamily.UNRECOGNIZED, with no image ver
    <span class="o">}</span>
 
 <span class="o">}</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <h4>Instruct jclouds to use your parser</h4>
@@ -388,7 +402,8 @@ OsFamily.UNRECOGNIZED, with no image ver
                <span class="n">bind</span><span class="o">(</span><span class="n">AWSEC2ReviseParsedImage</span><span class="o">.</span><span class="na">class</span><span class="o">).</span><span class="na">to</span><span class="o">(</span><span class="n">FooAWSEC2ReviseParsedImage</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
             <span class="o">})))</span>
                       <span class="o">.</span><span class="na">buildView</span><span class="o">(</span><span class="n">ComputeServiceContext</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <h4>Use your image version</h4>
@@ -396,7 +411,8 @@ OsFamily.UNRECOGNIZED, with no image ver
 <p>jclouds will now pick the lexicographic highest version, as it now can parse your images.</p>
 
 <div class="highlight"><pre><code class="java"><span class="n">Template</span> <span class="n">template</span> <span class="o">=</span> <span class="n">context</span><span class="o">.</span><span class="na">getComputeService</span><span class="o">().</span><span class="na">templateBuilder</span><span class="o">().</span><span class="na">imageVersionMatches</span><span class="o">(</span><span class="s">&quot;1.1.0.*&quot;</span><span class="o">).</span><span class="na">build</span><span class="o">();</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <h2>ComputeService API extensions</h2>
@@ -411,7 +427,8 @@ We now allow you to control this a bit t
 
 <div class="highlight"><pre><code class="java">                                                                                                                                                                                      
 <span class="n">options</span><span class="o">.</span><span class="na">as</span><span class="o">(</span><span class="n">AWSEC2TemplateOptions</span><span class="o">.</span><span class="na">class</span><span class="o">).</span><span class="na">spotPrice</span><span class="o">(</span><span class="mf">0.3f</span><span class="o">);</span>                                                                                                                                  
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <p>AWSEC2ComputeServiceLiveTest.testExtendedOptionsAndLogin() uses the spot price option on the portable interface.</p>
@@ -428,7 +445,8 @@ spot request goes through, but perhaps t
 
 <div class="highlight"><pre><code class="java"><span class="c1">// specify your own groups which already have the correct rules applied</span>
 <span class="n">template</span><span class="o">.</span><span class="na">getOptions</span><span class="o">().</span><span class="na">as</span><span class="o">(</span><span class="n">EC2TemplateOptions</span><span class="o">.</span><span class="na">class</span><span class="o">).</span><span class="na">securityGroups</span><span class="o">(</span><span class="n">group1</span><span class="o">,</span> <span class="n">group2</span><span class="o">);</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <h3>Key Pairs</h3>
@@ -438,7 +456,8 @@ spot request goes through, but perhaps t
 
 <span class="c1">// if your image doesn&#39;t use keypairs (ex enstratus), skip creating one</span>
 <span class="n">template</span><span class="o">.</span><span class="na">getOptions</span><span class="o">().</span><span class="na">as</span><span class="o">(</span><span class="n">EC2TemplateOptions</span><span class="o">.</span><span class="na">class</span><span class="o">).</span><span class="na">noKeyPair</span><span class="o">();</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <h3>VPC</h3>
@@ -451,7 +470,8 @@ spot request goes through, but perhaps t
 
 <span class="n">Set</span><span class="o">&lt;?</span> <span class="kd">extends</span> <span class="n">NodeMetadata</span><span class="o">&gt;</span> <span class="n">nodes</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">runNodesInGroup</span><span class="o">(</span><span class="n">group</span><span class="o">,</span> <span class="mi">1</span><span class="o">,</span>
                <span class="n">options</span><span class="o">);</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <p>You can also checkout <code>EC2ComputeServiceListTest.testExtendedOptionsWithSubnetId()</code></p>
@@ -466,7 +486,8 @@ spot request goes through, but perhaps t
 <span class="n">options</span><span class="o">.</span><span class="na">as</span><span class="o">(</span><span class="n">EC2TemplateOptions</span><span class="o">.</span><span class="na">class</span><span class="o">).</span><span class="na">enableMonitoring</span><span class="o">();</span>
 
 <span class="n">Set</span><span class="o">&lt;?</span> <span class="kd">extends</span> <span class="n">NodeMetadata</span><span class="o">&gt;</span> <span class="n">monitoredNodes</span> <span class="o">=</span> <span class="n">compute</span><span class="o">.</span><span class="na">runNodesInGroup</span><span class="o">(</span><span class="n">group</span><span class="o">,</span> <span class="mi">1</span><span class="o">,</span> <span class="n">options</span><span class="o">);</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <p>You can then use the !CloudWatchClient to get statistics on your nodes.</p>
@@ -480,7 +501,8 @@ spot request goes through, but perhaps t
 
 <span class="n">Set</span><span class="o">&lt;</span><span class="n">Datapoint</span><span class="o">&gt;</span> <span class="n">datapoints</span> <span class="o">=</span> <span class="n">monitoringContext</span><span class="o">.</span><span class="na">getApi</span><span class="o">().</span><span class="na">getMetricStatisticsInRegion</span><span class="o">(</span><span class="n">region</span><span class="o">,</span>
                   <span class="s">&quot;CPUUtilization&quot;</span><span class="o">,</span> <span class="n">before</span><span class="o">,</span> <span class="k">new</span> <span class="n">Date</span><span class="o">(),</span> <span class="mi">60</span><span class="o">,</span> <span class="s">&quot;Average&quot;</span><span class="o">);</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <h2>GovCloud</h2>
@@ -490,7 +512,8 @@ For EC2:</p>
 
 <div class="highlight"><pre><code class="java"><span class="kd">public</span> <span class="kd">static</span> <span class="kd">final</span> <span class="n">String</span> <span class="n">GOV_CLOUD_ENDPOINT</span> <span class="o">=</span> <span class="s">&quot;https://ec2.us-gov-west-1.amazonaws.com&quot;</span><span class="o">;</span>
 <span class="n">overrides</span><span class="o">.</span><span class="na">setProperty</span><span class="o">(</span><span class="s">&quot;aws-ec2.endpoint&quot;</span><span class="o">,</span> <span class="n">GOV_CLOUD_ENDPOINT</span><span class="o">);</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <p>You can find GovCloud endpoints for other services here:
@@ -501,11 +524,11 @@ http://docs.amazonwebservices.com/genera
     <div id="footer">
        <p>Copyright &copy; 2011-2013 <a href="http://www.apache.org">The Apache Software Foundation</a>. All Rights Reserved.</p>
 
-<p>jclouds is licensed under <a href="https://github.com/jclouds/jclouds/blob/master/resources/LICENSE.txt">the Apache License, Version 2.0</a>.</p>
-
 <p>Apache, jclouds, Apache jclouds, the jclouds logo, and the Apache feather logos are registered trademarks or trademarks of the Apache Software Foundation.</p>
+
+<p><a href="http://www.apache.org/licenses/">License</a> | <a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a> | <a href="http://www.apache.org/foundation/thanks.html">Thanks</a> | <a href="http://www.apache.org/security/">Security</a></p>
  <!-- This bit of liquid lets us render the template components as markdown -->
-     <img src="http://incubator.apache.org/images/egg-logo.png"/>
+     <a href="http://www.apache.org"><img src="http://incubator.apache.org/images/egg-logo.png"/></a>
     </div>
   </div>
 </body>

Modified: incubator/jclouds/site-content/documentation/userguide/using-maven/index.html
URL: http://svn.apache.org/viewvc/incubator/jclouds/site-content/documentation/userguide/using-maven/index.html?rev=1522939&r1=1522938&r2=1522939&view=diff
==============================================================================
--- incubator/jclouds/site-content/documentation/userguide/using-maven/index.html (original)
+++ incubator/jclouds/site-content/documentation/userguide/using-maven/index.html Fri Sep 13 14:05:16 2013
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 
 <head>
-  <title>Using jClouds with Apache Maven</title>
+  <title>Apache jclouds&reg; :: Using Apache Maven</title>
   <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
 
   <!-- **** jclouds stylesheet **** -->
@@ -41,7 +41,7 @@
 <li><a href="/documentation/">Documentation</a></li>
 <li><a href="/documentation/community/">Community</a></li>
 <li><a href="/documentation/devguides/">Development</a></li>
-<li><a href="http://groups.google.com/group/jclouds">Contact</a></li>
+<li><a href="http://incubator.apache.org/projects/jclouds.html">Contact</a></li>
 </ul>
 
  <!-- This bit of liquid lets us render the template components as markdown -->
@@ -49,7 +49,7 @@
     </div>
     <div id="content">
       <div id="column2">
-		<h1>Using jClouds with Apache Maven</h1>
+		<h1>Using Apache jclouds&reg; with Apache Maven</h1>
 
 <h2>Introduction</h2>
 
@@ -88,7 +88,8 @@
 <span class="n">Map</span><span class="o">&lt;</span><span class="n">String</span><span class="o">,</span> <span class="n">InputStream</span><span class="o">&gt;</span> <span class="n">map</span> <span class="o">=</span> <span class="n">context</span><span class="o">.</span><span class="na">createInputStreamMap</span><span class="o">(</span><span class="s">&quot;adrian.home&quot;</span><span class="o">);</span>
   <span class="c1">// do work</span>
 <span class="n">context</span><span class="o">.</span><span class="na">close</span><span class="o">();</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <p>This also assumes that you do not have heavy-duty needs that warrant connection-pooling or NIO,
@@ -101,7 +102,8 @@ or that you are in an environment that c
     <span class="nt">&lt;artifactId&gt;</span>jclouds-blobstore<span class="nt">&lt;/artifactId&gt;</span>
     <span class="nt">&lt;version&gt;</span>1.2.1<span class="nt">&lt;/version&gt;</span>
 <span class="nt">&lt;/dependency&gt;</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <p>Using the above, you will gain access to the provider named <code>transient</code>.  Note that this is in-memory.  Typically, you will instead want to add dependencies on a specific provider of resources like those for S3:</p>
@@ -111,7 +113,8 @@ or that you are in an environment that c
     <span class="nt">&lt;artifactId&gt;</span>aws-s3<span class="nt">&lt;/artifactId&gt;</span>
     <span class="nt">&lt;version&gt;</span>1.2.1<span class="nt">&lt;/version&gt;</span>
 <span class="nt">&lt;/dependency&gt;</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <p>Noting that you could alternatively ask for all of our supported blobstores using the dependency <code>jclouds-allblobstore</code> instead.</p>
@@ -121,7 +124,8 @@ or that you are in an environment that c
 <div class="highlight"><pre><code class="java"><span class="n">BlobStoreContext</span> <span class="n">context</span> <span class="o">=</span> <span class="n">ContextBuilder</span><span class="o">.</span><span class="na">newBuilder</span><span class="o">(</span><span class="s">&quot;aws-s3&quot;</span><span class="o">)</span>
                  <span class="o">.</span><span class="na">credentials</span><span class="o">(</span><span class="n">accessKey</span><span class="o">,</span> <span class="n">secret</span><span class="o">)</span>
                  <span class="o">.</span><span class="na">buildView</span><span class="o">(</span><span class="n">BlobStoreContext</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <h3>BlobStore from Google App Engine</h3>
@@ -134,7 +138,8 @@ However, you do have to configure your c
                       <span class="o">.</span><span class="na">modules</span><span class="o">(</span><span class="n">ImmutableSet</span><span class="o">.</span><span class="na">of</span><span class="o">(</span>
                                   <span class="k">new</span> <span class="nf">AsyncGoogleAppEngineConfigurationModule</span><span class="o">()))</span>
                       <span class="o">.</span><span class="na">buildView</span><span class="o">(</span><span class="n">BlobStoreContext</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <p>Here are the dependencies needed to use google's UrlFetchService::</p>
@@ -149,7 +154,8 @@ However, you do have to configure your c
     <span class="nt">&lt;artifactId&gt;</span>jclouds-gae<span class="nt">&lt;/artifactId&gt;</span>
     <span class="nt">&lt;version&gt;</span>1.2.1<span class="nt">&lt;/version&gt;</span>
 <span class="nt">&lt;/dependency&gt;</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <h3>Logging</h3>
@@ -160,7 +166,8 @@ However, you do have to configure your c
                       <span class="o">.</span><span class="na">credentials</span><span class="o">(</span><span class="n">identity</span><span class="o">,</span> <span class="n">credential</span><span class="o">)</span>
                       <span class="o">.</span><span class="na">modules</span><span class="o">(</span><span class="n">ImmutableSet</span><span class="o">.</span><span class="na">of</span><span class="o">(</span><span class="k">new</span> <span class="n">Log4JLoggingModule</span><span class="o">()))</span>
                       <span class="o">.</span><span class="na">buildView</span><span class="o">(</span><span class="n">BlobStoreContext</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <p>Here are the dependencies for BlobStore and log4j logging:</p>
@@ -175,7 +182,8 @@ However, you do have to configure your c
     <span class="nt">&lt;artifactId&gt;</span>jclouds-log4j<span class="nt">&lt;/artifactId&gt;</span>
     <span class="nt">&lt;version&gt;</span>1.2.1<span class="nt">&lt;/version&gt;</span>
 <span class="nt">&lt;/dependency&gt;</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <p>The log categories are set to package names, so plan on assigning <code>org.jclouds</code> appropriately in your log4j.xml.</p>
@@ -201,7 +209,8 @@ so that your credentials can be used for
     <span class="nt">&lt;test.provider.credential&gt;</span>password,secret,etc<span class="nt">&lt;/test.provider.credential&gt;</span>
   <span class="nt">&lt;/properties&gt;</span>
 <span class="nt">&lt;/profile&gt;</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <p>Here is an example of a complete <em>settings.xml</em> file you can save to the ~/.m2 directory, just remember to add your personal credentials:</p>
@@ -222,7 +231,8 @@ so that your credentials can be used for
     <span class="nt">&lt;/profile&gt;</span>
   <span class="nt">&lt;/profiles&gt;</span>
 <span class="nt">&lt;/settings&gt;</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <h3>Testing SSH drivers</h3>
@@ -242,7 +252,8 @@ so that your credentials can be used for
     <span class="nt">&lt;test.ssh.password&gt;</span>LOCAL_SSH_PASSWORD<span class="nt">&lt;/test.ssh.password&gt;</span>
   <span class="nt">&lt;/properties&gt;</span>
 <span class="nt">&lt;/profile&gt;</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 <p>Here is an example of a complete <em>settings.xml</em> file you can save to the ~/.m2 directory, just remember to change the ssh credentials:</p>
@@ -261,7 +272,8 @@ so that your credentials can be used for
     <span class="nt">&lt;/profile&gt;</span>
   <span class="nt">&lt;/profiles&gt;</span>
 <span class="nt">&lt;/settings&gt;</span>
-</code></pre></div>
+</code></pre>
+</div>
 
 
 
@@ -271,11 +283,11 @@ so that your credentials can be used for
     <div id="footer">
        <p>Copyright &copy; 2011-2013 <a href="http://www.apache.org">The Apache Software Foundation</a>. All Rights Reserved.</p>
 
-<p>jclouds is licensed under <a href="https://github.com/jclouds/jclouds/blob/master/resources/LICENSE.txt">the Apache License, Version 2.0</a>.</p>
-
 <p>Apache, jclouds, Apache jclouds, the jclouds logo, and the Apache feather logos are registered trademarks or trademarks of the Apache Software Foundation.</p>
+
+<p><a href="http://www.apache.org/licenses/">License</a> | <a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a> | <a href="http://www.apache.org/foundation/thanks.html">Thanks</a> | <a href="http://www.apache.org/security/">Security</a></p>
  <!-- This bit of liquid lets us render the template components as markdown -->
-     <img src="http://incubator.apache.org/images/egg-logo.png"/>
+     <a href="http://www.apache.org"><img src="http://incubator.apache.org/images/egg-logo.png"/></a>
     </div>
   </div>
 </body>

Modified: incubator/jclouds/site-content/documentation/userguide/using-s3/index.html
URL: http://svn.apache.org/viewvc/incubator/jclouds/site-content/documentation/userguide/using-s3/index.html?rev=1522939&r1=1522938&r2=1522939&view=diff
==============================================================================
--- incubator/jclouds/site-content/documentation/userguide/using-s3/index.html (original)
+++ incubator/jclouds/site-content/documentation/userguide/using-s3/index.html Fri Sep 13 14:05:16 2013
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 
 <head>
-  <title>Using the s3 Api</title>
+  <title>Apache jclouds&reg; :: Using the s3 Api</title>
   <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
 
   <!-- **** jclouds stylesheet **** -->
@@ -41,7 +41,7 @@
 <li><a href="/documentation/">Documentation</a></li>
 <li><a href="/documentation/community/">Community</a></li>
 <li><a href="/documentation/devguides/">Development</a></li>
-<li><a href="http://groups.google.com/group/jclouds">Contact</a></li>
+<li><a href="http://incubator.apache.org/projects/jclouds.html">Contact</a></li>
 </ul>
 
  <!-- This bit of liquid lets us render the template components as markdown -->
@@ -91,11 +91,11 @@ s3.endpoint=http://host:8773/services/Wa
     <div id="footer">
        <p>Copyright &copy; 2011-2013 <a href="http://www.apache.org">The Apache Software Foundation</a>. All Rights Reserved.</p>
 
-<p>jclouds is licensed under <a href="https://github.com/jclouds/jclouds/blob/master/resources/LICENSE.txt">the Apache License, Version 2.0</a>.</p>
-
 <p>Apache, jclouds, Apache jclouds, the jclouds logo, and the Apache feather logos are registered trademarks or trademarks of the Apache Software Foundation.</p>
+
+<p><a href="http://www.apache.org/licenses/">License</a> | <a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a> | <a href="http://www.apache.org/foundation/thanks.html">Thanks</a> | <a href="http://www.apache.org/security/">Security</a></p>
  <!-- This bit of liquid lets us render the template components as markdown -->
-     <img src="http://incubator.apache.org/images/egg-logo.png"/>
+     <a href="http://www.apache.org"><img src="http://incubator.apache.org/images/egg-logo.png"/></a>
     </div>
   </div>
 </body>