juju-core

Merge lp:~marcoceppi/juju-core/doc-build into lp:juju-core/docs

  1. doc-build
  2. Merge into docs
Proposed by Marco Ceppi
Status: Merged
Merged at revision: 27
Proposed branch: lp:~marcoceppi/juju-core/doc-build
Merge into: lp:juju-core/docs
Diff against target: 6337 lines (+3274/-2380)
34 files modified
build.py (+61/-0)
htmldocs/authors-charm-anatomy.html (+52/-52)
htmldocs/authors-charm-best-practice.html (+107/-83)
htmldocs/authors-charm-icon.html (+107/-83)
htmldocs/authors-charm-policy.html (+107/-83)
htmldocs/authors-charm-quality.html (+107/-83)
htmldocs/authors-charm-store.html (+107/-83)
htmldocs/authors-charm-writing.html (+107/-83)
htmldocs/authors-hooks.html (+107/-83)
htmldocs/authors-implicit-relations.html (+107/-83)
htmldocs/authors-subordinate-services.html (+107/-83)
htmldocs/authors-testing.html (+107/-83)
htmldocs/charms-config.html (+107/-83)
htmldocs/charms-constraints.html (+107/-83)
htmldocs/charms-deploying.html (+107/-83)
htmldocs/charms-destroy.html (+107/-83)
htmldocs/charms-exposing.html (+107/-83)
htmldocs/charms-relations.html (+107/-83)
htmldocs/charms-scaling.html (+107/-83)
htmldocs/charms-upgrading.html (+107/-83)
htmldocs/charms.html (+108/-84)
htmldocs/commands.html (+107/-83)
htmldocs/config-aws.html (+107/-83)
htmldocs/config-hpcloud.html (+107/-83)
htmldocs/config-maas.html (+107/-83)
htmldocs/config-openstack.html (+107/-83)
htmldocs/contributing.html (+107/-83)
htmldocs/getting-started.html (+109/-85)
htmldocs/glossary.html (+107/-83)
htmldocs/index.html (+108/-84)
htmldocs/navigation.json (+56/-0)
skel/footer.tpl (+54/-0)
skel/head.tpl (+16/-0)
skel/header.tpl (+35/-0)
To merge this branch: bzr merge lp:~marcoceppi/juju-core/doc-build
Reviewer Review Type Date Requested Status
Mark Mims (community) Approve
Review via email: mp+174574@code.launchpad.net

Commit message

Build script to mass replace large chunks of the docs

Description of the change

Adds a build script to replace head, header, footer on all doc pages.

To post a comment you must log in.
Revision history for this message
Mark Mims (mark-mims) wrote :

