Merge lp:~evilnick/juju-core/docs-last-jade-version into lp:juju-core/docs

[Nick Veitch]

stacktack added. last jade version

Unmerged revisions

=== modified file 'src/charms-deploying.jade'
--- src/charms-deploying.jade	2013-06-12 23:38:04 +0000
+++ src/charms-deploying.jade	2013-06-25 18:11:25 +0000
@@ -45,4 +45,5 @@
        </code></pre>
        <h1>A note about caching...</h1>
        <p>After juju resolves a charm and its dependencies, it bundles them and deploys them to a machine provider charm cache/repository (e.g. ~/.juju/charmcache). This allows the same charm to be deployed to multiple machines repeatably and with minimal network transfers.</p>
+
       </section>

=== modified file 'src/inc/layout.jade'
--- src/inc/layout.jade	2013-06-17 15:16:32 +0000
+++ src/inc/layout.jade	2013-06-25 18:11:25 +0000
@@ -16,6 +16,12 @@
     mixin stylesheet('https://juju.ubuntu.com/wp-content/themes/juju-website/css/base.css')
     mixin stylesheet('https://juju.ubuntu.com/wp-content/themes/juju-website/css/resources.css')
     mixin stylesheet('css/main.css')
+    script(src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js")
+    script(src="http://app.stacktack.com/jquery.stacktack.min.js")
+    script(type='text/javascript')
+      $(document).ready(function() {
+            $(document).stacktack();
+      });
     block styles
     //if lt IE 9
       script(type='text/javascript', src='//html5shim.googlecode.com/svn/trunk/html5.js')