Just looked like the build file and a bunch of header changes. It's _really_ hard to deal with content this way. html is an output format.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'build.py'
2--- build.py 1970-01-01 00:00:00 +0000
3+++ build.py 2013-07-13 18:35:28 +0000
4@@ -0,0 +1,61 @@
5+#!/usr/bin/python
6+
7+# Use this to build out a new header/footer or when you've updated javascript
8+# Don't use this if you've only updated content.
9+
10+import os
11+import re
12+import sys
13+import glob
14+import json
15+import time
16+
17+
18+def page_title(page, source=None, itr=None):
19+ if not source:
20+ with open('htmldocs/navigation.json', 'r') as f:
21+ source = json.loads(f.read())
22+
23+ if 'link' in source:
24+ if source['link'] == page:
25+ return itr
26+
27+ for key, val in source.iteritems():
28+ if isinstance(val, dict):
29+ code = page_title(page, val, key)
30+ if code:
31+ return code
32+
33+ if val == page:
34+ return key
35+
36+def fill_tpl(tpl, values={}):
37+ for key, val in values.iteritems():
38+ tpl = tpl.replace('{{%s}}' % key.upper(), str(val))
39+
40+ return tpl
41+
42+if __name__ == '__main__':
43+ if not os.path.exists(os.path.join(os.path.dirname(os.path.abspath(__file__)), 'skel')):
44+ print "Couldn't find skeleton files"
45+ sys.exit(1)
46+
47+ templates = glob.glob('skel/*.tpl')
48+ docs = glob.glob('htmldocs/*.html')
49+ timestamp = int(time.time())
50+
51+
52+ for template in templates:
53+ with open(template, 'r') as f:
54+ tpl = os.path.splitext(os.path.basename(template))[0]
55+ tpl_file = f.read()
56+ chop = re.compile('<%s>.*?</%s>' % (tpl, tpl), re.DOTALL)
57+ for doc in docs:
58+ with open(doc, 'r+') as d:
59+ print "%s: %s" % (doc, tpl)
60+ opts = {'PAGE': page_title(os.path.basename(doc)),
61+ 'TIMESTAMP': timestamp}
62+ new_html = chop.sub(fill_tpl(tpl_file, opts), d.read())
63+ d.seek(0)
64+ d.write(new_html)
65+ d.truncate()
66
67=== modified file 'htmldocs/authors-charm-anatomy.html'
68--- htmldocs/authors-charm-anatomy.html 2013-07-11 20:41:29 +0000
69+++ htmldocs/authors-charm-anatomy.html 2013-07-13 18:35:28 +0000
70@@ -1,61 +1,61 @@
71 <!DOCTYPE html>
72 <html>
73 <head>
74- <meta charset="utf-8">
75- <title>Juju Documentation - Contributing!</title>
76- <link href="//fonts.googleapis.com/css?family=Ubuntu:400,400italic" rel="stylesheet" type="text/css"/>
77- <link href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400" rel="stylesheet" type="text/css"/>
78- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" rel="stylesheet" type="text/css"/>
79- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" rel="stylesheet" type="text/css"/>
80- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" rel="stylesheet" type="text/css"/>
81- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/resources.css" rel="stylesheet" type="text/css"/>
82- <link href="css/main.css" rel="stylesheet" type="text/css"/>
83- <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
84- <script src="http://app.stacktack.com/jquery.stacktack.min.js"></script>
85- <script type="text/javascript">
86- $(document).ready(function() {
87- $(document).stacktack();
88- });
89- </script><!--[if lt IE 9]>
90- <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
91- </head>
92+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
93+ <title>Juju Documentation - Anatomy of a Charm</title>
94+ <link href='https://fonts.googleapis.com/css?family=Ubuntu:400,300,300italic,400italic,700,700italic|Ubuntu+Mono' rel='stylesheet' type='text/css' />
95+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" />
96+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" />
97+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" />
98+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/home-new.css" />
99+ <link rel='stylesheet' id='stacktack-css' href='//juju.ubuntu.com/wp-content/plugins/stacktack/css/stacktack.min.css?ver=3.4.2' type='text/css' media='all' />
100+ <link href="css/main.css?1373740025" rel="stylesheet" type="text/css"/>
101+
102+ <!--[if lt IE 9]>
103+ <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
104+ <![endif]-->
105+</head>
106+<!-- DO NOT EDIT ABOVE THIS LINE -->
107+
108+<!-- DO NOT EDIT ABOVE THIS LINE -->
109+
110+
111 <body class="resources">
112- <header>
113- <div class="header-login">
114+ <header class="global clearfix" role="banner">
115+ <div class="header-navigation">
116+ <div>
117+ <nav role="navigation">
118 <ul>
119- <li>&nbsp;</li>
120+ <li class="page_item page-item-6"><a href="https://juju.ubuntu.com/">Home</a></li>
121+ <li class="page_item page-item-7"><a href="https://juju.ubuntu.com/get-started/">Get started</a></li>
122+ <li class="page_item page-item-9 current_page_item"><a href="https://juju.ubuntu.com/resources/">Resources</a></li>
123+ <li class="page_item page-item-13"><a href="https://juju.ubuntu.com/community/">Community</a></li>
124+ <li class="page_item page-item-3688"><a href="https://juju.ubuntu.com/charm-store/">Charm Store</a></li>
125+ <li class="page_item page-item-3691"><a href="https://juju.ubuntu.com/events/">Events</a></li>
126+ <li class="page_item page-item-4474"><a href="https://juju.ubuntu.com/charm-championship/">Charm Championship</a></li>
127+ <li class="page_item page-item-4249"><a href="https://juju.ubuntu.com/survey/">Survey</a></li>
128+ <li>
129+ <form id="form-search" method="get" action="https://juju.ubuntu.com/">
130+ <fieldset>
131+ <input id="input-search" type="text" name="s" value="Search" />
132+ </fieldset>
133+ </form>
134+ </li>
135 </ul>
136- </div>
137- <div class="header-navigation">
138- <div>
139- <nav role="navigation">
140- <ul>
141- <li class="page_item"><a href="https://juju.ubuntu.com/">Home</a></li>
142- <li class="page_item current_page_item"><a href="https://juju.ubuntu.com/">Resources</a></li>
143- <li class="page_item"><a href="https://juju.ubuntu.com/">Community</a></li>
144- <li class="page_item"><a href="https://juju.ubuntu.com/">Charm Store</a></li>
145- <li class="page_item"><a href="https://juju.ubuntu.com/">Events</a></li>
146- <li class="page_item"><a href="https://juju.ubuntu.com/">Survey</a></li>
147- <li>
148- <form id="form-search" method="get" action="/">
149- <fieldset>
150- <input id="input-search" type="text" name="s" value="Search">
151- </fieldset>
152- </form>
153- </li>
154- </ul>
155- </nav><a href="https://juju.ubuntu.com/" class="logo-ubuntu"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/logo-ubuntu.png"></a>
156- </div>
157- </div>
158- <div class="header-content">
159- <div class="clearfix"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
160- <div class="header-navigation-secondary"></div>
161- <div class="header-image"></div>
162- <h1>Resources</h1>
163- <h2>A collection of some of the most important online references for Juju users and developers.</h2>
164- </div>
165- </div>
166- </header>
167+ </nav>
168+ </div>
169+ </div>
170+ <div class="header-content">
171+ <div class="clearfix">
172+ <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
173+ <div class="header-navigation-secondary"></div>
174+ <div class="header-image"></div>
175+ <h1>Resources</h1>
176+ <h2>A collection of some of the most important online references for Juju users and developers.</h2>
177+ </div>
178+ </div>
179+</header>
180+
181 <section id="content" class="container-12">
182 <div class="grid-12 doc-container">
183 <div class="grid-3 doc-navigation">
184
185=== modified file 'htmldocs/authors-charm-best-practice.html'
186--- htmldocs/authors-charm-best-practice.html 2013-07-12 07:32:14 +0000
187+++ htmldocs/authors-charm-best-practice.html 2013-07-13 18:35:28 +0000
188@@ -1,56 +1,61 @@
189 <!DOCTYPE html>
190 <html>
191 <head>
192- <meta charset="utf-8">
193- <title>Juju Documentation - Best Practice for Charm Authors</title>
194- <link href="//fonts.googleapis.com/css?family=Ubuntu:400,400italic" rel="stylesheet" type="text/css"/>
195- <link href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400" rel="stylesheet" type="text/css"/>
196- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" rel="stylesheet" type="text/css"/>
197- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" rel="stylesheet" type="text/css"/>
198- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" rel="stylesheet" type="text/css"/>
199- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/resources.css" rel="stylesheet" type="text/css"/>
200- <link href="css/main.css" rel="stylesheet" type="text/css"/>
201- <!--[if lt IE 9]>
202- <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
203- <![endif]-->
204- </head>
205+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
206+ <title>Juju Documentation - None</title>
207+ <link href='https://fonts.googleapis.com/css?family=Ubuntu:400,300,300italic,400italic,700,700italic|Ubuntu+Mono' rel='stylesheet' type='text/css' />
208+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" />
209+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" />
210+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" />
211+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/home-new.css" />
212+ <link rel='stylesheet' id='stacktack-css' href='//juju.ubuntu.com/wp-content/plugins/stacktack/css/stacktack.min.css?ver=3.4.2' type='text/css' media='all' />
213+ <link href="css/main.css?1373740025" rel="stylesheet" type="text/css"/>
214+
215+ <!--[if lt IE 9]>
216+ <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
217+ <![endif]-->
218+</head>
219+<!-- DO NOT EDIT ABOVE THIS LINE -->
220+
221+<!-- DO NOT EDIT ABOVE THIS LINE -->
222+
223+
224 <body class="resources">
225- <header>
226- <div class="header-login">
227+ <header class="global clearfix" role="banner">
228+ <div class="header-navigation">
229+ <div>
230+ <nav role="navigation">
231 <ul>
232- <li>&nbsp;</li>
233+ <li class="page_item page-item-6"><a href="https://juju.ubuntu.com/">Home</a></li>
234+ <li class="page_item page-item-7"><a href="https://juju.ubuntu.com/get-started/">Get started</a></li>
235+ <li class="page_item page-item-9 current_page_item"><a href="https://juju.ubuntu.com/resources/">Resources</a></li>
236+ <li class="page_item page-item-13"><a href="https://juju.ubuntu.com/community/">Community</a></li>
237+ <li class="page_item page-item-3688"><a href="https://juju.ubuntu.com/charm-store/">Charm Store</a></li>
238+ <li class="page_item page-item-3691"><a href="https://juju.ubuntu.com/events/">Events</a></li>
239+ <li class="page_item page-item-4474"><a href="https://juju.ubuntu.com/charm-championship/">Charm Championship</a></li>
240+ <li class="page_item page-item-4249"><a href="https://juju.ubuntu.com/survey/">Survey</a></li>
241+ <li>
242+ <form id="form-search" method="get" action="https://juju.ubuntu.com/">
243+ <fieldset>
244+ <input id="input-search" type="text" name="s" value="Search" />
245+ </fieldset>
246+ </form>
247+ </li>
248 </ul>
249- </div>
250- <div class="header-navigation">
251- <div>
252- <nav role="navigation">
253- <ul>
254- <li class="page_item"><a href="https://juju.ubuntu.com/">Home</a></li>
255- <li class="page_item current_page_item"><a href="https://juju.ubuntu.com/">Resources</a></li>
256- <li class="page_item"><a href="https://juju.ubuntu.com/">Community</a></li>
257- <li class="page_item"><a href="https://juju.ubuntu.com/">Charm Store</a></li>
258- <li class="page_item"><a href="https://juju.ubuntu.com/">Events</a></li>
259- <li class="page_item"><a href="https://juju.ubuntu.com/">Survey</a></li>
260- <li>
261- <form id="form-search" method="get" action="/">
262- <fieldset>
263- <input id="input-search" type="text" name="s" value="Search">
264- </fieldset>
265- </form>
266- </li>
267- </ul>
268- </nav><a href="https://juju.ubuntu.com/" class="logo-ubuntu"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/logo-ubuntu.png"></a>
269- </div>
270- </div>
271- <div class="header-content">
272- <div class="clearfix"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
273- <div class="header-navigation-secondary"></div>
274- <div class="header-image"></div>
275- <h1>Resources</h1>
276- <h2>A collection of some of the most important online references for Juju users and developers.</h2>
277- </div>
278- </div>
279- </header>
280+ </nav>
281+ </div>
282+ </div>
283+ <div class="header-content">
284+ <div class="clearfix">
285+ <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
286+ <div class="header-navigation-secondary"></div>
287+ <div class="header-image"></div>
288+ <h1>Resources</h1>
289+ <h2>A collection of some of the most important online references for Juju users and developers.</h2>
290+ </div>
291+ </div>
292+</header>
293+
294 <section id="content" class="container-12">
295 <div class="grid-12 doc-container">
296 <div class="grid-3 doc-navigation">
297@@ -167,43 +172,62 @@
298 </div>
299 </section>
300 <div class="shadow"></div>
301- <footer>
302- <div>
303- <nav role="navigation" class="clearfix">
304- <ul>
305- <li><a href="https://juju.ubuntu.com/get-started">Get started</a></li>
306- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li>
307- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li>
308- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li>
309- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li>
310- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li>
311- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li>
312- </ul>
313- <ul>
314- <li><a href="https://juju.ubuntu.com/resources">Resources</a></li>
315- <li><a href="https://juju.ubuntu.com/docs">Documentation</a></li>
316- <li><a href="https://juju.ubuntu.com/resources/videos">Videos</a></li>
317- <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI Demo</a></li>
318- </ul>
319- <ul>
320- <li><a href="https://juju.ubuntu.com/community">Community</a></li>
321- <li class="page_item"><a href="https://juju.ubuntu.com/community/juju-blog/">Blog</a></li>
322- <li class="page_item"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Charm Meetings</a></li>
323- <li class="page_item"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li>
324- <li class="page_item"><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li>
325- <li class="page_item"><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li>
326- <li class="page_item"><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&amp;amp;pagesize=50">FAQ</a></li>
327- </ul>
328- <ul class="last">
329- <li><a href="https://launchpad.net/juju">Code</a></li>
330- <li><a href="https://launchpad.net/juju-core">Juju Core</a></li>
331- <li><a href="https://launchpad.net/charms">Charms</a></li>
332- </ul>
333- </nav>
334- </div>
335- </footer>
336+ <footer class="global clearfix" role="contentinfo">
337+ <div class="row">
338+ <div class="inner-wrapper">
339+ <nav role="navigation" class="clearfix">
340+ <ul class="footer-a">
341+ <li class="grid-3 first-col">
342+ <h4><a href="/get-started">Get started</a></h4>
343+ <ul>
344+ <li class="page_item page-item-20"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li>
345+ <li class="page_item page-item-22"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li>
346+ <li class="page_item page-item-18"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li>
347+ <li class="page_item page-item-16"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li>
348+ <li class="page_item page-item-3596"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li>
349+ <li class="page_item page-item-3600"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li>
350+ </ul>
351+ </li>
352+ <li class="grid-3">
353+ <h4><a href="/resources">Resources</a></h4>
354+ <ul>
355+ <li><a href="http://juju.ubuntu.com/docs">Documentation</a></li>
356+ <li><a href="/resources/videos/">Videos</a></li>
357+ <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI demo site</a></li>
358+ </ul>
359+ </li>
360+ <li class="grid-3">
361+ <h4><a href="/community">Community</a></h4>
362+ <ul>
363+ <li class="page_item page-item-28"><a href="https://juju.ubuntu.com/community/juju-blog/">Juju Blog</a></li>
364+ <li class="page_item page-item-4262"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Weekly Charm Meeting</a></li>
365+ <li class="page_item page-item-4036"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li>
366+ <li><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li>
367+ <li><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li>
368+ <li><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&pagesize=50">FAQ</a></li>
369+ </ul>
370+ </li>
371+ <li class="grid-3 last-col">
372+ <h4><a href="https://launchpad.net/juju">Code</a></h4>
373+ <ul>
374+ <li><a href="https://launchpad.net/juju-core">Juju Core</a></li>
375+ <li><a href="https://launchpad.net/charms">Charms</a></li>
376+ </ul>
377+ </li>
378+ </ul>
379+ </nav>
380+ </div>
381+ </div>
382+ <div class="row no-border">
383+ <div class="legal inner-wrapper">
384+ <p>&copy; 2013 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p>
385+ <p><a href="https://bugs.launchpad.net/juju-website/+filebug">Report a bug on this site</a></p>
386+ </div>
387+ </div>
388+</footer>
389+
390 <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
391- <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.8.14/jquery-ui.min.js"></script>
392+ <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script>
393 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
394 <script type="text/javascript" src="js/main.js"></script>
395 </body>
396
397=== modified file 'htmldocs/authors-charm-icon.html'
398--- htmldocs/authors-charm-icon.html 2013-07-12 16:05:56 +0000
399+++ htmldocs/authors-charm-icon.html 2013-07-13 18:35:28 +0000
400@@ -1,56 +1,61 @@
401 <!DOCTYPE html>
402 <html>
403 <head>
404- <meta charset="utf-8">
405- <title>Juju Documentation - charm icons</title>
406- <link href="//fonts.googleapis.com/css?family=Ubuntu:400,400italic" rel="stylesheet" type="text/css"/>
407- <link href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400" rel="stylesheet" type="text/css"/>
408- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" rel="stylesheet" type="text/css"/>
409- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" rel="stylesheet" type="text/css"/>
410- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" rel="stylesheet" type="text/css"/>
411- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/resources.css" rel="stylesheet" type="text/css"/>
412- <link href="css/main.css" rel="stylesheet" type="text/css"/>
413- <!--[if lt IE 9]>
414- <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
415- <![endif]-->
416- </head>
417+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
418+ <title>Juju Documentation - None</title>
419+ <link href='https://fonts.googleapis.com/css?family=Ubuntu:400,300,300italic,400italic,700,700italic|Ubuntu+Mono' rel='stylesheet' type='text/css' />
420+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" />
421+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" />
422+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" />
423+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/home-new.css" />
424+ <link rel='stylesheet' id='stacktack-css' href='//juju.ubuntu.com/wp-content/plugins/stacktack/css/stacktack.min.css?ver=3.4.2' type='text/css' media='all' />
425+ <link href="css/main.css?1373740025" rel="stylesheet" type="text/css"/>
426+
427+ <!--[if lt IE 9]>
428+ <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
429+ <![endif]-->
430+</head>
431+<!-- DO NOT EDIT ABOVE THIS LINE -->
432+
433+<!-- DO NOT EDIT ABOVE THIS LINE -->
434+
435+
436 <body class="resources">
437- <header>
438- <div class="header-login">
439+ <header class="global clearfix" role="banner">
440+ <div class="header-navigation">
441+ <div>
442+ <nav role="navigation">
443 <ul>
444- <li>&nbsp;</li>
445+ <li class="page_item page-item-6"><a href="https://juju.ubuntu.com/">Home</a></li>
446+ <li class="page_item page-item-7"><a href="https://juju.ubuntu.com/get-started/">Get started</a></li>
447+ <li class="page_item page-item-9 current_page_item"><a href="https://juju.ubuntu.com/resources/">Resources</a></li>
448+ <li class="page_item page-item-13"><a href="https://juju.ubuntu.com/community/">Community</a></li>
449+ <li class="page_item page-item-3688"><a href="https://juju.ubuntu.com/charm-store/">Charm Store</a></li>
450+ <li class="page_item page-item-3691"><a href="https://juju.ubuntu.com/events/">Events</a></li>
451+ <li class="page_item page-item-4474"><a href="https://juju.ubuntu.com/charm-championship/">Charm Championship</a></li>
452+ <li class="page_item page-item-4249"><a href="https://juju.ubuntu.com/survey/">Survey</a></li>
453+ <li>
454+ <form id="form-search" method="get" action="https://juju.ubuntu.com/">
455+ <fieldset>
456+ <input id="input-search" type="text" name="s" value="Search" />
457+ </fieldset>
458+ </form>
459+ </li>
460 </ul>
461- </div>
462- <div class="header-navigation">
463- <div>
464- <nav role="navigation">
465- <ul>
466- <li class="page_item"><a href="https://juju.ubuntu.com/">Home</a></li>
467- <li class="page_item current_page_item"><a href="https://juju.ubuntu.com/">Resources</a></li>
468- <li class="page_item"><a href="https://juju.ubuntu.com/">Community</a></li>
469- <li class="page_item"><a href="https://juju.ubuntu.com/">Charm Store</a></li>
470- <li class="page_item"><a href="https://juju.ubuntu.com/">Events</a></li>
471- <li class="page_item"><a href="https://juju.ubuntu.com/">Survey</a></li>
472- <li>
473- <form id="form-search" method="get" action="/">
474- <fieldset>
475- <input id="input-search" type="text" name="s" value="Search">
476- </fieldset>
477- </form>
478- </li>
479- </ul>
480- </nav><a href="https://juju.ubuntu.com/" class="logo-ubuntu"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/logo-ubuntu.png"></a>
481- </div>
482- </div>
483- <div class="header-content">
484- <div class="clearfix"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
485- <div class="header-navigation-secondary"></div>
486- <div class="header-image"></div>
487- <h1>Resources</h1>
488- <h2>A collection of some of the most important online references for Juju users and developers.</h2>
489- </div>
490- </div>
491- </header>
492+ </nav>
493+ </div>
494+ </div>
495+ <div class="header-content">
496+ <div class="clearfix">
497+ <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
498+ <div class="header-navigation-secondary"></div>
499+ <div class="header-image"></div>
500+ <h1>Resources</h1>
501+ <h2>A collection of some of the most important online references for Juju users and developers.</h2>
502+ </div>
503+ </div>
504+</header>
505+
506 <section id="content" class="container-12">
507 <div class="grid-12 doc-container">
508 <div class="grid-3 doc-navigation">
509@@ -190,43 +195,62 @@
510 </div>
511 </section>
512 <div class="shadow"></div>
513- <footer>
514- <div>
515- <nav role="navigation" class="clearfix">
516- <ul>
517- <li><a href="https://juju.ubuntu.com/get-started">Get started</a></li>
518- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li>
519- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li>
520- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li>
521- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li>
522- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li>
523- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li>
524- </ul>
525- <ul>
526- <li><a href="https://juju.ubuntu.com/resources">Resources</a></li>
527- <li><a href="https://juju.ubuntu.com/docs">Documentation</a></li>
528- <li><a href="https://juju.ubuntu.com/resources/videos">Videos</a></li>
529- <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI Demo</a></li>
530- </ul>
531- <ul>
532- <li><a href="https://juju.ubuntu.com/community">Community</a></li>
533- <li class="page_item"><a href="https://juju.ubuntu.com/community/juju-blog/">Blog</a></li>
534- <li class="page_item"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Charm Meetings</a></li>
535- <li class="page_item"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li>
536- <li class="page_item"><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li>
537- <li class="page_item"><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li>
538- <li class="page_item"><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&amp;amp;pagesize=50">FAQ</a></li>
539- </ul>
540- <ul class="last">
541- <li><a href="https://launchpad.net/juju">Code</a></li>
542- <li><a href="https://launchpad.net/juju-core">Juju Core</a></li>
543- <li><a href="https://launchpad.net/charms">Charms</a></li>
544- </ul>
545- </nav>
546- </div>
547- </footer>
548+ <footer class="global clearfix" role="contentinfo">
549+ <div class="row">
550+ <div class="inner-wrapper">
551+ <nav role="navigation" class="clearfix">
552+ <ul class="footer-a">
553+ <li class="grid-3 first-col">
554+ <h4><a href="/get-started">Get started</a></h4>
555+ <ul>
556+ <li class="page_item page-item-20"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li>
557+ <li class="page_item page-item-22"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li>
558+ <li class="page_item page-item-18"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li>
559+ <li class="page_item page-item-16"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li>
560+ <li class="page_item page-item-3596"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li>
561+ <li class="page_item page-item-3600"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li>
562+ </ul>
563+ </li>
564+ <li class="grid-3">
565+ <h4><a href="/resources">Resources</a></h4>
566+ <ul>
567+ <li><a href="http://juju.ubuntu.com/docs">Documentation</a></li>
568+ <li><a href="/resources/videos/">Videos</a></li>
569+ <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI demo site</a></li>
570+ </ul>
571+ </li>
572+ <li class="grid-3">
573+ <h4><a href="/community">Community</a></h4>
574+ <ul>
575+ <li class="page_item page-item-28"><a href="https://juju.ubuntu.com/community/juju-blog/">Juju Blog</a></li>
576+ <li class="page_item page-item-4262"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Weekly Charm Meeting</a></li>
577+ <li class="page_item page-item-4036"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li>
578+ <li><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li>
579+ <li><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li>
580+ <li><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&pagesize=50">FAQ</a></li>
581+ </ul>
582+ </li>
583+ <li class="grid-3 last-col">
584+ <h4><a href="https://launchpad.net/juju">Code</a></h4>
585+ <ul>
586+ <li><a href="https://launchpad.net/juju-core">Juju Core</a></li>
587+ <li><a href="https://launchpad.net/charms">Charms</a></li>
588+ </ul>
589+ </li>
590+ </ul>
591+ </nav>
592+ </div>
593+ </div>
594+ <div class="row no-border">
595+ <div class="legal inner-wrapper">
596+ <p>&copy; 2013 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p>
597+ <p><a href="https://bugs.launchpad.net/juju-website/+filebug">Report a bug on this site</a></p>
598+ </div>
599+ </div>
600+</footer>
601+
602 <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
603- <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.8.14/jquery-ui.min.js"></script>
604+ <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script>
605 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
606 <script type="text/javascript" src="js/main.js"></script>
607 </body>
608
609=== modified file 'htmldocs/authors-charm-policy.html'
610--- htmldocs/authors-charm-policy.html 2013-07-12 07:32:14 +0000
611+++ htmldocs/authors-charm-policy.html 2013-07-13 18:35:28 +0000
612@@ -1,56 +1,61 @@
613 <!DOCTYPE html>
614 <html>
615 <head>
616- <meta charset="utf-8">
617- <title>Juju Documentation - Charm Store Policy</title>
618- <link href="//fonts.googleapis.com/css?family=Ubuntu:400,400italic" rel="stylesheet" type="text/css"/>
619- <link href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400" rel="stylesheet" type="text/css"/>
620- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" rel="stylesheet" type="text/css"/>
621- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" rel="stylesheet" type="text/css"/>
622- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" rel="stylesheet" type="text/css"/>
623- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/resources.css" rel="stylesheet" type="text/css"/>
624- <link href="css/main.css" rel="stylesheet" type="text/css"/>
625- <!--[if lt IE 9]>
626- <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
627- <![endif]-->
628- </head>
629+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
630+ <title>Juju Documentation - Charm Store Policy</title>
631+ <link href='https://fonts.googleapis.com/css?family=Ubuntu:400,300,300italic,400italic,700,700italic|Ubuntu+Mono' rel='stylesheet' type='text/css' />
632+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" />
633+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" />
634+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" />
635+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/home-new.css" />
636+ <link rel='stylesheet' id='stacktack-css' href='//juju.ubuntu.com/wp-content/plugins/stacktack/css/stacktack.min.css?ver=3.4.2' type='text/css' media='all' />
637+ <link href="css/main.css?1373740025" rel="stylesheet" type="text/css"/>
638+
639+ <!--[if lt IE 9]>
640+ <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
641+ <![endif]-->
642+</head>
643+<!-- DO NOT EDIT ABOVE THIS LINE -->
644+
645+<!-- DO NOT EDIT ABOVE THIS LINE -->
646+
647+
648 <body class="resources">
649- <header>
650- <div class="header-login">
651+ <header class="global clearfix" role="banner">
652+ <div class="header-navigation">
653+ <div>
654+ <nav role="navigation">
655 <ul>
656- <li>&nbsp;</li>
657+ <li class="page_item page-item-6"><a href="https://juju.ubuntu.com/">Home</a></li>
658+ <li class="page_item page-item-7"><a href="https://juju.ubuntu.com/get-started/">Get started</a></li>
659+ <li class="page_item page-item-9 current_page_item"><a href="https://juju.ubuntu.com/resources/">Resources</a></li>
660+ <li class="page_item page-item-13"><a href="https://juju.ubuntu.com/community/">Community</a></li>
661+ <li class="page_item page-item-3688"><a href="https://juju.ubuntu.com/charm-store/">Charm Store</a></li>
662+ <li class="page_item page-item-3691"><a href="https://juju.ubuntu.com/events/">Events</a></li>
663+ <li class="page_item page-item-4474"><a href="https://juju.ubuntu.com/charm-championship/">Charm Championship</a></li>
664+ <li class="page_item page-item-4249"><a href="https://juju.ubuntu.com/survey/">Survey</a></li>
665+ <li>
666+ <form id="form-search" method="get" action="https://juju.ubuntu.com/">
667+ <fieldset>
668+ <input id="input-search" type="text" name="s" value="Search" />
669+ </fieldset>
670+ </form>
671+ </li>
672 </ul>
673- </div>
674- <div class="header-navigation">
675- <div>
676- <nav role="navigation">
677- <ul>
678- <li class="page_item"><a href="https://juju.ubuntu.com/">Home</a></li>
679- <li class="page_item current_page_item"><a href="https://juju.ubuntu.com/">Resources</a></li>
680- <li class="page_item"><a href="https://juju.ubuntu.com/">Community</a></li>
681- <li class="page_item"><a href="https://juju.ubuntu.com/">Charm Store</a></li>
682- <li class="page_item"><a href="https://juju.ubuntu.com/">Events</a></li>
683- <li class="page_item"><a href="https://juju.ubuntu.com/">Survey</a></li>
684- <li>
685- <form id="form-search" method="get" action="/">
686- <fieldset>
687- <input id="input-search" type="text" name="s" value="Search">
688- </fieldset>
689- </form>
690- </li>
691- </ul>
692- </nav><a href="https://juju.ubuntu.com/" class="logo-ubuntu"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/logo-ubuntu.png"></a>
693- </div>
694- </div>
695- <div class="header-content">
696- <div class="clearfix"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
697- <div class="header-navigation-secondary"></div>
698- <div class="header-image"></div>
699- <h1>Resources</h1>
700- <h2>A collection of some of the most important online references for Juju users and developers.</h2>
701- </div>
702- </div>
703- </header>
704+ </nav>
705+ </div>
706+ </div>
707+ <div class="header-content">
708+ <div class="clearfix">
709+ <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
710+ <div class="header-navigation-secondary"></div>
711+ <div class="header-image"></div>
712+ <h1>Resources</h1>
713+ <h2>A collection of some of the most important online references for Juju users and developers.</h2>
714+ </div>
715+ </div>
716+</header>
717+
718 <section id="content" class="container-12">
719 <div class="grid-12 doc-container">
720 <div class="grid-3 doc-navigation">
721@@ -161,43 +166,62 @@
722 </div>
723 </section>
724 <div class="shadow"></div>
725- <footer>
726- <div>
727- <nav role="navigation" class="clearfix">
728- <ul>
729- <li><a href="https://juju.ubuntu.com/get-started">Get started</a></li>
730- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li>
731- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li>
732- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li>
733- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li>
734- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li>
735- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li>
736- </ul>
737- <ul>
738- <li><a href="https://juju.ubuntu.com/resources">Resources</a></li>
739- <li><a href="https://juju.ubuntu.com/docs">Documentation</a></li>
740- <li><a href="https://juju.ubuntu.com/resources/videos">Videos</a></li>
741- <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI Demo</a></li>
742- </ul>
743- <ul>
744- <li><a href="https://juju.ubuntu.com/community">Community</a></li>
745- <li class="page_item"><a href="https://juju.ubuntu.com/community/juju-blog/">Blog</a></li>
746- <li class="page_item"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Charm Meetings</a></li>
747- <li class="page_item"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li>
748- <li class="page_item"><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li>
749- <li class="page_item"><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li>
750- <li class="page_item"><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&amp;amp;pagesize=50">FAQ</a></li>
751- </ul>
752- <ul class="last">
753- <li><a href="https://launchpad.net/juju">Code</a></li>
754- <li><a href="https://launchpad.net/juju-core">Juju Core</a></li>
755- <li><a href="https://launchpad.net/charms">Charms</a></li>
756- </ul>
757- </nav>
758- </div>
759- </footer>
760+ <footer class="global clearfix" role="contentinfo">
761+ <div class="row">
762+ <div class="inner-wrapper">
763+ <nav role="navigation" class="clearfix">
764+ <ul class="footer-a">
765+ <li class="grid-3 first-col">
766+ <h4><a href="/get-started">Get started</a></h4>
767+ <ul>
768+ <li class="page_item page-item-20"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li>
769+ <li class="page_item page-item-22"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li>
770+ <li class="page_item page-item-18"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li>
771+ <li class="page_item page-item-16"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li>
772+ <li class="page_item page-item-3596"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li>
773+ <li class="page_item page-item-3600"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li>
774+ </ul>
775+ </li>
776+ <li class="grid-3">
777+ <h4><a href="/resources">Resources</a></h4>
778+ <ul>
779+ <li><a href="http://juju.ubuntu.com/docs">Documentation</a></li>
780+ <li><a href="/resources/videos/">Videos</a></li>
781+ <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI demo site</a></li>
782+ </ul>
783+ </li>
784+ <li class="grid-3">
785+ <h4><a href="/community">Community</a></h4>
786+ <ul>
787+ <li class="page_item page-item-28"><a href="https://juju.ubuntu.com/community/juju-blog/">Juju Blog</a></li>
788+ <li class="page_item page-item-4262"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Weekly Charm Meeting</a></li>
789+ <li class="page_item page-item-4036"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li>
790+ <li><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li>
791+ <li><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li>
792+ <li><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&pagesize=50">FAQ</a></li>
793+ </ul>
794+ </li>
795+ <li class="grid-3 last-col">
796+ <h4><a href="https://launchpad.net/juju">Code</a></h4>
797+ <ul>
798+ <li><a href="https://launchpad.net/juju-core">Juju Core</a></li>
799+ <li><a href="https://launchpad.net/charms">Charms</a></li>
800+ </ul>
801+ </li>
802+ </ul>
803+ </nav>
804+ </div>
805+ </div>
806+ <div class="row no-border">
807+ <div class="legal inner-wrapper">
808+ <p>&copy; 2013 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p>
809+ <p><a href="https://bugs.launchpad.net/juju-website/+filebug">Report a bug on this site</a></p>
810+ </div>
811+ </div>
812+</footer>
813+
814 <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
815- <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.8.14/jquery-ui.min.js"></script>
816+ <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script>
817 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
818 <script type="text/javascript" src="js/main.js"></script>
819 </body>
820
821=== modified file 'htmldocs/authors-charm-quality.html'
822--- htmldocs/authors-charm-quality.html 2013-07-12 00:12:30 +0000
823+++ htmldocs/authors-charm-quality.html 2013-07-13 18:35:28 +0000
824@@ -1,56 +1,61 @@
825 <!DOCTYPE html>
826 <html>
827 <head>
828- <meta charset="utf-8">
829- <title>Juju Documentation - Authoring Charms</title>
830- <link href="//fonts.googleapis.com/css?family=Ubuntu:400,400italic" rel="stylesheet" type="text/css"/>
831- <link href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400" rel="stylesheet" type="text/css"/>
832- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" rel="stylesheet" type="text/css"/>
833- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" rel="stylesheet" type="text/css"/>
834- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" rel="stylesheet" type="text/css"/>
835- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/resources.css" rel="stylesheet" type="text/css"/>
836- <link href="css/main.css" rel="stylesheet" type="text/css"/>
837- <!--[if lt IE 9]>
838- <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
839- <![endif]-->
840- </head>
841+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
842+ <title>Juju Documentation - Charm Quality Rating</title>
843+ <link href='https://fonts.googleapis.com/css?family=Ubuntu:400,300,300italic,400italic,700,700italic|Ubuntu+Mono' rel='stylesheet' type='text/css' />
844+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" />
845+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" />
846+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" />
847+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/home-new.css" />
848+ <link rel='stylesheet' id='stacktack-css' href='//juju.ubuntu.com/wp-content/plugins/stacktack/css/stacktack.min.css?ver=3.4.2' type='text/css' media='all' />
849+ <link href="css/main.css?1373740025" rel="stylesheet" type="text/css"/>
850+
851+ <!--[if lt IE 9]>
852+ <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
853+ <![endif]-->
854+</head>
855+<!-- DO NOT EDIT ABOVE THIS LINE -->
856+
857+<!-- DO NOT EDIT ABOVE THIS LINE -->
858+
859+
860 <body class="resources">
861- <header>
862- <div class="header-login">
863+ <header class="global clearfix" role="banner">
864+ <div class="header-navigation">
865+ <div>
866+ <nav role="navigation">
867 <ul>
868- <li>&nbsp;</li>
869+ <li class="page_item page-item-6"><a href="https://juju.ubuntu.com/">Home</a></li>
870+ <li class="page_item page-item-7"><a href="https://juju.ubuntu.com/get-started/">Get started</a></li>
871+ <li class="page_item page-item-9 current_page_item"><a href="https://juju.ubuntu.com/resources/">Resources</a></li>
872+ <li class="page_item page-item-13"><a href="https://juju.ubuntu.com/community/">Community</a></li>
873+ <li class="page_item page-item-3688"><a href="https://juju.ubuntu.com/charm-store/">Charm Store</a></li>
874+ <li class="page_item page-item-3691"><a href="https://juju.ubuntu.com/events/">Events</a></li>
875+ <li class="page_item page-item-4474"><a href="https://juju.ubuntu.com/charm-championship/">Charm Championship</a></li>
876+ <li class="page_item page-item-4249"><a href="https://juju.ubuntu.com/survey/">Survey</a></li>
877+ <li>
878+ <form id="form-search" method="get" action="https://juju.ubuntu.com/">
879+ <fieldset>
880+ <input id="input-search" type="text" name="s" value="Search" />
881+ </fieldset>
882+ </form>
883+ </li>
884 </ul>
885- </div>
886- <div class="header-navigation">
887- <div>
888- <nav role="navigation">
889- <ul>
890- <li class="page_item"><a href="https://juju.ubuntu.com/">Home</a></li>
891- <li class="page_item current_page_item"><a href="https://juju.ubuntu.com/">Resources</a></li>
892- <li class="page_item"><a href="https://juju.ubuntu.com/">Community</a></li>
893- <li class="page_item"><a href="https://juju.ubuntu.com/">Charm Store</a></li>
894- <li class="page_item"><a href="https://juju.ubuntu.com/">Events</a></li>
895- <li class="page_item"><a href="https://juju.ubuntu.com/">Survey</a></li>
896- <li>
897- <form id="form-search" method="get" action="/">
898- <fieldset>
899- <input id="input-search" type="text" name="s" value="Search">
900- </fieldset>
901- </form>
902- </li>
903- </ul>
904- </nav><a href="https://juju.ubuntu.com/" class="logo-ubuntu"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/logo-ubuntu.png"></a>
905- </div>
906- </div>
907- <div class="header-content">
908- <div class="clearfix"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
909- <div class="header-navigation-secondary"></div>
910- <div class="header-image"></div>
911- <h1>Resources</h1>
912- <h2>A collection of some of the most important online references for Juju users and developers.</h2>
913- </div>
914- </div>
915- </header>
916+ </nav>
917+ </div>
918+ </div>
919+ <div class="header-content">
920+ <div class="clearfix">
921+ <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
922+ <div class="header-navigation-secondary"></div>
923+ <div class="header-image"></div>
924+ <h1>Resources</h1>
925+ <h2>A collection of some of the most important online references for Juju users and developers.</h2>
926+ </div>
927+ </div>
928+</header>
929+
930 <section id="content" class="container-12">
931 <div class="grid-12 doc-container">
932 <div class="grid-3 doc-navigation">
933@@ -243,43 +248,62 @@
934 </div>
935 </section>
936 <div class="shadow"></div>
937- <footer>
938- <div>
939- <nav role="navigation" class="clearfix">
940- <ul>
941- <li><a href="https://juju.ubuntu.com/get-started">Get started</a></li>
942- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li>
943- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li>
944- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li>
945- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li>
946- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li>
947- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li>
948- </ul>
949- <ul>
950- <li><a href="https://juju.ubuntu.com/resources">Resources</a></li>
951- <li><a href="https://juju.ubuntu.com/docs">Documentation</a></li>
952- <li><a href="https://juju.ubuntu.com/resources/videos">Videos</a></li>
953- <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI Demo</a></li>
954- </ul>
955- <ul>
956- <li><a href="https://juju.ubuntu.com/community">Community</a></li>
957- <li class="page_item"><a href="https://juju.ubuntu.com/community/juju-blog/">Blog</a></li>
958- <li class="page_item"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Charm Meetings</a></li>
959- <li class="page_item"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li>
960- <li class="page_item"><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li>
961- <li class="page_item"><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li>
962- <li class="page_item"><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&amp;amp;pagesize=50">FAQ</a></li>
963- </ul>
964- <ul class="last">
965- <li><a href="https://launchpad.net/juju">Code</a></li>
966- <li><a href="https://launchpad.net/juju-core">Juju Core</a></li>
967- <li><a href="https://launchpad.net/charms">Charms</a></li>
968- </ul>
969- </nav>
970- </div>
971- </footer>
972+ <footer class="global clearfix" role="contentinfo">
973+ <div class="row">
974+ <div class="inner-wrapper">
975+ <nav role="navigation" class="clearfix">
976+ <ul class="footer-a">
977+ <li class="grid-3 first-col">
978+ <h4><a href="/get-started">Get started</a></h4>
979+ <ul>
980+ <li class="page_item page-item-20"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li>
981+ <li class="page_item page-item-22"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li>
982+ <li class="page_item page-item-18"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li>
983+ <li class="page_item page-item-16"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li>
984+ <li class="page_item page-item-3596"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li>
985+ <li class="page_item page-item-3600"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li>
986+ </ul>
987+ </li>
988+ <li class="grid-3">
989+ <h4><a href="/resources">Resources</a></h4>
990+ <ul>
991+ <li><a href="http://juju.ubuntu.com/docs">Documentation</a></li>
992+ <li><a href="/resources/videos/">Videos</a></li>
993+ <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI demo site</a></li>
994+ </ul>
995+ </li>
996+ <li class="grid-3">
997+ <h4><a href="/community">Community</a></h4>
998+ <ul>
999+ <li class="page_item page-item-28"><a href="https://juju.ubuntu.com/community/juju-blog/">Juju Blog</a></li>
1000+ <li class="page_item page-item-4262"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Weekly Charm Meeting</a></li>
1001+ <li class="page_item page-item-4036"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li>
1002+ <li><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li>
1003+ <li><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li>
1004+ <li><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&pagesize=50">FAQ</a></li>
1005+ </ul>
1006+ </li>
1007+ <li class="grid-3 last-col">
1008+ <h4><a href="https://launchpad.net/juju">Code</a></h4>
1009+ <ul>
1010+ <li><a href="https://launchpad.net/juju-core">Juju Core</a></li>
1011+ <li><a href="https://launchpad.net/charms">Charms</a></li>
1012+ </ul>
1013+ </li>
1014+ </ul>
1015+ </nav>
1016+ </div>
1017+ </div>
1018+ <div class="row no-border">
1019+ <div class="legal inner-wrapper">
1020+ <p>&copy; 2013 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p>
1021+ <p><a href="https://bugs.launchpad.net/juju-website/+filebug">Report a bug on this site</a></p>
1022+ </div>
1023+ </div>
1024+</footer>
1025+
1026 <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
1027- <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.8.14/jquery-ui.min.js"></script>
1028+ <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script>
1029 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
1030 <script type="text/javascript" src="js/main.js"></script>
1031 </body>
1032
1033=== modified file 'htmldocs/authors-charm-store.html'
1034--- htmldocs/authors-charm-store.html 2013-07-12 07:32:14 +0000
1035+++ htmldocs/authors-charm-store.html 2013-07-13 18:35:28 +0000
1036@@ -1,56 +1,61 @@
1037 <!DOCTYPE html>
1038 <html>
1039 <head>
1040- <meta charset="utf-8">
1041- <title>Juju Documentation - Authoring Charms</title>
1042- <link href="//fonts.googleapis.com/css?family=Ubuntu:400,400italic" rel="stylesheet" type="text/css"/>
1043- <link href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400" rel="stylesheet" type="text/css"/>
1044- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" rel="stylesheet" type="text/css"/>
1045- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" rel="stylesheet" type="text/css"/>
1046- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" rel="stylesheet" type="text/css"/>
1047- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/resources.css" rel="stylesheet" type="text/css"/>
1048- <link href="css/main.css" rel="stylesheet" type="text/css"/>
1049- <!--[if lt IE 9]>
1050- <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
1051- <![endif]-->
1052- </head>
1053+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
1054+ <title>Juju Documentation - The Juju Charm Store</title>
1055+ <link href='https://fonts.googleapis.com/css?family=Ubuntu:400,300,300italic,400italic,700,700italic|Ubuntu+Mono' rel='stylesheet' type='text/css' />
1056+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" />
1057+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" />
1058+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" />
1059+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/home-new.css" />
1060+ <link rel='stylesheet' id='stacktack-css' href='//juju.ubuntu.com/wp-content/plugins/stacktack/css/stacktack.min.css?ver=3.4.2' type='text/css' media='all' />
1061+ <link href="css/main.css?1373740025" rel="stylesheet" type="text/css"/>
1062+
1063+ <!--[if lt IE 9]>
1064+ <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
1065+ <![endif]-->
1066+</head>
1067+<!-- DO NOT EDIT ABOVE THIS LINE -->
1068+
1069+<!-- DO NOT EDIT ABOVE THIS LINE -->
1070+
1071+
1072 <body class="resources">
1073- <header>
1074- <div class="header-login">
1075+ <header class="global clearfix" role="banner">
1076+ <div class="header-navigation">
1077+ <div>
1078+ <nav role="navigation">
1079 <ul>
1080- <li>&nbsp;</li>
1081+ <li class="page_item page-item-6"><a href="https://juju.ubuntu.com/">Home</a></li>
1082+ <li class="page_item page-item-7"><a href="https://juju.ubuntu.com/get-started/">Get started</a></li>
1083+ <li class="page_item page-item-9 current_page_item"><a href="https://juju.ubuntu.com/resources/">Resources</a></li>
1084+ <li class="page_item page-item-13"><a href="https://juju.ubuntu.com/community/">Community</a></li>
1085+ <li class="page_item page-item-3688"><a href="https://juju.ubuntu.com/charm-store/">Charm Store</a></li>
1086+ <li class="page_item page-item-3691"><a href="https://juju.ubuntu.com/events/">Events</a></li>
1087+ <li class="page_item page-item-4474"><a href="https://juju.ubuntu.com/charm-championship/">Charm Championship</a></li>
1088+ <li class="page_item page-item-4249"><a href="https://juju.ubuntu.com/survey/">Survey</a></li>
1089+ <li>
1090+ <form id="form-search" method="get" action="https://juju.ubuntu.com/">
1091+ <fieldset>
1092+ <input id="input-search" type="text" name="s" value="Search" />
1093+ </fieldset>
1094+ </form>
1095+ </li>
1096 </ul>
1097- </div>
1098- <div class="header-navigation">
1099- <div>
1100- <nav role="navigation">
1101- <ul>
1102- <li class="page_item"><a href="https://juju.ubuntu.com/">Home</a></li>
1103- <li class="page_item current_page_item"><a href="https://juju.ubuntu.com/">Resources</a></li>
1104- <li class="page_item"><a href="https://juju.ubuntu.com/">Community</a></li>
1105- <li class="page_item"><a href="https://juju.ubuntu.com/">Charm Store</a></li>
1106- <li class="page_item"><a href="https://juju.ubuntu.com/">Events</a></li>
1107- <li class="page_item"><a href="https://juju.ubuntu.com/">Survey</a></li>
1108- <li>
1109- <form id="form-search" method="get" action="/">
1110- <fieldset>
1111- <input id="input-search" type="text" name="s" value="Search">
1112- </fieldset>
1113- </form>
1114- </li>
1115- </ul>
1116- </nav><a href="https://juju.ubuntu.com/" class="logo-ubuntu"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/logo-ubuntu.png"></a>
1117- </div>
1118- </div>
1119- <div class="header-content">
1120- <div class="clearfix"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
1121- <div class="header-navigation-secondary"></div>
1122- <div class="header-image"></div>
1123- <h1>Resources</h1>
1124- <h2>A collection of some of the most important online references for Juju users and developers.</h2>
1125- </div>
1126- </div>
1127- </header>
1128+ </nav>
1129+ </div>
1130+ </div>
1131+ <div class="header-content">
1132+ <div class="clearfix">
1133+ <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
1134+ <div class="header-navigation-secondary"></div>
1135+ <div class="header-image"></div>
1136+ <h1>Resources</h1>
1137+ <h2>A collection of some of the most important online references for Juju users and developers.</h2>
1138+ </div>
1139+ </div>
1140+</header>
1141+
1142 <section id="content" class="container-12">
1143 <div class="grid-12 doc-container">
1144 <div class="grid-3 doc-navigation">
1145@@ -245,43 +250,62 @@
1146 </div>
1147 </section>
1148 <div class="shadow"></div>
1149- <footer>
1150- <div>
1151- <nav role="navigation" class="clearfix">
1152- <ul>
1153- <li><a href="https://juju.ubuntu.com/get-started">Get started</a></li>
1154- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li>
1155- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li>
1156- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li>
1157- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li>
1158- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li>
1159- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li>
1160- </ul>
1161- <ul>
1162- <li><a href="https://juju.ubuntu.com/resources">Resources</a></li>
1163- <li><a href="https://juju.ubuntu.com/docs">Documentation</a></li>
1164- <li><a href="https://juju.ubuntu.com/resources/videos">Videos</a></li>
1165- <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI Demo</a></li>
1166- </ul>
1167- <ul>
1168- <li><a href="https://juju.ubuntu.com/community">Community</a></li>
1169- <li class="page_item"><a href="https://juju.ubuntu.com/community/juju-blog/">Blog</a></li>
1170- <li class="page_item"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Charm Meetings</a></li>
1171- <li class="page_item"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li>
1172- <li class="page_item"><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li>
1173- <li class="page_item"><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li>
1174- <li class="page_item"><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&amp;amp;pagesize=50">FAQ</a></li>
1175- </ul>
1176- <ul class="last">
1177- <li><a href="https://launchpad.net/juju">Code</a></li>
1178- <li><a href="https://launchpad.net/juju-core">Juju Core</a></li>
1179- <li><a href="https://launchpad.net/charms">Charms</a></li>
1180- </ul>
1181- </nav>
1182- </div>
1183- </footer>
1184+ <footer class="global clearfix" role="contentinfo">
1185+ <div class="row">
1186+ <div class="inner-wrapper">
1187+ <nav role="navigation" class="clearfix">
1188+ <ul class="footer-a">
1189+ <li class="grid-3 first-col">
1190+ <h4><a href="/get-started">Get started</a></h4>
1191+ <ul>
1192+ <li class="page_item page-item-20"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li>
1193+ <li class="page_item page-item-22"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li>
1194+ <li class="page_item page-item-18"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li>
1195+ <li class="page_item page-item-16"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li>
1196+ <li class="page_item page-item-3596"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li>
1197+ <li class="page_item page-item-3600"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li>
1198+ </ul>
1199+ </li>
1200+ <li class="grid-3">
1201+ <h4><a href="/resources">Resources</a></h4>
1202+ <ul>
1203+ <li><a href="http://juju.ubuntu.com/docs">Documentation</a></li>
1204+ <li><a href="/resources/videos/">Videos</a></li>
1205+ <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI demo site</a></li>
1206+ </ul>
1207+ </li>
1208+ <li class="grid-3">
1209+ <h4><a href="/community">Community</a></h4>
1210+ <ul>
1211+ <li class="page_item page-item-28"><a href="https://juju.ubuntu.com/community/juju-blog/">Juju Blog</a></li>
1212+ <li class="page_item page-item-4262"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Weekly Charm Meeting</a></li>
1213+ <li class="page_item page-item-4036"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li>
1214+ <li><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li>
1215+ <li><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li>
1216+ <li><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&pagesize=50">FAQ</a></li>
1217+ </ul>
1218+ </li>
1219+ <li class="grid-3 last-col">
1220+ <h4><a href="https://launchpad.net/juju">Code</a></h4>
1221+ <ul>
1222+ <li><a href="https://launchpad.net/juju-core">Juju Core</a></li>
1223+ <li><a href="https://launchpad.net/charms">Charms</a></li>
1224+ </ul>
1225+ </li>
1226+ </ul>
1227+ </nav>
1228+ </div>
1229+ </div>
1230+ <div class="row no-border">
1231+ <div class="legal inner-wrapper">
1232+ <p>&copy; 2013 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p>
1233+ <p><a href="https://bugs.launchpad.net/juju-website/+filebug">Report a bug on this site</a></p>
1234+ </div>
1235+ </div>
1236+</footer>
1237+
1238 <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
1239- <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.8.14/jquery-ui.min.js"></script>
1240+ <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script>
1241 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
1242 <script type="text/javascript" src="js/main.js"></script>
1243 </body>
1244
1245=== modified file 'htmldocs/authors-charm-writing.html'
1246--- htmldocs/authors-charm-writing.html 2013-07-12 16:05:56 +0000
1247+++ htmldocs/authors-charm-writing.html 2013-07-13 18:35:28 +0000
1248@@ -1,56 +1,61 @@
1249 <!DOCTYPE html>
1250 <html>
1251 <head>
1252- <meta charset="utf-8">
1253- <title>Juju Documentation - Writing a charm</title>
1254- <link href="//fonts.googleapis.com/css?family=Ubuntu:400,400italic" rel="stylesheet" type="text/css"/>
1255- <link href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400" rel="stylesheet" type="text/css"/>
1256- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" rel="stylesheet" type="text/css"/>
1257- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" rel="stylesheet" type="text/css"/>
1258- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" rel="stylesheet" type="text/css"/>
1259- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/resources.css" rel="stylesheet" type="text/css"/>
1260- <link href="css/main.css" rel="stylesheet" type="text/css"/>
1261- <!--[if lt IE 9]>
1262- <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
1263- <![endif]-->
1264- </head>
1265+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
1266+ <title>Juju Documentation - Writing a Charm</title>
1267+ <link href='https://fonts.googleapis.com/css?family=Ubuntu:400,300,300italic,400italic,700,700italic|Ubuntu+Mono' rel='stylesheet' type='text/css' />
1268+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" />
1269+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" />
1270+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" />
1271+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/home-new.css" />
1272+ <link rel='stylesheet' id='stacktack-css' href='//juju.ubuntu.com/wp-content/plugins/stacktack/css/stacktack.min.css?ver=3.4.2' type='text/css' media='all' />
1273+ <link href="css/main.css?1373740025" rel="stylesheet" type="text/css"/>
1274+
1275+ <!--[if lt IE 9]>
1276+ <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
1277+ <![endif]-->
1278+</head>
1279+<!-- DO NOT EDIT ABOVE THIS LINE -->
1280+
1281+<!-- DO NOT EDIT ABOVE THIS LINE -->
1282+
1283+
1284 <body class="resources">
1285- <header>
1286- <div class="header-login">
1287+ <header class="global clearfix" role="banner">
1288+ <div class="header-navigation">
1289+ <div>
1290+ <nav role="navigation">
1291 <ul>
1292- <li>&nbsp;</li>
1293+ <li class="page_item page-item-6"><a href="https://juju.ubuntu.com/">Home</a></li>
1294+ <li class="page_item page-item-7"><a href="https://juju.ubuntu.com/get-started/">Get started</a></li>
1295+ <li class="page_item page-item-9 current_page_item"><a href="https://juju.ubuntu.com/resources/">Resources</a></li>
1296+ <li class="page_item page-item-13"><a href="https://juju.ubuntu.com/community/">Community</a></li>
1297+ <li class="page_item page-item-3688"><a href="https://juju.ubuntu.com/charm-store/">Charm Store</a></li>
1298+ <li class="page_item page-item-3691"><a href="https://juju.ubuntu.com/events/">Events</a></li>
1299+ <li class="page_item page-item-4474"><a href="https://juju.ubuntu.com/charm-championship/">Charm Championship</a></li>
1300+ <li class="page_item page-item-4249"><a href="https://juju.ubuntu.com/survey/">Survey</a></li>
1301+ <li>
1302+ <form id="form-search" method="get" action="https://juju.ubuntu.com/">
1303+ <fieldset>
1304+ <input id="input-search" type="text" name="s" value="Search" />
1305+ </fieldset>
1306+ </form>
1307+ </li>
1308 </ul>
1309- </div>
1310- <div class="header-navigation">
1311- <div>
1312- <nav role="navigation">
1313- <ul>
1314- <li class="page_item"><a href="https://juju.ubuntu.com/">Home</a></li>
1315- <li class="page_item current_page_item"><a href="https://juju.ubuntu.com/">Resources</a></li>
1316- <li class="page_item"><a href="https://juju.ubuntu.com/">Community</a></li>
1317- <li class="page_item"><a href="https://juju.ubuntu.com/">Charm Store</a></li>
1318- <li class="page_item"><a href="https://juju.ubuntu.com/">Events</a></li>
1319- <li class="page_item"><a href="https://juju.ubuntu.com/">Survey</a></li>
1320- <li>
1321- <form id="form-search" method="get" action="/">
1322- <fieldset>
1323- <input id="input-search" type="text" name="s" value="Search">
1324- </fieldset>
1325- </form>
1326- </li>
1327- </ul>
1328- </nav><a href="https://juju.ubuntu.com/" class="logo-ubuntu"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/logo-ubuntu.png"></a>
1329- </div>
1330- </div>
1331- <div class="header-content">
1332- <div class="clearfix"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
1333- <div class="header-navigation-secondary"></div>
1334- <div class="header-image"></div>
1335- <h1>Resources</h1>
1336- <h2>A collection of some of the most important online references for Juju users and developers.</h2>
1337- </div>
1338- </div>
1339- </header>
1340+ </nav>
1341+ </div>
1342+ </div>
1343+ <div class="header-content">
1344+ <div class="clearfix">
1345+ <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
1346+ <div class="header-navigation-secondary"></div>
1347+ <div class="header-image"></div>
1348+ <h1>Resources</h1>
1349+ <h2>A collection of some of the most important online references for Juju users and developers.</h2>
1350+ </div>
1351+ </div>
1352+</header>
1353+
1354 <section id="content" class="container-12">
1355 <div class="grid-12 doc-container">
1356 <div class="grid-3 doc-navigation">
1357@@ -440,43 +445,62 @@
1358 </div>
1359 </section>
1360 <div class="shadow"></div>
1361- <footer>
1362- <div>
1363- <nav role="navigation" class="clearfix">
1364- <ul>
1365- <li><a href="https://juju.ubuntu.com/get-started">Get started</a></li>
1366- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li>
1367- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li>
1368- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li>
1369- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li>
1370- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li>
1371- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li>
1372- </ul>
1373- <ul>
1374- <li><a href="https://juju.ubuntu.com/resources">Resources</a></li>
1375- <li><a href="https://juju.ubuntu.com/docs">Documentation</a></li>
1376- <li><a href="https://juju.ubuntu.com/resources/videos">Videos</a></li>
1377- <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI Demo</a></li>
1378- </ul>
1379- <ul>
1380- <li><a href="https://juju.ubuntu.com/community">Community</a></li>
1381- <li class="page_item"><a href="https://juju.ubuntu.com/community/juju-blog/">Blog</a></li>
1382- <li class="page_item"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Charm Meetings</a></li>
1383- <li class="page_item"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li>
1384- <li class="page_item"><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li>
1385- <li class="page_item"><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li>
1386- <li class="page_item"><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&amp;amp;pagesize=50">FAQ</a></li>
1387- </ul>
1388- <ul class="last">
1389- <li><a href="https://launchpad.net/juju">Code</a></li>
1390- <li><a href="https://launchpad.net/juju-core">Juju Core</a></li>
1391- <li><a href="https://launchpad.net/charms">Charms</a></li>
1392- </ul>
1393- </nav>
1394- </div>
1395- </footer>
1396+ <footer class="global clearfix" role="contentinfo">
1397+ <div class="row">
1398+ <div class="inner-wrapper">
1399+ <nav role="navigation" class="clearfix">
1400+ <ul class="footer-a">
1401+ <li class="grid-3 first-col">
1402+ <h4><a href="/get-started">Get started</a></h4>
1403+ <ul>
1404+ <li class="page_item page-item-20"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li>
1405+ <li class="page_item page-item-22"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li>
1406+ <li class="page_item page-item-18"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li>
1407+ <li class="page_item page-item-16"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li>
1408+ <li class="page_item page-item-3596"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li>
1409+ <li class="page_item page-item-3600"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li>
1410+ </ul>
1411+ </li>
1412+ <li class="grid-3">
1413+ <h4><a href="/resources">Resources</a></h4>
1414+ <ul>
1415+ <li><a href="http://juju.ubuntu.com/docs">Documentation</a></li>
1416+ <li><a href="/resources/videos/">Videos</a></li>
1417+ <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI demo site</a></li>
1418+ </ul>
1419+ </li>
1420+ <li class="grid-3">
1421+ <h4><a href="/community">Community</a></h4>
1422+ <ul>
1423+ <li class="page_item page-item-28"><a href="https://juju.ubuntu.com/community/juju-blog/">Juju Blog</a></li>
1424+ <li class="page_item page-item-4262"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Weekly Charm Meeting</a></li>
1425+ <li class="page_item page-item-4036"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li>
1426+ <li><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li>
1427+ <li><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li>
1428+ <li><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&pagesize=50">FAQ</a></li>
1429+ </ul>
1430+ </li>
1431+ <li class="grid-3 last-col">
1432+ <h4><a href="https://launchpad.net/juju">Code</a></h4>
1433+ <ul>
1434+ <li><a href="https://launchpad.net/juju-core">Juju Core</a></li>
1435+ <li><a href="https://launchpad.net/charms">Charms</a></li>
1436+ </ul>
1437+ </li>
1438+ </ul>
1439+ </nav>
1440+ </div>
1441+ </div>
1442+ <div class="row no-border">
1443+ <div class="legal inner-wrapper">
1444+ <p>&copy; 2013 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p>
1445+ <p><a href="https://bugs.launchpad.net/juju-website/+filebug">Report a bug on this site</a></p>
1446+ </div>
1447+ </div>
1448+</footer>
1449+
1450 <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
1451- <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.8.14/jquery-ui.min.js"></script>
1452+ <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script>
1453 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
1454 <script type="text/javascript" src="js/main.js"></script>
1455 </body>
1456
1457=== modified file 'htmldocs/authors-hooks.html'
1458--- htmldocs/authors-hooks.html 2013-07-12 00:12:30 +0000
1459+++ htmldocs/authors-hooks.html 2013-07-13 18:35:28 +0000
1460@@ -1,56 +1,61 @@
1461 <!DOCTYPE html>
1462 <html>
1463 <head>
1464- <meta charset="utf-8">
1465- <title>Juju Documentation - Authoring Charms</title>
1466- <link href="//fonts.googleapis.com/css?family=Ubuntu:400,400italic" rel="stylesheet" type="text/css"/>
1467- <link href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400" rel="stylesheet" type="text/css"/>
1468- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" rel="stylesheet" type="text/css"/>
1469- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" rel="stylesheet" type="text/css"/>
1470- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" rel="stylesheet" type="text/css"/>
1471- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/resources.css" rel="stylesheet" type="text/css"/>
1472- <link href="css/main.css" rel="stylesheet" type="text/css"/>
1473- <!--[if lt IE 9]>
1474- <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
1475- <![endif]-->
1476- </head>
1477+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
1478+ <title>Juju Documentation - Hook Debugging</title>
1479+ <link href='https://fonts.googleapis.com/css?family=Ubuntu:400,300,300italic,400italic,700,700italic|Ubuntu+Mono' rel='stylesheet' type='text/css' />
1480+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" />
1481+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" />
1482+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" />
1483+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/home-new.css" />
1484+ <link rel='stylesheet' id='stacktack-css' href='//juju.ubuntu.com/wp-content/plugins/stacktack/css/stacktack.min.css?ver=3.4.2' type='text/css' media='all' />
1485+ <link href="css/main.css?1373740025" rel="stylesheet" type="text/css"/>
1486+
1487+ <!--[if lt IE 9]>
1488+ <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
1489+ <![endif]-->
1490+</head>
1491+<!-- DO NOT EDIT ABOVE THIS LINE -->
1492+
1493+<!-- DO NOT EDIT ABOVE THIS LINE -->
1494+
1495+
1496 <body class="resources">
1497- <header>
1498- <div class="header-login">
1499+ <header class="global clearfix" role="banner">
1500+ <div class="header-navigation">
1501+ <div>
1502+ <nav role="navigation">
1503 <ul>
1504- <li>&nbsp;</li>
1505+ <li class="page_item page-item-6"><a href="https://juju.ubuntu.com/">Home</a></li>
1506+ <li class="page_item page-item-7"><a href="https://juju.ubuntu.com/get-started/">Get started</a></li>
1507+ <li class="page_item page-item-9 current_page_item"><a href="https://juju.ubuntu.com/resources/">Resources</a></li>
1508+ <li class="page_item page-item-13"><a href="https://juju.ubuntu.com/community/">Community</a></li>
1509+ <li class="page_item page-item-3688"><a href="https://juju.ubuntu.com/charm-store/">Charm Store</a></li>
1510+ <li class="page_item page-item-3691"><a href="https://juju.ubuntu.com/events/">Events</a></li>
1511+ <li class="page_item page-item-4474"><a href="https://juju.ubuntu.com/charm-championship/">Charm Championship</a></li>
1512+ <li class="page_item page-item-4249"><a href="https://juju.ubuntu.com/survey/">Survey</a></li>
1513+ <li>
1514+ <form id="form-search" method="get" action="https://juju.ubuntu.com/">
1515+ <fieldset>
1516+ <input id="input-search" type="text" name="s" value="Search" />
1517+ </fieldset>
1518+ </form>
1519+ </li>
1520 </ul>
1521- </div>
1522- <div class="header-navigation">
1523- <div>
1524- <nav role="navigation">
1525- <ul>
1526- <li class="page_item"><a href="https://juju.ubuntu.com/">Home</a></li>
1527- <li class="page_item current_page_item"><a href="https://juju.ubuntu.com/">Resources</a></li>
1528- <li class="page_item"><a href="https://juju.ubuntu.com/">Community</a></li>
1529- <li class="page_item"><a href="https://juju.ubuntu.com/">Charm Store</a></li>
1530- <li class="page_item"><a href="https://juju.ubuntu.com/">Events</a></li>
1531- <li class="page_item"><a href="https://juju.ubuntu.com/">Survey</a></li>
1532- <li>
1533- <form id="form-search" method="get" action="/">
1534- <fieldset>
1535- <input id="input-search" type="text" name="s" value="Search">
1536- </fieldset>
1537- </form>
1538- </li>
1539- </ul>
1540- </nav><a href="https://juju.ubuntu.com/" class="logo-ubuntu"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/logo-ubuntu.png"></a>
1541- </div>
1542- </div>
1543- <div class="header-content">
1544- <div class="clearfix"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
1545- <div class="header-navigation-secondary"></div>
1546- <div class="header-image"></div>
1547- <h1>Resources</h1>
1548- <h2>A collection of some of the most important online references for Juju users and developers.</h2>
1549- </div>
1550- </div>
1551- </header>
1552+ </nav>
1553+ </div>
1554+ </div>
1555+ <div class="header-content">
1556+ <div class="clearfix">
1557+ <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
1558+ <div class="header-navigation-secondary"></div>
1559+ <div class="header-image"></div>
1560+ <h1>Resources</h1>
1561+ <h2>A collection of some of the most important online references for Juju users and developers.</h2>
1562+ </div>
1563+ </div>
1564+</header>
1565+
1566 <section id="content" class="container-12">
1567 <div class="grid-12 doc-container">
1568 <div class="grid-3 doc-navigation">
1569@@ -133,43 +138,62 @@
1570 </div>
1571 </section>
1572 <div class="shadow"></div>
1573- <footer>
1574- <div>
1575- <nav role="navigation" class="clearfix">
1576- <ul>
1577- <li><a href="https://juju.ubuntu.com/get-started">Get started</a></li>
1578- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li>
1579- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li>
1580- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li>
1581- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li>
1582- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li>
1583- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li>
1584- </ul>
1585- <ul>
1586- <li><a href="https://juju.ubuntu.com/resources">Resources</a></li>
1587- <li><a href="https://juju.ubuntu.com/docs">Documentation</a></li>
1588- <li><a href="https://juju.ubuntu.com/resources/videos">Videos</a></li>
1589- <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI Demo</a></li>
1590- </ul>
1591- <ul>
1592- <li><a href="https://juju.ubuntu.com/community">Community</a></li>
1593- <li class="page_item"><a href="https://juju.ubuntu.com/community/juju-blog/">Blog</a></li>
1594- <li class="page_item"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Charm Meetings</a></li>
1595- <li class="page_item"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li>
1596- <li class="page_item"><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li>
1597- <li class="page_item"><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li>
1598- <li class="page_item"><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&amp;amp;pagesize=50">FAQ</a></li>
1599- </ul>
1600- <ul class="last">
1601- <li><a href="https://launchpad.net/juju">Code</a></li>
1602- <li><a href="https://launchpad.net/juju-core">Juju Core</a></li>
1603- <li><a href="https://launchpad.net/charms">Charms</a></li>
1604- </ul>
1605- </nav>
1606- </div>
1607- </footer>
1608+ <footer class="global clearfix" role="contentinfo">
1609+ <div class="row">
1610+ <div class="inner-wrapper">
1611+ <nav role="navigation" class="clearfix">
1612+ <ul class="footer-a">
1613+ <li class="grid-3 first-col">
1614+ <h4><a href="/get-started">Get started</a></h4>
1615+ <ul>
1616+ <li class="page_item page-item-20"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li>
1617+ <li class="page_item page-item-22"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li>
1618+ <li class="page_item page-item-18"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li>
1619+ <li class="page_item page-item-16"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li>
1620+ <li class="page_item page-item-3596"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li>
1621+ <li class="page_item page-item-3600"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li>
1622+ </ul>
1623+ </li>
1624+ <li class="grid-3">
1625+ <h4><a href="/resources">Resources</a></h4>
1626+ <ul>
1627+ <li><a href="http://juju.ubuntu.com/docs">Documentation</a></li>
1628+ <li><a href="/resources/videos/">Videos</a></li>
1629+ <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI demo site</a></li>
1630+ </ul>
1631+ </li>
1632+ <li class="grid-3">
1633+ <h4><a href="/community">Community</a></h4>
1634+ <ul>
1635+ <li class="page_item page-item-28"><a href="https://juju.ubuntu.com/community/juju-blog/">Juju Blog</a></li>
1636+ <li class="page_item page-item-4262"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Weekly Charm Meeting</a></li>
1637+ <li class="page_item page-item-4036"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li>
1638+ <li><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li>
1639+ <li><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li>
1640+ <li><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&pagesize=50">FAQ</a></li>
1641+ </ul>
1642+ </li>
1643+ <li class="grid-3 last-col">
1644+ <h4><a href="https://launchpad.net/juju">Code</a></h4>
1645+ <ul>
1646+ <li><a href="https://launchpad.net/juju-core">Juju Core</a></li>
1647+ <li><a href="https://launchpad.net/charms">Charms</a></li>
1648+ </ul>
1649+ </li>
1650+ </ul>
1651+ </nav>
1652+ </div>
1653+ </div>
1654+ <div class="row no-border">
1655+ <div class="legal inner-wrapper">
1656+ <p>&copy; 2013 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p>
1657+ <p><a href="https://bugs.launchpad.net/juju-website/+filebug">Report a bug on this site</a></p>
1658+ </div>
1659+ </div>
1660+</footer>
1661+
1662 <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
1663- <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.8.14/jquery-ui.min.js"></script>
1664+ <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script>
1665 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
1666 <script type="text/javascript" src="js/main.js"></script>
1667 </body>
1668
1669=== modified file 'htmldocs/authors-implicit-relations.html'
1670--- htmldocs/authors-implicit-relations.html 2013-07-12 00:12:30 +0000
1671+++ htmldocs/authors-implicit-relations.html 2013-07-13 18:35:28 +0000
1672@@ -1,56 +1,61 @@
1673 <!DOCTYPE html>
1674 <html>
1675 <head>
1676- <meta charset="utf-8">
1677- <title>Juju Documentation - Authoring Charms</title>
1678- <link href="//fonts.googleapis.com/css?family=Ubuntu:400,400italic" rel="stylesheet" type="text/css"/>
1679- <link href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400" rel="stylesheet" type="text/css"/>
1680- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" rel="stylesheet" type="text/css"/>
1681- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" rel="stylesheet" type="text/css"/>
1682- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" rel="stylesheet" type="text/css"/>
1683- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/resources.css" rel="stylesheet" type="text/css"/>
1684- <link href="css/main.css" rel="stylesheet" type="text/css"/>
1685- <!--[if lt IE 9]>
1686- <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
1687- <![endif]-->
1688- </head>
1689+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
1690+ <title>Juju Documentation - Implicit Relations</title>
1691+ <link href='https://fonts.googleapis.com/css?family=Ubuntu:400,300,300italic,400italic,700,700italic|Ubuntu+Mono' rel='stylesheet' type='text/css' />
1692+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" />
1693+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" />
1694+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" />
1695+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/home-new.css" />
1696+ <link rel='stylesheet' id='stacktack-css' href='//juju.ubuntu.com/wp-content/plugins/stacktack/css/stacktack.min.css?ver=3.4.2' type='text/css' media='all' />
1697+ <link href="css/main.css?1373740025" rel="stylesheet" type="text/css"/>
1698+
1699+ <!--[if lt IE 9]>
1700+ <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
1701+ <![endif]-->
1702+</head>
1703+<!-- DO NOT EDIT ABOVE THIS LINE -->
1704+
1705+<!-- DO NOT EDIT ABOVE THIS LINE -->
1706+
1707+
1708 <body class="resources">
1709- <header>
1710- <div class="header-login">
1711+ <header class="global clearfix" role="banner">
1712+ <div class="header-navigation">
1713+ <div>
1714+ <nav role="navigation">
1715 <ul>
1716- <li>&nbsp;</li>
1717+ <li class="page_item page-item-6"><a href="https://juju.ubuntu.com/">Home</a></li>
1718+ <li class="page_item page-item-7"><a href="https://juju.ubuntu.com/get-started/">Get started</a></li>
1719+ <li class="page_item page-item-9 current_page_item"><a href="https://juju.ubuntu.com/resources/">Resources</a></li>
1720+ <li class="page_item page-item-13"><a href="https://juju.ubuntu.com/community/">Community</a></li>
1721+ <li class="page_item page-item-3688"><a href="https://juju.ubuntu.com/charm-store/">Charm Store</a></li>
1722+ <li class="page_item page-item-3691"><a href="https://juju.ubuntu.com/events/">Events</a></li>
1723+ <li class="page_item page-item-4474"><a href="https://juju.ubuntu.com/charm-championship/">Charm Championship</a></li>
1724+ <li class="page_item page-item-4249"><a href="https://juju.ubuntu.com/survey/">Survey</a></li>
1725+ <li>
1726+ <form id="form-search" method="get" action="https://juju.ubuntu.com/">
1727+ <fieldset>
1728+ <input id="input-search" type="text" name="s" value="Search" />
1729+ </fieldset>
1730+ </form>
1731+ </li>
1732 </ul>
1733- </div>
1734- <div class="header-navigation">
1735- <div>
1736- <nav role="navigation">
1737- <ul>
1738- <li class="page_item"><a href="https://juju.ubuntu.com/">Home</a></li>
1739- <li class="page_item current_page_item"><a href="https://juju.ubuntu.com/">Resources</a></li>
1740- <li class="page_item"><a href="https://juju.ubuntu.com/">Community</a></li>
1741- <li class="page_item"><a href="https://juju.ubuntu.com/">Charm Store</a></li>
1742- <li class="page_item"><a href="https://juju.ubuntu.com/">Events</a></li>
1743- <li class="page_item"><a href="https://juju.ubuntu.com/">Survey</a></li>
1744- <li>
1745- <form id="form-search" method="get" action="/">
1746- <fieldset>
1747- <input id="input-search" type="text" name="s" value="Search">
1748- </fieldset>
1749- </form>
1750- </li>
1751- </ul>
1752- </nav><a href="https://juju.ubuntu.com/" class="logo-ubuntu"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/logo-ubuntu.png"></a>
1753- </div>
1754- </div>
1755- <div class="header-content">
1756- <div class="clearfix"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
1757- <div class="header-navigation-secondary"></div>
1758- <div class="header-image"></div>
1759- <h1>Resources</h1>
1760- <h2>A collection of some of the most important online references for Juju users and developers.</h2>
1761- </div>
1762- </div>
1763- </header>
1764+ </nav>
1765+ </div>
1766+ </div>
1767+ <div class="header-content">
1768+ <div class="clearfix">
1769+ <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
1770+ <div class="header-navigation-secondary"></div>
1771+ <div class="header-image"></div>
1772+ <h1>Resources</h1>
1773+ <h2>A collection of some of the most important online references for Juju users and developers.</h2>
1774+ </div>
1775+ </div>
1776+</header>
1777+
1778 <section id="content" class="container-12">
1779 <div class="grid-12 doc-container">
1780 <div class="grid-3 doc-navigation">
1781@@ -134,43 +139,62 @@
1782 </div>
1783 </section>
1784 <div class="shadow"></div>
1785- <footer>
1786- <div>
1787- <nav role="navigation" class="clearfix">
1788- <ul>
1789- <li><a href="https://juju.ubuntu.com/get-started">Get started</a></li>
1790- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li>
1791- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li>
1792- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li>
1793- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li>
1794- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li>
1795- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li>
1796- </ul>
1797- <ul>
1798- <li><a href="https://juju.ubuntu.com/resources">Resources</a></li>
1799- <li><a href="https://juju.ubuntu.com/docs">Documentation</a></li>
1800- <li><a href="https://juju.ubuntu.com/resources/videos">Videos</a></li>
1801- <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI Demo</a></li>
1802- </ul>
1803- <ul>
1804- <li><a href="https://juju.ubuntu.com/community">Community</a></li>
1805- <li class="page_item"><a href="https://juju.ubuntu.com/community/juju-blog/">Blog</a></li>
1806- <li class="page_item"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Charm Meetings</a></li>
1807- <li class="page_item"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li>
1808- <li class="page_item"><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li>
1809- <li class="page_item"><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li>
1810- <li class="page_item"><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&amp;amp;pagesize=50">FAQ</a></li>
1811- </ul>
1812- <ul class="last">
1813- <li><a href="https://launchpad.net/juju">Code</a></li>
1814- <li><a href="https://launchpad.net/juju-core">Juju Core</a></li>
1815- <li><a href="https://launchpad.net/charms">Charms</a></li>
1816- </ul>
1817- </nav>
1818- </div>
1819- </footer>
1820+ <footer class="global clearfix" role="contentinfo">
1821+ <div class="row">
1822+ <div class="inner-wrapper">
1823+ <nav role="navigation" class="clearfix">
1824+ <ul class="footer-a">
1825+ <li class="grid-3 first-col">
1826+ <h4><a href="/get-started">Get started</a></h4>
1827+ <ul>
1828+ <li class="page_item page-item-20"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li>
1829+ <li class="page_item page-item-22"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li>
1830+ <li class="page_item page-item-18"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li>
1831+ <li class="page_item page-item-16"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li>
1832+ <li class="page_item page-item-3596"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li>
1833+ <li class="page_item page-item-3600"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li>
1834+ </ul>
1835+ </li>
1836+ <li class="grid-3">
1837+ <h4><a href="/resources">Resources</a></h4>
1838+ <ul>
1839+ <li><a href="http://juju.ubuntu.com/docs">Documentation</a></li>
1840+ <li><a href="/resources/videos/">Videos</a></li>
1841+ <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI demo site</a></li>
1842+ </ul>
1843+ </li>
1844+ <li class="grid-3">
1845+ <h4><a href="/community">Community</a></h4>
1846+ <ul>
1847+ <li class="page_item page-item-28"><a href="https://juju.ubuntu.com/community/juju-blog/">Juju Blog</a></li>
1848+ <li class="page_item page-item-4262"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Weekly Charm Meeting</a></li>
1849+ <li class="page_item page-item-4036"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li>
1850+ <li><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li>
1851+ <li><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li>
1852+ <li><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&pagesize=50">FAQ</a></li>
1853+ </ul>
1854+ </li>
1855+ <li class="grid-3 last-col">
1856+ <h4><a href="https://launchpad.net/juju">Code</a></h4>
1857+ <ul>
1858+ <li><a href="https://launchpad.net/juju-core">Juju Core</a></li>
1859+ <li><a href="https://launchpad.net/charms">Charms</a></li>
1860+ </ul>
1861+ </li>
1862+ </ul>
1863+ </nav>
1864+ </div>
1865+ </div>
1866+ <div class="row no-border">
1867+ <div class="legal inner-wrapper">
1868+ <p>&copy; 2013 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p>
1869+ <p><a href="https://bugs.launchpad.net/juju-website/+filebug">Report a bug on this site</a></p>
1870+ </div>
1871+ </div>
1872+</footer>
1873+
1874 <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
1875- <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.8.14/jquery-ui.min.js"></script>
1876+ <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script>
1877 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
1878 <script type="text/javascript" src="js/main.js"></script>
1879 </body>
1880
1881=== modified file 'htmldocs/authors-subordinate-services.html'
1882--- htmldocs/authors-subordinate-services.html 2013-07-12 00:12:30 +0000
1883+++ htmldocs/authors-subordinate-services.html 2013-07-13 18:35:28 +0000
1884@@ -1,56 +1,61 @@
1885 <!DOCTYPE html>
1886 <html>
1887 <head>
1888- <meta charset="utf-8">
1889- <title>Juju Documentation - Authoring Charms</title>
1890- <link href="//fonts.googleapis.com/css?family=Ubuntu:400,400italic" rel="stylesheet" type="text/css"/>
1891- <link href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400" rel="stylesheet" type="text/css"/>
1892- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" rel="stylesheet" type="text/css"/>
1893- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" rel="stylesheet" type="text/css"/>
1894- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" rel="stylesheet" type="text/css"/>
1895- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/resources.css" rel="stylesheet" type="text/css"/>
1896- <link href="css/main.css" rel="stylesheet" type="text/css"/>
1897- <!--[if lt IE 9]>
1898- <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
1899- <![endif]-->
1900- </head>
1901+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
1902+ <title>Juju Documentation - Subordinate Services</title>
1903+ <link href='https://fonts.googleapis.com/css?family=Ubuntu:400,300,300italic,400italic,700,700italic|Ubuntu+Mono' rel='stylesheet' type='text/css' />
1904+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" />
1905+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" />
1906+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" />
1907+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/home-new.css" />
1908+ <link rel='stylesheet' id='stacktack-css' href='//juju.ubuntu.com/wp-content/plugins/stacktack/css/stacktack.min.css?ver=3.4.2' type='text/css' media='all' />
1909+ <link href="css/main.css?1373740025" rel="stylesheet" type="text/css"/>
1910+
1911+ <!--[if lt IE 9]>
1912+ <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
1913+ <![endif]-->
1914+</head>
1915+<!-- DO NOT EDIT ABOVE THIS LINE -->
1916+
1917+<!-- DO NOT EDIT ABOVE THIS LINE -->
1918+
1919+
1920 <body class="resources">
1921- <header>
1922- <div class="header-login">
1923+ <header class="global clearfix" role="banner">
1924+ <div class="header-navigation">
1925+ <div>
1926+ <nav role="navigation">
1927 <ul>
1928- <li>&nbsp;</li>
1929+ <li class="page_item page-item-6"><a href="https://juju.ubuntu.com/">Home</a></li>
1930+ <li class="page_item page-item-7"><a href="https://juju.ubuntu.com/get-started/">Get started</a></li>
1931+ <li class="page_item page-item-9 current_page_item"><a href="https://juju.ubuntu.com/resources/">Resources</a></li>
1932+ <li class="page_item page-item-13"><a href="https://juju.ubuntu.com/community/">Community</a></li>
1933+ <li class="page_item page-item-3688"><a href="https://juju.ubuntu.com/charm-store/">Charm Store</a></li>
1934+ <li class="page_item page-item-3691"><a href="https://juju.ubuntu.com/events/">Events</a></li>
1935+ <li class="page_item page-item-4474"><a href="https://juju.ubuntu.com/charm-championship/">Charm Championship</a></li>
1936+ <li class="page_item page-item-4249"><a href="https://juju.ubuntu.com/survey/">Survey</a></li>
1937+ <li>
1938+ <form id="form-search" method="get" action="https://juju.ubuntu.com/">
1939+ <fieldset>
1940+ <input id="input-search" type="text" name="s" value="Search" />
1941+ </fieldset>
1942+ </form>
1943+ </li>
1944 </ul>
1945- </div>
1946- <div class="header-navigation">
1947- <div>
1948- <nav role="navigation">
1949- <ul>
1950- <li class="page_item"><a href="https://juju.ubuntu.com/">Home</a></li>
1951- <li class="page_item current_page_item"><a href="https://juju.ubuntu.com/">Resources</a></li>
1952- <li class="page_item"><a href="https://juju.ubuntu.com/">Community</a></li>
1953- <li class="page_item"><a href="https://juju.ubuntu.com/">Charm Store</a></li>
1954- <li class="page_item"><a href="https://juju.ubuntu.com/">Events</a></li>
1955- <li class="page_item"><a href="https://juju.ubuntu.com/">Survey</a></li>
1956- <li>
1957- <form id="form-search" method="get" action="/">
1958- <fieldset>
1959- <input id="input-search" type="text" name="s" value="Search">
1960- </fieldset>
1961- </form>
1962- </li>
1963- </ul>
1964- </nav><a href="https://juju.ubuntu.com/" class="logo-ubuntu"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/logo-ubuntu.png"></a>
1965- </div>
1966- </div>
1967- <div class="header-content">
1968- <div class="clearfix"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
1969- <div class="header-navigation-secondary"></div>
1970- <div class="header-image"></div>
1971- <h1>Resources</h1>
1972- <h2>A collection of some of the most important online references for Juju users and developers.</h2>
1973- </div>
1974- </div>
1975- </header>
1976+ </nav>
1977+ </div>
1978+ </div>
1979+ <div class="header-content">
1980+ <div class="clearfix">
1981+ <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
1982+ <div class="header-navigation-secondary"></div>
1983+ <div class="header-image"></div>
1984+ <h1>Resources</h1>
1985+ <h2>A collection of some of the most important online references for Juju users and developers.</h2>
1986+ </div>
1987+ </div>
1988+</header>
1989+
1990 <section id="content" class="container-12">
1991 <div class="grid-12 doc-container">
1992 <div class="grid-3 doc-navigation">
1993@@ -182,43 +187,62 @@
1994 </div>
1995 </section>
1996 <div class="shadow"></div>
1997- <footer>
1998- <div>
1999- <nav role="navigation" class="clearfix">
2000- <ul>
2001- <li><a href="https://juju.ubuntu.com/get-started">Get started</a></li>
2002- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li>
2003- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li>
2004- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li>
2005- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li>
2006- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li>
2007- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li>
2008- </ul>
2009- <ul>
2010- <li><a href="https://juju.ubuntu.com/resources">Resources</a></li>
2011- <li><a href="https://juju.ubuntu.com/docs">Documentation</a></li>
2012- <li><a href="https://juju.ubuntu.com/resources/videos">Videos</a></li>
2013- <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI Demo</a></li>
2014- </ul>
2015- <ul>
2016- <li><a href="https://juju.ubuntu.com/community">Community</a></li>
2017- <li class="page_item"><a href="https://juju.ubuntu.com/community/juju-blog/">Blog</a></li>
2018- <li class="page_item"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Charm Meetings</a></li>
2019- <li class="page_item"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li>
2020- <li class="page_item"><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li>
2021- <li class="page_item"><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li>
2022- <li class="page_item"><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&amp;amp;pagesize=50">FAQ</a></li>
2023- </ul>
2024- <ul class="last">
2025- <li><a href="https://launchpad.net/juju">Code</a></li>
2026- <li><a href="https://launchpad.net/juju-core">Juju Core</a></li>
2027- <li><a href="https://launchpad.net/charms">Charms</a></li>
2028- </ul>
2029- </nav>
2030- </div>
2031- </footer>
2032+ <footer class="global clearfix" role="contentinfo">
2033+ <div class="row">
2034+ <div class="inner-wrapper">
2035+ <nav role="navigation" class="clearfix">
2036+ <ul class="footer-a">
2037+ <li class="grid-3 first-col">
2038+ <h4><a href="/get-started">Get started</a></h4>
2039+ <ul>
2040+ <li class="page_item page-item-20"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li>
2041+ <li class="page_item page-item-22"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li>
2042+ <li class="page_item page-item-18"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li>
2043+ <li class="page_item page-item-16"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li>
2044+ <li class="page_item page-item-3596"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li>
2045+ <li class="page_item page-item-3600"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li>
2046+ </ul>
2047+ </li>
2048+ <li class="grid-3">
2049+ <h4><a href="/resources">Resources</a></h4>
2050+ <ul>
2051+ <li><a href="http://juju.ubuntu.com/docs">Documentation</a></li>
2052+ <li><a href="/resources/videos/">Videos</a></li>
2053+ <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI demo site</a></li>
2054+ </ul>
2055+ </li>
2056+ <li class="grid-3">
2057+ <h4><a href="/community">Community</a></h4>
2058+ <ul>
2059+ <li class="page_item page-item-28"><a href="https://juju.ubuntu.com/community/juju-blog/">Juju Blog</a></li>
2060+ <li class="page_item page-item-4262"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Weekly Charm Meeting</a></li>
2061+ <li class="page_item page-item-4036"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li>
2062+ <li><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li>
2063+ <li><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li>
2064+ <li><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&pagesize=50">FAQ</a></li>
2065+ </ul>
2066+ </li>
2067+ <li class="grid-3 last-col">
2068+ <h4><a href="https://launchpad.net/juju">Code</a></h4>
2069+ <ul>
2070+ <li><a href="https://launchpad.net/juju-core">Juju Core</a></li>
2071+ <li><a href="https://launchpad.net/charms">Charms</a></li>
2072+ </ul>
2073+ </li>
2074+ </ul>
2075+ </nav>
2076+ </div>
2077+ </div>
2078+ <div class="row no-border">
2079+ <div class="legal inner-wrapper">
2080+ <p>&copy; 2013 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p>
2081+ <p><a href="https://bugs.launchpad.net/juju-website/+filebug">Report a bug on this site</a></p>
2082+ </div>
2083+ </div>
2084+</footer>
2085+
2086 <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
2087- <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.8.14/jquery-ui.min.js"></script>
2088+ <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script>
2089 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
2090 <script type="text/javascript" src="js/main.js"></script>
2091 </body>
2092
2093=== modified file 'htmldocs/authors-testing.html'
2094--- htmldocs/authors-testing.html 2013-07-12 00:12:30 +0000
2095+++ htmldocs/authors-testing.html 2013-07-13 18:35:28 +0000
2096@@ -1,56 +1,61 @@
2097 <!DOCTYPE html>
2098 <html>
2099 <head>
2100- <meta charset="utf-8">
2101- <title>Juju Documentation - Authoring Charms</title>
2102- <link href="//fonts.googleapis.com/css?family=Ubuntu:400,400italic" rel="stylesheet" type="text/css"/>
2103- <link href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400" rel="stylesheet" type="text/css"/>
2104- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" rel="stylesheet" type="text/css"/>
2105- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" rel="stylesheet" type="text/css"/>
2106- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" rel="stylesheet" type="text/css"/>
2107- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/resources.css" rel="stylesheet" type="text/css"/>
2108- <link href="css/main.css" rel="stylesheet" type="text/css"/>
2109- <!--[if lt IE 9]>
2110- <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
2111- <![endif]-->
2112- </head>
2113+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
2114+ <title>Juju Documentation - Charm Testing</title>
2115+ <link href='https://fonts.googleapis.com/css?family=Ubuntu:400,300,300italic,400italic,700,700italic|Ubuntu+Mono' rel='stylesheet' type='text/css' />
2116+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" />
2117+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" />
2118+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" />
2119+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/home-new.css" />
2120+ <link rel='stylesheet' id='stacktack-css' href='//juju.ubuntu.com/wp-content/plugins/stacktack/css/stacktack.min.css?ver=3.4.2' type='text/css' media='all' />
2121+ <link href="css/main.css?1373740025" rel="stylesheet" type="text/css"/>
2122+
2123+ <!--[if lt IE 9]>
2124+ <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
2125+ <![endif]-->
2126+</head>
2127+<!-- DO NOT EDIT ABOVE THIS LINE -->
2128+
2129+<!-- DO NOT EDIT ABOVE THIS LINE -->
2130+
2131+
2132 <body class="resources">
2133- <header>
2134- <div class="header-login">
2135+ <header class="global clearfix" role="banner">
2136+ <div class="header-navigation">
2137+ <div>
2138+ <nav role="navigation">
2139 <ul>
2140- <li>&nbsp;</li>
2141+ <li class="page_item page-item-6"><a href="https://juju.ubuntu.com/">Home</a></li>
2142+ <li class="page_item page-item-7"><a href="https://juju.ubuntu.com/get-started/">Get started</a></li>
2143+ <li class="page_item page-item-9 current_page_item"><a href="https://juju.ubuntu.com/resources/">Resources</a></li>
2144+ <li class="page_item page-item-13"><a href="https://juju.ubuntu.com/community/">Community</a></li>
2145+ <li class="page_item page-item-3688"><a href="https://juju.ubuntu.com/charm-store/">Charm Store</a></li>
2146+ <li class="page_item page-item-3691"><a href="https://juju.ubuntu.com/events/">Events</a></li>
2147+ <li class="page_item page-item-4474"><a href="https://juju.ubuntu.com/charm-championship/">Charm Championship</a></li>
2148+ <li class="page_item page-item-4249"><a href="https://juju.ubuntu.com/survey/">Survey</a></li>
2149+ <li>
2150+ <form id="form-search" method="get" action="https://juju.ubuntu.com/">
2151+ <fieldset>
2152+ <input id="input-search" type="text" name="s" value="Search" />
2153+ </fieldset>
2154+ </form>
2155+ </li>
2156 </ul>
2157- </div>
2158- <div class="header-navigation">
2159- <div>
2160- <nav role="navigation">
2161- <ul>
2162- <li class="page_item"><a href="https://juju.ubuntu.com/">Home</a></li>
2163- <li class="page_item current_page_item"><a href="https://juju.ubuntu.com/">Resources</a></li>
2164- <li class="page_item"><a href="https://juju.ubuntu.com/">Community</a></li>
2165- <li class="page_item"><a href="https://juju.ubuntu.com/">Charm Store</a></li>
2166- <li class="page_item"><a href="https://juju.ubuntu.com/">Events</a></li>
2167- <li class="page_item"><a href="https://juju.ubuntu.com/">Survey</a></li>
2168- <li>
2169- <form id="form-search" method="get" action="/">
2170- <fieldset>
2171- <input id="input-search" type="text" name="s" value="Search">
2172- </fieldset>
2173- </form>
2174- </li>
2175- </ul>
2176- </nav><a href="https://juju.ubuntu.com/" class="logo-ubuntu"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/logo-ubuntu.png"></a>
2177- </div>
2178- </div>
2179- <div class="header-content">
2180- <div class="clearfix"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
2181- <div class="header-navigation-secondary"></div>
2182- <div class="header-image"></div>
2183- <h1>Resources</h1>
2184- <h2>A collection of some of the most important online references for Juju users and developers.</h2>
2185- </div>
2186- </div>
2187- </header>
2188+ </nav>
2189+ </div>
2190+ </div>
2191+ <div class="header-content">
2192+ <div class="clearfix">
2193+ <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
2194+ <div class="header-navigation-secondary"></div>
2195+ <div class="header-image"></div>
2196+ <h1>Resources</h1>
2197+ <h2>A collection of some of the most important online references for Juju users and developers.</h2>
2198+ </div>
2199+ </div>
2200+</header>
2201+
2202 <section id="content" class="container-12">
2203 <div class="grid-12 doc-container">
2204 <div class="grid-3 doc-navigation">
2205@@ -305,43 +310,62 @@
2206 </div>
2207 </section>
2208 <div class="shadow"></div>
2209- <footer>
2210- <div>
2211- <nav role="navigation" class="clearfix">
2212- <ul>
2213- <li><a href="https://juju.ubuntu.com/get-started">Get started</a></li>
2214- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li>
2215- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li>
2216- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li>
2217- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li>
2218- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li>
2219- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li>
2220- </ul>
2221- <ul>
2222- <li><a href="https://juju.ubuntu.com/resources">Resources</a></li>
2223- <li><a href="https://juju.ubuntu.com/docs">Documentation</a></li>
2224- <li><a href="https://juju.ubuntu.com/resources/videos">Videos</a></li>
2225- <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI Demo</a></li>
2226- </ul>
2227- <ul>
2228- <li><a href="https://juju.ubuntu.com/community">Community</a></li>
2229- <li class="page_item"><a href="https://juju.ubuntu.com/community/juju-blog/">Blog</a></li>
2230- <li class="page_item"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Charm Meetings</a></li>
2231- <li class="page_item"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li>
2232- <li class="page_item"><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li>
2233- <li class="page_item"><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li>
2234- <li class="page_item"><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&amp;amp;pagesize=50">FAQ</a></li>
2235- </ul>
2236- <ul class="last">
2237- <li><a href="https://launchpad.net/juju">Code</a></li>
2238- <li><a href="https://launchpad.net/juju-core">Juju Core</a></li>
2239- <li><a href="https://launchpad.net/charms">Charms</a></li>
2240- </ul>
2241- </nav>
2242- </div>
2243- </footer>
2244+ <footer class="global clearfix" role="contentinfo">
2245+ <div class="row">
2246+ <div class="inner-wrapper">
2247+ <nav role="navigation" class="clearfix">
2248+ <ul class="footer-a">
2249+ <li class="grid-3 first-col">
2250+ <h4><a href="/get-started">Get started</a></h4>
2251+ <ul>
2252+ <li class="page_item page-item-20"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li>
2253+ <li class="page_item page-item-22"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li>
2254+ <li class="page_item page-item-18"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li>
2255+ <li class="page_item page-item-16"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li>
2256+ <li class="page_item page-item-3596"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li>
2257+ <li class="page_item page-item-3600"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li>
2258+ </ul>
2259+ </li>
2260+ <li class="grid-3">
2261+ <h4><a href="/resources">Resources</a></h4>
2262+ <ul>
2263+ <li><a href="http://juju.ubuntu.com/docs">Documentation</a></li>
2264+ <li><a href="/resources/videos/">Videos</a></li>
2265+ <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI demo site</a></li>
2266+ </ul>
2267+ </li>
2268+ <li class="grid-3">
2269+ <h4><a href="/community">Community</a></h4>
2270+ <ul>
2271+ <li class="page_item page-item-28"><a href="https://juju.ubuntu.com/community/juju-blog/">Juju Blog</a></li>
2272+ <li class="page_item page-item-4262"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Weekly Charm Meeting</a></li>
2273+ <li class="page_item page-item-4036"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li>
2274+ <li><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li>
2275+ <li><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li>
2276+ <li><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&pagesize=50">FAQ</a></li>
2277+ </ul>
2278+ </li>
2279+ <li class="grid-3 last-col">
2280+ <h4><a href="https://launchpad.net/juju">Code</a></h4>
2281+ <ul>
2282+ <li><a href="https://launchpad.net/juju-core">Juju Core</a></li>
2283+ <li><a href="https://launchpad.net/charms">Charms</a></li>
2284+ </ul>
2285+ </li>
2286+ </ul>
2287+ </nav>
2288+ </div>
2289+ </div>
2290+ <div class="row no-border">
2291+ <div class="legal inner-wrapper">
2292+ <p>&copy; 2013 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p>
2293+ <p><a href="https://bugs.launchpad.net/juju-website/+filebug">Report a bug on this site</a></p>
2294+ </div>
2295+ </div>
2296+</footer>
2297+
2298 <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
2299- <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.8.14/jquery-ui.min.js"></script>
2300+ <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script>
2301 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
2302 <script type="text/javascript" src="js/main.js"></script>
2303 </body>
2304
2305=== modified file 'htmldocs/charms-config.html'
2306--- htmldocs/charms-config.html 2013-07-12 00:12:30 +0000
2307+++ htmldocs/charms-config.html 2013-07-13 18:35:28 +0000
2308@@ -1,56 +1,61 @@
2309 <!DOCTYPE html>
2310 <html>
2311 <head>
2312- <meta charset="utf-8">
2313- <title>Juju Documentation - Exposing Charms</title>
2314- <link href="//fonts.googleapis.com/css?family=Ubuntu:400,400italic" rel="stylesheet" type="text/css"/>
2315- <link href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400" rel="stylesheet" type="text/css"/>
2316- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" rel="stylesheet" type="text/css"/>
2317- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" rel="stylesheet" type="text/css"/>
2318- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" rel="stylesheet" type="text/css"/>
2319- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/resources.css" rel="stylesheet" type="text/css"/>
2320- <link href="css/main.css" rel="stylesheet" type="text/css"/>
2321- <!--[if lt IE 9]>
2322- <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
2323- <![endif]-->
2324- </head>
2325+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
2326+ <title>Juju Documentation - Service Configuration</title>
2327+ <link href='https://fonts.googleapis.com/css?family=Ubuntu:400,300,300italic,400italic,700,700italic|Ubuntu+Mono' rel='stylesheet' type='text/css' />
2328+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" />
2329+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" />
2330+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" />
2331+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/home-new.css" />
2332+ <link rel='stylesheet' id='stacktack-css' href='//juju.ubuntu.com/wp-content/plugins/stacktack/css/stacktack.min.css?ver=3.4.2' type='text/css' media='all' />
2333+ <link href="css/main.css?1373740025" rel="stylesheet" type="text/css"/>
2334+
2335+ <!--[if lt IE 9]>
2336+ <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
2337+ <![endif]-->
2338+</head>
2339+<!-- DO NOT EDIT ABOVE THIS LINE -->
2340+
2341+<!-- DO NOT EDIT ABOVE THIS LINE -->
2342+
2343+
2344 <body class="resources">
2345- <header>
2346- <div class="header-login">
2347+ <header class="global clearfix" role="banner">
2348+ <div class="header-navigation">
2349+ <div>
2350+ <nav role="navigation">
2351 <ul>
2352- <li>&nbsp;</li>
2353+ <li class="page_item page-item-6"><a href="https://juju.ubuntu.com/">Home</a></li>
2354+ <li class="page_item page-item-7"><a href="https://juju.ubuntu.com/get-started/">Get started</a></li>
2355+ <li class="page_item page-item-9 current_page_item"><a href="https://juju.ubuntu.com/resources/">Resources</a></li>
2356+ <li class="page_item page-item-13"><a href="https://juju.ubuntu.com/community/">Community</a></li>
2357+ <li class="page_item page-item-3688"><a href="https://juju.ubuntu.com/charm-store/">Charm Store</a></li>
2358+ <li class="page_item page-item-3691"><a href="https://juju.ubuntu.com/events/">Events</a></li>
2359+ <li class="page_item page-item-4474"><a href="https://juju.ubuntu.com/charm-championship/">Charm Championship</a></li>
2360+ <li class="page_item page-item-4249"><a href="https://juju.ubuntu.com/survey/">Survey</a></li>
2361+ <li>
2362+ <form id="form-search" method="get" action="https://juju.ubuntu.com/">
2363+ <fieldset>
2364+ <input id="input-search" type="text" name="s" value="Search" />
2365+ </fieldset>
2366+ </form>
2367+ </li>
2368 </ul>
2369- </div>
2370- <div class="header-navigation">
2371- <div>
2372- <nav role="navigation">
2373- <ul>
2374- <li class="page_item"><a href="https://juju.ubuntu.com/">Home</a></li>
2375- <li class="page_item current_page_item"><a href="https://juju.ubuntu.com/">Resources</a></li>
2376- <li class="page_item"><a href="https://juju.ubuntu.com/">Community</a></li>
2377- <li class="page_item"><a href="https://juju.ubuntu.com/">Charm Store</a></li>
2378- <li class="page_item"><a href="https://juju.ubuntu.com/">Events</a></li>
2379- <li class="page_item"><a href="https://juju.ubuntu.com/">Survey</a></li>
2380- <li>
2381- <form id="form-search" method="get" action="/">
2382- <fieldset>
2383- <input id="input-search" type="text" name="s" value="Search">
2384- </fieldset>
2385- </form>
2386- </li>
2387- </ul>
2388- </nav><a href="https://juju.ubuntu.com/" class="logo-ubuntu"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/logo-ubuntu.png"></a>
2389- </div>
2390- </div>
2391- <div class="header-content">
2392- <div class="clearfix"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
2393- <div class="header-navigation-secondary"></div>
2394- <div class="header-image"></div>
2395- <h1>Resources</h1>
2396- <h2>A collection of some of the most important online references for Juju users and developers.</h2>
2397- </div>
2398- </div>
2399- </header>
2400+ </nav>
2401+ </div>
2402+ </div>
2403+ <div class="header-content">
2404+ <div class="clearfix">
2405+ <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
2406+ <div class="header-navigation-secondary"></div>
2407+ <div class="header-image"></div>
2408+ <h1>Resources</h1>
2409+ <h2>A collection of some of the most important online references for Juju users and developers.</h2>
2410+ </div>
2411+ </div>
2412+</header>
2413+
2414 <section id="content" class="container-12">
2415 <div class="grid-12 doc-container">
2416 <div class="grid-3 doc-navigation">
2417@@ -172,43 +177,62 @@
2418 </div>
2419 </section>
2420 <div class="shadow"></div>
2421- <footer>
2422- <div>
2423- <nav role="navigation" class="clearfix">
2424- <ul>
2425- <li><a href="https://juju.ubuntu.com/get-started">Get started</a></li>
2426- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li>
2427- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li>
2428- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li>
2429- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li>
2430- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li>
2431- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li>
2432- </ul>
2433- <ul>
2434- <li><a href="https://juju.ubuntu.com/resources">Resources</a></li>
2435- <li><a href="https://juju.ubuntu.com/docs">Documentation</a></li>
2436- <li><a href="https://juju.ubuntu.com/resources/videos">Videos</a></li>
2437- <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI Demo</a></li>
2438- </ul>
2439- <ul>
2440- <li><a href="https://juju.ubuntu.com/community">Community</a></li>
2441- <li class="page_item"><a href="https://juju.ubuntu.com/community/juju-blog/">Blog</a></li>
2442- <li class="page_item"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Charm Meetings</a></li>
2443- <li class="page_item"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li>
2444- <li class="page_item"><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li>
2445- <li class="page_item"><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li>
2446- <li class="page_item"><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&amp;amp;pagesize=50">FAQ</a></li>
2447- </ul>
2448- <ul class="last">
2449- <li><a href="https://launchpad.net/juju">Code</a></li>
2450- <li><a href="https://launchpad.net/juju-core">Juju Core</a></li>
2451- <li><a href="https://launchpad.net/charms">Charms</a></li>
2452- </ul>
2453- </nav>
2454- </div>
2455- </footer>
2456+ <footer class="global clearfix" role="contentinfo">
2457+ <div class="row">
2458+ <div class="inner-wrapper">
2459+ <nav role="navigation" class="clearfix">
2460+ <ul class="footer-a">
2461+ <li class="grid-3 first-col">
2462+ <h4><a href="/get-started">Get started</a></h4>
2463+ <ul>
2464+ <li class="page_item page-item-20"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li>
2465+ <li class="page_item page-item-22"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li>
2466+ <li class="page_item page-item-18"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li>
2467+ <li class="page_item page-item-16"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li>
2468+ <li class="page_item page-item-3596"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li>
2469+ <li class="page_item page-item-3600"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li>
2470+ </ul>
2471+ </li>
2472+ <li class="grid-3">
2473+ <h4><a href="/resources">Resources</a></h4>
2474+ <ul>
2475+ <li><a href="http://juju.ubuntu.com/docs">Documentation</a></li>
2476+ <li><a href="/resources/videos/">Videos</a></li>
2477+ <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI demo site</a></li>
2478+ </ul>
2479+ </li>
2480+ <li class="grid-3">
2481+ <h4><a href="/community">Community</a></h4>
2482+ <ul>
2483+ <li class="page_item page-item-28"><a href="https://juju.ubuntu.com/community/juju-blog/">Juju Blog</a></li>
2484+ <li class="page_item page-item-4262"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Weekly Charm Meeting</a></li>
2485+ <li class="page_item page-item-4036"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li>
2486+ <li><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li>
2487+ <li><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li>
2488+ <li><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&pagesize=50">FAQ</a></li>
2489+ </ul>
2490+ </li>
2491+ <li class="grid-3 last-col">
2492+ <h4><a href="https://launchpad.net/juju">Code</a></h4>
2493+ <ul>
2494+ <li><a href="https://launchpad.net/juju-core">Juju Core</a></li>
2495+ <li><a href="https://launchpad.net/charms">Charms</a></li>
2496+ </ul>
2497+ </li>
2498+ </ul>
2499+ </nav>
2500+ </div>
2501+ </div>
2502+ <div class="row no-border">
2503+ <div class="legal inner-wrapper">
2504+ <p>&copy; 2013 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p>
2505+ <p><a href="https://bugs.launchpad.net/juju-website/+filebug">Report a bug on this site</a></p>
2506+ </div>
2507+ </div>
2508+</footer>
2509+
2510 <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
2511- <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.8.14/jquery-ui.min.js"></script>
2512+ <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script>
2513 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
2514 <script type="text/javascript" src="js/main.js"></script>
2515 </body>
2516
2517=== modified file 'htmldocs/charms-constraints.html'
2518--- htmldocs/charms-constraints.html 2013-07-12 00:12:30 +0000
2519+++ htmldocs/charms-constraints.html 2013-07-13 18:35:28 +0000
2520@@ -1,56 +1,61 @@
2521 <!DOCTYPE html>
2522 <html>
2523 <head>
2524- <meta charset="utf-8">
2525- <title>Juju Documentation - Using Constraints</title>
2526- <link href="//fonts.googleapis.com/css?family=Ubuntu:400,400italic" rel="stylesheet" type="text/css"/>
2527- <link href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400" rel="stylesheet" type="text/css"/>
2528- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" rel="stylesheet" type="text/css"/>
2529- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" rel="stylesheet" type="text/css"/>
2530- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" rel="stylesheet" type="text/css"/>
2531- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/resources.css" rel="stylesheet" type="text/css"/>
2532- <link href="css/main.css" rel="stylesheet" type="text/css"/>
2533- <!--[if lt IE 9]>
2534- <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
2535- <![endif]-->
2536- </head>
2537+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
2538+ <title>Juju Documentation - Using Constraints</title>
2539+ <link href='https://fonts.googleapis.com/css?family=Ubuntu:400,300,300italic,400italic,700,700italic|Ubuntu+Mono' rel='stylesheet' type='text/css' />
2540+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" />
2541+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" />
2542+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" />
2543+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/home-new.css" />
2544+ <link rel='stylesheet' id='stacktack-css' href='//juju.ubuntu.com/wp-content/plugins/stacktack/css/stacktack.min.css?ver=3.4.2' type='text/css' media='all' />
2545+ <link href="css/main.css?1373740025" rel="stylesheet" type="text/css"/>
2546+
2547+ <!--[if lt IE 9]>
2548+ <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
2549+ <![endif]-->
2550+</head>
2551+<!-- DO NOT EDIT ABOVE THIS LINE -->
2552+
2553+<!-- DO NOT EDIT ABOVE THIS LINE -->
2554+
2555+
2556 <body class="resources">
2557- <header>
2558- <div class="header-login">
2559+ <header class="global clearfix" role="banner">
2560+ <div class="header-navigation">
2561+ <div>
2562+ <nav role="navigation">
2563 <ul>
2564- <li>&nbsp;</li>
2565+ <li class="page_item page-item-6"><a href="https://juju.ubuntu.com/">Home</a></li>
2566+ <li class="page_item page-item-7"><a href="https://juju.ubuntu.com/get-started/">Get started</a></li>
2567+ <li class="page_item page-item-9 current_page_item"><a href="https://juju.ubuntu.com/resources/">Resources</a></li>
2568+ <li class="page_item page-item-13"><a href="https://juju.ubuntu.com/community/">Community</a></li>
2569+ <li class="page_item page-item-3688"><a href="https://juju.ubuntu.com/charm-store/">Charm Store</a></li>
2570+ <li class="page_item page-item-3691"><a href="https://juju.ubuntu.com/events/">Events</a></li>
2571+ <li class="page_item page-item-4474"><a href="https://juju.ubuntu.com/charm-championship/">Charm Championship</a></li>
2572+ <li class="page_item page-item-4249"><a href="https://juju.ubuntu.com/survey/">Survey</a></li>
2573+ <li>
2574+ <form id="form-search" method="get" action="https://juju.ubuntu.com/">
2575+ <fieldset>
2576+ <input id="input-search" type="text" name="s" value="Search" />
2577+ </fieldset>
2578+ </form>
2579+ </li>
2580 </ul>
2581- </div>
2582- <div class="header-navigation">
2583- <div>
2584- <nav role="navigation">
2585- <ul>
2586- <li class="page_item"><a href="https://juju.ubuntu.com/">Home</a></li>
2587- <li class="page_item current_page_item"><a href="https://juju.ubuntu.com/">Resources</a></li>
2588- <li class="page_item"><a href="https://juju.ubuntu.com/">Community</a></li>
2589- <li class="page_item"><a href="https://juju.ubuntu.com/">Charm Store</a></li>
2590- <li class="page_item"><a href="https://juju.ubuntu.com/">Events</a></li>
2591- <li class="page_item"><a href="https://juju.ubuntu.com/">Survey</a></li>
2592- <li>
2593- <form id="form-search" method="get" action="/">
2594- <fieldset>
2595- <input id="input-search" type="text" name="s" value="Search">
2596- </fieldset>
2597- </form>
2598- </li>
2599- </ul>
2600- </nav><a href="https://juju.ubuntu.com/" class="logo-ubuntu"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/logo-ubuntu.png"></a>
2601- </div>
2602- </div>
2603- <div class="header-content">
2604- <div class="clearfix"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
2605- <div class="header-navigation-secondary"></div>
2606- <div class="header-image"></div>
2607- <h1>Resources</h1>
2608- <h2>A collection of some of the most important online references for Juju users and developers.</h2>
2609- </div>
2610- </div>
2611- </header>
2612+ </nav>
2613+ </div>
2614+ </div>
2615+ <div class="header-content">
2616+ <div class="clearfix">
2617+ <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
2618+ <div class="header-navigation-secondary"></div>
2619+ <div class="header-image"></div>
2620+ <h1>Resources</h1>
2621+ <h2>A collection of some of the most important online references for Juju users and developers.</h2>
2622+ </div>
2623+ </div>
2624+</header>
2625+
2626 <section id="content" class="container-12">
2627 <div class="grid-12 doc-container">
2628 <div class="grid-3 doc-navigation">
2629@@ -197,43 +202,62 @@
2630 </div>
2631 </section>
2632 <div class="shadow"></div>
2633- <footer>
2634- <div>
2635- <nav role="navigation" class="clearfix">
2636- <ul>
2637- <li><a href="https://juju.ubuntu.com/get-started">Get started</a></li>
2638- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li>
2639- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li>
2640- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li>
2641- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li>
2642- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li>
2643- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li>
2644- </ul>
2645- <ul>
2646- <li><a href="https://juju.ubuntu.com/resources">Resources</a></li>
2647- <li><a href="https://juju.ubuntu.com/docs">Documentation</a></li>
2648- <li><a href="https://juju.ubuntu.com/resources/videos">Videos</a></li>
2649- <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI Demo</a></li>
2650- </ul>
2651- <ul>
2652- <li><a href="https://juju.ubuntu.com/community">Community</a></li>
2653- <li class="page_item"><a href="https://juju.ubuntu.com/community/juju-blog/">Blog</a></li>
2654- <li class="page_item"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Charm Meetings</a></li>
2655- <li class="page_item"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li>
2656- <li class="page_item"><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li>
2657- <li class="page_item"><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li>
2658- <li class="page_item"><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&amp;amp;pagesize=50">FAQ</a></li>
2659- </ul>
2660- <ul class="last">
2661- <li><a href="https://launchpad.net/juju">Code</a></li>
2662- <li><a href="https://launchpad.net/juju-core">Juju Core</a></li>
2663- <li><a href="https://launchpad.net/charms">Charms</a></li>
2664- </ul>
2665- </nav>
2666- </div>
2667- </footer>
2668+ <footer class="global clearfix" role="contentinfo">
2669+ <div class="row">
2670+ <div class="inner-wrapper">
2671+ <nav role="navigation" class="clearfix">
2672+ <ul class="footer-a">
2673+ <li class="grid-3 first-col">
2674+ <h4><a href="/get-started">Get started</a></h4>
2675+ <ul>
2676+ <li class="page_item page-item-20"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li>
2677+ <li class="page_item page-item-22"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li>
2678+ <li class="page_item page-item-18"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li>
2679+ <li class="page_item page-item-16"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li>
2680+ <li class="page_item page-item-3596"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li>
2681+ <li class="page_item page-item-3600"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li>
2682+ </ul>
2683+ </li>
2684+ <li class="grid-3">
2685+ <h4><a href="/resources">Resources</a></h4>
2686+ <ul>
2687+ <li><a href="http://juju.ubuntu.com/docs">Documentation</a></li>
2688+ <li><a href="/resources/videos/">Videos</a></li>
2689+ <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI demo site</a></li>
2690+ </ul>
2691+ </li>
2692+ <li class="grid-3">
2693+ <h4><a href="/community">Community</a></h4>
2694+ <ul>
2695+ <li class="page_item page-item-28"><a href="https://juju.ubuntu.com/community/juju-blog/">Juju Blog</a></li>
2696+ <li class="page_item page-item-4262"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Weekly Charm Meeting</a></li>
2697+ <li class="page_item page-item-4036"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li>
2698+ <li><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li>
2699+ <li><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li>
2700+ <li><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&pagesize=50">FAQ</a></li>
2701+ </ul>
2702+ </li>
2703+ <li class="grid-3 last-col">
2704+ <h4><a href="https://launchpad.net/juju">Code</a></h4>
2705+ <ul>
2706+ <li><a href="https://launchpad.net/juju-core">Juju Core</a></li>
2707+ <li><a href="https://launchpad.net/charms">Charms</a></li>
2708+ </ul>
2709+ </li>
2710+ </ul>
2711+ </nav>
2712+ </div>
2713+ </div>
2714+ <div class="row no-border">
2715+ <div class="legal inner-wrapper">
2716+ <p>&copy; 2013 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p>
2717+ <p><a href="https://bugs.launchpad.net/juju-website/+filebug">Report a bug on this site</a></p>
2718+ </div>
2719+ </div>
2720+</footer>
2721+
2722 <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
2723- <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.8.14/jquery-ui.min.js"></script>
2724+ <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script>
2725 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
2726 <script type="text/javascript" src="js/main.js"></script>
2727 </body>
2728
2729=== modified file 'htmldocs/charms-deploying.html'
2730--- htmldocs/charms-deploying.html 2013-07-12 00:12:30 +0000
2731+++ htmldocs/charms-deploying.html 2013-07-13 18:35:28 +0000
2732@@ -1,56 +1,61 @@
2733 <!DOCTYPE html>
2734 <html>
2735 <head>
2736- <meta charset="utf-8">
2737- <title>Juju Documentation - Deploying charms</title>
2738- <link href="//fonts.googleapis.com/css?family=Ubuntu:400,400italic" rel="stylesheet" type="text/css"/>
2739- <link href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400" rel="stylesheet" type="text/css"/>
2740- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" rel="stylesheet" type="text/css"/>
2741- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" rel="stylesheet" type="text/css"/>
2742- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" rel="stylesheet" type="text/css"/>
2743- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/resources.css" rel="stylesheet" type="text/css"/>
2744- <link href="css/main.css" rel="stylesheet" type="text/css"/>
2745- <!--[if lt IE 9]>
2746- <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
2747- <![endif]-->
2748- </head>
2749+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
2750+ <title>Juju Documentation - Deploying Services</title>
2751+ <link href='https://fonts.googleapis.com/css?family=Ubuntu:400,300,300italic,400italic,700,700italic|Ubuntu+Mono' rel='stylesheet' type='text/css' />
2752+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" />
2753+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" />
2754+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" />
2755+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/home-new.css" />
2756+ <link rel='stylesheet' id='stacktack-css' href='//juju.ubuntu.com/wp-content/plugins/stacktack/css/stacktack.min.css?ver=3.4.2' type='text/css' media='all' />
2757+ <link href="css/main.css?1373740025" rel="stylesheet" type="text/css"/>
2758+
2759+ <!--[if lt IE 9]>
2760+ <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
2761+ <![endif]-->
2762+</head>
2763+<!-- DO NOT EDIT ABOVE THIS LINE -->
2764+
2765+<!-- DO NOT EDIT ABOVE THIS LINE -->
2766+
2767+
2768 <body class="resources">
2769- <header>
2770- <div class="header-login">
2771+ <header class="global clearfix" role="banner">
2772+ <div class="header-navigation">
2773+ <div>
2774+ <nav role="navigation">
2775 <ul>
2776- <li>&nbsp;</li>
2777+ <li class="page_item page-item-6"><a href="https://juju.ubuntu.com/">Home</a></li>
2778+ <li class="page_item page-item-7"><a href="https://juju.ubuntu.com/get-started/">Get started</a></li>
2779+ <li class="page_item page-item-9 current_page_item"><a href="https://juju.ubuntu.com/resources/">Resources</a></li>
2780+ <li class="page_item page-item-13"><a href="https://juju.ubuntu.com/community/">Community</a></li>
2781+ <li class="page_item page-item-3688"><a href="https://juju.ubuntu.com/charm-store/">Charm Store</a></li>
2782+ <li class="page_item page-item-3691"><a href="https://juju.ubuntu.com/events/">Events</a></li>
2783+ <li class="page_item page-item-4474"><a href="https://juju.ubuntu.com/charm-championship/">Charm Championship</a></li>
2784+ <li class="page_item page-item-4249"><a href="https://juju.ubuntu.com/survey/">Survey</a></li>
2785+ <li>
2786+ <form id="form-search" method="get" action="https://juju.ubuntu.com/">
2787+ <fieldset>
2788+ <input id="input-search" type="text" name="s" value="Search" />
2789+ </fieldset>
2790+ </form>
2791+ </li>
2792 </ul>
2793- </div>
2794- <div class="header-navigation">
2795- <div>
2796- <nav role="navigation">
2797- <ul>
2798- <li class="page_item"><a href="https://juju.ubuntu.com/">Home</a></li>
2799- <li class="page_item current_page_item"><a href="https://juju.ubuntu.com/">Resources</a></li>
2800- <li class="page_item"><a href="https://juju.ubuntu.com/">Community</a></li>
2801- <li class="page_item"><a href="https://juju.ubuntu.com/">Charm Store</a></li>
2802- <li class="page_item"><a href="https://juju.ubuntu.com/">Events</a></li>
2803- <li class="page_item"><a href="https://juju.ubuntu.com/">Survey</a></li>
2804- <li>
2805- <form id="form-search" method="get" action="/">
2806- <fieldset>
2807- <input id="input-search" type="text" name="s" value="Search">
2808- </fieldset>
2809- </form>
2810- </li>
2811- </ul>
2812- </nav><a href="https://juju.ubuntu.com/" class="logo-ubuntu"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/logo-ubuntu.png"></a>
2813- </div>
2814- </div>
2815- <div class="header-content">
2816- <div class="clearfix"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
2817- <div class="header-navigation-secondary"></div>
2818- <div class="header-image"></div>
2819- <h1>Resources</h1>
2820- <h2>A collection of some of the most important online references for Juju users and developers.</h2>
2821- </div>
2822- </div>
2823- </header>
2824+ </nav>
2825+ </div>
2826+ </div>
2827+ <div class="header-content">
2828+ <div class="clearfix">
2829+ <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
2830+ <div class="header-navigation-secondary"></div>
2831+ <div class="header-image"></div>
2832+ <h1>Resources</h1>
2833+ <h2>A collection of some of the most important online references for Juju users and developers.</h2>
2834+ </div>
2835+ </div>
2836+</header>
2837+
2838 <section id="content" class="container-12">
2839 <div class="grid-12 doc-container">
2840 <div class="grid-3 doc-navigation">
2841@@ -144,43 +149,62 @@
2842 </div>
2843 </section>
2844 <div class="shadow"></div>
2845- <footer>
2846- <div>
2847- <nav role="navigation" class="clearfix">
2848- <ul>
2849- <li><a href="https://juju.ubuntu.com/get-started">Get started</a></li>
2850- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li>
2851- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li>
2852- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li>
2853- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li>
2854- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li>
2855- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li>
2856- </ul>
2857- <ul>
2858- <li><a href="https://juju.ubuntu.com/resources">Resources</a></li>
2859- <li><a href="https://juju.ubuntu.com/docs">Documentation</a></li>
2860- <li><a href="https://juju.ubuntu.com/resources/videos">Videos</a></li>
2861- <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI Demo</a></li>
2862- </ul>
2863- <ul>
2864- <li><a href="https://juju.ubuntu.com/community">Community</a></li>
2865- <li class="page_item"><a href="https://juju.ubuntu.com/community/juju-blog/">Blog</a></li>
2866- <li class="page_item"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Charm Meetings</a></li>
2867- <li class="page_item"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li>
2868- <li class="page_item"><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li>
2869- <li class="page_item"><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li>
2870- <li class="page_item"><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&amp;amp;pagesize=50">FAQ</a></li>
2871- </ul>
2872- <ul class="last">
2873- <li><a href="https://launchpad.net/juju">Code</a></li>
2874- <li><a href="https://launchpad.net/juju-core">Juju Core</a></li>
2875- <li><a href="https://launchpad.net/charms">Charms</a></li>
2876- </ul>
2877- </nav>
2878- </div>
2879- </footer>
2880+ <footer class="global clearfix" role="contentinfo">
2881+ <div class="row">
2882+ <div class="inner-wrapper">
2883+ <nav role="navigation" class="clearfix">
2884+ <ul class="footer-a">
2885+ <li class="grid-3 first-col">
2886+ <h4><a href="/get-started">Get started</a></h4>
2887+ <ul>
2888+ <li class="page_item page-item-20"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li>
2889+ <li class="page_item page-item-22"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li>
2890+ <li class="page_item page-item-18"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li>
2891+ <li class="page_item page-item-16"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li>
2892+ <li class="page_item page-item-3596"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li>
2893+ <li class="page_item page-item-3600"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li>
2894+ </ul>
2895+ </li>
2896+ <li class="grid-3">
2897+ <h4><a href="/resources">Resources</a></h4>
2898+ <ul>
2899+ <li><a href="http://juju.ubuntu.com/docs">Documentation</a></li>
2900+ <li><a href="/resources/videos/">Videos</a></li>
2901+ <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI demo site</a></li>
2902+ </ul>
2903+ </li>
2904+ <li class="grid-3">
2905+ <h4><a href="/community">Community</a></h4>
2906+ <ul>
2907+ <li class="page_item page-item-28"><a href="https://juju.ubuntu.com/community/juju-blog/">Juju Blog</a></li>
2908+ <li class="page_item page-item-4262"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Weekly Charm Meeting</a></li>
2909+ <li class="page_item page-item-4036"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li>
2910+ <li><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li>
2911+ <li><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li>
2912+ <li><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&pagesize=50">FAQ</a></li>
2913+ </ul>
2914+ </li>
2915+ <li class="grid-3 last-col">
2916+ <h4><a href="https://launchpad.net/juju">Code</a></h4>
2917+ <ul>
2918+ <li><a href="https://launchpad.net/juju-core">Juju Core</a></li>
2919+ <li><a href="https://launchpad.net/charms">Charms</a></li>
2920+ </ul>
2921+ </li>
2922+ </ul>
2923+ </nav>
2924+ </div>
2925+ </div>
2926+ <div class="row no-border">
2927+ <div class="legal inner-wrapper">
2928+ <p>&copy; 2013 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p>
2929+ <p><a href="https://bugs.launchpad.net/juju-website/+filebug">Report a bug on this site</a></p>
2930+ </div>
2931+ </div>
2932+</footer>
2933+
2934 <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
2935- <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.8.14/jquery-ui.min.js"></script>
2936+ <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script>
2937 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
2938 <script type="text/javascript" src="js/main.js"></script>
2939 </body>
2940
2941=== modified file 'htmldocs/charms-destroy.html'
2942--- htmldocs/charms-destroy.html 2013-07-12 00:12:30 +0000
2943+++ htmldocs/charms-destroy.html 2013-07-13 18:35:28 +0000
2944@@ -1,56 +1,61 @@
2945 <!DOCTYPE html>
2946 <html>
2947 <head>
2948- <meta charset="utf-8">
2949- <title>Juju Documentation - Destroying Services</title>
2950- <link href="//fonts.googleapis.com/css?family=Ubuntu:400,400italic" rel="stylesheet" type="text/css"/>
2951- <link href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400" rel="stylesheet" type="text/css"/>
2952- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" rel="stylesheet" type="text/css"/>
2953- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" rel="stylesheet" type="text/css"/>
2954- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" rel="stylesheet" type="text/css"/>
2955- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/resources.css" rel="stylesheet" type="text/css"/>
2956- <link href="css/main.css" rel="stylesheet" type="text/css"/>
2957- <!--[if lt IE 9]>
2958- <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
2959- <![endif]-->
2960- </head>
2961+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
2962+ <title>Juju Documentation - Destroying Services</title>
2963+ <link href='https://fonts.googleapis.com/css?family=Ubuntu:400,300,300italic,400italic,700,700italic|Ubuntu+Mono' rel='stylesheet' type='text/css' />
2964+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" />
2965+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" />
2966+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" />
2967+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/home-new.css" />
2968+ <link rel='stylesheet' id='stacktack-css' href='//juju.ubuntu.com/wp-content/plugins/stacktack/css/stacktack.min.css?ver=3.4.2' type='text/css' media='all' />
2969+ <link href="css/main.css?1373740025" rel="stylesheet" type="text/css"/>
2970+
2971+ <!--[if lt IE 9]>
2972+ <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
2973+ <![endif]-->
2974+</head>
2975+<!-- DO NOT EDIT ABOVE THIS LINE -->
2976+
2977+<!-- DO NOT EDIT ABOVE THIS LINE -->
2978+
2979+
2980 <body class="resources">
2981- <header>
2982- <div class="header-login">
2983+ <header class="global clearfix" role="banner">
2984+ <div class="header-navigation">
2985+ <div>
2986+ <nav role="navigation">
2987 <ul>
2988- <li>&nbsp;</li>
2989+ <li class="page_item page-item-6"><a href="https://juju.ubuntu.com/">Home</a></li>
2990+ <li class="page_item page-item-7"><a href="https://juju.ubuntu.com/get-started/">Get started</a></li>
2991+ <li class="page_item page-item-9 current_page_item"><a href="https://juju.ubuntu.com/resources/">Resources</a></li>
2992+ <li class="page_item page-item-13"><a href="https://juju.ubuntu.com/community/">Community</a></li>
2993+ <li class="page_item page-item-3688"><a href="https://juju.ubuntu.com/charm-store/">Charm Store</a></li>
2994+ <li class="page_item page-item-3691"><a href="https://juju.ubuntu.com/events/">Events</a></li>
2995+ <li class="page_item page-item-4474"><a href="https://juju.ubuntu.com/charm-championship/">Charm Championship</a></li>
2996+ <li class="page_item page-item-4249"><a href="https://juju.ubuntu.com/survey/">Survey</a></li>
2997+ <li>
2998+ <form id="form-search" method="get" action="https://juju.ubuntu.com/">
2999+ <fieldset>
3000+ <input id="input-search" type="text" name="s" value="Search" />
3001+ </fieldset>
3002+ </form>
3003+ </li>
3004 </ul>
3005- </div>
3006- <div class="header-navigation">
3007- <div>
3008- <nav role="navigation">
3009- <ul>
3010- <li class="page_item"><a href="https://juju.ubuntu.com/">Home</a></li>
3011- <li class="page_item current_page_item"><a href="https://juju.ubuntu.com/">Resources</a></li>
3012- <li class="page_item"><a href="https://juju.ubuntu.com/">Community</a></li>
3013- <li class="page_item"><a href="https://juju.ubuntu.com/">Charm Store</a></li>
3014- <li class="page_item"><a href="https://juju.ubuntu.com/">Events</a></li>
3015- <li class="page_item"><a href="https://juju.ubuntu.com/">Survey</a></li>
3016- <li>
3017- <form id="form-search" method="get" action="/">
3018- <fieldset>
3019- <input id="input-search" type="text" name="s" value="Search">
3020- </fieldset>
3021- </form>
3022- </li>
3023- </ul>
3024- </nav><a href="https://juju.ubuntu.com/" class="logo-ubuntu"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/logo-ubuntu.png"></a>
3025- </div>
3026- </div>
3027- <div class="header-content">
3028- <div class="clearfix"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
3029- <div class="header-navigation-secondary"></div>
3030- <div class="header-image"></div>
3031- <h1>Resources</h1>
3032- <h2>A collection of some of the most important online references for Juju users and developers.</h2>
3033- </div>
3034- </div>
3035- </header>
3036+ </nav>
3037+ </div>
3038+ </div>
3039+ <div class="header-content">
3040+ <div class="clearfix">
3041+ <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
3042+ <div class="header-navigation-secondary"></div>
3043+ <div class="header-image"></div>
3044+ <h1>Resources</h1>
3045+ <h2>A collection of some of the most important online references for Juju users and developers.</h2>
3046+ </div>
3047+ </div>
3048+</header>
3049+
3050 <section id="content" class="container-12">
3051 <div class="grid-12 doc-container">
3052 <div class="grid-3 doc-navigation">
3053@@ -144,43 +149,62 @@
3054 </div>
3055 </section>
3056 <div class="shadow"></div>
3057- <footer>
3058- <div>
3059- <nav role="navigation" class="clearfix">
3060- <ul>
3061- <li><a href="https://juju.ubuntu.com/get-started">Get started</a></li>
3062- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li>
3063- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li>
3064- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li>
3065- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li>
3066- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li>
3067- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li>
3068- </ul>
3069- <ul>
3070- <li><a href="https://juju.ubuntu.com/resources">Resources</a></li>
3071- <li><a href="https://juju.ubuntu.com/docs">Documentation</a></li>
3072- <li><a href="https://juju.ubuntu.com/resources/videos">Videos</a></li>
3073- <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI Demo</a></li>
3074- </ul>
3075- <ul>
3076- <li><a href="https://juju.ubuntu.com/community">Community</a></li>
3077- <li class="page_item"><a href="https://juju.ubuntu.com/community/juju-blog/">Blog</a></li>
3078- <li class="page_item"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Charm Meetings</a></li>
3079- <li class="page_item"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li>
3080- <li class="page_item"><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li>
3081- <li class="page_item"><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li>
3082- <li class="page_item"><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&amp;amp;pagesize=50">FAQ</a></li>
3083- </ul>
3084- <ul class="last">
3085- <li><a href="https://launchpad.net/juju">Code</a></li>
3086- <li><a href="https://launchpad.net/juju-core">Juju Core</a></li>
3087- <li><a href="https://launchpad.net/charms">Charms</a></li>
3088- </ul>
3089- </nav>
3090- </div>
3091- </footer>
3092+ <footer class="global clearfix" role="contentinfo">
3093+ <div class="row">
3094+ <div class="inner-wrapper">
3095+ <nav role="navigation" class="clearfix">
3096+ <ul class="footer-a">
3097+ <li class="grid-3 first-col">
3098+ <h4><a href="/get-started">Get started</a></h4>
3099+ <ul>
3100+ <li class="page_item page-item-20"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li>
3101+ <li class="page_item page-item-22"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li>
3102+ <li class="page_item page-item-18"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li>
3103+ <li class="page_item page-item-16"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li>
3104+ <li class="page_item page-item-3596"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li>
3105+ <li class="page_item page-item-3600"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li>
3106+ </ul>
3107+ </li>
3108+ <li class="grid-3">
3109+ <h4><a href="/resources">Resources</a></h4>
3110+ <ul>
3111+ <li><a href="http://juju.ubuntu.com/docs">Documentation</a></li>
3112+ <li><a href="/resources/videos/">Videos</a></li>
3113+ <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI demo site</a></li>
3114+ </ul>
3115+ </li>
3116+ <li class="grid-3">
3117+ <h4><a href="/community">Community</a></h4>
3118+ <ul>
3119+ <li class="page_item page-item-28"><a href="https://juju.ubuntu.com/community/juju-blog/">Juju Blog</a></li>
3120+ <li class="page_item page-item-4262"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Weekly Charm Meeting</a></li>
3121+ <li class="page_item page-item-4036"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li>
3122+ <li><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li>
3123+ <li><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li>
3124+ <li><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&pagesize=50">FAQ</a></li>
3125+ </ul>
3126+ </li>
3127+ <li class="grid-3 last-col">
3128+ <h4><a href="https://launchpad.net/juju">Code</a></h4>
3129+ <ul>
3130+ <li><a href="https://launchpad.net/juju-core">Juju Core</a></li>
3131+ <li><a href="https://launchpad.net/charms">Charms</a></li>
3132+ </ul>
3133+ </li>
3134+ </ul>
3135+ </nav>
3136+ </div>
3137+ </div>
3138+ <div class="row no-border">
3139+ <div class="legal inner-wrapper">
3140+ <p>&copy; 2013 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p>
3141+ <p><a href="https://bugs.launchpad.net/juju-website/+filebug">Report a bug on this site</a></p>
3142+ </div>
3143+ </div>
3144+</footer>
3145+
3146 <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
3147- <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.8.14/jquery-ui.min.js"></script>
3148+ <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script>
3149 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
3150 <script type="text/javascript" src="js/main.js"></script>
3151 </body>
3152
3153=== modified file 'htmldocs/charms-exposing.html'
3154--- htmldocs/charms-exposing.html 2013-07-12 00:12:30 +0000
3155+++ htmldocs/charms-exposing.html 2013-07-13 18:35:28 +0000
3156@@ -1,56 +1,61 @@
3157 <!DOCTYPE html>
3158 <html>
3159 <head>
3160- <meta charset="utf-8">
3161- <title>Juju Documentation - Exposing Charms</title>
3162- <link href="//fonts.googleapis.com/css?family=Ubuntu:400,400italic" rel="stylesheet" type="text/css"/>
3163- <link href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400" rel="stylesheet" type="text/css"/>
3164- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" rel="stylesheet" type="text/css"/>
3165- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" rel="stylesheet" type="text/css"/>
3166- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" rel="stylesheet" type="text/css"/>
3167- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/resources.css" rel="stylesheet" type="text/css"/>
3168- <link href="css/main.css" rel="stylesheet" type="text/css"/>
3169- <!--[if lt IE 9]>
3170- <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
3171- <![endif]-->
3172- </head>
3173+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
3174+ <title>Juju Documentation - Exposing Services</title>
3175+ <link href='https://fonts.googleapis.com/css?family=Ubuntu:400,300,300italic,400italic,700,700italic|Ubuntu+Mono' rel='stylesheet' type='text/css' />
3176+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" />
3177+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" />
3178+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" />
3179+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/home-new.css" />
3180+ <link rel='stylesheet' id='stacktack-css' href='//juju.ubuntu.com/wp-content/plugins/stacktack/css/stacktack.min.css?ver=3.4.2' type='text/css' media='all' />
3181+ <link href="css/main.css?1373740025" rel="stylesheet" type="text/css"/>
3182+
3183+ <!--[if lt IE 9]>
3184+ <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
3185+ <![endif]-->
3186+</head>
3187+<!-- DO NOT EDIT ABOVE THIS LINE -->
3188+
3189+<!-- DO NOT EDIT ABOVE THIS LINE -->
3190+
3191+
3192 <body class="resources">
3193- <header>
3194- <div class="header-login">
3195+ <header class="global clearfix" role="banner">
3196+ <div class="header-navigation">
3197+ <div>
3198+ <nav role="navigation">
3199 <ul>
3200- <li>&nbsp;</li>
3201+ <li class="page_item page-item-6"><a href="https://juju.ubuntu.com/">Home</a></li>
3202+ <li class="page_item page-item-7"><a href="https://juju.ubuntu.com/get-started/">Get started</a></li>
3203+ <li class="page_item page-item-9 current_page_item"><a href="https://juju.ubuntu.com/resources/">Resources</a></li>
3204+ <li class="page_item page-item-13"><a href="https://juju.ubuntu.com/community/">Community</a></li>
3205+ <li class="page_item page-item-3688"><a href="https://juju.ubuntu.com/charm-store/">Charm Store</a></li>
3206+ <li class="page_item page-item-3691"><a href="https://juju.ubuntu.com/events/">Events</a></li>
3207+ <li class="page_item page-item-4474"><a href="https://juju.ubuntu.com/charm-championship/">Charm Championship</a></li>
3208+ <li class="page_item page-item-4249"><a href="https://juju.ubuntu.com/survey/">Survey</a></li>
3209+ <li>
3210+ <form id="form-search" method="get" action="https://juju.ubuntu.com/">
3211+ <fieldset>
3212+ <input id="input-search" type="text" name="s" value="Search" />
3213+ </fieldset>
3214+ </form>
3215+ </li>
3216 </ul>
3217- </div>
3218- <div class="header-navigation">
3219- <div>
3220- <nav role="navigation">
3221- <ul>
3222- <li class="page_item"><a href="https://juju.ubuntu.com/">Home</a></li>
3223- <li class="page_item current_page_item"><a href="https://juju.ubuntu.com/">Resources</a></li>
3224- <li class="page_item"><a href="https://juju.ubuntu.com/">Community</a></li>
3225- <li class="page_item"><a href="https://juju.ubuntu.com/">Charm Store</a></li>
3226- <li class="page_item"><a href="https://juju.ubuntu.com/">Events</a></li>
3227- <li class="page_item"><a href="https://juju.ubuntu.com/">Survey</a></li>
3228- <li>
3229- <form id="form-search" method="get" action="/">
3230- <fieldset>
3231- <input id="input-search" type="text" name="s" value="Search">
3232- </fieldset>
3233- </form>
3234- </li>
3235- </ul>
3236- </nav><a href="https://juju.ubuntu.com/" class="logo-ubuntu"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/logo-ubuntu.png"></a>
3237- </div>
3238- </div>
3239- <div class="header-content">
3240- <div class="clearfix"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
3241- <div class="header-navigation-secondary"></div>
3242- <div class="header-image"></div>
3243- <h1>Resources</h1>
3244- <h2>A collection of some of the most important online references for Juju users and developers.</h2>
3245- </div>
3246- </div>
3247- </header>
3248+ </nav>
3249+ </div>
3250+ </div>
3251+ <div class="header-content">
3252+ <div class="clearfix">
3253+ <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
3254+ <div class="header-navigation-secondary"></div>
3255+ <div class="header-image"></div>
3256+ <h1>Resources</h1>
3257+ <h2>A collection of some of the most important online references for Juju users and developers.</h2>
3258+ </div>
3259+ </div>
3260+</header>
3261+
3262 <section id="content" class="container-12">
3263 <div class="grid-12 doc-container">
3264 <div class="grid-3 doc-navigation">
3265@@ -135,43 +140,62 @@
3266 </div>
3267 </section>
3268 <div class="shadow"></div>
3269- <footer>
3270- <div>
3271- <nav role="navigation" class="clearfix">
3272- <ul>
3273- <li><a href="https://juju.ubuntu.com/get-started">Get started</a></li>
3274- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li>
3275- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li>
3276- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li>
3277- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li>
3278- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li>
3279- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li>
3280- </ul>
3281- <ul>
3282- <li><a href="https://juju.ubuntu.com/resources">Resources</a></li>
3283- <li><a href="https://juju.ubuntu.com/docs">Documentation</a></li>
3284- <li><a href="https://juju.ubuntu.com/resources/videos">Videos</a></li>
3285- <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI Demo</a></li>
3286- </ul>
3287- <ul>
3288- <li><a href="https://juju.ubuntu.com/community">Community</a></li>
3289- <li class="page_item"><a href="https://juju.ubuntu.com/community/juju-blog/">Blog</a></li>
3290- <li class="page_item"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Charm Meetings</a></li>
3291- <li class="page_item"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li>
3292- <li class="page_item"><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li>
3293- <li class="page_item"><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li>
3294- <li class="page_item"><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&amp;amp;pagesize=50">FAQ</a></li>
3295- </ul>
3296- <ul class="last">
3297- <li><a href="https://launchpad.net/juju">Code</a></li>
3298- <li><a href="https://launchpad.net/juju-core">Juju Core</a></li>
3299- <li><a href="https://launchpad.net/charms">Charms</a></li>
3300- </ul>
3301- </nav>
3302- </div>
3303- </footer>
3304+ <footer class="global clearfix" role="contentinfo">
3305+ <div class="row">
3306+ <div class="inner-wrapper">
3307+ <nav role="navigation" class="clearfix">
3308+ <ul class="footer-a">
3309+ <li class="grid-3 first-col">
3310+ <h4><a href="/get-started">Get started</a></h4>
3311+ <ul>
3312+ <li class="page_item page-item-20"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li>
3313+ <li class="page_item page-item-22"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li>
3314+ <li class="page_item page-item-18"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li>
3315+ <li class="page_item page-item-16"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li>
3316+ <li class="page_item page-item-3596"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li>
3317+ <li class="page_item page-item-3600"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li>
3318+ </ul>
3319+ </li>
3320+ <li class="grid-3">
3321+ <h4><a href="/resources">Resources</a></h4>
3322+ <ul>
3323+ <li><a href="http://juju.ubuntu.com/docs">Documentation</a></li>
3324+ <li><a href="/resources/videos/">Videos</a></li>
3325+ <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI demo site</a></li>
3326+ </ul>
3327+ </li>
3328+ <li class="grid-3">
3329+ <h4><a href="/community">Community</a></h4>
3330+ <ul>
3331+ <li class="page_item page-item-28"><a href="https://juju.ubuntu.com/community/juju-blog/">Juju Blog</a></li>
3332+ <li class="page_item page-item-4262"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Weekly Charm Meeting</a></li>
3333+ <li class="page_item page-item-4036"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li>
3334+ <li><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li>
3335+ <li><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li>
3336+ <li><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&pagesize=50">FAQ</a></li>
3337+ </ul>
3338+ </li>
3339+ <li class="grid-3 last-col">
3340+ <h4><a href="https://launchpad.net/juju">Code</a></h4>
3341+ <ul>
3342+ <li><a href="https://launchpad.net/juju-core">Juju Core</a></li>
3343+ <li><a href="https://launchpad.net/charms">Charms</a></li>
3344+ </ul>
3345+ </li>
3346+ </ul>
3347+ </nav>
3348+ </div>
3349+ </div>
3350+ <div class="row no-border">
3351+ <div class="legal inner-wrapper">
3352+ <p>&copy; 2013 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p>
3353+ <p><a href="https://bugs.launchpad.net/juju-website/+filebug">Report a bug on this site</a></p>
3354+ </div>
3355+ </div>
3356+</footer>
3357+
3358 <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
3359- <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.8.14/jquery-ui.min.js"></script>
3360+ <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script>
3361 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
3362 <script type="text/javascript" src="js/main.js"></script>
3363 </body>
3364
3365=== modified file 'htmldocs/charms-relations.html'
3366--- htmldocs/charms-relations.html 2013-07-12 00:12:30 +0000
3367+++ htmldocs/charms-relations.html 2013-07-13 18:35:28 +0000
3368@@ -1,56 +1,61 @@
3369 <!DOCTYPE html>
3370 <html>
3371 <head>
3372- <meta charset="utf-8">
3373- <title>Juju Documentation - Relations</title>
3374- <link href="//fonts.googleapis.com/css?family=Ubuntu:400,400italic" rel="stylesheet" type="text/css"/>
3375- <link href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400" rel="stylesheet" type="text/css"/>
3376- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" rel="stylesheet" type="text/css"/>
3377- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" rel="stylesheet" type="text/css"/>
3378- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" rel="stylesheet" type="text/css"/>
3379- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/resources.css" rel="stylesheet" type="text/css"/>
3380- <link href="css/main.css" rel="stylesheet" type="text/css"/>
3381- <!--[if lt IE 9]>
3382- <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
3383- <![endif]-->
3384- </head>
3385+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
3386+ <title>Juju Documentation - None</title>
3387+ <link href='https://fonts.googleapis.com/css?family=Ubuntu:400,300,300italic,400italic,700,700italic|Ubuntu+Mono' rel='stylesheet' type='text/css' />
3388+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" />
3389+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" />
3390+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" />
3391+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/home-new.css" />
3392+ <link rel='stylesheet' id='stacktack-css' href='//juju.ubuntu.com/wp-content/plugins/stacktack/css/stacktack.min.css?ver=3.4.2' type='text/css' media='all' />
3393+ <link href="css/main.css?1373740025" rel="stylesheet" type="text/css"/>
3394+
3395+ <!--[if lt IE 9]>
3396+ <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
3397+ <![endif]-->
3398+</head>
3399+<!-- DO NOT EDIT ABOVE THIS LINE -->
3400+
3401+<!-- DO NOT EDIT ABOVE THIS LINE -->
3402+
3403+
3404 <body class="resources">
3405- <header>
3406- <div class="header-login">
3407+ <header class="global clearfix" role="banner">
3408+ <div class="header-navigation">
3409+ <div>
3410+ <nav role="navigation">
3411 <ul>
3412- <li>&nbsp;</li>
3413+ <li class="page_item page-item-6"><a href="https://juju.ubuntu.com/">Home</a></li>
3414+ <li class="page_item page-item-7"><a href="https://juju.ubuntu.com/get-started/">Get started</a></li>
3415+ <li class="page_item page-item-9 current_page_item"><a href="https://juju.ubuntu.com/resources/">Resources</a></li>
3416+ <li class="page_item page-item-13"><a href="https://juju.ubuntu.com/community/">Community</a></li>
3417+ <li class="page_item page-item-3688"><a href="https://juju.ubuntu.com/charm-store/">Charm Store</a></li>
3418+ <li class="page_item page-item-3691"><a href="https://juju.ubuntu.com/events/">Events</a></li>
3419+ <li class="page_item page-item-4474"><a href="https://juju.ubuntu.com/charm-championship/">Charm Championship</a></li>
3420+ <li class="page_item page-item-4249"><a href="https://juju.ubuntu.com/survey/">Survey</a></li>
3421+ <li>
3422+ <form id="form-search" method="get" action="https://juju.ubuntu.com/">
3423+ <fieldset>
3424+ <input id="input-search" type="text" name="s" value="Search" />
3425+ </fieldset>
3426+ </form>
3427+ </li>
3428 </ul>
3429- </div>
3430- <div class="header-navigation">
3431- <div>
3432- <nav role="navigation">
3433- <ul>
3434- <li class="page_item"><a href="https://juju.ubuntu.com/">Home</a></li>
3435- <li class="page_item current_page_item"><a href="https://juju.ubuntu.com/">Resources</a></li>
3436- <li class="page_item"><a href="https://juju.ubuntu.com/">Community</a></li>
3437- <li class="page_item"><a href="https://juju.ubuntu.com/">Charm Store</a></li>
3438- <li class="page_item"><a href="https://juju.ubuntu.com/">Events</a></li>
3439- <li class="page_item"><a href="https://juju.ubuntu.com/">Survey</a></li>
3440- <li>
3441- <form id="form-search" method="get" action="/">
3442- <fieldset>
3443- <input id="input-search" type="text" name="s" value="Search">
3444- </fieldset>
3445- </form>
3446- </li>
3447- </ul>
3448- </nav><a href="https://juju.ubuntu.com/" class="logo-ubuntu"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/logo-ubuntu.png"></a>
3449- </div>
3450- </div>
3451- <div class="header-content">
3452- <div class="clearfix"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
3453- <div class="header-navigation-secondary"></div>
3454- <div class="header-image"></div>
3455- <h1>Resources</h1>
3456- <h2>A collection of some of the most important online references for Juju users and developers.</h2>
3457- </div>
3458- </div>
3459- </header>
3460+ </nav>
3461+ </div>
3462+ </div>
3463+ <div class="header-content">
3464+ <div class="clearfix">
3465+ <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
3466+ <div class="header-navigation-secondary"></div>
3467+ <div class="header-image"></div>
3468+ <h1>Resources</h1>
3469+ <h2>A collection of some of the most important online references for Juju users and developers.</h2>
3470+ </div>
3471+ </div>
3472+</header>
3473+
3474 <section id="content" class="container-12">
3475 <div class="grid-12 doc-container">
3476 <div class="grid-3 doc-navigation">
3477@@ -177,43 +182,62 @@
3478 </div>
3479 </section>
3480 <div class="shadow"></div>
3481- <footer>
3482- <div>
3483- <nav role="navigation" class="clearfix">
3484- <ul>
3485- <li><a href="https://juju.ubuntu.com/get-started">Get started</a></li>
3486- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li>
3487- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li>
3488- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li>
3489- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li>
3490- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li>
3491- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li>
3492- </ul>
3493- <ul>
3494- <li><a href="https://juju.ubuntu.com/resources">Resources</a></li>
3495- <li><a href="https://juju.ubuntu.com/docs">Documentation</a></li>
3496- <li><a href="https://juju.ubuntu.com/resources/videos">Videos</a></li>
3497- <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI Demo</a></li>
3498- </ul>
3499- <ul>
3500- <li><a href="https://juju.ubuntu.com/community">Community</a></li>
3501- <li class="page_item"><a href="https://juju.ubuntu.com/community/juju-blog/">Blog</a></li>
3502- <li class="page_item"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Charm Meetings</a></li>
3503- <li class="page_item"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li>
3504- <li class="page_item"><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li>
3505- <li class="page_item"><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li>
3506- <li class="page_item"><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&amp;amp;pagesize=50">FAQ</a></li>
3507- </ul>
3508- <ul class="last">
3509- <li><a href="https://launchpad.net/juju">Code</a></li>
3510- <li><a href="https://launchpad.net/juju-core">Juju Core</a></li>
3511- <li><a href="https://launchpad.net/charms">Charms</a></li>
3512- </ul>
3513- </nav>
3514- </div>
3515- </footer>
3516+ <footer class="global clearfix" role="contentinfo">
3517+ <div class="row">
3518+ <div class="inner-wrapper">
3519+ <nav role="navigation" class="clearfix">
3520+ <ul class="footer-a">
3521+ <li class="grid-3 first-col">
3522+ <h4><a href="/get-started">Get started</a></h4>
3523+ <ul>
3524+ <li class="page_item page-item-20"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li>
3525+ <li class="page_item page-item-22"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li>
3526+ <li class="page_item page-item-18"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li>
3527+ <li class="page_item page-item-16"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li>
3528+ <li class="page_item page-item-3596"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li>
3529+ <li class="page_item page-item-3600"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li>
3530+ </ul>
3531+ </li>
3532+ <li class="grid-3">
3533+ <h4><a href="/resources">Resources</a></h4>
3534+ <ul>
3535+ <li><a href="http://juju.ubuntu.com/docs">Documentation</a></li>
3536+ <li><a href="/resources/videos/">Videos</a></li>
3537+ <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI demo site</a></li>
3538+ </ul>
3539+ </li>
3540+ <li class="grid-3">
3541+ <h4><a href="/community">Community</a></h4>
3542+ <ul>
3543+ <li class="page_item page-item-28"><a href="https://juju.ubuntu.com/community/juju-blog/">Juju Blog</a></li>
3544+ <li class="page_item page-item-4262"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Weekly Charm Meeting</a></li>
3545+ <li class="page_item page-item-4036"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li>
3546+ <li><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li>
3547+ <li><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li>
3548+ <li><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&pagesize=50">FAQ</a></li>
3549+ </ul>
3550+ </li>
3551+ <li class="grid-3 last-col">
3552+ <h4><a href="https://launchpad.net/juju">Code</a></h4>
3553+ <ul>
3554+ <li><a href="https://launchpad.net/juju-core">Juju Core</a></li>
3555+ <li><a href="https://launchpad.net/charms">Charms</a></li>
3556+ </ul>
3557+ </li>
3558+ </ul>
3559+ </nav>
3560+ </div>
3561+ </div>
3562+ <div class="row no-border">
3563+ <div class="legal inner-wrapper">
3564+ <p>&copy; 2013 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p>
3565+ <p><a href="https://bugs.launchpad.net/juju-website/+filebug">Report a bug on this site</a></p>
3566+ </div>
3567+ </div>
3568+</footer>
3569+
3570 <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
3571- <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.8.14/jquery-ui.min.js"></script>
3572+ <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script>
3573 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
3574 <script type="text/javascript" src="js/main.js"></script>
3575 </body>
3576
3577=== modified file 'htmldocs/charms-scaling.html'
3578--- htmldocs/charms-scaling.html 2013-07-12 00:12:30 +0000
3579+++ htmldocs/charms-scaling.html 2013-07-13 18:35:28 +0000
3580@@ -1,56 +1,61 @@
3581 <!DOCTYPE html>
3582 <html>
3583 <head>
3584- <meta charset="utf-8">
3585- <title>Juju Documentation - scaling charms</title>
3586- <link href="//fonts.googleapis.com/css?family=Ubuntu:400,400italic" rel="stylesheet" type="text/css"/>
3587- <link href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400" rel="stylesheet" type="text/css"/>
3588- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" rel="stylesheet" type="text/css"/>
3589- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" rel="stylesheet" type="text/css"/>
3590- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" rel="stylesheet" type="text/css"/>
3591- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/resources.css" rel="stylesheet" type="text/css"/>
3592- <link href="css/main.css" rel="stylesheet" type="text/css"/>
3593- <!--[if lt IE 9]>
3594- <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
3595- <![endif]-->
3596- </head>
3597+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
3598+ <title>Juju Documentation - Scaling Services</title>
3599+ <link href='https://fonts.googleapis.com/css?family=Ubuntu:400,300,300italic,400italic,700,700italic|Ubuntu+Mono' rel='stylesheet' type='text/css' />
3600+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" />
3601+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" />
3602+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" />
3603+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/home-new.css" />
3604+ <link rel='stylesheet' id='stacktack-css' href='//juju.ubuntu.com/wp-content/plugins/stacktack/css/stacktack.min.css?ver=3.4.2' type='text/css' media='all' />
3605+ <link href="css/main.css?1373740025" rel="stylesheet" type="text/css"/>
3606+
3607+ <!--[if lt IE 9]>
3608+ <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
3609+ <![endif]-->
3610+</head>
3611+<!-- DO NOT EDIT ABOVE THIS LINE -->
3612+
3613+<!-- DO NOT EDIT ABOVE THIS LINE -->
3614+
3615+
3616 <body class="resources">
3617- <header>
3618- <div class="header-login">
3619+ <header class="global clearfix" role="banner">
3620+ <div class="header-navigation">
3621+ <div>
3622+ <nav role="navigation">
3623 <ul>
3624- <li>&nbsp;</li>
3625+ <li class="page_item page-item-6"><a href="https://juju.ubuntu.com/">Home</a></li>
3626+ <li class="page_item page-item-7"><a href="https://juju.ubuntu.com/get-started/">Get started</a></li>
3627+ <li class="page_item page-item-9 current_page_item"><a href="https://juju.ubuntu.com/resources/">Resources</a></li>
3628+ <li class="page_item page-item-13"><a href="https://juju.ubuntu.com/community/">Community</a></li>
3629+ <li class="page_item page-item-3688"><a href="https://juju.ubuntu.com/charm-store/">Charm Store</a></li>
3630+ <li class="page_item page-item-3691"><a href="https://juju.ubuntu.com/events/">Events</a></li>
3631+ <li class="page_item page-item-4474"><a href="https://juju.ubuntu.com/charm-championship/">Charm Championship</a></li>
3632+ <li class="page_item page-item-4249"><a href="https://juju.ubuntu.com/survey/">Survey</a></li>
3633+ <li>
3634+ <form id="form-search" method="get" action="https://juju.ubuntu.com/">
3635+ <fieldset>
3636+ <input id="input-search" type="text" name="s" value="Search" />
3637+ </fieldset>
3638+ </form>
3639+ </li>
3640 </ul>
3641- </div>
3642- <div class="header-navigation">
3643- <div>
3644- <nav role="navigation">
3645- <ul>
3646- <li class="page_item"><a href="https://juju.ubuntu.com/">Home</a></li>
3647- <li class="page_item current_page_item"><a href="https://juju.ubuntu.com/">Resources</a></li>
3648- <li class="page_item"><a href="https://juju.ubuntu.com/">Community</a></li>
3649- <li class="page_item"><a href="https://juju.ubuntu.com/">Charm Store</a></li>
3650- <li class="page_item"><a href="https://juju.ubuntu.com/">Events</a></li>
3651- <li class="page_item"><a href="https://juju.ubuntu.com/">Survey</a></li>
3652- <li>
3653- <form id="form-search" method="get" action="/">
3654- <fieldset>
3655- <input id="input-search" type="text" name="s" value="Search">
3656- </fieldset>
3657- </form>
3658- </li>
3659- </ul>
3660- </nav><a href="https://juju.ubuntu.com/" class="logo-ubuntu"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/logo-ubuntu.png"></a>
3661- </div>
3662- </div>
3663- <div class="header-content">
3664- <div class="clearfix"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
3665- <div class="header-navigation-secondary"></div>
3666- <div class="header-image"></div>
3667- <h1>Resources</h1>
3668- <h2>A collection of some of the most important online references for Juju users and developers.</h2>
3669- </div>
3670- </div>
3671- </header>
3672+ </nav>
3673+ </div>
3674+ </div>
3675+ <div class="header-content">
3676+ <div class="clearfix">
3677+ <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
3678+ <div class="header-navigation-secondary"></div>
3679+ <div class="header-image"></div>
3680+ <h1>Resources</h1>
3681+ <h2>A collection of some of the most important online references for Juju users and developers.</h2>
3682+ </div>
3683+ </div>
3684+</header>
3685+
3686 <section id="content" class="container-12">
3687 <div class="grid-12 doc-container">
3688 <div class="grid-3 doc-navigation">
3689@@ -131,43 +136,62 @@
3690 </div>
3691 </section>
3692 <div class="shadow"></div>
3693- <footer>
3694- <div>
3695- <nav role="navigation" class="clearfix">
3696- <ul>
3697- <li><a href="https://juju.ubuntu.com/get-started">Get started</a></li>
3698- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li>
3699- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li>
3700- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li>
3701- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li>
3702- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li>
3703- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li>
3704- </ul>
3705- <ul>
3706- <li><a href="https://juju.ubuntu.com/resources">Resources</a></li>
3707- <li><a href="https://juju.ubuntu.com/docs">Documentation</a></li>
3708- <li><a href="https://juju.ubuntu.com/resources/videos">Videos</a></li>
3709- <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI Demo</a></li>
3710- </ul>
3711- <ul>
3712- <li><a href="https://juju.ubuntu.com/community">Community</a></li>
3713- <li class="page_item"><a href="https://juju.ubuntu.com/community/juju-blog/">Blog</a></li>
3714- <li class="page_item"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Charm Meetings</a></li>
3715- <li class="page_item"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li>
3716- <li class="page_item"><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li>
3717- <li class="page_item"><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li>
3718- <li class="page_item"><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&amp;amp;pagesize=50">FAQ</a></li>
3719- </ul>
3720- <ul class="last">
3721- <li><a href="https://launchpad.net/juju">Code</a></li>
3722- <li><a href="https://launchpad.net/juju-core">Juju Core</a></li>
3723- <li><a href="https://launchpad.net/charms">Charms</a></li>
3724- </ul>
3725- </nav>
3726- </div>
3727- </footer>
3728+ <footer class="global clearfix" role="contentinfo">
3729+ <div class="row">
3730+ <div class="inner-wrapper">
3731+ <nav role="navigation" class="clearfix">
3732+ <ul class="footer-a">
3733+ <li class="grid-3 first-col">
3734+ <h4><a href="/get-started">Get started</a></h4>
3735+ <ul>
3736+ <li class="page_item page-item-20"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li>
3737+ <li class="page_item page-item-22"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li>
3738+ <li class="page_item page-item-18"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li>
3739+ <li class="page_item page-item-16"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li>
3740+ <li class="page_item page-item-3596"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li>
3741+ <li class="page_item page-item-3600"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li>
3742+ </ul>
3743+ </li>
3744+ <li class="grid-3">
3745+ <h4><a href="/resources">Resources</a></h4>
3746+ <ul>
3747+ <li><a href="http://juju.ubuntu.com/docs">Documentation</a></li>
3748+ <li><a href="/resources/videos/">Videos</a></li>
3749+ <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI demo site</a></li>
3750+ </ul>
3751+ </li>
3752+ <li class="grid-3">
3753+ <h4><a href="/community">Community</a></h4>
3754+ <ul>
3755+ <li class="page_item page-item-28"><a href="https://juju.ubuntu.com/community/juju-blog/">Juju Blog</a></li>
3756+ <li class="page_item page-item-4262"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Weekly Charm Meeting</a></li>
3757+ <li class="page_item page-item-4036"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li>
3758+ <li><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li>
3759+ <li><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li>
3760+ <li><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&pagesize=50">FAQ</a></li>
3761+ </ul>
3762+ </li>
3763+ <li class="grid-3 last-col">
3764+ <h4><a href="https://launchpad.net/juju">Code</a></h4>
3765+ <ul>
3766+ <li><a href="https://launchpad.net/juju-core">Juju Core</a></li>
3767+ <li><a href="https://launchpad.net/charms">Charms</a></li>
3768+ </ul>
3769+ </li>
3770+ </ul>
3771+ </nav>
3772+ </div>
3773+ </div>
3774+ <div class="row no-border">
3775+ <div class="legal inner-wrapper">
3776+ <p>&copy; 2013 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p>
3777+ <p><a href="https://bugs.launchpad.net/juju-website/+filebug">Report a bug on this site</a></p>
3778+ </div>
3779+ </div>
3780+</footer>
3781+
3782 <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
3783- <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.8.14/jquery-ui.min.js"></script>
3784+ <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script>
3785 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
3786 <script type="text/javascript" src="js/main.js"></script>
3787 </body>
3788
3789=== modified file 'htmldocs/charms-upgrading.html'
3790--- htmldocs/charms-upgrading.html 2013-07-12 00:12:30 +0000
3791+++ htmldocs/charms-upgrading.html 2013-07-13 18:35:28 +0000
3792@@ -1,56 +1,61 @@
3793 <!DOCTYPE html>
3794 <html>
3795 <head>
3796- <meta charset="utf-8">
3797- <title>Juju Documentation - Upgrading</title>
3798- <link href="//fonts.googleapis.com/css?family=Ubuntu:400,400italic" rel="stylesheet" type="text/css"/>
3799- <link href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400" rel="stylesheet" type="text/css"/>
3800- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" rel="stylesheet" type="text/css"/>
3801- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" rel="stylesheet" type="text/css"/>
3802- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" rel="stylesheet" type="text/css"/>
3803- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/resources.css" rel="stylesheet" type="text/css"/>
3804- <link href="css/main.css" rel="stylesheet" type="text/css"/>
3805- <!--[if lt IE 9]>
3806- <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
3807- <![endif]-->
3808- </head>
3809+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
3810+ <title>Juju Documentation - None</title>
3811+ <link href='https://fonts.googleapis.com/css?family=Ubuntu:400,300,300italic,400italic,700,700italic|Ubuntu+Mono' rel='stylesheet' type='text/css' />
3812+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" />
3813+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" />
3814+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" />
3815+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/home-new.css" />
3816+ <link rel='stylesheet' id='stacktack-css' href='//juju.ubuntu.com/wp-content/plugins/stacktack/css/stacktack.min.css?ver=3.4.2' type='text/css' media='all' />
3817+ <link href="css/main.css?1373740025" rel="stylesheet" type="text/css"/>
3818+
3819+ <!--[if lt IE 9]>
3820+ <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
3821+ <![endif]-->
3822+</head>
3823+<!-- DO NOT EDIT ABOVE THIS LINE -->
3824+
3825+<!-- DO NOT EDIT ABOVE THIS LINE -->
3826+
3827+
3828 <body class="resources">
3829- <header>
3830- <div class="header-login">
3831+ <header class="global clearfix" role="banner">
3832+ <div class="header-navigation">
3833+ <div>
3834+ <nav role="navigation">
3835 <ul>
3836- <li>&nbsp;</li>
3837+ <li class="page_item page-item-6"><a href="https://juju.ubuntu.com/">Home</a></li>
3838+ <li class="page_item page-item-7"><a href="https://juju.ubuntu.com/get-started/">Get started</a></li>
3839+ <li class="page_item page-item-9 current_page_item"><a href="https://juju.ubuntu.com/resources/">Resources</a></li>
3840+ <li class="page_item page-item-13"><a href="https://juju.ubuntu.com/community/">Community</a></li>
3841+ <li class="page_item page-item-3688"><a href="https://juju.ubuntu.com/charm-store/">Charm Store</a></li>
3842+ <li class="page_item page-item-3691"><a href="https://juju.ubuntu.com/events/">Events</a></li>
3843+ <li class="page_item page-item-4474"><a href="https://juju.ubuntu.com/charm-championship/">Charm Championship</a></li>
3844+ <li class="page_item page-item-4249"><a href="https://juju.ubuntu.com/survey/">Survey</a></li>
3845+ <li>
3846+ <form id="form-search" method="get" action="https://juju.ubuntu.com/">
3847+ <fieldset>
3848+ <input id="input-search" type="text" name="s" value="Search" />
3849+ </fieldset>
3850+ </form>
3851+ </li>
3852 </ul>
3853- </div>
3854- <div class="header-navigation">
3855- <div>
3856- <nav role="navigation">
3857- <ul>
3858- <li class="page_item"><a href="https://juju.ubuntu.com/">Home</a></li>
3859- <li class="page_item current_page_item"><a href="https://juju.ubuntu.com/">Resources</a></li>
3860- <li class="page_item"><a href="https://juju.ubuntu.com/">Community</a></li>
3861- <li class="page_item"><a href="https://juju.ubuntu.com/">Charm Store</a></li>
3862- <li class="page_item"><a href="https://juju.ubuntu.com/">Events</a></li>
3863- <li class="page_item"><a href="https://juju.ubuntu.com/">Survey</a></li>
3864- <li>
3865- <form id="form-search" method="get" action="/">
3866- <fieldset>
3867- <input id="input-search" type="text" name="s" value="Search">
3868- </fieldset>
3869- </form>
3870- </li>
3871- </ul>
3872- </nav><a href="https://juju.ubuntu.com/" class="logo-ubuntu"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/logo-ubuntu.png"></a>
3873- </div>
3874- </div>
3875- <div class="header-content">
3876- <div class="clearfix"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
3877- <div class="header-navigation-secondary"></div>
3878- <div class="header-image"></div>
3879- <h1>Resources</h1>
3880- <h2>A collection of some of the most important online references for Juju users and developers.</h2>
3881- </div>
3882- </div>
3883- </header>
3884+ </nav>
3885+ </div>
3886+ </div>
3887+ <div class="header-content">
3888+ <div class="clearfix">
3889+ <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
3890+ <div class="header-navigation-secondary"></div>
3891+ <div class="header-image"></div>
3892+ <h1>Resources</h1>
3893+ <h2>A collection of some of the most important online references for Juju users and developers.</h2>
3894+ </div>
3895+ </div>
3896+</header>
3897+
3898 <section id="content" class="container-12">
3899 <div class="grid-12 doc-container">
3900 <div class="grid-3 doc-navigation">
3901@@ -109,43 +114,62 @@
3902 </div>
3903 </section>
3904 <div class="shadow"></div>
3905- <footer>
3906- <div>
3907- <nav role="navigation" class="clearfix">
3908- <ul>
3909- <li><a href="https://juju.ubuntu.com/get-started">Get started</a></li>
3910- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li>
3911- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li>
3912- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li>
3913- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li>
3914- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li>
3915- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li>
3916- </ul>
3917- <ul>
3918- <li><a href="https://juju.ubuntu.com/resources">Resources</a></li>
3919- <li><a href="https://juju.ubuntu.com/docs">Documentation</a></li>
3920- <li><a href="https://juju.ubuntu.com/resources/videos">Videos</a></li>
3921- <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI Demo</a></li>
3922- </ul>
3923- <ul>
3924- <li><a href="https://juju.ubuntu.com/community">Community</a></li>
3925- <li class="page_item"><a href="https://juju.ubuntu.com/community/juju-blog/">Blog</a></li>
3926- <li class="page_item"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Charm Meetings</a></li>
3927- <li class="page_item"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li>
3928- <li class="page_item"><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li>
3929- <li class="page_item"><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li>
3930- <li class="page_item"><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&amp;amp;pagesize=50">FAQ</a></li>
3931- </ul>
3932- <ul class="last">
3933- <li><a href="https://launchpad.net/juju">Code</a></li>
3934- <li><a href="https://launchpad.net/juju-core">Juju Core</a></li>
3935- <li><a href="https://launchpad.net/charms">Charms</a></li>
3936- </ul>
3937- </nav>
3938- </div>
3939- </footer>
3940+ <footer class="global clearfix" role="contentinfo">
3941+ <div class="row">
3942+ <div class="inner-wrapper">
3943+ <nav role="navigation" class="clearfix">
3944+ <ul class="footer-a">
3945+ <li class="grid-3 first-col">
3946+ <h4><a href="/get-started">Get started</a></h4>
3947+ <ul>
3948+ <li class="page_item page-item-20"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li>
3949+ <li class="page_item page-item-22"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li>
3950+ <li class="page_item page-item-18"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li>
3951+ <li class="page_item page-item-16"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li>
3952+ <li class="page_item page-item-3596"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li>
3953+ <li class="page_item page-item-3600"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li>
3954+ </ul>
3955+ </li>
3956+ <li class="grid-3">
3957+ <h4><a href="/resources">Resources</a></h4>
3958+ <ul>
3959+ <li><a href="http://juju.ubuntu.com/docs">Documentation</a></li>
3960+ <li><a href="/resources/videos/">Videos</a></li>
3961+ <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI demo site</a></li>
3962+ </ul>
3963+ </li>
3964+ <li class="grid-3">
3965+ <h4><a href="/community">Community</a></h4>
3966+ <ul>
3967+ <li class="page_item page-item-28"><a href="https://juju.ubuntu.com/community/juju-blog/">Juju Blog</a></li>
3968+ <li class="page_item page-item-4262"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Weekly Charm Meeting</a></li>
3969+ <li class="page_item page-item-4036"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li>
3970+ <li><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li>
3971+ <li><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li>
3972+ <li><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&pagesize=50">FAQ</a></li>
3973+ </ul>
3974+ </li>
3975+ <li class="grid-3 last-col">
3976+ <h4><a href="https://launchpad.net/juju">Code</a></h4>
3977+ <ul>
3978+ <li><a href="https://launchpad.net/juju-core">Juju Core</a></li>
3979+ <li><a href="https://launchpad.net/charms">Charms</a></li>
3980+ </ul>
3981+ </li>
3982+ </ul>
3983+ </nav>
3984+ </div>
3985+ </div>
3986+ <div class="row no-border">
3987+ <div class="legal inner-wrapper">
3988+ <p>&copy; 2013 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p>
3989+ <p><a href="https://bugs.launchpad.net/juju-website/+filebug">Report a bug on this site</a></p>
3990+ </div>
3991+ </div>
3992+</footer>
3993+
3994 <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
3995- <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.8.14/jquery-ui.min.js"></script>
3996+ <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script>
3997 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
3998 <script type="text/javascript" src="js/main.js"></script>
3999 </body>
4000
4001=== modified file 'htmldocs/charms.html'
4002--- htmldocs/charms.html 2013-07-12 00:12:30 +0000
4003+++ htmldocs/charms.html 2013-07-13 18:35:28 +0000
4004@@ -1,56 +1,61 @@
4005 <!DOCTYPE html>
4006 <html>
4007 <head>
4008- <meta charset="utf-8">
4009- <title>Juju Documentation - Charms!</title>
4010- <link href="//fonts.googleapis.com/css?family=Ubuntu:400,400italic" rel="stylesheet" type="text/css"/>
4011- <link href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400" rel="stylesheet" type="text/css"/>
4012- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" rel="stylesheet" type="text/css"/>
4013- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" rel="stylesheet" type="text/css"/>
4014- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" rel="stylesheet" type="text/css"/>
4015- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/resources.css" rel="stylesheet" type="text/css"/>
4016- <link href="css/main.css" rel="stylesheet" type="text/css"/>
4017- <!--[if lt IE 9]>
4018- <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
4019- <![endif]-->
4020- </head>
4021+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
4022+ <title>Juju Documentation - Using Charms</title>
4023+ <link href='https://fonts.googleapis.com/css?family=Ubuntu:400,300,300italic,400italic,700,700italic|Ubuntu+Mono' rel='stylesheet' type='text/css' />
4024+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" />
4025+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" />
4026+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" />
4027+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/home-new.css" />
4028+ <link rel='stylesheet' id='stacktack-css' href='//juju.ubuntu.com/wp-content/plugins/stacktack/css/stacktack.min.css?ver=3.4.2' type='text/css' media='all' />
4029+ <link href="css/main.css?1373740025" rel="stylesheet" type="text/css"/>
4030+
4031+ <!--[if lt IE 9]>
4032+ <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
4033+ <![endif]-->
4034+</head>
4035+<!-- DO NOT EDIT ABOVE THIS LINE -->
4036+
4037+<!-- DO NOT EDIT ABOVE THIS LINE -->
4038+
4039+
4040 <body class="resources">
4041- <header>
4042- <div class="header-login">
4043+ <header class="global clearfix" role="banner">
4044+ <div class="header-navigation">
4045+ <div>
4046+ <nav role="navigation">
4047 <ul>
4048- <li>&nbsp;</li>
4049+ <li class="page_item page-item-6"><a href="https://juju.ubuntu.com/">Home</a></li>
4050+ <li class="page_item page-item-7"><a href="https://juju.ubuntu.com/get-started/">Get started</a></li>
4051+ <li class="page_item page-item-9 current_page_item"><a href="https://juju.ubuntu.com/resources/">Resources</a></li>
4052+ <li class="page_item page-item-13"><a href="https://juju.ubuntu.com/community/">Community</a></li>
4053+ <li class="page_item page-item-3688"><a href="https://juju.ubuntu.com/charm-store/">Charm Store</a></li>
4054+ <li class="page_item page-item-3691"><a href="https://juju.ubuntu.com/events/">Events</a></li>
4055+ <li class="page_item page-item-4474"><a href="https://juju.ubuntu.com/charm-championship/">Charm Championship</a></li>
4056+ <li class="page_item page-item-4249"><a href="https://juju.ubuntu.com/survey/">Survey</a></li>
4057+ <li>
4058+ <form id="form-search" method="get" action="https://juju.ubuntu.com/">
4059+ <fieldset>
4060+ <input id="input-search" type="text" name="s" value="Search" />
4061+ </fieldset>
4062+ </form>
4063+ </li>
4064 </ul>
4065- </div>
4066- <div class="header-navigation">
4067- <div>
4068- <nav role="navigation">
4069- <ul>
4070- <li class="page_item"><a href="https://juju.ubuntu.com/">Home</a></li>
4071- <li class="page_item current_page_item"><a href="https://juju.ubuntu.com/">Resources</a></li>
4072- <li class="page_item"><a href="https://juju.ubuntu.com/">Community</a></li>
4073- <li class="page_item"><a href="https://juju.ubuntu.com/">Charm Store</a></li>
4074- <li class="page_item"><a href="https://juju.ubuntu.com/">Events</a></li>
4075- <li class="page_item"><a href="https://juju.ubuntu.com/">Survey</a></li>
4076- <li>
4077- <form id="form-search" method="get" action="/">
4078- <fieldset>
4079- <input id="input-search" type="text" name="s" value="Search">
4080- </fieldset>
4081- </form>
4082- </li>
4083- </ul>
4084- </nav><a href="https://juju.ubuntu.com/" class="logo-ubuntu"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/logo-ubuntu.png"></a>
4085- </div>
4086- </div>
4087- <div class="header-content">
4088- <div class="clearfix"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
4089- <div class="header-navigation-secondary"></div>
4090- <div class="header-image"></div>
4091- <h1>Resources</h1>
4092- <h2>A collection of some of the most important online references for Juju users and developers.</h2>
4093- </div>
4094- </div>
4095- </header>
4096+ </nav>
4097+ </div>
4098+ </div>
4099+ <div class="header-content">
4100+ <div class="clearfix">
4101+ <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
4102+ <div class="header-navigation-secondary"></div>
4103+ <div class="header-image"></div>
4104+ <h1>Resources</h1>
4105+ <h2>A collection of some of the most important online references for Juju users and developers.</h2>
4106+ </div>
4107+ </div>
4108+</header>
4109+
4110 <section id="content" class="container-12">
4111 <div class="grid-12 doc-container">
4112 <div class="grid-3 doc-navigation">
4113@@ -101,7 +106,7 @@
4114 <section id="charms">
4115 <h1>Introducing Charms</h1>
4116 <aside>
4117- <iframe class="youtube-player" type="text/html" width="400" height="300" src="http://www.youtube.com/embed/0AT6qKyam9I" frameborder="0">
4118+ <iframe class="youtube-player" type="text/html" width="400" height="300" src="//www.youtube.com/embed/0AT6qKyam9I" frameborder="0">
4119 </iframe>
4120 </aside>
4121
4122@@ -128,43 +133,62 @@
4123 </div>
4124 </section>
4125 <div class="shadow"></div>
4126- <footer>
4127- <div>
4128- <nav role="navigation" class="clearfix">
4129- <ul>
4130- <li><a href="https://juju.ubuntu.com/get-started">Get started</a></li>
4131- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li>
4132- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li>
4133- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li>
4134- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li>
4135- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li>
4136- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li>
4137- </ul>
4138- <ul>
4139- <li><a href="https://juju.ubuntu.com/resources">Resources</a></li>
4140- <li><a href="https://juju.ubuntu.com/docs">Documentation</a></li>
4141- <li><a href="https://juju.ubuntu.com/resources/videos">Videos</a></li>
4142- <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI Demo</a></li>
4143- </ul>
4144- <ul>
4145- <li><a href="https://juju.ubuntu.com/community">Community</a></li>
4146- <li class="page_item"><a href="https://juju.ubuntu.com/community/juju-blog/">Blog</a></li>
4147- <li class="page_item"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Charm Meetings</a></li>
4148- <li class="page_item"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li>
4149- <li class="page_item"><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li>
4150- <li class="page_item"><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li>
4151- <li class="page_item"><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&amp;amp;pagesize=50">FAQ</a></li>
4152- </ul>
4153- <ul class="last">
4154- <li><a href="https://launchpad.net/juju">Code</a></li>
4155- <li><a href="https://launchpad.net/juju-core">Juju Core</a></li>
4156- <li><a href="https://launchpad.net/charms">Charms</a></li>
4157- </ul>
4158- </nav>
4159- </div>
4160- </footer>
4161+ <footer class="global clearfix" role="contentinfo">
4162+ <div class="row">
4163+ <div class="inner-wrapper">
4164+ <nav role="navigation" class="clearfix">
4165+ <ul class="footer-a">
4166+ <li class="grid-3 first-col">
4167+ <h4><a href="/get-started">Get started</a></h4>
4168+ <ul>
4169+ <li class="page_item page-item-20"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li>
4170+ <li class="page_item page-item-22"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li>
4171+ <li class="page_item page-item-18"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li>
4172+ <li class="page_item page-item-16"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li>
4173+ <li class="page_item page-item-3596"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li>
4174+ <li class="page_item page-item-3600"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li>
4175+ </ul>
4176+ </li>
4177+ <li class="grid-3">
4178+ <h4><a href="/resources">Resources</a></h4>
4179+ <ul>
4180+ <li><a href="http://juju.ubuntu.com/docs">Documentation</a></li>
4181+ <li><a href="/resources/videos/">Videos</a></li>
4182+ <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI demo site</a></li>
4183+ </ul>
4184+ </li>
4185+ <li class="grid-3">
4186+ <h4><a href="/community">Community</a></h4>
4187+ <ul>
4188+ <li class="page_item page-item-28"><a href="https://juju.ubuntu.com/community/juju-blog/">Juju Blog</a></li>
4189+ <li class="page_item page-item-4262"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Weekly Charm Meeting</a></li>
4190+ <li class="page_item page-item-4036"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li>
4191+ <li><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li>
4192+ <li><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li>
4193+ <li><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&pagesize=50">FAQ</a></li>
4194+ </ul>
4195+ </li>
4196+ <li class="grid-3 last-col">
4197+ <h4><a href="https://launchpad.net/juju">Code</a></h4>
4198+ <ul>
4199+ <li><a href="https://launchpad.net/juju-core">Juju Core</a></li>
4200+ <li><a href="https://launchpad.net/charms">Charms</a></li>
4201+ </ul>
4202+ </li>
4203+ </ul>
4204+ </nav>
4205+ </div>
4206+ </div>
4207+ <div class="row no-border">
4208+ <div class="legal inner-wrapper">
4209+ <p>&copy; 2013 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p>
4210+ <p><a href="https://bugs.launchpad.net/juju-website/+filebug">Report a bug on this site</a></p>
4211+ </div>
4212+ </div>
4213+</footer>
4214+
4215 <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
4216- <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.8.14/jquery-ui.min.js"></script>
4217+ <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script>
4218 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
4219 <script type="text/javascript" src="js/main.js"></script>
4220 </body>
4221
4222=== modified file 'htmldocs/commands.html'
4223--- htmldocs/commands.html 2013-07-12 00:12:30 +0000
4224+++ htmldocs/commands.html 2013-07-13 18:35:28 +0000
4225@@ -1,56 +1,61 @@
4226 <!DOCTYPE html>
4227 <html>
4228 <head>
4229- <meta charset="utf-8">
4230- <title>Juju Documentation - Destroying Services</title>
4231- <link href="//fonts.googleapis.com/css?family=Ubuntu:400,400italic" rel="stylesheet" type="text/css"/>
4232- <link href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400" rel="stylesheet" type="text/css"/>
4233- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" rel="stylesheet" type="text/css"/>
4234- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" rel="stylesheet" type="text/css"/>
4235- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" rel="stylesheet" type="text/css"/>
4236- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/resources.css" rel="stylesheet" type="text/css"/>
4237- <link href="css/main.css" rel="stylesheet" type="text/css"/>
4238- <!--[if lt IE 9]>
4239- <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
4240- <![endif]-->
4241- </head>
4242+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
4243+ <title>Juju Documentation - Juju Commands</title>
4244+ <link href='https://fonts.googleapis.com/css?family=Ubuntu:400,300,300italic,400italic,700,700italic|Ubuntu+Mono' rel='stylesheet' type='text/css' />
4245+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" />
4246+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" />
4247+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" />
4248+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/home-new.css" />
4249+ <link rel='stylesheet' id='stacktack-css' href='//juju.ubuntu.com/wp-content/plugins/stacktack/css/stacktack.min.css?ver=3.4.2' type='text/css' media='all' />
4250+ <link href="css/main.css?1373740025" rel="stylesheet" type="text/css"/>
4251+
4252+ <!--[if lt IE 9]>
4253+ <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
4254+ <![endif]-->
4255+</head>
4256+<!-- DO NOT EDIT ABOVE THIS LINE -->
4257+
4258+<!-- DO NOT EDIT ABOVE THIS LINE -->
4259+
4260+
4261 <body class="resources">
4262- <header>
4263- <div class="header-login">
4264+ <header class="global clearfix" role="banner">
4265+ <div class="header-navigation">
4266+ <div>
4267+ <nav role="navigation">
4268 <ul>
4269- <li>&nbsp;</li>
4270+ <li class="page_item page-item-6"><a href="https://juju.ubuntu.com/">Home</a></li>
4271+ <li class="page_item page-item-7"><a href="https://juju.ubuntu.com/get-started/">Get started</a></li>
4272+ <li class="page_item page-item-9 current_page_item"><a href="https://juju.ubuntu.com/resources/">Resources</a></li>
4273+ <li class="page_item page-item-13"><a href="https://juju.ubuntu.com/community/">Community</a></li>
4274+ <li class="page_item page-item-3688"><a href="https://juju.ubuntu.com/charm-store/">Charm Store</a></li>
4275+ <li class="page_item page-item-3691"><a href="https://juju.ubuntu.com/events/">Events</a></li>
4276+ <li class="page_item page-item-4474"><a href="https://juju.ubuntu.com/charm-championship/">Charm Championship</a></li>
4277+ <li class="page_item page-item-4249"><a href="https://juju.ubuntu.com/survey/">Survey</a></li>
4278+ <li>
4279+ <form id="form-search" method="get" action="https://juju.ubuntu.com/">
4280+ <fieldset>
4281+ <input id="input-search" type="text" name="s" value="Search" />
4282+ </fieldset>
4283+ </form>
4284+ </li>
4285 </ul>
4286- </div>
4287- <div class="header-navigation">
4288- <div>
4289- <nav role="navigation">
4290- <ul>
4291- <li class="page_item"><a href="https://juju.ubuntu.com/">Home</a></li>
4292- <li class="page_item current_page_item"><a href="https://juju.ubuntu.com/">Resources</a></li>
4293- <li class="page_item"><a href="https://juju.ubuntu.com/">Community</a></li>
4294- <li class="page_item"><a href="https://juju.ubuntu.com/">Charm Store</a></li>
4295- <li class="page_item"><a href="https://juju.ubuntu.com/">Events</a></li>
4296- <li class="page_item"><a href="https://juju.ubuntu.com/">Survey</a></li>
4297- <li>
4298- <form id="form-search" method="get" action="/">
4299- <fieldset>
4300- <input id="input-search" type="text" name="s" value="Search">
4301- </fieldset>
4302- </form>
4303- </li>
4304- </ul>
4305- </nav><a href="https://juju.ubuntu.com/" class="logo-ubuntu"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/logo-ubuntu.png"></a>
4306- </div>
4307- </div>
4308- <div class="header-content">
4309- <div class="clearfix"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
4310- <div class="header-navigation-secondary"></div>
4311- <div class="header-image"></div>
4312- <h1>Resources</h1>
4313- <h2>A collection of some of the most important online references for Juju users and developers.</h2>
4314- </div>
4315- </div>
4316- </header>
4317+ </nav>
4318+ </div>
4319+ </div>
4320+ <div class="header-content">
4321+ <div class="clearfix">
4322+ <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
4323+ <div class="header-navigation-secondary"></div>
4324+ <div class="header-image"></div>
4325+ <h1>Resources</h1>
4326+ <h2>A collection of some of the most important online references for Juju users and developers.</h2>
4327+ </div>
4328+ </div>
4329+</header>
4330+
4331 <section id="content" class="container-12">
4332 <div class="grid-12 doc-container">
4333 <div class="grid-3 doc-navigation">
4334@@ -144,43 +149,62 @@
4335 </div>
4336 </section>
4337 <div class="shadow"></div>
4338- <footer>
4339- <div>
4340- <nav role="navigation" class="clearfix">
4341- <ul>
4342- <li><a href="https://juju.ubuntu.com/get-started">Get started</a></li>
4343- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li>
4344- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li>
4345- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li>
4346- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li>
4347- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li>
4348- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li>
4349- </ul>
4350- <ul>
4351- <li><a href="https://juju.ubuntu.com/resources">Resources</a></li>
4352- <li><a href="https://juju.ubuntu.com/docs">Documentation</a></li>
4353- <li><a href="https://juju.ubuntu.com/resources/videos">Videos</a></li>
4354- <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI Demo</a></li>
4355- </ul>
4356- <ul>
4357- <li><a href="https://juju.ubuntu.com/community">Community</a></li>
4358- <li class="page_item"><a href="https://juju.ubuntu.com/community/juju-blog/">Blog</a></li>
4359- <li class="page_item"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Charm Meetings</a></li>
4360- <li class="page_item"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li>
4361- <li class="page_item"><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li>
4362- <li class="page_item"><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li>
4363- <li class="page_item"><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&amp;amp;pagesize=50">FAQ</a></li>
4364- </ul>
4365- <ul class="last">
4366- <li><a href="https://launchpad.net/juju">Code</a></li>
4367- <li><a href="https://launchpad.net/juju-core">Juju Core</a></li>
4368- <li><a href="https://launchpad.net/charms">Charms</a></li>
4369- </ul>
4370- </nav>
4371- </div>
4372- </footer>
4373+ <footer class="global clearfix" role="contentinfo">
4374+ <div class="row">
4375+ <div class="inner-wrapper">
4376+ <nav role="navigation" class="clearfix">
4377+ <ul class="footer-a">
4378+ <li class="grid-3 first-col">
4379+ <h4><a href="/get-started">Get started</a></h4>
4380+ <ul>
4381+ <li class="page_item page-item-20"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li>
4382+ <li class="page_item page-item-22"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li>
4383+ <li class="page_item page-item-18"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li>
4384+ <li class="page_item page-item-16"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li>
4385+ <li class="page_item page-item-3596"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li>
4386+ <li class="page_item page-item-3600"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li>
4387+ </ul>
4388+ </li>
4389+ <li class="grid-3">
4390+ <h4><a href="/resources">Resources</a></h4>
4391+ <ul>
4392+ <li><a href="http://juju.ubuntu.com/docs">Documentation</a></li>
4393+ <li><a href="/resources/videos/">Videos</a></li>
4394+ <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI demo site</a></li>
4395+ </ul>
4396+ </li>
4397+ <li class="grid-3">
4398+ <h4><a href="/community">Community</a></h4>
4399+ <ul>
4400+ <li class="page_item page-item-28"><a href="https://juju.ubuntu.com/community/juju-blog/">Juju Blog</a></li>
4401+ <li class="page_item page-item-4262"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Weekly Charm Meeting</a></li>
4402+ <li class="page_item page-item-4036"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li>
4403+ <li><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li>
4404+ <li><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li>
4405+ <li><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&pagesize=50">FAQ</a></li>
4406+ </ul>
4407+ </li>
4408+ <li class="grid-3 last-col">
4409+ <h4><a href="https://launchpad.net/juju">Code</a></h4>
4410+ <ul>
4411+ <li><a href="https://launchpad.net/juju-core">Juju Core</a></li>
4412+ <li><a href="https://launchpad.net/charms">Charms</a></li>
4413+ </ul>
4414+ </li>
4415+ </ul>
4416+ </nav>
4417+ </div>
4418+ </div>
4419+ <div class="row no-border">
4420+ <div class="legal inner-wrapper">
4421+ <p>&copy; 2013 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p>
4422+ <p><a href="https://bugs.launchpad.net/juju-website/+filebug">Report a bug on this site</a></p>
4423+ </div>
4424+ </div>
4425+</footer>
4426+
4427 <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
4428- <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.8.14/jquery-ui.min.js"></script>
4429+ <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script>
4430 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
4431 <script type="text/javascript" src="js/main.js"></script>
4432 </body>
4433
4434=== modified file 'htmldocs/config-aws.html'
4435--- htmldocs/config-aws.html 2013-07-12 00:12:30 +0000
4436+++ htmldocs/config-aws.html 2013-07-13 18:35:28 +0000
4437@@ -1,56 +1,61 @@
4438 <!DOCTYPE html>
4439 <html>
4440 <head>
4441- <meta charset="utf-8">
4442- <title>Juju Documentation - Configuring Juju to work with AWS</title>
4443- <link href="//fonts.googleapis.com/css?family=Ubuntu:400,400italic" rel="stylesheet" type="text/css"/>
4444- <link href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400" rel="stylesheet" type="text/css"/>
4445- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" rel="stylesheet" type="text/css"/>
4446- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" rel="stylesheet" type="text/css"/>
4447- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" rel="stylesheet" type="text/css"/>
4448- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/resources.css" rel="stylesheet" type="text/css"/>
4449- <link href="css/main.css" rel="stylesheet" type="text/css"/>
4450- <!--[if lt IE 9]>
4451- <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
4452- <![endif]-->
4453- </head>
4454+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
4455+ <title>Juju Documentation - AWS Configuration</title>
4456+ <link href='https://fonts.googleapis.com/css?family=Ubuntu:400,300,300italic,400italic,700,700italic|Ubuntu+Mono' rel='stylesheet' type='text/css' />
4457+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" />
4458+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" />
4459+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" />
4460+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/home-new.css" />
4461+ <link rel='stylesheet' id='stacktack-css' href='//juju.ubuntu.com/wp-content/plugins/stacktack/css/stacktack.min.css?ver=3.4.2' type='text/css' media='all' />
4462+ <link href="css/main.css?1373740025" rel="stylesheet" type="text/css"/>
4463+
4464+ <!--[if lt IE 9]>
4465+ <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
4466+ <![endif]-->
4467+</head>
4468+<!-- DO NOT EDIT ABOVE THIS LINE -->
4469+
4470+<!-- DO NOT EDIT ABOVE THIS LINE -->
4471+
4472+
4473 <body class="resources">
4474- <header>
4475- <div class="header-login">
4476+ <header class="global clearfix" role="banner">
4477+ <div class="header-navigation">
4478+ <div>
4479+ <nav role="navigation">
4480 <ul>
4481- <li>&nbsp;</li>
4482+ <li class="page_item page-item-6"><a href="https://juju.ubuntu.com/">Home</a></li>
4483+ <li class="page_item page-item-7"><a href="https://juju.ubuntu.com/get-started/">Get started</a></li>
4484+ <li class="page_item page-item-9 current_page_item"><a href="https://juju.ubuntu.com/resources/">Resources</a></li>
4485+ <li class="page_item page-item-13"><a href="https://juju.ubuntu.com/community/">Community</a></li>
4486+ <li class="page_item page-item-3688"><a href="https://juju.ubuntu.com/charm-store/">Charm Store</a></li>
4487+ <li class="page_item page-item-3691"><a href="https://juju.ubuntu.com/events/">Events</a></li>
4488+ <li class="page_item page-item-4474"><a href="https://juju.ubuntu.com/charm-championship/">Charm Championship</a></li>
4489+ <li class="page_item page-item-4249"><a href="https://juju.ubuntu.com/survey/">Survey</a></li>
4490+ <li>
4491+ <form id="form-search" method="get" action="https://juju.ubuntu.com/">
4492+ <fieldset>
4493+ <input id="input-search" type="text" name="s" value="Search" />
4494+ </fieldset>
4495+ </form>
4496+ </li>
4497 </ul>
4498- </div>
4499- <div class="header-navigation">
4500- <div>
4501- <nav role="navigation">
4502- <ul>
4503- <li class="page_item"><a href="https://juju.ubuntu.com/">Home</a></li>
4504- <li class="page_item current_page_item"><a href="https://juju.ubuntu.com/">Resources</a></li>
4505- <li class="page_item"><a href="https://juju.ubuntu.com/">Community</a></li>
4506- <li class="page_item"><a href="https://juju.ubuntu.com/">Charm Store</a></li>
4507- <li class="page_item"><a href="https://juju.ubuntu.com/">Events</a></li>
4508- <li class="page_item"><a href="https://juju.ubuntu.com/">Survey</a></li>
4509- <li>
4510- <form id="form-search" method="get" action="/">
4511- <fieldset>
4512- <input id="input-search" type="text" name="s" value="Search">
4513- </fieldset>
4514- </form>
4515- </li>
4516- </ul>
4517- </nav><a href="https://juju.ubuntu.com/" class="logo-ubuntu"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/logo-ubuntu.png"></a>
4518- </div>
4519- </div>
4520- <div class="header-content">
4521- <div class="clearfix"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
4522- <div class="header-navigation-secondary"></div>
4523- <div class="header-image"></div>
4524- <h1>Resources</h1>
4525- <h2>A collection of some of the most important online references for Juju users and developers.</h2>
4526- </div>
4527- </div>
4528- </header>
4529+ </nav>
4530+ </div>
4531+ </div>
4532+ <div class="header-content">
4533+ <div class="clearfix">
4534+ <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
4535+ <div class="header-navigation-secondary"></div>
4536+ <div class="header-image"></div>
4537+ <h1>Resources</h1>
4538+ <h2>A collection of some of the most important online references for Juju users and developers.</h2>
4539+ </div>
4540+ </div>
4541+</header>
4542+
4543 <section id="content" class="container-12">
4544 <div class="grid-12 doc-container">
4545 <div class="grid-3 doc-navigation">
4546@@ -134,43 +139,62 @@
4547 </div>
4548 </section>
4549 <div class="shadow"></div>
4550- <footer>
4551- <div>
4552- <nav role="navigation" class="clearfix">
4553- <ul>
4554- <li><a href="https://juju.ubuntu.com/get-started">Get started</a></li>
4555- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li>
4556- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li>
4557- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li>
4558- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li>
4559- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li>
4560- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li>
4561- </ul>
4562- <ul>
4563- <li><a href="https://juju.ubuntu.com/resources">Resources</a></li>
4564- <li><a href="https://juju.ubuntu.com/docs">Documentation</a></li>
4565- <li><a href="https://juju.ubuntu.com/resources/videos">Videos</a></li>
4566- <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI Demo</a></li>
4567- </ul>
4568- <ul>
4569- <li><a href="https://juju.ubuntu.com/community">Community</a></li>
4570- <li class="page_item"><a href="https://juju.ubuntu.com/community/juju-blog/">Blog</a></li>
4571- <li class="page_item"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Charm Meetings</a></li>
4572- <li class="page_item"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li>
4573- <li class="page_item"><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li>
4574- <li class="page_item"><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li>
4575- <li class="page_item"><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&amp;amp;pagesize=50">FAQ</a></li>
4576- </ul>
4577- <ul class="last">
4578- <li><a href="https://launchpad.net/juju">Code</a></li>
4579- <li><a href="https://launchpad.net/juju-core">Juju Core</a></li>
4580- <li><a href="https://launchpad.net/charms">Charms</a></li>
4581- </ul>
4582- </nav>
4583- </div>
4584- </footer>
4585+ <footer class="global clearfix" role="contentinfo">
4586+ <div class="row">
4587+ <div class="inner-wrapper">
4588+ <nav role="navigation" class="clearfix">
4589+ <ul class="footer-a">
4590+ <li class="grid-3 first-col">
4591+ <h4><a href="/get-started">Get started</a></h4>
4592+ <ul>
4593+ <li class="page_item page-item-20"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li>
4594+ <li class="page_item page-item-22"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li>
4595+ <li class="page_item page-item-18"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li>
4596+ <li class="page_item page-item-16"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li>
4597+ <li class="page_item page-item-3596"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li>
4598+ <li class="page_item page-item-3600"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li>
4599+ </ul>
4600+ </li>
4601+ <li class="grid-3">
4602+ <h4><a href="/resources">Resources</a></h4>
4603+ <ul>
4604+ <li><a href="http://juju.ubuntu.com/docs">Documentation</a></li>
4605+ <li><a href="/resources/videos/">Videos</a></li>
4606+ <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI demo site</a></li>
4607+ </ul>
4608+ </li>
4609+ <li class="grid-3">
4610+ <h4><a href="/community">Community</a></h4>
4611+ <ul>
4612+ <li class="page_item page-item-28"><a href="https://juju.ubuntu.com/community/juju-blog/">Juju Blog</a></li>
4613+ <li class="page_item page-item-4262"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Weekly Charm Meeting</a></li>
4614+ <li class="page_item page-item-4036"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li>
4615+ <li><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li>
4616+ <li><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li>
4617+ <li><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&pagesize=50">FAQ</a></li>
4618+ </ul>
4619+ </li>
4620+ <li class="grid-3 last-col">
4621+ <h4><a href="https://launchpad.net/juju">Code</a></h4>
4622+ <ul>
4623+ <li><a href="https://launchpad.net/juju-core">Juju Core</a></li>
4624+ <li><a href="https://launchpad.net/charms">Charms</a></li>
4625+ </ul>
4626+ </li>
4627+ </ul>
4628+ </nav>
4629+ </div>
4630+ </div>
4631+ <div class="row no-border">
4632+ <div class="legal inner-wrapper">
4633+ <p>&copy; 2013 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p>
4634+ <p><a href="https://bugs.launchpad.net/juju-website/+filebug">Report a bug on this site</a></p>
4635+ </div>
4636+ </div>
4637+</footer>
4638+
4639 <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
4640- <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.8.14/jquery-ui.min.js"></script>
4641+ <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script>
4642 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
4643 <script type="text/javascript" src="js/main.js"></script>
4644 </body>
4645
4646=== modified file 'htmldocs/config-hpcloud.html'
4647--- htmldocs/config-hpcloud.html 2013-07-12 00:12:30 +0000
4648+++ htmldocs/config-hpcloud.html 2013-07-13 18:35:28 +0000
4649@@ -1,56 +1,61 @@
4650 <!DOCTYPE html>
4651 <html>
4652 <head>
4653- <meta charset="utf-8">
4654- <title>Juju Documentation - Configuring Juju to work with HPCloud</title>
4655- <link href="//fonts.googleapis.com/css?family=Ubuntu:400,400italic" rel="stylesheet" type="text/css"/>
4656- <link href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400" rel="stylesheet" type="text/css"/>
4657- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" rel="stylesheet" type="text/css"/>
4658- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" rel="stylesheet" type="text/css"/>
4659- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" rel="stylesheet" type="text/css"/>
4660- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/resources.css" rel="stylesheet" type="text/css"/>
4661- <link href="css/main.css" rel="stylesheet" type="text/css"/>
4662- <!--[if lt IE 9]>
4663- <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
4664- <![endif]-->
4665- </head>
4666+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
4667+ <title>Juju Documentation - HP Cloud Configuration</title>
4668+ <link href='https://fonts.googleapis.com/css?family=Ubuntu:400,300,300italic,400italic,700,700italic|Ubuntu+Mono' rel='stylesheet' type='text/css' />
4669+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" />
4670+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" />
4671+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" />
4672+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/home-new.css" />
4673+ <link rel='stylesheet' id='stacktack-css' href='//juju.ubuntu.com/wp-content/plugins/stacktack/css/stacktack.min.css?ver=3.4.2' type='text/css' media='all' />
4674+ <link href="css/main.css?1373740025" rel="stylesheet" type="text/css"/>
4675+
4676+ <!--[if lt IE 9]>
4677+ <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
4678+ <![endif]-->
4679+</head>
4680+<!-- DO NOT EDIT ABOVE THIS LINE -->
4681+
4682+<!-- DO NOT EDIT ABOVE THIS LINE -->
4683+
4684+
4685 <body class="resources">
4686- <header>
4687- <div class="header-login">
4688+ <header class="global clearfix" role="banner">
4689+ <div class="header-navigation">
4690+ <div>
4691+ <nav role="navigation">
4692 <ul>
4693- <li>&nbsp;</li>
4694+ <li class="page_item page-item-6"><a href="https://juju.ubuntu.com/">Home</a></li>
4695+ <li class="page_item page-item-7"><a href="https://juju.ubuntu.com/get-started/">Get started</a></li>
4696+ <li class="page_item page-item-9 current_page_item"><a href="https://juju.ubuntu.com/resources/">Resources</a></li>
4697+ <li class="page_item page-item-13"><a href="https://juju.ubuntu.com/community/">Community</a></li>
4698+ <li class="page_item page-item-3688"><a href="https://juju.ubuntu.com/charm-store/">Charm Store</a></li>
4699+ <li class="page_item page-item-3691"><a href="https://juju.ubuntu.com/events/">Events</a></li>
4700+ <li class="page_item page-item-4474"><a href="https://juju.ubuntu.com/charm-championship/">Charm Championship</a></li>
4701+ <li class="page_item page-item-4249"><a href="https://juju.ubuntu.com/survey/">Survey</a></li>
4702+ <li>
4703+ <form id="form-search" method="get" action="https://juju.ubuntu.com/">
4704+ <fieldset>
4705+ <input id="input-search" type="text" name="s" value="Search" />
4706+ </fieldset>
4707+ </form>
4708+ </li>
4709 </ul>
4710- </div>
4711- <div class="header-navigation">
4712- <div>
4713- <nav role="navigation">
4714- <ul>
4715- <li class="page_item"><a href="https://juju.ubuntu.com/">Home</a></li>
4716- <li class="page_item current_page_item"><a href="https://juju.ubuntu.com/">Resources</a></li>
4717- <li class="page_item"><a href="https://juju.ubuntu.com/">Community</a></li>
4718- <li class="page_item"><a href="https://juju.ubuntu.com/">Charm Store</a></li>
4719- <li class="page_item"><a href="https://juju.ubuntu.com/">Events</a></li>
4720- <li class="page_item"><a href="https://juju.ubuntu.com/">Survey</a></li>
4721- <li>
4722- <form id="form-search" method="get" action="/">
4723- <fieldset>
4724- <input id="input-search" type="text" name="s" value="Search">
4725- </fieldset>
4726- </form>
4727- </li>
4728- </ul>
4729- </nav><a href="https://juju.ubuntu.com/" class="logo-ubuntu"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/logo-ubuntu.png"></a>
4730- </div>
4731- </div>
4732- <div class="header-content">
4733- <div class="clearfix"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
4734- <div class="header-navigation-secondary"></div>
4735- <div class="header-image"></div>
4736- <h1>Resources</h1>
4737- <h2>A collection of some of the most important online references for Juju users and developers.</h2>
4738- </div>
4739- </div>
4740- </header>
4741+ </nav>
4742+ </div>
4743+ </div>
4744+ <div class="header-content">
4745+ <div class="clearfix">
4746+ <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
4747+ <div class="header-navigation-secondary"></div>
4748+ <div class="header-image"></div>
4749+ <h1>Resources</h1>
4750+ <h2>A collection of some of the most important online references for Juju users and developers.</h2>
4751+ </div>
4752+ </div>
4753+</header>
4754+
4755 <section id="content" class="container-12">
4756 <div class="grid-12 doc-container">
4757 <div class="grid-3 doc-navigation">
4758@@ -148,43 +153,62 @@
4759 </div>
4760 </section>
4761 <div class="shadow"></div>
4762- <footer>
4763- <div>
4764- <nav role="navigation" class="clearfix">
4765- <ul>
4766- <li><a href="https://juju.ubuntu.com/get-started">Get started</a></li>
4767- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li>
4768- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li>
4769- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li>
4770- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li>
4771- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li>
4772- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li>
4773- </ul>
4774- <ul>
4775- <li><a href="https://juju.ubuntu.com/resources">Resources</a></li>
4776- <li><a href="https://juju.ubuntu.com/docs">Documentation</a></li>
4777- <li><a href="https://juju.ubuntu.com/resources/videos">Videos</a></li>
4778- <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI Demo</a></li>
4779- </ul>
4780- <ul>
4781- <li><a href="https://juju.ubuntu.com/community">Community</a></li>
4782- <li class="page_item"><a href="https://juju.ubuntu.com/community/juju-blog/">Blog</a></li>
4783- <li class="page_item"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Charm Meetings</a></li>
4784- <li class="page_item"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li>
4785- <li class="page_item"><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li>
4786- <li class="page_item"><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li>
4787- <li class="page_item"><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&amp;amp;pagesize=50">FAQ</a></li>
4788- </ul>
4789- <ul class="last">
4790- <li><a href="https://launchpad.net/juju">Code</a></li>
4791- <li><a href="https://launchpad.net/juju-core">Juju Core</a></li>
4792- <li><a href="https://launchpad.net/charms">Charms</a></li>
4793- </ul>
4794- </nav>
4795- </div>
4796- </footer>
4797+ <footer class="global clearfix" role="contentinfo">
4798+ <div class="row">
4799+ <div class="inner-wrapper">
4800+ <nav role="navigation" class="clearfix">
4801+ <ul class="footer-a">
4802+ <li class="grid-3 first-col">
4803+ <h4><a href="/get-started">Get started</a></h4>
4804+ <ul>
4805+ <li class="page_item page-item-20"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li>
4806+ <li class="page_item page-item-22"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li>
4807+ <li class="page_item page-item-18"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li>
4808+ <li class="page_item page-item-16"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li>
4809+ <li class="page_item page-item-3596"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li>
4810+ <li class="page_item page-item-3600"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li>
4811+ </ul>
4812+ </li>
4813+ <li class="grid-3">
4814+ <h4><a href="/resources">Resources</a></h4>
4815+ <ul>
4816+ <li><a href="http://juju.ubuntu.com/docs">Documentation</a></li>
4817+ <li><a href="/resources/videos/">Videos</a></li>
4818+ <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI demo site</a></li>
4819+ </ul>
4820+ </li>
4821+ <li class="grid-3">
4822+ <h4><a href="/community">Community</a></h4>
4823+ <ul>
4824+ <li class="page_item page-item-28"><a href="https://juju.ubuntu.com/community/juju-blog/">Juju Blog</a></li>
4825+ <li class="page_item page-item-4262"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Weekly Charm Meeting</a></li>
4826+ <li class="page_item page-item-4036"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li>
4827+ <li><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li>
4828+ <li><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li>
4829+ <li><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&pagesize=50">FAQ</a></li>
4830+ </ul>
4831+ </li>
4832+ <li class="grid-3 last-col">
4833+ <h4><a href="https://launchpad.net/juju">Code</a></h4>
4834+ <ul>
4835+ <li><a href="https://launchpad.net/juju-core">Juju Core</a></li>
4836+ <li><a href="https://launchpad.net/charms">Charms</a></li>
4837+ </ul>
4838+ </li>
4839+ </ul>
4840+ </nav>
4841+ </div>
4842+ </div>
4843+ <div class="row no-border">
4844+ <div class="legal inner-wrapper">
4845+ <p>&copy; 2013 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p>
4846+ <p><a href="https://bugs.launchpad.net/juju-website/+filebug">Report a bug on this site</a></p>
4847+ </div>
4848+ </div>
4849+</footer>
4850+
4851 <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
4852- <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.8.14/jquery-ui.min.js"></script>
4853+ <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script>
4854 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
4855 <script type="text/javascript" src="js/main.js"></script>
4856 </body>
4857
4858=== modified file 'htmldocs/config-maas.html'
4859--- htmldocs/config-maas.html 2013-07-12 00:12:30 +0000
4860+++ htmldocs/config-maas.html 2013-07-13 18:35:28 +0000
4861@@ -1,56 +1,61 @@
4862 <!DOCTYPE html>
4863 <html>
4864 <head>
4865- <meta charset="utf-8">
4866- <title>Juju Documentation - Configuring Juju to work with MAAS</title>
4867- <link href="//fonts.googleapis.com/css?family=Ubuntu:400,400italic" rel="stylesheet" type="text/css"/>
4868- <link href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400" rel="stylesheet" type="text/css"/>
4869- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" rel="stylesheet" type="text/css"/>
4870- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" rel="stylesheet" type="text/css"/>
4871- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" rel="stylesheet" type="text/css"/>
4872- <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/resources.css" rel="stylesheet" type="text/css"/>
4873- <link href="css/main.css" rel="stylesheet" type="text/css"/>
4874- <!--[if lt IE 9]>
4875- <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
4876- <![endif]-->
4877- </head>
4878+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
4879+ <title>Juju Documentation - MAAS Configuration</title>
4880+ <link href='https://fonts.googleapis.com/css?family=Ubuntu:400,300,300italic,400italic,700,700italic|Ubuntu+Mono' rel='stylesheet' type='text/css' />
4881+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" />
4882+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" />
4883+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" />
4884+ <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/home-new.css" />
4885+ <link rel='stylesheet' id='stacktack-css' href='//juju.ubuntu.com/wp-content/plugins/stacktack/css/stacktack.min.css?ver=3.4.2' type='text/css' media='all' />
4886+ <link href="css/main.css?1373740025" rel="stylesheet" type="text/css"/>
4887+
4888+ <!--[if lt IE 9]>
4889+ <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
4890+ <![endif]-->
4891+</head>
4892+<!-- DO NOT EDIT ABOVE THIS LINE -->
4893+
4894+<!-- DO NOT EDIT ABOVE THIS LINE -->
4895+
4896+
4897 <body class="resources">
4898- <header>
4899- <div class="header-login">
4900+ <header class="global clearfix" role="banner">
4901+ <div class="header-navigation">
4902+ <div>
4903+ <nav role="navigation">
4904 <ul>
4905- <li>&nbsp;</li>
4906+ <li class="page_item page-item-6"><a href="https://juju.ubuntu.com/">Home</a></li>
4907+ <li class="page_item page-item-7"><a href="https://juju.ubuntu.com/get-started/">Get started</a></li>
4908+ <li class="page_item page-item-9 current_page_item"><a href="https://juju.ubuntu.com/resources/">Resources</a></li>
4909+ <li class="page_item page-item-13"><a href="https://juju.ubuntu.com/community/">Community</a></li>
4910+ <li class="page_item page-item-3688"><a href="https://juju.ubuntu.com/charm-store/">Charm Store</a></li>
4911+ <li class="page_item page-item-3691"><a href="https://juju.ubuntu.com/events/">Events</a></li>
4912+ <li class="page_item page-item-4474"><a href="https://juju.ubuntu.com/charm-championship/">Charm Championship</a></li>
4913+ <li class="page_item page-item-4249"><a href="https://juju.ubuntu.com/survey/">Survey</a></li>
4914+ <li>
4915+ <form id="form-search" method="get" action="https://juju.ubuntu.com/">
4916+ <fieldset>
4917+ <input id="input-search" type="text" name="s" value="Search" />
4918+ </fieldset>
4919+ </form>
4920+ </li>
4921 </ul>
4922- </div>
4923- <div class="header-navigation">
4924- <div>
4925- <nav role="navigation">
4926- <ul>
4927- <li class="page_item"><a href="https://juju.ubuntu.com/">Home</a></li>
4928- <li class="page_item current_page_item"><a href="https://juju.ubuntu.com/">Resources</a></li>
4929- <li class="page_item"><a href="https://juju.ubuntu.com/">Community</a></li>
4930- <li class="page_item"><a href="https://juju.ubuntu.com/">Charm Store</a></li>
4931- <li class="page_item"><a href="https://juju.ubuntu.com/">Events</a></li>
4932- <li class="page_item"><a href="https://juju.ubuntu.com/">Survey</a></li>
4933- <li>
4934- <form id="form-search" method="get" action="/">
4935- <fieldset>
4936- <input id="input-search" type="text" name="s" value="Search">
4937- </fieldset>
4938- </form>
4939- </li>
4940- </ul>
4941- </nav><a href="https://juju.ubuntu.com/" class="logo-ubuntu"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/logo-ubuntu.png"></a>
4942- </div>
4943- </div>
4944- <div class="header-content">
4945- <div class="clearfix"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
4946- <div class="header-navigation-secondary"></div>
4947- <div class="header-image"></div>
4948- <h1>Resources</h1>
4949- <h2>A collection of some of the most important online references for Juju users and developers.</h2>
4950- </div>
4951- </div>
4952- </header>
4953+ </nav>
4954+ </div>
4955+ </div>
4956+ <div class="header-content">
4957+ <div class="clearfix">
4958+ <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
4959+ <div class="header-navigation-secondary"></div>
4960+ <div class="header-image"></div>
4961+ <h1>Resources</h1>
4962+ <h2>A collection of some of the most important online references for Juju users and developers.</h2>
4963+ </div>
4964+ </div>
4965+</header>
4966+
4967 <section id="content" class="container-12">
4968 <div class="grid-12 doc-container">
4969 <div class="grid-3 doc-navigation">
4970@@ -129,43 +134,62 @@
4971 </div>
4972 </section>
4973 <div class="shadow"></div>
4974- <footer>
4975- <div>
4976- <nav role="navigation" class="clearfix">
4977- <ul>
4978- <li><a href="https://juju.ubuntu.com/get-started">Get started</a></li>
4979- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li>
4980- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li>
4981- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li>
4982- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li>
4983- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li>
4984- <li class="page_item"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li>
4985- </ul>
4986- <ul>
4987- <li><a href="https://juju.ubuntu.com/resources">Resources</a></li>
4988- <li><a href="https://juju.ubuntu.com/docs">Documentation</a></li>
4989- <li><a href="https://juju.ubuntu.com/resources/videos">Videos</a></li>
4990- <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI Demo</a></li>
4991- </ul>
4992- <ul>
4993- <li><a href="https://juju.ubuntu.com/community">Community</a></li>
4994- <li class="page_item"><a href="https://juju.ubuntu.com/community/juju-blog/">Blog</a></li>
4995- <li class="page_item"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Charm Meetings</a></li>
4996- <li class="page_item"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li>
4997- <li class="page_item"><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li>
4998- <li class="page_item"><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li>
4999- <li class="page_item"><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&amp;amp;pagesize=50">FAQ</a></li>
5000- </ul>
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches