juju-core

Merge lp:~darkmuggle-deactivatedaccount/juju-core/docs into lp:juju-core/docs

  1. docs
  2. Merge into docs
Proposed by Ben Howard
Status: Merged
Merge reported by: Nick Veitch
Merged at revision: not available
Proposed branch: lp:~darkmuggle-deactivatedaccount/juju-core/docs
Merge into: lp:juju-core/docs
Diff against target: 2116 lines (+256/-1299)
32 files modified
htmldocs/authors-charm-anatomy.html (+6/-42)
htmldocs/authors-charm-best-practice.html (+7/-43)
htmldocs/authors-charm-icon.html (+7/-44)
htmldocs/authors-charm-policy.html (+7/-43)
htmldocs/authors-charm-quality.html (+7/-43)
htmldocs/authors-charm-store.html (+7/-43)
htmldocs/authors-charm-writing.html (+7/-43)
htmldocs/authors-charms-in-action.html (+7/-42)
htmldocs/authors-hooks.html (+7/-43)
htmldocs/authors-implicit-relations.html (+7/-43)
htmldocs/authors-service-config.html (+7/-43)
htmldocs/authors-subordinate-services.html (+7/-43)
htmldocs/authors-testing.html (+7/-43)
htmldocs/charms-config.html (+7/-43)
htmldocs/charms-constraints.html (+7/-43)
htmldocs/charms-deploying.html (+7/-43)
htmldocs/charms-destroy.html (+7/-43)
htmldocs/charms-exposing.html (+7/-43)
htmldocs/charms-relations.html (+7/-43)
htmldocs/charms-scaling.html (+7/-43)
htmldocs/charms-upgrading.html (+7/-43)
htmldocs/charms.html (+7/-43)
htmldocs/commands.html (+7/-43)
htmldocs/config-aws.html (+14/-52)
htmldocs/config-hpcloud.html (+7/-43)
htmldocs/config-maas.html (+7/-43)
htmldocs/config-openstack.html (+7/-43)
htmldocs/contributing.html (+7/-43)
htmldocs/getting-started.html (+7/-43)
htmldocs/glossary.html (+7/-43)
htmldocs/navigation.html (+39/-0)
htmldocs/navigation.json (+1/-1)
To merge this branch: bzr merge lp:~darkmuggle-deactivatedaccount/juju-core/docs
Reviewer Review Type Date Requested Status
Nick Veitch Pending
Review via email: mp+180196@code.launchpad.net

Description of the change

Use JS to load the navigation links.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'htmldocs/authors-charm-anatomy.html'
2--- htmldocs/authors-charm-anatomy.html 2013-08-08 15:29:48 +0000
3+++ htmldocs/authors-charm-anatomy.html 2013-08-14 17:43:07 +0000
4@@ -64,48 +64,7 @@
5
6 <section id="content" class="container-12">
7 <div class="grid-12 doc-container">
8- <div class="grid-3 doc-navigation">
9- <nav role="navigation">
10- <h1>User Guide</h1>
11- <ul>
12- <li class=""><a href="getting-started.html">Getting Started</a></li>
13- <li class=" sub"><a href="getting-started.html#intro">Introduction</a></li>
14- <li class=" sub"><a href="getting-started.html#install">Installation</a></li>
15- <li class=" sub"><a href="config-aws.html">AWS Configuration</a></li>
16- <li class=" sub"><a href="config-hpcloud.html">HP Cloud Configuration</a></li>
17- <li class=" sub"><a href="config-openstack.html">OpenStack Configuration</a></li>
18- <li class=" sub"><a href="config-maas.html">MAAS Configuration</a></li>
19- <li class=" sub"><a href="getting-started.html#test">Testing your setup</a></li>
20- <li class=""><a href="charms.html">Using Charms</a></li>
21- <li class=" sub"><a href="charms.html#intro">What are Charms?</a></li>
22- <li class=" sub"><a href="charms-deploying.html">Deploying Services</a></li>
23- <li class=" sub"><a href="charms-constraints.html">Using constraints</a></li>
24- <li class=" sub"><a href="charms-config.html">Service Configuration</a></li>
25- <li class=" sub"><a href="charms-relations.html">Service Relationships</a></li>
26- <li class=" sub"><a href="charms-exposing.html">Exposing Services</a></li>
27- <li class=" sub"><a href="charms-scaling.html">Scaling Services</a></li>
28- <li class=" sub"><a href="charms-destroy.html">Destroying Services</a></li>
29- </ul>
30- <h1>Charm Authors</h1>
31- <ul></ul>
32- <li class=""><a href="authors-charm-anatomy.html">Anatomy of a charm</a></li>
33- <li class=""><a href="authors-charm-writing.html">Writing a charm</a></li>
34- <li class=" sub"><a href="authors-subordinate-services.html">Subordinate services</a></li>
35- <li class=" sub"><a href="authors-implicit-relations.html">Implicit Relations</a></li>
36- <li class=" sub"><a href="authors-testing.html">Charm Testing</a></li>
37- <li class=" sub"><a href="authors-hooks.html">Hook debugging</a></li>
38- <li class=""><a href="authors-charm-store.html">The Juju Charm Store</a></li>
39- <li class=" sub"><a href="authors-charm-policy.html">Charm store policy</a></li>
40- <li class=" sub"><a href="authors-charm-best-practice.html">Best practices</a></li>
41- <li class=" sub"><a href="authors-charm-quality.html">Charm Quality Rating</a></li>
42- <h1>Reference</h1>
43- <ul>
44- <li class="sub"><a href="commands.html">Juju commands</a></li>
45- <li class="sub"><a href="glossary.html">Glossary</a></li>
46- <li class="sub"><a href="contributing.html">Contribute to the Docs!</a></li>
47- </ul>
48- </nav>
49- </div>
50+ <div id="navlinks" class="doc-navigation">LINKS</div>
51 <div class="grid-9 doc-content">
52 <article>
53 <article>
54@@ -480,5 +439,10 @@
55 </section>
56 </article>
57
58+<script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
59+<script>
60+ $("#navlinks").load("navigation.html");
61+</script>
62+
63
64
65
66=== modified file 'htmldocs/authors-charm-best-practice.html'
67--- htmldocs/authors-charm-best-practice.html 2013-08-08 15:29:48 +0000
68+++ htmldocs/authors-charm-best-practice.html 2013-08-14 17:43:07 +0000
69@@ -64,49 +64,7 @@
70
71 <section id="content" class="container-12">
72 <div class="grid-12 doc-container">
73- <div class="grid-3 doc-navigation">
74- <nav role="navigation">
75- <h1>User Guide</h1>
76- <ul>
77- <li class=""><a href="getting-started.html">Getting Started</a></li>
78- <li class=" sub"><a href="getting-started.html#intro">Introduction</a></li>
79- <li class=" sub"><a href="getting-started.html#install">Installation</a></li>
80- <li class=" sub"><a href="config-aws.html">AWS Configuration</a></li>
81- <li class=" sub"><a href="config-hpcloud.html">HP Cloud Configuration</a></li>
82- <li class=" sub"><a href="config-openstack.html">OpenStack Configuration</a></li>
83- <li class=" sub"><a href="config-maas.html">MAAS Configuration</a></li>
84- <li class=" sub"><a href="getting-started.html#test">Testing your setup</a></li>
85- <li class=""><a href="charms.html">Using Charms</a></li>
86- <li class=" sub"><a href="charms.html#intro">What are Charms?</a></li>
87- <li class=" sub"><a href="charms-deploying.html">Deploying Services</a></li>
88- <li class=" sub"><a href="charms-constraints.html">Using constraints</a></li>
89- <li class=" sub"><a href="charms-config.html">Service Configuration</a></li>
90- <li class=" sub"><a href="charms-relations.html">Service Relationships</a></li>
91- <li class=" sub"><a href="charms-exposing.html">Exposing Services</a></li>
92- <li class=" sub"><a href="charms-scaling.html">Scaling Services</a></li>
93- <li class=" sub"><a href="charms-destroy.html">Destroying Services</a></li>
94- </ul>
95- <h1>Charm Authors</h1>
96- <ul></ul>
97- <li class=""><a href="authors-charm-anatomy.html">Anatomy of a charm</a></li>
98- <li class=""><a href="authors-charm-writing.html">Writing a charm</a></li>
99- <li class=" sub"><a href="authors-subordinate-services.html">Subordinate services</a></li>
100- <li class=" sub"><a href="authors-implicit-relations.html">Implicit Relations</a></li>
101- <li class=" sub"><a href="authors-testing.html">Charm Testing</a></li>
102- <li class=" sub"><a href="authors-hooks.html">Hook debugging</a></li>
103- <li class=""><a href="authors-charm-store.html">The Juju Charm Store</a></li>
104- <li class=" sub"><a href="authors-charm-policy.html">Charm store policy</a></li>
105- <li class=" sub"><a href="authors-charm-best-practice.html">Best practices</a></li>
106- <li class=" sub"><a href="authors-charm-quality.html">Charm Quality Rating</a></li>
107- <li class=" sub"><a href="authors-charm-icon.html">Charm Icons</a></li>
108- <h1>Reference</h1>
109- <ul>
110- <li class="sub"><a href="commands.html">Juju commands</a></li>
111- <li class="sub"><a href="glossary.html">Glossary</a></li>
112- <li class="sub"><a href="contributing.html">Contribute to the Docs!</a></li>
113- </ul>
114- </nav>
115- </div>
116+ <div id="navlinks" class="doc-navigation">LINKS</div>
117 <div class="grid-9 doc-content">
118 <article>
119 <section id ="best_practice">
120@@ -237,5 +195,11 @@
121 <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script>
122 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
123 <script type="text/javascript" src="js/main.js"></script>
124+ <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
125+
126+ <script>
127+ $("#navlinks").load("navigation.html");
128+ </script>
129+
130 </body>
131 </html>
132
133=== modified file 'htmldocs/authors-charm-icon.html'
134--- htmldocs/authors-charm-icon.html 2013-08-08 15:29:48 +0000
135+++ htmldocs/authors-charm-icon.html 2013-08-14 17:43:07 +0000
136@@ -64,50 +64,7 @@
137
138 <section id="content" class="container-12">
139 <div class="grid-12 doc-container">
140- <div class="grid-3 doc-navigation">
141- <nav role="navigation">
142- <h1>User Guide</h1>
143- <ul>
144- <li class=""><a href="getting-started.html">Getting Started</a></li>
145- <li class=" sub"><a href="getting-started.html#intro">Introduction</a></li>
146- <li class=" sub"><a href="getting-started.html#install">Installation</a></li>
147- <li class=" sub"><a href="config-aws.html">AWS Configuration</a></li>
148- <li class=" sub"><a href="config-hpcloud.html">HP Cloud Configuration</a></li>
149- <li class=" sub"><a href="config-openstack.html">OpenStack Configuration</a></li>
150- <li class=" sub"><a href="config-maas.html">MAAS Configuration</a></li>
151- <li class=" sub"><a href="getting-started.html#test">Testing your setup</a></li>
152- <li class=""><a href="charms.html">Using Charms</a></li>
153- <li class=" sub"><a href="charms.html#intro">What are Charms?</a></li>
154- <li class=" sub"><a href="charms-deploying.html">Deploying Services</a></li>
155- <li class=" sub"><a href="charms-constraints.html">Using constraints</a></li>
156- <li class=" sub"><a href="charms-config.html">Service Configuration</a></li>
157- <li class=" sub"><a href="charms-relations.html">Service Relationships</a></li>
158- <li class=" sub"><a href="charms-exposing.html">Exposing Services</a></li>
159- <li class=" sub"><a href="charms-scaling.html">Scaling Services</a></li>
160- <li class=" sub"><a href="charms-destroy.html">Destroying Services</a></li>
161- </ul>
162- <h1>Charm Authors</h1>
163- <ul></ul>
164- <li class=""><a href="authors-charm-anatomy.html">Anatomy of a charm</a></li>
165- <li class=""><a href="authors-charm-writing.html">Writing a charm</a></li>
166- <li class=" sub"><a href="authors-subordinate-services.html">Subordinate services</a></li>
167- <li class=" sub"><a href="authors-implicit-relations.html">Implicit Relations</a></li>
168- <li class=" sub"><a href="authors-testing.html">Charm Testing</a></li>
169- <li class=" sub"><a href="authors-hooks.html">Hook debugging</a></li>
170- <li class=""><a href="authors-charm-store.html">The Juju Charm Store</a></li>
171- <li class=" sub"><a href="authors-charm-policy.html">Charm store policy</a></li>
172- <li class=" sub"><a href="authors-charm-best-practice.html">Best practices</a></li>
173- <li class=" sub"><a href="authors-charm-quality.html">Charm Quality Rating</a></li>
174- <li class=" sub"><a href="authors-charm-icon.html">Charm Icons</a></li>
175-
176- <h1>Reference</h1>
177- <ul>
178- <li class="sub"><a href="commands.html">Juju commands</a></li>
179- <li class="sub"><a href="glossary.html">Glossary</a></li>
180- <li class="sub"><a href="contributing.html">Contribute to the Docs!</a></li>
181- </ul>
182- </nav>
183- </div>
184+ <div id="navlinks" class="doc-navigation">LINKS</div>
185 <div class="grid-9 doc-content">
186 <article>
187 <section id='charm-icons'>
188@@ -259,5 +216,11 @@
189 <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script>
190 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
191 <script type="text/javascript" src="js/main.js"></script>
192+ <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
193+
194+ <script>
195+ $("#navlinks").load("navigation.html");
196+ </script>
197+
198 </body>
199 </html>
200
201=== modified file 'htmldocs/authors-charm-policy.html'
202--- htmldocs/authors-charm-policy.html 2013-08-08 15:29:48 +0000
203+++ htmldocs/authors-charm-policy.html 2013-08-14 17:43:07 +0000
204@@ -64,49 +64,7 @@
205
206 <section id="content" class="container-12">
207 <div class="grid-12 doc-container">
208- <div class="grid-3 doc-navigation">
209- <nav role="navigation">
210- <h1>User Guide</h1>
211- <ul>
212- <li class=""><a href="getting-started.html">Getting Started</a></li>
213- <li class=" sub"><a href="getting-started.html#intro">Introduction</a></li>
214- <li class=" sub"><a href="getting-started.html#install">Installation</a></li>
215- <li class=" sub"><a href="config-aws.html">AWS Configuration</a></li>
216- <li class=" sub"><a href="config-hpcloud.html">HP Cloud Configuration</a></li>
217- <li class=" sub"><a href="config-openstack.html">OpenStack Configuration</a></li>
218- <li class=" sub"><a href="config-maas.html">MAAS Configuration</a></li>
219- <li class=" sub"><a href="getting-started.html#test">Testing your setup</a></li>
220- <li class=""><a href="charms.html">Using Charms</a></li>
221- <li class=" sub"><a href="charms.html#intro">What are Charms?</a></li>
222- <li class=" sub"><a href="charms-deploying.html">Deploying Services</a></li>
223- <li class=" sub"><a href="charms-constraints.html">Using constraints</a></li>
224- <li class=" sub"><a href="charms-config.html">Service Configuration</a></li>
225- <li class=" sub"><a href="charms-relations.html">Service Relationships</a></li>
226- <li class=" sub"><a href="charms-exposing.html">Exposing Services</a></li>
227- <li class=" sub"><a href="charms-scaling.html">Scaling Services</a></li>
228- <li class=" sub"><a href="charms-destroy.html">Destroying Services</a></li>
229- </ul>
230- <h1>Charm Authors</h1>
231- <ul></ul>
232- <li class=""><a href="authors-charm-anatomy.html">Anatomy of a charm</a></li>
233- <li class=""><a href="authors-charm-writing.html">Writing a charm</a></li>
234- <li class=" sub"><a href="authors-subordinate-services.html">Subordinate services</a></li>
235- <li class=" sub"><a href="authors-implicit-relations.html">Implicit Relations</a></li>
236- <li class=" sub"><a href="authors-testing.html">Charm Testing</a></li>
237- <li class=" sub"><a href="authors-hooks.html">Hook debugging</a></li>
238- <li class=""><a href="authors-charm-store.html">The Juju Charm Store</a></li>
239- <li class=" sub"><a href="authors-charm-policy.html">Charm store policy</a></li>
240- <li class=" sub"><a href="authors-charm-best-practice.html">Best practices</a></li>
241- <li class=" sub"><a href="authors-charm-quality.html">Charm Quality Rating</a></li>
242- <li class=" sub"><a href="authors-charm-icon.html">Charm Icons</a></li>
243- <h1>Reference</h1>
244- <ul>
245- <li class="sub"><a href="commands.html">Juju commands</a></li>
246- <li class="sub"><a href="glossary.html">Glossary</a></li>
247- <li class="sub"><a href="contributing.html">Contribute to the Docs!</a></li>
248- </ul>
249- </nav>
250- </div>
251+ <div id="navlinks" class="doc-navigation">LINKS</div>
252 <div class="grid-9 doc-content">
253 <article>
254 <section id ="charm-policy">
255@@ -230,5 +188,11 @@
256 <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script>
257 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
258 <script type="text/javascript" src="js/main.js"></script>
259+ <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
260+
261+ <script>
262+ $("#navlinks").load("navigation.html");
263+ </script>
264+
265 </body>
266 </html>
267
268=== modified file 'htmldocs/authors-charm-quality.html'
269--- htmldocs/authors-charm-quality.html 2013-08-08 15:29:48 +0000
270+++ htmldocs/authors-charm-quality.html 2013-08-14 17:43:07 +0000
271@@ -64,49 +64,7 @@
272
273 <section id="content" class="container-12">
274 <div class="grid-12 doc-container">
275- <div class="grid-3 doc-navigation">
276- <nav role="navigation">
277- <h1>User Guide</h1>
278- <ul>
279- <li class=""><a href="getting-started.html">Getting Started</a></li>
280- <li class=" sub"><a href="getting-started.html#intro">Introduction</a></li>
281- <li class=" sub"><a href="getting-started.html#install">Installation</a></li>
282- <li class=" sub"><a href="config-aws.html">AWS Configuration</a></li>
283- <li class=" sub"><a href="config-hpcloud.html">HP Cloud Configuration</a></li>
284- <li class=" sub"><a href="">OpenStack Configuration</a></li>
285- <li class=" sub"><a href="config-maas.html">MAAS Configuration</a></li>
286- <li class=" sub"><a href="getting-started.html#test">Testing your setup</a></li>
287- <li class=""><a href="charms.html">Using Charms</a></li>
288- <li class=" sub"><a href="charms.html#intro">What are Charms?</a></li>
289- <li class=" sub"><a href="charms-deploying.html">Deploying Services</a></li>
290- <li class=" sub"><a href="charms-constraints.html">Using constraints</a></li>
291- <li class=" sub"><a href="charms-config.html">Service Configuration</a></li>
292- <li class=" sub"><a href="charms-relations.html">Service Relationships</a></li>
293- <li class=" sub"><a href="charms-exposing.html">Exposing Services</a></li>
294- <li class=" sub"><a href="charms-scaling.html">Scaling Services</a></li>
295- <li class=" sub"><a href="charms-destroy.html">Destroying Services</a></li>
296- </ul>
297- <h1>Charm Authors</h1>
298- <ul></ul>
299- <li class=""><a href="authors-charm-anatomy.html">Anatomy of a charm</a></li>
300- <li class=""><a href="authors-charm-writing.html">Writing a charm</a></li>
301- <li class=" sub"><a href="authors-subordinate-services.html">Subordinate services</a></li>
302- <li class=" sub"><a href="authors-implicit-relations.html">Implicit Relations</a></li>
303- <li class=" sub"><a href="authors-testing.html">Charm Testing</a></li>
304- <li class=" sub"><a href="authors-hooks.html">Hook debugging</a></li>
305- <li class=""><a href="authors-charm-store.html">The Juju Charm Store</a></li>
306- <li class=" sub"><a href="authors-charm-policy.html">Charm store policy</a></li>
307- <li class=" sub"><a href="authors-charm-best-practice.html">Best practices</a></li>
308- <li class=" sub"><a href="authors-charm-quality.html">Charm Quality Rating</a></li>
309- <li class=" sub"><a href="authors-charm-icon.html">Charm Icons</a></li>
310- <h1>Reference</h1>
311- <ul>
312- <li class="sub"><a href="commands.html">Juju commands</a></li>
313- <li class="sub"><a href="glossary.html">Glossary</a></li>
314- <li class="sub"><a href="contributing.html">Contribute to the Docs!</a></li>
315- </ul>
316- </nav>
317- </div>
318+ <div id="navlinks" class="doc-navigation">LINKS</div>
319 <div class="grid-9 doc-content">
320 <article>
321 <section id ="authors-charm-quality">
322@@ -312,5 +270,11 @@
323 <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script>
324 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
325 <script type="text/javascript" src="js/main.js"></script>
326+ <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
327+
328+ <script>
329+ $("#navlinks").load("navigation.html");
330+ </script>
331+
332 </body>
333 </html>
334
335=== modified file 'htmldocs/authors-charm-store.html'
336--- htmldocs/authors-charm-store.html 2013-08-08 15:29:48 +0000
337+++ htmldocs/authors-charm-store.html 2013-08-14 17:43:07 +0000
338@@ -64,49 +64,7 @@
339
340 <section id="content" class="container-12">
341 <div class="grid-12 doc-container">
342- <div class="grid-3 doc-navigation">
343- <nav role="navigation">
344- <h1>User Guide</h1>
345- <ul>
346- <li class=""><a href="getting-started.html">Getting Started</a></li>
347- <li class=" sub"><a href="getting-started.html#intro">Introduction</a></li>
348- <li class=" sub"><a href="getting-started.html#install">Installation</a></li>
349- <li class=" sub"><a href="config-aws.html">AWS Configuration</a></li>
350- <li class=" sub"><a href="config-hpcloud.html">HP Cloud Configuration</a></li>
351- <li class=" sub"><a href="config-openstack.html">OpenStack Configuration</a></li>
352- <li class=" sub"><a href="config-maas.html">MAAS Configuration</a></li>
353- <li class=" sub"><a href="getting-started.html#test">Testing your setup</a></li>
354- <li class=""><a href="charms.html">Using Charms</a></li>
355- <li class=" sub"><a href="charms.html#intro">What are Charms?</a></li>
356- <li class=" sub"><a href="charms-deploying.html">Deploying Services</a></li>
357- <li class=" sub"><a href="charms-constraints.html">Using constraints</a></li>
358- <li class=" sub"><a href="charms-config.html">Service Configuration</a></li>
359- <li class=" sub"><a href="charms-relations.html">Service Relationships</a></li>
360- <li class=" sub"><a href="charms-exposing.html">Exposing Services</a></li>
361- <li class=" sub"><a href="charms-scaling.html">Scaling Services</a></li>
362- <li class=" sub"><a href="charms-destroy.html">Destroying Services</a></li>
363- </ul>
364- <h1>Charm Authors</h1>
365- <ul></ul>
366- <li class=""><a href="authors-charm-anatomy.html">Anatomy of a charm</a></li>
367- <li class=""><a href="authors-charm-writing.html">Writing a charm</a></li>
368- <li class=" sub"><a href="authors-subordinate-services.html">Subordinate services</a></li>
369- <li class=" sub"><a href="authors-implicit-relations.html">Implicit Relations</a></li>
370- <li class=" sub"><a href="authors-testing.html">Charm Testing</a></li>
371- <li class=" sub"><a href="authors-hooks.html">Hook debugging</a></li>
372- <li class=""><a href="authors-charm-store.html">The Juju Charm Store</a></li>
373- <li class=" sub"><a href="authors-charm-policy.html">Charm store policy</a></li>
374- <li class=" sub"><a href="authors-charm-best-practice.html">Best practices</a></li>
375- <li class=" sub"><a href="authors-charm-quality.html">Charm Quality Rating</a></li>
376- <li class=" sub"><a href="authors-charm-icon.html">Charm Icons</a></li>
377- <h1>Reference</h1>
378- <ul>
379- <li class="sub"><a href="commands.html">Juju commands</a></li>
380- <li class="sub"><a href="glossary.html">Glossary</a></li>
381- <li class="sub"><a href="contributing.html">Contribute to the Docs!</a></li>
382- </ul>
383- </nav>
384- </div>
385+ <div id="navlinks" class="grid-3 doc-navigation">LINKS</div>
386 <div class="grid-9 doc-content">
387 <article>
388 <section id ="upgrading">
389@@ -314,5 +272,11 @@
390 <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script>
391 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
392 <script type="text/javascript" src="js/main.js"></script>
393+ <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
394+
395+ <script>
396+ $("#navlinks").load("navigation.html");
397+ </script>
398+
399 </body>
400 </html>
401
402=== modified file 'htmldocs/authors-charm-writing.html'
403--- htmldocs/authors-charm-writing.html 2013-08-08 15:29:48 +0000
404+++ htmldocs/authors-charm-writing.html 2013-08-14 17:43:07 +0000
405@@ -64,49 +64,7 @@
406
407 <section id="content" class="container-12">
408 <div class="grid-12 doc-container">
409- <div class="grid-3 doc-navigation">
410- <nav role="navigation">
411- <h1>User Guide</h1>
412- <ul>
413- <li class=""><a href="getting-started.html">Getting Started</a></li>
414- <li class=" sub"><a href="getting-started.html#intro">Introduction</a></li>
415- <li class=" sub"><a href="getting-started.html#install">Installation</a></li>
416- <li class=" sub"><a href="config-aws.html">AWS Configuration</a></li>
417- <li class=" sub"><a href="config-hpcloud.html">HP Cloud Configuration</a></li>
418- <li class=" sub"><a href="">OpenStack Configuration</a></li>
419- <li class=" sub"><a href="config-maas.html">MAAS Configuration</a></li>
420- <li class=" sub"><a href="getting-started.html#test">Testing your setup</a></li>
421- <li class=""><a href="charms.html">Using Charms</a></li>
422- <li class=" sub"><a href="charms.html#intro">What are Charms?</a></li>
423- <li class=" sub"><a href="charms-deploying.html">Deploying Services</a></li>
424- <li class=" sub"><a href="charms-constraints.html">Using constraints</a></li>
425- <li class=" sub"><a href="charms-config.html">Service Configuration</a></li>
426- <li class=" sub"><a href="charms-relations.html">Service Relationships</a></li>
427- <li class=" sub"><a href="charms-exposing.html">Exposing Services</a></li>
428- <li class=" sub"><a href="charms-scaling.html">Scaling Services</a></li>
429- <li class=" sub"><a href="charms-destroy.html">Destroying Services</a></li>
430- </ul>
431- <h1>Charm Authors</h1>
432- <ul></ul>
433- <li class=""><a href="authors-charm-anatomy.html">Anatomy of a charm</a></li>
434- <li class=""><a href="authors-charm-writing.html">Writing a charm</a></li>
435- <li class=" sub"><a href="authors-subordinate-services.html">Subordinate services</a></li>
436- <li class=" sub"><a href="authors-implicit-relations.html">Implicit Relations</a></li>
437- <li class=" sub"><a href="authors-testing.html">Charm Testing</a></li>
438- <li class=" sub"><a href="authors-hooks.html">Hook debugging</a></li>
439- <li class=""><a href="authors-charm-store.html">The Juju Charm Store</a></li>
440- <li class=" sub"><a href="authors-charm-policy.html">Charm store policy</a></li>
441- <li class=" sub"><a href="authors-charm-best-practice.html">Best practices</a></li>
442- <li class=" sub"><a href="authors-charm-quality.html">Charm Quality Rating</a></li>
443- <li class=" sub"><a href="authors-charm-icon.html">Charm Icons</a></li>
444- <h1>Reference</h1>
445- <ul>
446- <li class="sub"><a href="commands.html">Juju commands</a></li>
447- <li class="sub"><a href="glossary.html">Glossary</a></li>
448- <li class="sub"><a href="contributing.html">Contribute to the Docs!</a></li>
449- </ul>
450- </nav>
451- </div>
452+ <div id="navlinks" class="grid-3 doc-navigation">LINKS</div>
453 <div class="grid-9 doc-content">
454 <article>
455 <h1>Your First charm starts here!</h1>
456@@ -434,5 +392,11 @@
457 <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script>
458 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
459 <script type="text/javascript" src="js/main.js"></script>
460+ <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
461+
462+ <script>
463+ $("#navlinks").load("navigation.html");
464+ </script>
465+
466 </body>
467 </html>
468
469=== modified file 'htmldocs/authors-charms-in-action.html'
470--- htmldocs/authors-charms-in-action.html 2013-08-08 15:29:48 +0000
471+++ htmldocs/authors-charms-in-action.html 2013-08-14 17:43:07 +0000
472@@ -64,48 +64,7 @@
473
474 <section id="content" class="container-12">
475 <div class="grid-12 doc-container">
476- <div class="grid-3 doc-navigation">
477- <nav role="navigation">
478- <h1>User Guide</h1>
479- <ul>
480- <li class=""><a href="getting-started.html">Getting Started</a></li>
481- <li class=" sub"><a href="getting-started.html#intro">Introduction</a></li>
482- <li class=" sub"><a href="getting-started.html#install">Installation</a></li>
483- <li class=" sub"><a href="config-aws.html">AWS Configuration</a></li>
484- <li class=" sub"><a href="config-hpcloud.html">HP Cloud Configuration</a></li>
485- <li class=" sub"><a href="config-openstack.html">OpenStack Configuration</a></li>
486- <li class=" sub"><a href="config-maas.html">MAAS Configuration</a></li>
487- <li class=" sub"><a href="getting-started.html#test">Testing your setup</a></li>
488- <li class=""><a href="charms.html">Using Charms</a></li>
489- <li class=" sub"><a href="charms.html#intro">What are Charms?</a></li>
490- <li class=" sub"><a href="charms-deploying.html">Deploying Services</a></li>
491- <li class=" sub"><a href="charms-constraints.html">Using constraints</a></li>
492- <li class=" sub"><a href="charms-config.html">Service Configuration</a></li>
493- <li class=" sub"><a href="charms-relations.html">Service Relationships</a></li>
494- <li class=" sub"><a href="charms-exposing.html">Exposing Services</a></li>
495- <li class=" sub"><a href="charms-scaling.html">Scaling Services</a></li>
496- <li class=" sub"><a href="charms-destroy.html">Destroying Services</a></li>
497- </ul>
498- <h1>Charm Authors</h1>
499- <ul></ul>
500- <li class=""><a href="authors-charm-anatomy.html">Anatomy of a charm</a></li>
501- <li class=""><a href="authors-charm-writing.html">Writing a charm</a></li>
502- <li class=" sub"><a href="authors-subordinate-services.html">Subordinate services</a></li>
503- <li class=" sub"><a href="authors-implicit-relations.html">Implicit Relations</a></li>
504- <li class=" sub"><a href="authors-testing.html">Charm Testing</a></li>
505- <li class=" sub"><a href="authors-hooks.html">Hook debugging</a></li>
506- <li class=""><a href="authors-charm-store.html">The Juju Charm Store</a></li>
507- <li class=" sub"><a href="authors-charm-policy.html">Charm store policy</a></li>
508- <li class=" sub"><a href="authors-charm-best-practice.html">Best practices</a></li>
509- <li class=" sub"><a href="authors-charm-quality.html">Charm Quality Rating</a></li>
510- <h1>Reference</h1>
511- <ul>
512- <li class="sub"><a href="commands.html">Juju commands</a></li>
513- <li class="sub"><a href="glossary.html">Glossary</a></li>
514- <li class="sub"><a href="contributing.html">Contribute to the Docs!</a></li>
515- </ul>
516- </nav>
517- </div>
518+ <div id="navlinks" class="grid-3 doc-navigation">LINKS</div>
519 <div class="grid-9 doc-content">
520 <article>
521 <section id="charm-in-action">
522@@ -306,5 +265,11 @@
523 <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script>
524 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
525 <script type="text/javascript" src="js/main.js"></script>
526+ <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
527+
528+ <script>
529+ $("#navlinks").load("navigation.html");
530+ </script>
531+
532 </body>
533 </html>
534
535=== modified file 'htmldocs/authors-hooks.html'
536--- htmldocs/authors-hooks.html 2013-08-08 15:29:48 +0000
537+++ htmldocs/authors-hooks.html 2013-08-14 17:43:07 +0000
538@@ -64,49 +64,7 @@
539
540 <section id="content" class="container-12">
541 <div class="grid-12 doc-container">
542- <div class="grid-3 doc-navigation">
543- <nav role="navigation">
544- <h1>User Guide</h1>
545- <ul>
546- <li class=""><a href="getting-started.html">Getting Started</a></li>
547- <li class=" sub"><a href="getting-started.html#intro">Introduction</a></li>
548- <li class=" sub"><a href="getting-started.html#install">Installation</a></li>
549- <li class=" sub"><a href="config-aws.html">AWS Configuration</a></li>
550- <li class=" sub"><a href="config-hpcloud.html">HP Cloud Configuration</a></li>
551- <li class=" sub"><a href="config-openstack.html">OpenStack Configuration</a></li>
552- <li class=" sub"><a href="config-maas.html">MAAS Configuration</a></li>
553- <li class=" sub"><a href="getting-started.html#test">Testing your setup</a></li>
554- <li class=""><a href="charms.html">Using Charms</a></li>
555- <li class=" sub"><a href="charms.html#intro">What are Charms?</a></li>
556- <li class=" sub"><a href="charms-deploying.html">Deploying Services</a></li>
557- <li class=" sub"><a href="charms-constraints.html">Using constraints</a></li>
558- <li class=" sub"><a href="charms-config.html">Service Configuration</a></li>
559- <li class=" sub"><a href="charms-relations.html">Service Relationships</a></li>
560- <li class=" sub"><a href="charms-exposing.html">Exposing Services</a></li>
561- <li class=" sub"><a href="charms-scaling.html">Scaling Services</a></li>
562- <li class=" sub"><a href="charms-destroy.html">Destroying Services</a></li>
563- </ul>
564- <h1>Charm Authors</h1>
565- <ul></ul>
566- <li class=""><a href="authors-charm-anatomy.html">Anatomy of a charm</a></li>
567- <li class=""><a href="authors-charm-writing.html">Writing a charm</a></li>
568- <li class=" sub"><a href="authors-subordinate-services.html">Subordinate services</a></li>
569- <li class=" sub"><a href="authors-implicit-relations.html">Implicit Relations</a></li>
570- <li class=" sub"><a href="authors-testing.html">Charm Testing</a></li>
571- <li class=" sub"><a href="authors-hooks.html">Hook debugging</a></li>
572- <li class=""><a href="authors-charm-store.html">The Juju Charm Store</a></li>
573- <li class=" sub"><a href="authors-charm-policy.html">Charm store policy</a></li>
574- <li class=" sub"><a href="authors-charm-best-practice.html">Best practices</a></li>
575- <li class=" sub"><a href="authors-charm-quality.html">Charm Quality Rating</a></li>
576- <li class=" sub"><a href="authors-charm-icon.html">Charm Icons</a></li>
577- <h1>Reference</h1>
578- <ul>
579- <li class="sub"><a href="commands.html">Juju commands</a></li>
580- <li class="sub"><a href="glossary.html">Glossary</a></li>
581- <li class="sub"><a href="contributing.html">Contribute to the Docs!</a></li>
582- </ul>
583- </nav>
584- </div>
585+ <div id="navlinks" class="grid-3 doc-navigation">LINKS</div>
586 <div class="grid-9 doc-content">
587 <article>
588 <section id ="hook-debugging">
589@@ -202,5 +160,11 @@
590 <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script>
591 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
592 <script type="text/javascript" src="js/main.js"></script>
593+ <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
594+
595+ <script>
596+ $("#navlinks").load("navigation.html");
597+ </script>
598+
599 </body>
600 </html>
601
602=== modified file 'htmldocs/authors-implicit-relations.html'
603--- htmldocs/authors-implicit-relations.html 2013-08-08 15:29:48 +0000
604+++ htmldocs/authors-implicit-relations.html 2013-08-14 17:43:07 +0000
605@@ -64,49 +64,7 @@
606
607 <section id="content" class="container-12">
608 <div class="grid-12 doc-container">
609- <div class="grid-3 doc-navigation">
610- <nav role="navigation">
611- <h1>User Guide</h1>
612- <ul>
613- <li class=""><a href="getting-started.html">Getting Started</a></li>
614- <li class=" sub"><a href="getting-started.html#intro">Introduction</a></li>
615- <li class=" sub"><a href="getting-started.html#install">Installation</a></li>
616- <li class=" sub"><a href="config-aws.html">AWS Configuration</a></li>
617- <li class=" sub"><a href="config-hpcloud.html">HP Cloud Configuration</a></li>
618- <li class=" sub"><a href="config-openstack.html">OpenStack Configuration</a></li>
619- <li class=" sub"><a href="config-maas.html">MAAS Configuration</a></li>
620- <li class=" sub"><a href="getting-started.html#test">Testing your setup</a></li>
621- <li class=""><a href="charms.html">Using Charms</a></li>
622- <li class=" sub"><a href="charms.html#intro">What are Charms?</a></li>
623- <li class=" sub"><a href="charms-deploying.html">Deploying Services</a></li>
624- <li class=" sub"><a href="charms-constraints.html">Using constraints</a></li>
625- <li class=" sub"><a href="charms-config.html">Service Configuration</a></li>
626- <li class=" sub"><a href="charms-relations.html">Service Relationships</a></li>
627- <li class=" sub"><a href="charms-exposing.html">Exposing Services</a></li>
628- <li class=" sub"><a href="charms-scaling.html">Scaling Services</a></li>
629- <li class=" sub"><a href="charms-destroy.html">Destroying Services</a></li>
630- </ul>
631- <h1>Charm Authors</h1>
632- <ul></ul>
633- <li class=""><a href="authors-charm-anatomy.html">Anatomy of a charm</a></li>
634- <li class=""><a href="authors-charm-writing.html">Writing a charm</a></li>
635- <li class=" sub"><a href="authors-subordinate-services.html">Subordinate services</a></li>
636- <li class=" sub"><a href="authors-implicit-relations.html">Implicit Relations</a></li>
637- <li class=" sub"><a href="authors-testing.html">Charm Testing</a></li>
638- <li class=" sub"><a href="authors-hooks.html">Hook debugging</a></li>
639- <li class=""><a href="authors-charm-store.html">The Juju Charm Store</a></li>
640- <li class=" sub"><a href="authors-charm-policy.html">Charm store policy</a></li>
641- <li class=" sub"><a href="authors-charm-best-practice.html">Best practices</a></li>
642- <li class=" sub"><a href="authors-charm-quality.html">Charm Quality Rating</a></li>
643- <li class=" sub"><a href="authors-charm-icon.html">Charm Icons</a></li>
644- <h1>Reference</h1>
645- <ul>
646- <li class="sub"><a href="commands.html">Juju commands</a></li>
647- <li class="sub"><a href="glossary.html">Glossary</a></li>
648- <li class="sub"><a href="contributing.html">Contribute to the Docs!</a></li>
649- </ul>
650- </nav>
651- </div>
652+ <div id="navlinks" class="grid-3 doc-navigation">LINKS</div>
653 <div class="grid-9 doc-content">
654 <article>
655 <section id ="implicit-relations">
656@@ -203,5 +161,11 @@
657 <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script>
658 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
659 <script type="text/javascript" src="js/main.js"></script>
660+ <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
661+
662+ <script>
663+ $("#navlinks").load("navigation.html");
664+ </script>
665+
666 </body>
667 </html>
668
669=== modified file 'htmldocs/authors-service-config.html'
670--- htmldocs/authors-service-config.html 2013-08-08 15:29:48 +0000
671+++ htmldocs/authors-service-config.html 2013-08-14 17:43:07 +0000
672@@ -64,49 +64,7 @@
673
674 <section id="content" class="container-12">
675 <div class="grid-12 doc-container">
676- <div class="grid-3 doc-navigation">
677- <nav role="navigation">
678- <h1>User Guide</h1>
679- <ul>
680- <li class=""><a href="getting-started.html">Getting Started</a></li>
681- <li class=" sub"><a href="getting-started.html#intro">Introduction</a></li>
682- <li class=" sub"><a href="getting-started.html#install">Installation</a></li>
683- <li class=" sub"><a href="config-aws.html">AWS Configuration</a></li>
684- <li class=" sub"><a href="config-hpcloud.html">HP Cloud Configuration</a></li>
685- <li class=" sub"><a href="config-openstack.html">OpenStack Configuration</a></li>
686- <li class=" sub"><a href="config-maas.html">MAAS Configuration</a></li>
687- <li class=" sub"><a href="getting-started.html#test">Testing your setup</a></li>
688- <li class=""><a href="charms.html">Using Charms</a></li>
689- <li class=" sub"><a href="charms.html#intro">What are Charms?</a></li>
690- <li class=" sub"><a href="charms-deploying.html">Deploying Services</a></li>
691- <li class=" sub"><a href="charms-constraints.html">Using constraints</a></li>
692- <li class=" sub"><a href="charms-config.html">Service Configuration</a></li>
693- <li class=" sub"><a href="charms-relations.html">Service Relationships</a></li>
694- <li class=" sub"><a href="charms-exposing.html">Exposing Services</a></li>
695- <li class=" sub"><a href="charms-scaling.html">Scaling Services</a></li>
696- <li class=" sub"><a href="charms-destroy.html">Destroying Services</a></li>
697- </ul>
698- <h1>Charm Authors</h1>
699- <ul></ul>
700- <li class=""><a href="authors-charm-anatomy.html">Anatomy of a charm</a></li>
701- <li class=""><a href="authors-charm-writing.html">Writing a charm</a></li>
702- <li class=" sub"><a href="authors-subordinate-services.html">Subordinate services</a></li>
703- <li class=" sub"><a href="authors-implicit-relations.html">Implicit Relations</a></li>
704- <li class=" sub"><a href="authors-testing.html">Charm Testing</a></li>
705- <li class=" sub"><a href="authors-hooks.html">Hook debugging</a></li>
706- <li class=""><a href="authors-charm-store.html">The Juju Charm Store</a></li>
707- <li class=" sub"><a href="authors-charm-policy.html">Charm store policy</a></li>
708- <li class=" sub"><a href="authors-charm-best-practice.html">Best practices</a></li>
709- <li class=" sub"><a href="authors-charm-quality.html">Charm Quality Rating</a></li>
710- <li class=" sub"><a href="authors-charm-icon.html">Charm Icons</a></li>
711- <h1>Reference</h1>
712- <ul>
713- <li class="sub"><a href="commands.html">Juju commands</a></li>
714- <li class="sub"><a href="glossary.html">Glossary</a></li>
715- <li class="sub"><a href="contributing.html">Contribute to the Docs!</a></li>
716- </ul>
717- </nav>
718- </div>
719+ <div id="navlinks" class="grid-3 doc-navigation">LINKS</div>
720 <div class="grid-9 doc-content">
721 <article>
722 <h1>Service configuration</h1>
723@@ -219,5 +177,11 @@
724 <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script>
725 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
726 <script type="text/javascript" src="js/main.js"></script>
727+ <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
728+
729+ <script>
730+ $("#navlinks").load("navigation.html");
731+ </script>
732+
733 </body>
734 </html>
735
736=== modified file 'htmldocs/authors-subordinate-services.html'
737--- htmldocs/authors-subordinate-services.html 2013-08-08 15:29:48 +0000
738+++ htmldocs/authors-subordinate-services.html 2013-08-14 17:43:07 +0000
739@@ -64,49 +64,7 @@
740
741 <section id="content" class="container-12">
742 <div class="grid-12 doc-container">
743- <div class="grid-3 doc-navigation">
744- <nav role="navigation">
745- <h1>User Guide</h1>
746- <ul>
747- <li class=""><a href="getting-started.html">Getting Started</a></li>
748- <li class=" sub"><a href="getting-started.html#intro">Introduction</a></li>
749- <li class=" sub"><a href="getting-started.html#install">Installation</a></li>
750- <li class=" sub"><a href="config-aws.html">AWS Configuration</a></li>
751- <li class=" sub"><a href="config-hpcloud.html">HP Cloud Configuration</a></li>
752- <li class=" sub"><a href="config-openstack.html">OpenStack Configuration</a></li>
753- <li class=" sub"><a href="config-maas.html">MAAS Configuration</a></li>
754- <li class=" sub"><a href="getting-started.html#test">Testing your setup</a></li>
755- <li class=""><a href="charms.html">Using Charms</a></li>
756- <li class=" sub"><a href="charms.html#intro">What are Charms?</a></li>
757- <li class=" sub"><a href="charms-deploying.html">Deploying Services</a></li>
758- <li class=" sub"><a href="charms-constraints.html">Using constraints</a></li>
759- <li class=" sub"><a href="charms-config.html">Service Configuration</a></li>
760- <li class=" sub"><a href="charms-relations.html">Service Relationships</a></li>
761- <li class=" sub"><a href="charms-exposing.html">Exposing Services</a></li>
762- <li class=" sub"><a href="charms-scaling.html">Scaling Services</a></li>
763- <li class=" sub"><a href="charms-destroy.html">Destroying Services</a></li>
764- </ul>
765- <h1>Charm Authors</h1>
766- <ul></ul>
767- <li class=""><a href="authors-charm-anatomy.html">Anatomy of a charm</a></li>
768- <li class=""><a href="authors-charm-writing.html">Writing a charm</a></li>
769- <li class=" sub"><a href="authors-subordinate-services.html">Subordinate services</a></li>
770- <li class=" sub"><a href="authors-implicit-relations.html">Implicit Relations</a></li>
771- <li class=" sub"><a href="authors-testing.html">Charm Testing</a></li>
772- <li class=" sub"><a href="authors-hooks.html">Hook debugging</a></li>
773- <li class=""><a href="authors-charm-store.html">The Juju Charm Store</a></li>
774- <li class=" sub"><a href="authors-charm-policy.html">Charm store policy</a></li>
775- <li class=" sub"><a href="authors-charm-best-practice.html">Best practices</a></li>
776- <li class=" sub"><a href="authors-charm-quality.html">Charm Quality Rating</a></li>
777- <li class=" sub"><a href="authors-charm-icon.html">Charm Icons</a></li>
778- <h1>Reference</h1>
779- <ul>
780- <li class="sub"><a href="commands.html">Juju commands</a></li>
781- <li class="sub"><a href="glossary.html">Glossary</a></li>
782- <li class="sub"><a href="contributing.html">Contribute to the Docs!</a></li>
783- </ul>
784- </nav>
785- </div>
786+ <div id="navlinks" class="grid-3 doc-navigation">LINKS</div>
787 <div class="grid-9 doc-content">
788 <article>
789 <section id ="subordinate-services">
790@@ -251,5 +209,11 @@
791 <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script>
792 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
793 <script type="text/javascript" src="js/main.js"></script>
794+ <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
795+
796+ <script>
797+ $("#navlinks").load("navigation.html");
798+ </script>
799+
800 </body>
801 </html>
802
803=== modified file 'htmldocs/authors-testing.html'
804--- htmldocs/authors-testing.html 2013-08-08 15:29:48 +0000
805+++ htmldocs/authors-testing.html 2013-08-14 17:43:07 +0000
806@@ -64,49 +64,7 @@
807
808 <section id="content" class="container-12">
809 <div class="grid-12 doc-container">
810- <div class="grid-3 doc-navigation">
811- <nav role="navigation">
812- <h1>User Guide</h1>
813- <ul>
814- <li class=""><a href="getting-started.html">Getting Started</a></li>
815- <li class=" sub"><a href="getting-started.html#intro">Introduction</a></li>
816- <li class=" sub"><a href="getting-started.html#install">Installation</a></li>
817- <li class=" sub"><a href="config-aws.html">AWS Configuration</a></li>
818- <li class=" sub"><a href="config-hpcloud.html">HP Cloud Configuration</a></li>
819- <li class=" sub"><a href="config-openstack.html">OpenStack Configuration</a></li>
820- <li class=" sub"><a href="config-maas.html">MAAS Configuration</a></li>
821- <li class=" sub"><a href="getting-started.html#test">Testing your setup</a></li>
822- <li class=""><a href="charms.html">Using Charms</a></li>
823- <li class=" sub"><a href="charms.html#intro">What are Charms?</a></li>
824- <li class=" sub"><a href="charms-deploying.html">Deploying Services</a></li>
825- <li class=" sub"><a href="charms-constraints.html">Using constraints</a></li>
826- <li class=" sub"><a href="charms-config.html">Service Configuration</a></li>
827- <li class=" sub"><a href="charms-relations.html">Service Relationships</a></li>
828- <li class=" sub"><a href="charms-exposing.html">Exposing Services</a></li>
829- <li class=" sub"><a href="charms-scaling.html">Scaling Services</a></li>
830- <li class=" sub"><a href="charms-destroy.html">Destroying Services</a></li>
831- </ul>
832- <h1>Charm Authors</h1>
833- <ul></ul>
834- <li class=""><a href="authors-charm-anatomy.html">Anatomy of a charm</a></li>
835- <li class=""><a href="authors-charm-writing.html">Writing a charm</a></li>
836- <li class=" sub"><a href="authors-subordinate-services.html">Subordinate services</a></li>
837- <li class=" sub"><a href="authors-implicit-relations.html">Implicit Relations</a></li>
838- <li class=" sub"><a href="authors-testing.html">Charm Testing</a></li>
839- <li class=" sub"><a href="authors-hooks.html">Hook debugging</a></li>
840- <li class=""><a href="authors-charm-store.html">The Juju Charm Store</a></li>
841- <li class=" sub"><a href="authors-charm-policy.html">Charm store policy</a></li>
842- <li class=" sub"><a href="authors-charm-best-practice.html">Best practices</a></li>
843- <li class=" sub"><a href="authors-charm-quality.html">Charm Quality Rating</a></li>
844- <li class=" sub"><a href="authors-charm-icon.html">Charm Icons</a></li>
845- <h1>Reference</h1>
846- <ul>
847- <li class="sub"><a href="commands.html">Juju commands</a></li>
848- <li class="sub"><a href="glossary.html">Glossary</a></li>
849- <li class="sub"><a href="contributing.html">Contribute to the Docs!</a></li>
850- </ul>
851- </nav>
852- </div>
853+ <div id="navlinks" class="grid-3 doc-navigation">LINKS</div>
854 <div class="grid-9 doc-content">
855 <article>
856 <section id='authors-charm-testing'>
857@@ -374,5 +332,11 @@
858 <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script>
859 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
860 <script type="text/javascript" src="js/main.js"></script>
861+ <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
862+
863+ <script>
864+ $("#navlinks").load("navigation.html");
865+ </script>
866+
867 </body>
868 </html>
869
870=== modified file 'htmldocs/charms-config.html'
871--- htmldocs/charms-config.html 2013-08-08 15:29:48 +0000
872+++ htmldocs/charms-config.html 2013-08-14 17:43:07 +0000
873@@ -64,49 +64,7 @@
874
875 <section id="content" class="container-12">
876 <div class="grid-12 doc-container">
877- <div class="grid-3 doc-navigation">
878- <nav role="navigation">
879- <h1>User Guide</h1>
880- <ul>
881- <li class=""><a href="getting-started.html">Getting Started</a></li>
882- <li class=" sub"><a href="getting-started.html#intro">Introduction</a></li>
883- <li class=" sub"><a href="getting-started.html#install">Installation</a></li>
884- <li class=" sub"><a href="config-aws.html">AWS Configuration</a></li>
885- <li class=" sub"><a href="config-hpcloud.html">HP Cloud Configuration</a></li>
886- <li class=" sub"><a href="config-openstack.html">OpenStack Configuration</a></li>
887- <li class=" sub"><a href="config-maas.html">MAAS Configuration</a></li>
888- <li class=" sub"><a href="getting-started.html#test">Testing your setup</a></li>
889- <li class=""><a href="charms.html">Using Charms</a></li>
890- <li class=" sub"><a href="charms.html#intro">What are Charms?</a></li>
891- <li class=" sub"><a href="charms-deploying.html">Deploying Services</a></li>
892- <li class=" sub"><a href="charms-constraints.html">Using constraints</a></li>
893- <li class=" sub"><a href="charms-config.html">Service Configuration</a></li>
894- <li class=" sub"><a href="charms-relations.html">Service Relationships</a></li>
895- <li class=" sub"><a href="charms-exposing.html">Exposing Services</a></li>
896- <li class=" sub"><a href="charms-scaling.html">Scaling Services</a></li>
897- <li class=" sub"><a href="charms-destroy.html">Destroying Services</a></li>
898- </ul>
899- <h1>Charm Authors</h1>
900- <ul></ul>
901- <li class=""><a href="authors-charm-anatomy.html">Anatomy of a charm</a></li>
902- <li class=""><a href="authors-charm-writing.html">Writing a charm</a></li>
903- <li class=" sub"><a href="authors-subordinate-services.html">Subordinate services</a></li>
904- <li class=" sub"><a href="authors-implicit-relations.html">Implicit Relations</a></li>
905- <li class=" sub"><a href="authors-testing.html">Charm Testing</a></li>
906- <li class=" sub"><a href="authors-hooks.html">Hook debugging</a></li>
907- <li class=""><a href="authors-charm-store.html">The Juju Charm Store</a></li>
908- <li class=" sub"><a href="authors-charm-policy.html">Charm store policy</a></li>
909- <li class=" sub"><a href="authors-charm-best-practice.html">Best practices</a></li>
910- <li class=" sub"><a href="authors-charm-quality.html">Charm Quality Rating</a></li>
911- <li class=" sub"><a href="authors-charm-icon.html">Charm Icons</a></li>
912- <h1>Reference</h1>
913- <ul>
914- <li class="sub"><a href="commands.html">Juju commands</a></li>
915- <li class="sub"><a href="glossary.html">Glossary</a></li>
916- <li class="sub"><a href="contributing.html">Contribute to the Docs!</a></li>
917- </ul>
918- </nav>
919- </div>
920+ <div id="navlinks" class="grid-3 doc-navigation">LINKS</div>
921 <div class="grid-9 doc-content">
922 <article>
923 <section id ="service_config">
924@@ -241,5 +199,11 @@
925 <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script>
926 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
927 <script type="text/javascript" src="js/main.js"></script>
928+ <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
929+
930+ <script>
931+ $("#navlinks").load("navigation.html");
932+ </script>
933+
934 </body>
935 </html>
936
937=== modified file 'htmldocs/charms-constraints.html'
938--- htmldocs/charms-constraints.html 2013-08-08 15:29:48 +0000
939+++ htmldocs/charms-constraints.html 2013-08-14 17:43:07 +0000
940@@ -64,49 +64,7 @@
941
942 <section id="content" class="container-12">
943 <div class="grid-12 doc-container">
944- <div class="grid-3 doc-navigation">
945- <nav role="navigation">
946- <h1>User Guide</h1>
947- <ul>
948- <li class=""><a href="getting-started.html">Getting Started</a></li>
949- <li class=" sub"><a href="getting-started.html#intro">Introduction</a></li>
950- <li class=" sub"><a href="getting-started.html#install">Installation</a></li>
951- <li class=" sub"><a href="config-aws.html">AWS Configuration</a></li>
952- <li class=" sub"><a href="config-hpcloud.html">HP Cloud Configuration</a></li>
953- <li class=" sub"><a href="config-openstack.html">OpenStack Configuration</a></li>
954- <li class=" sub"><a href="config-maas.html">MAAS Configuration</a></li>
955- <li class=" sub"><a href="getting-started.html#test">Testing your setup</a></li>
956- <li class=""><a href="charms.html">Using Charms</a></li>
957- <li class=" sub"><a href="charms.html#intro">What are Charms?</a></li>
958- <li class=" sub"><a href="charms-deploying.html">Deploying Services</a></li>
959- <li class=" sub"><a href="charms-constraints.html">Using constraints</a></li>
960- <li class=" sub"><a href="charms-config.html">Service Configuration</a></li>
961- <li class=" sub"><a href="charms-relations.html">Service Relationships</a></li>
962- <li class=" sub"><a href="charms-exposing.html">Exposing Services</a></li>
963- <li class=" sub"><a href="charms-scaling.html">Scaling Services</a></li>
964- <li class=" sub"><a href="charms-destroy.html">Destroying Services</a></li>
965- </ul>
966- <h1>Charm Authors</h1>
967- <ul></ul>
968- <li class=""><a href="authors-charm-anatomy.html">Anatomy of a charm</a></li>
969- <li class=""><a href="authors-charm-writing.html">Writing a charm</a></li>
970- <li class=" sub"><a href="authors-subordinate-services.html">Subordinate services</a></li>
971- <li class=" sub"><a href="authors-implicit-relations.html">Implicit Relations</a></li>
972- <li class=" sub"><a href="authors-testing.html">Charm Testing</a></li>
973- <li class=" sub"><a href="authors-hooks.html">Hook debugging</a></li>
974- <li class=""><a href="authors-charm-store.html">The Juju Charm Store</a></li>
975- <li class=" sub"><a href="authors-charm-policy.html">Charm store policy</a></li>
976- <li class=" sub"><a href="authors-charm-best-practice.html">Best practices</a></li>
977- <li class=" sub"><a href="authors-charm-quality.html">Charm Quality Rating</a></li>
978- <li class=" sub"><a href="authors-charm-icon.html">Charm Icons</a></li>
979- <h1>Reference</h1>
980- <ul>
981- <li class="sub"><a href="commands.html">Juju commands</a></li>
982- <li class="sub"><a href="glossary.html">Glossary</a></li>
983- <li class="sub"><a href="contributing.html">Contribute to the Docs!</a></li>
984- </ul>
985- </nav>
986- </div>
987+ <div id="navlinks" class="grid-3 doc-navigation">LINKS</div>
988 <div class="grid-9 doc-content">
989 <article>
990 <section id ="charms-constraints">
991@@ -266,5 +224,11 @@
992 <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script>
993 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
994 <script type="text/javascript" src="js/main.js"></script>
995+ <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
996+
997+ <script>
998+ $("#navlinks").load("navigation.html");
999+ </script>
1000+
1001 </body>
1002 </html>
1003
1004=== modified file 'htmldocs/charms-deploying.html'
1005--- htmldocs/charms-deploying.html 2013-08-08 15:29:48 +0000
1006+++ htmldocs/charms-deploying.html 2013-08-14 17:43:07 +0000
1007@@ -64,49 +64,7 @@
1008
1009 <section id="content" class="container-12">
1010 <div class="grid-12 doc-container">
1011- <div class="grid-3 doc-navigation">
1012- <nav role="navigation">
1013- <h1>User Guide</h1>
1014- <ul>
1015- <li class=""><a href="getting-started.html">Getting Started</a></li>
1016- <li class=" sub"><a href="getting-started.html#intro">Introduction</a></li>
1017- <li class=" sub"><a href="getting-started.html#install">Installation</a></li>
1018- <li class=" sub"><a href="config-aws.html">AWS Configuration</a></li>
1019- <li class=" sub"><a href="config-hpcloud.html">HP Cloud Configuration</a></li>
1020- <li class=" sub"><a href="config-openstack.html">OpenStack Configuration</a></li>
1021- <li class=" sub"><a href="config-maas.html">MAAS Configuration</a></li>
1022- <li class=" sub"><a href="getting-started.html#test">Testing your setup</a></li>
1023- <li class=""><a href="charms.html">Using Charms</a></li>
1024- <li class=" sub"><a href="charms.html#intro">What are Charms?</a></li>
1025- <li class=" sub"><a href="charms-deploying.html">Deploying Services</a></li>
1026- <li class=" sub"><a href="charms-constraints.html">Using constraints</a></li>
1027- <li class=" sub"><a href="charms-config.html">Service Configuration</a></li>
1028- <li class=" sub"><a href="charms-relations.html">Service Relationships</a></li>
1029- <li class=" sub"><a href="charms-exposing.html">Exposing Services</a></li>
1030- <li class=" sub"><a href="charms-scaling.html">Scaling Services</a></li>
1031- <li class=" sub"><a href="charms-destroy.html">Destroying Services</a></li>
1032- </ul>
1033- <h1>Charm Authors</h1>
1034- <ul></ul>
1035- <li class=""><a href="authors-charm-anatomy.html">Anatomy of a charm</a></li>
1036- <li class=""><a href="authors-charm-writing.html">Writing a charm</a></li>
1037- <li class=" sub"><a href="authors-subordinate-services.html">Subordinate services</a></li>
1038- <li class=" sub"><a href="authors-implicit-relations.html">Implicit Relations</a></li>
1039- <li class=" sub"><a href="authors-testing.html">Charm Testing</a></li>
1040- <li class=" sub"><a href="authors-hooks.html">Hook debugging</a></li>
1041- <li class=""><a href="authors-charm-store.html">The Juju Charm Store</a></li>
1042- <li class=" sub"><a href="authors-charm-policy.html">Charm store policy</a></li>
1043- <li class=" sub"><a href="authors-charm-best-practice.html">Best practices</a></li>
1044- <li class=" sub"><a href="authors-charm-quality.html">Charm Quality Rating</a></li>
1045- <li class=" sub"><a href="authors-charm-icon.html">Charm Icons</a></li>
1046- <h1>Reference</h1>
1047- <ul>
1048- <li class="sub"><a href="commands.html">Juju commands</a></li>
1049- <li class="sub"><a href="glossary.html">Glossary</a></li>
1050- <li class="sub"><a href="contributing.html">Contribute to the Docs!</a></li>
1051- </ul>
1052- </nav>
1053- </div>
1054+ <div id="navlinks" class="grid-3 doc-navigation">LINKS</div>
1055 <div class="grid-9 doc-content">
1056 <article>
1057 <section id="deploying">
1058@@ -213,5 +171,11 @@
1059 <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script>
1060 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
1061 <script type="text/javascript" src="js/main.js"></script>
1062+ <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
1063+
1064+ <script>
1065+ $("#navlinks").load("navigation.html");
1066+ </script>
1067+
1068 </body>
1069 </html>
1070
1071=== modified file 'htmldocs/charms-destroy.html'
1072--- htmldocs/charms-destroy.html 2013-08-08 15:29:48 +0000
1073+++ htmldocs/charms-destroy.html 2013-08-14 17:43:07 +0000
1074@@ -64,49 +64,7 @@
1075
1076 <section id="content" class="container-12">
1077 <div class="grid-12 doc-container">
1078- <div class="grid-3 doc-navigation">
1079- <nav role="navigation">
1080- <h1>User Guide</h1>
1081- <ul>
1082- <li class=""><a href="getting-started.html">Getting Started</a></li>
1083- <li class=" sub"><a href="getting-started.html#intro">Introduction</a></li>
1084- <li class=" sub"><a href="getting-started.html#install">Installation</a></li>
1085- <li class=" sub"><a href="config-aws.html">AWS Configuration</a></li>
1086- <li class=" sub"><a href="config-hpcloud.html">HP Cloud Configuration</a></li>
1087- <li class=" sub"><a href="config-openstack.html">OpenStack Configuration</a></li>
1088- <li class=" sub"><a href="config-maas.html">MAAS Configuration</a></li>
1089- <li class=" sub"><a href="getting-started.html#test">Testing your setup</a></li>
1090- <li class=""><a href="charms.html">Using Charms</a></li>
1091- <li class=" sub"><a href="charms.html#intro">What are Charms?</a></li>
1092- <li class=" sub"><a href="charms-deploying.html">Deploying Services</a></li>
1093- <li class=" sub"><a href="charms-constraints.html">Using constraints</a></li>
1094- <li class=" sub"><a href="charms-config.html">Service Configuration</a></li>
1095- <li class=" sub"><a href="charms-relations.html">Service Relationships</a></li>
1096- <li class=" sub"><a href="charms-exposing.html">Exposing Services</a></li>
1097- <li class=" sub"><a href="charms-scaling.html">Scaling Services</a></li>
1098- <li class=" sub"><a href="charms-destroy.html">Destroying Services</a></li>
1099- </ul>
1100- <h1>Charm Authors</h1>
1101- <ul></ul>
1102- <li class=""><a href="authors-charm-anatomy.html">Anatomy of a charm</a></li>
1103- <li class=""><a href="authors-charm-writing.html">Writing a charm</a></li>
1104- <li class=" sub"><a href="authors-subordinate-services.html">Subordinate services</a></li>
1105- <li class=" sub"><a href="authors-implicit-relations.html">Implicit Relations</a></li>
1106- <li class=" sub"><a href="authors-testing.html">Charm Testing</a></li>
1107- <li class=" sub"><a href="authors-hooks.html">Hook debugging</a></li>
1108- <li class=""><a href="authors-charm-store.html">The Juju Charm Store</a></li>
1109- <li class=" sub"><a href="authors-charm-policy.html">Charm store policy</a></li>
1110- <li class=" sub"><a href="authors-charm-best-practice.html">Best practices</a></li>
1111- <li class=" sub"><a href="authors-charm-quality.html">Charm Quality Rating</a></li>
1112- <li class=" sub"><a href="authors-charm-icon.html">Charm Icons</a></li>
1113- <h1>Reference</h1>
1114- <ul>
1115- <li class="sub"><a href="commands.html">Juju commands</a></li>
1116- <li class="sub"><a href="glossary.html">Glossary</a></li>
1117- <li class="sub"><a href="contributing.html">Contribute to the Docs!</a></li>
1118- </ul>
1119- </nav>
1120- </div>
1121+ <div id="navlinks" class="grid-3 doc-navigation">LINKS</div>
1122 <div class="grid-9 doc-content">
1123 <article>
1124 <section id ="charms-destroy">
1125@@ -213,5 +171,11 @@
1126 <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script>
1127 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
1128 <script type="text/javascript" src="js/main.js"></script>
1129+ <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
1130+
1131+ <script>
1132+ $("#navlinks").load("navigation.html");
1133+ </script>
1134+
1135 </body>
1136 </html>
1137
1138=== modified file 'htmldocs/charms-exposing.html'
1139--- htmldocs/charms-exposing.html 2013-08-08 15:29:48 +0000
1140+++ htmldocs/charms-exposing.html 2013-08-14 17:43:07 +0000
1141@@ -64,49 +64,7 @@
1142
1143 <section id="content" class="container-12">
1144 <div class="grid-12 doc-container">
1145- <div class="grid-3 doc-navigation">
1146- <nav role="navigation">
1147- <h1>User Guide</h1>
1148- <ul>
1149- <li class=""><a href="getting-started.html">Getting Started</a></li>
1150- <li class=" sub"><a href="getting-started.html#intro">Introduction</a></li>
1151- <li class=" sub"><a href="getting-started.html#install">Installation</a></li>
1152- <li class=" sub"><a href="config-aws.html">AWS Configuration</a></li>
1153- <li class=" sub"><a href="config-hpcloud.html">HP Cloud Configuration</a></li>
1154- <li class=" sub"><a href="config-openstack.html">OpenStack Configuration</a></li>
1155- <li class=" sub"><a href="config-maas.html">MAAS Configuration</a></li>
1156- <li class=" sub"><a href="getting-started.html#test">Testing your setup</a></li>
1157- <li class=""><a href="charms.html">Using Charms</a></li>
1158- <li class=" sub"><a href="charms.html#intro">What are Charms?</a></li>
1159- <li class=" sub"><a href="charms-deploying.html">Deploying Services</a></li>
1160- <li class=" sub"><a href="charms-constraints.html">Using constraints</a></li>
1161- <li class=" sub"><a href="charms-config.html">Service Configuration</a></li>
1162- <li class=" sub"><a href="charms-relations.html">Service Relationships</a></li>
1163- <li class=" sub"><a href="charms-exposing.html">Exposing Services</a></li>
1164- <li class=" sub"><a href="charms-scaling.html">Scaling Services</a></li>
1165- <li class=" sub"><a href="charms-destroy.html">Destroying Services</a></li>
1166- </ul>
1167- <h1>Charm Authors</h1>
1168- <ul></ul>
1169- <li class=""><a href="authors-charm-anatomy.html">Anatomy of a charm</a></li>
1170- <li class=""><a href="authors-charm-writing.html">Writing a charm</a></li>
1171- <li class=" sub"><a href="authors-subordinate-services.html">Subordinate services</a></li>
1172- <li class=" sub"><a href="authors-implicit-relations.html">Implicit Relations</a></li>
1173- <li class=" sub"><a href="authors-testing.html">Charm Testing</a></li>
1174- <li class=" sub"><a href="authors-hooks.html">Hook debugging</a></li>
1175- <li class=""><a href="authors-charm-store.html">The Juju Charm Store</a></li>
1176- <li class=" sub"><a href="authors-charm-policy.html">Charm store policy</a></li>
1177- <li class=" sub"><a href="authors-charm-best-practice.html">Best practices</a></li>
1178- <li class=" sub"><a href="authors-charm-quality.html">Charm Quality Rating</a></li>
1179- <li class=" sub"><a href="authors-charm-icon.html">Charm Icons</a></li>
1180- <h1>Reference</h1>
1181- <ul>
1182- <li class="sub"><a href="commands.html">Juju commands</a></li>
1183- <li class="sub"><a href="glossary.html">Glossary</a></li>
1184- <li class="sub"><a href="contributing.html">Contribute to the Docs!</a></li>
1185- </ul>
1186- </nav>
1187- </div>
1188+ <div id="navlinks" class="grid-3 doc-navigation">LINKS</div>
1189 <div class="grid-9 doc-content">
1190 <article>
1191 <section id ="exposing">
1192@@ -204,5 +162,11 @@
1193 <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script>
1194 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
1195 <script type="text/javascript" src="js/main.js"></script>
1196+ <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
1197+
1198+ <script>
1199+ $("#navlinks").load("navigation.html");
1200+ </script>
1201+
1202 </body>
1203 </html>
1204
1205=== modified file 'htmldocs/charms-relations.html'
1206--- htmldocs/charms-relations.html 2013-08-08 15:29:48 +0000
1207+++ htmldocs/charms-relations.html 2013-08-14 17:43:07 +0000
1208@@ -64,49 +64,7 @@
1209
1210 <section id="content" class="container-12">
1211 <div class="grid-12 doc-container">
1212- <div class="grid-3 doc-navigation">
1213- <nav role="navigation">
1214- <h1>User Guide</h1>
1215- <ul>
1216- <li class=""><a href="getting-started.html">Getting Started</a></li>
1217- <li class=" sub"><a href="getting-started.html#intro">Introduction</a></li>
1218- <li class=" sub"><a href="getting-started.html#install">Installation</a></li>
1219- <li class=" sub"><a href="config-aws.html">AWS Configuration</a></li>
1220- <li class=" sub"><a href="config-hpcloud.html">HP Cloud Configuration</a></li>
1221- <li class=" sub"><a href="config-openstack.html">OpenStack Configuration</a></li>
1222- <li class=" sub"><a href="config-maas.html">MAAS Configuration</a></li>
1223- <li class=" sub"><a href="getting-started.html#test">Testing your setup</a></li>
1224- <li class=""><a href="charms.html">Using Charms</a></li>
1225- <li class=" sub"><a href="charms.html#intro">What are Charms?</a></li>
1226- <li class=" sub"><a href="charms-deploying.html">Deploying Services</a></li>
1227- <li class=" sub"><a href="charms-constraints.html">Using constraints</a></li>
1228- <li class=" sub"><a href="charms-config.html">Service Configuration</a></li>
1229- <li class=" sub"><a href="charms-relations.html">Service Relationships</a></li>
1230- <li class=" sub"><a href="charms-exposing.html">Exposing Services</a></li>
1231- <li class=" sub"><a href="charms-scaling.html">Scaling Services</a></li>
1232- <li class=" sub"><a href="charms-destroy.html">Destroying Services</a></li>
1233- </ul>
1234- <h1>Charm Authors</h1>
1235- <ul></ul>
1236- <li class=""><a href="authors-charm-anatomy.html">Anatomy of a charm</a></li>
1237- <li class=""><a href="authors-charm-writing.html">Writing a charm</a></li>
1238- <li class=" sub"><a href="authors-subordinate-services.html">Subordinate services</a></li>
1239- <li class=" sub"><a href="authors-implicit-relations.html">Implicit Relations</a></li>
1240- <li class=" sub"><a href="authors-testing.html">Charm Testing</a></li>
1241- <li class=" sub"><a href="authors-hooks.html">Hook debugging</a></li>
1242- <li class=""><a href="authors-charm-store.html">The Juju Charm Store</a></li>
1243- <li class=" sub"><a href="authors-charm-policy.html">Charm store policy</a></li>
1244- <li class=" sub"><a href="authors-charm-best-practice.html">Best practices</a></li>
1245- <li class=" sub"><a href="authors-charm-quality.html">Charm Quality Rating</a></li>
1246- <li class=" sub"><a href="authors-charm-icon.html">Charm Icons</a></li>
1247- <h1>Reference</h1>
1248- <ul>
1249- <li class="sub"><a href="commands.html">Juju commands</a></li>
1250- <li class="sub"><a href="glossary.html">Glossary</a></li>
1251- <li class="sub"><a href="contributing.html">Contribute to the Docs!</a></li>
1252- </ul>
1253- </nav>
1254- </div>
1255+ <div id="navlinks" class="grid-3 doc-navigation">LINKS</div>
1256 <div class="grid-9 doc-content">
1257 <article>
1258 <section id ="charms-relations">
1259@@ -246,5 +204,11 @@
1260 <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script>
1261 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
1262 <script type="text/javascript" src="js/main.js"></script>
1263+ <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
1264+
1265+ <script>
1266+ $("#navlinks").load("navigation.html");
1267+ </script>
1268+
1269 </body>
1270 </html>
1271
1272=== modified file 'htmldocs/charms-scaling.html'
1273--- htmldocs/charms-scaling.html 2013-08-08 15:29:48 +0000
1274+++ htmldocs/charms-scaling.html 2013-08-14 17:43:07 +0000
1275@@ -64,49 +64,7 @@
1276
1277 <section id="content" class="container-12">
1278 <div class="grid-12 doc-container">
1279- <div class="grid-3 doc-navigation">
1280- <nav role="navigation">
1281- <h1>User Guide</h1>
1282- <ul>
1283- <li class=""><a href="getting-started.html">Getting Started</a></li>
1284- <li class=" sub"><a href="getting-started.html#intro">Introduction</a></li>
1285- <li class=" sub"><a href="getting-started.html#install">Installation</a></li>
1286- <li class=" sub"><a href="config-aws.html">AWS Configuration</a></li>
1287- <li class=" sub"><a href="config-hpcloud.html">HP Cloud Configuration</a></li>
1288- <li class=" sub"><a href="config-openstack.html">OpenStack Configuration</a></li>
1289- <li class=" sub"><a href="config-maas.html">MAAS Configuration</a></li>
1290- <li class=" sub"><a href="getting-started.html#test">Testing your setup</a></li>
1291- <li class=""><a href="charms.html">Using Charms</a></li>
1292- <li class=" sub"><a href="charms.html#intro">What are Charms?</a></li>
1293- <li class=" sub"><a href="charms-deploying.html">Deploying Services</a></li>
1294- <li class=" sub"><a href="charms-constraints.html">Using constraints</a></li>
1295- <li class=" sub"><a href="charms-config.html">Service Configuration</a></li>
1296- <li class=" sub"><a href="charms-relations.html">Service Relationships</a></li>
1297- <li class=" sub"><a href="charms-exposing.html">Exposing Services</a></li>
1298- <li class=" sub"><a href="charms-scaling.html">Scaling Services</a></li>
1299- <li class=" sub"><a href="charms-destroy.html">Destroying Services</a></li>
1300- </ul>
1301- <h1>Charm Authors</h1>
1302- <ul></ul>
1303- <li class=""><a href="authors-charm-anatomy.html">Anatomy of a charm</a></li>
1304- <li class=""><a href="authors-charm-writing.html">Writing a charm</a></li>
1305- <li class=" sub"><a href="authors-subordinate-services.html">Subordinate services</a></li>
1306- <li class=" sub"><a href="authors-implicit-relations.html">Implicit Relations</a></li>
1307- <li class=" sub"><a href="authors-testing.html">Charm Testing</a></li>
1308- <li class=" sub"><a href="authors-hooks.html">Hook debugging</a></li>
1309- <li class=""><a href="authors-charm-store.html">The Juju Charm Store</a></li>
1310- <li class=" sub"><a href="authors-charm-policy.html">Charm store policy</a></li>
1311- <li class=" sub"><a href="authors-charm-best-practice.html">Best practices</a></li>
1312- <li class=" sub"><a href="authors-charm-quality.html">Charm Quality Rating</a></li>
1313- <li class=" sub"><a href="authors-charm-icon.html">Charm Icons</a></li>
1314- <h1>Reference</h1>
1315- <ul>
1316- <li class="sub"><a href="commands.html">Juju commands</a></li>
1317- <li class="sub"><a href="glossary.html">Glossary</a></li>
1318- <li class="sub"><a href="contributing.html">Contribute to the Docs!</a></li>
1319- </ul>
1320- </nav>
1321- </div>
1322+ <div id="navlinks" class="grid-3 doc-navigation">LINKS</div>
1323 <div class="grid-9 doc-content">
1324 <article>
1325 <section id="charms-scaling">
1326@@ -200,5 +158,11 @@
1327 <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script>
1328 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
1329 <script type="text/javascript" src="js/main.js"></script>
1330+ <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
1331+
1332+ <script>
1333+ $("#navlinks").load("navigation.html");
1334+ </script>
1335+
1336 </body>
1337 </html>
1338
1339=== modified file 'htmldocs/charms-upgrading.html'
1340--- htmldocs/charms-upgrading.html 2013-08-08 15:29:48 +0000
1341+++ htmldocs/charms-upgrading.html 2013-08-14 17:43:07 +0000
1342@@ -64,49 +64,7 @@
1343
1344 <section id="content" class="container-12">
1345 <div class="grid-12 doc-container">
1346- <div class="grid-3 doc-navigation">
1347- <nav role="navigation">
1348- <h1>User Guide</h1>
1349- <ul>
1350- <li class=""><a href="getting-started.html">Getting Started</a></li>
1351- <li class=" sub"><a href="getting-started.html#intro">Introduction</a></li>
1352- <li class=" sub"><a href="getting-started.html#install">Installation</a></li>
1353- <li class=" sub"><a href="config-aws.html">AWS Configuration</a></li>
1354- <li class=" sub"><a href="config-hpcloud.html">HP Cloud Configuration</a></li>
1355- <li class=" sub"><a href="config-openstack.html">OpenStack Configuration</a></li>
1356- <li class=" sub"><a href="config-maas.html">MAAS Configuration</a></li>
1357- <li class=" sub"><a href="getting-started.html#test">Testing your setup</a></li>
1358- <li class=""><a href="charms.html">Using Charms</a></li>
1359- <li class=" sub"><a href="charms.html#intro">What are Charms?</a></li>
1360- <li class=" sub"><a href="charms-deploying.html">Deploying Services</a></li>
1361- <li class=" sub"><a href="charms-constraints.html">Using constraints</a></li>
1362- <li class=" sub"><a href="charms-config.html">Service Configuration</a></li>
1363- <li class=" sub"><a href="charms-relations.html">Service Relationships</a></li>
1364- <li class=" sub"><a href="charms-exposing.html">Exposing Services</a></li>
1365- <li class=" sub"><a href="charms-scaling.html">Scaling Services</a></li>
1366- <li class=" sub"><a href="charms-destroy.html">Destroying Services</a></li>
1367- </ul>
1368- <h1>Charm Authors</h1>
1369- <ul></ul>
1370- <li class=""><a href="authors-charm-anatomy.html">Anatomy of a charm</a></li>
1371- <li class=""><a href="authors-charm-writing.html">Writing a charm</a></li>
1372- <li class=" sub"><a href="authors-subordinate-services.html">Subordinate services</a></li>
1373- <li class=" sub"><a href="authors-implicit-relations.html">Implicit Relations</a></li>
1374- <li class=" sub"><a href="authors-testing.html">Charm Testing</a></li>
1375- <li class=" sub"><a href="authors-hooks.html">Hook debugging</a></li>
1376- <li class=""><a href="authors-charm-store.html">The Juju Charm Store</a></li>
1377- <li class=" sub"><a href="authors-charm-policy.html">Charm store policy</a></li>
1378- <li class=" sub"><a href="authors-charm-best-practice.html">Best practices</a></li>
1379- <li class=" sub"><a href="authors-charm-quality.html">Charm Quality Rating</a></li>
1380- <li class=" sub"><a href="authors-charm-icon.html">Charm Icons</a></li>
1381- <h1>Reference</h1>
1382- <ul>
1383- <li class="sub"><a href="commands.html">Juju commands</a></li>
1384- <li class="sub"><a href="glossary.html">Glossary</a></li>
1385- <li class="sub"><a href="contributing.html">Contribute to the Docs!</a></li>
1386- </ul>
1387- </nav>
1388- </div>
1389+ <div id="navlinks" class="grid-3 doc-navigation">LINKS</div>
1390 <div class="grid-9 doc-content">
1391 <article>
1392 <section id ="upgrading">
1393@@ -178,5 +136,11 @@
1394 <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script>
1395 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
1396 <script type="text/javascript" src="js/main.js"></script>
1397+ <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
1398+
1399+ <script>
1400+ $("#navlinks").load("navigation.html");
1401+ </script>
1402+
1403 </body>
1404 </html>
1405
1406=== modified file 'htmldocs/charms.html'
1407--- htmldocs/charms.html 2013-08-08 15:29:48 +0000
1408+++ htmldocs/charms.html 2013-08-14 17:43:07 +0000
1409@@ -64,49 +64,7 @@
1410
1411 <section id="content" class="container-12">
1412 <div class="grid-12 doc-container">
1413- <div class="grid-3 doc-navigation">
1414- <nav role="navigation">
1415- <h1>User Guide</h1>
1416- <ul>
1417- <li class=""><a href="getting-started.html">Getting Started</a></li>
1418- <li class=" sub"><a href="getting-started.html#intro">Introduction</a></li>
1419- <li class=" sub"><a href="getting-started.html#install">Installation</a></li>
1420- <li class=" sub"><a href="config-aws.html">AWS Configuration</a></li>
1421- <li class=" sub"><a href="config-hpcloud.html">HP Cloud Configuration</a></li>
1422- <li class=" sub"><a href="config-openstack.html">OpenStack Configuration</a></li>
1423- <li class=" sub"><a href="config-maas.html">MAAS Configuration</a></li>
1424- <li class=" sub"><a href="getting-started.html#test">Testing your setup</a></li>
1425- <li class="selected"><a href="charms.html">Using Charms</a></li>
1426- <li class=" sub"><a href="charms.html#intro">What are Charms?</a></li>
1427- <li class=" sub"><a href="charms-deploying.html">Deploying Services</a></li>
1428- <li class=" sub"><a href="charms-constraints.html">Using constraints</a></li>
1429- <li class=" sub"><a href="charms-config.html">Service Configuration</a></li>
1430- <li class=" sub"><a href="charms-relations.html">Service Relationships</a></li>
1431- <li class=" sub"><a href="charms-exposing.html">Exposing Services</a></li>
1432- <li class=" sub"><a href="charms-scaling.html">Scaling Services</a></li>
1433- <li class=" sub"><a href="charms-destroy.html">Destroying Services</a></li>
1434- </ul>
1435- <h1>Charm Authors</h1>
1436- <ul></ul>
1437- <li class=""><a href="authors-charm-anatomy.html">Anatomy of a charm</a></li>
1438- <li class="selected"><a href="authors-charm-writing.html">Writing a charm</a></li>
1439- <li class=" sub"><a href="authors-subordinate-services.html">Subordinate services</a></li>
1440- <li class=" sub"><a href="authors-implicit-relations.html">Implicit Relations</a></li>
1441- <li class=" sub"><a href="authors-testing.html">Charm Testing</a></li>
1442- <li class=" sub"><a href="authors-hooks.html">Hook debugging</a></li>
1443- <li class=""><a href="authors-charm-store.html">The Juju Charm Store</a></li>
1444- <li class=" sub"><a href="authors-charm-policy.html">Charm store policy</a></li>
1445- <li class=" sub"><a href="authors-charm-best-practice.html">Best practices</a></li>
1446- <li class=" sub"><a href="authors-charm-quality.html">Charm Quality Rating</a></li>
1447- <li class=" sub"><a href="authors-charm-icon.html">Charm Icons</a></li>
1448- <h1>Reference</h1>
1449- <ul>
1450- <li class="sub"><a href="commands.html">Juju commands</a></li>
1451- <li class="sub"><a href="glossary.html">Glossary</a></li>
1452- <li class="sub"><a href="contributing.html">Contribute to the Docs!</a></li>
1453- </ul>
1454- </nav>
1455- </div>
1456+ <div id="navlinks" class="grid-3 doc-navigation">LINKS</div>
1457 <div class="grid-9 doc-content">
1458 <article>
1459 <section id="charms">
1460@@ -197,5 +155,11 @@
1461 <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script>
1462 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
1463 <script type="text/javascript" src="js/main.js"></script>
1464+ <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
1465+
1466+ <script>
1467+ $("#navlinks").load("navigation.html");
1468+ </script>
1469+
1470 </body>
1471 </html>
1472
1473=== modified file 'htmldocs/commands.html'
1474--- htmldocs/commands.html 2013-08-08 15:29:48 +0000
1475+++ htmldocs/commands.html 2013-08-14 17:43:07 +0000
1476@@ -64,49 +64,7 @@
1477
1478 <section id="content" class="container-12">
1479 <div class="grid-12 doc-container">
1480- <div class="grid-3 doc-navigation">
1481- <nav role="navigation">
1482- <h1>User Guide</h1>
1483- <ul>
1484- <li class=""><a href="getting-started.html">Getting Started</a></li>
1485- <li class=" sub"><a href="getting-started.html#intro">Introduction</a></li>
1486- <li class=" sub"><a href="getting-started.html#install">Installation</a></li>
1487- <li class=" sub"><a href="config-aws.html">AWS Configuration</a></li>
1488- <li class=" sub"><a href="config-hpcloud.html">HP Cloud Configuration</a></li>
1489- <li class=" sub"><a href="config-openstack.html">OpenStack Configuration</a></li>
1490- <li class=" sub"><a href="config-maas.html">MAAS Configuration</a></li>
1491- <li class=" sub"><a href="getting-started.html#test">Testing your setup</a></li>
1492- <li class=""><a href="charms.html">Using Charms</a></li>
1493- <li class=" sub"><a href="charms.html#intro">What are Charms?</a></li>
1494- <li class=" sub"><a href="charms-deploying.html">Deploying Services</a></li>
1495- <li class=" sub"><a href="charms-constraints.html">Using constraints</a></li>
1496- <li class=" sub"><a href="charms-config.html">Service Configuration</a></li>
1497- <li class=" sub"><a href="charms-relations.html">Service Relationships</a></li>
1498- <li class=" sub"><a href="charms-exposing.html">Exposing Services</a></li>
1499- <li class=" sub"><a href="charms-scaling.html">Scaling Services</a></li>
1500- <li class=" sub"><a href="charms-destroy.html">Destroying Services</a></li>
1501- </ul>
1502- <h1>Charm Authors</h1>
1503- <ul></ul>
1504- <li class=""><a href="authors-charm-anatomy.html">Anatomy of a charm</a></li>
1505- <li class=""><a href="authors-charm-writing.html">Writing a charm</a></li>
1506- <li class=" sub"><a href="authors-subordinate-services.html">Subordinate services</a></li>
1507- <li class=" sub"><a href="authors-implicit-relations.html">Implicit Relations</a></li>
1508- <li class=" sub"><a href="authors-testing.html">Charm Testing</a></li>
1509- <li class=" sub"><a href="authors-hooks.html">Hook debugging</a></li>
1510- <li class=""><a href="authors-charm-store.html">The Juju Charm Store</a></li>
1511- <li class=" sub"><a href="authors-charm-policy.html">Charm store policy</a></li>
1512- <li class=" sub"><a href="authors-charm-best-practice.html">Best practices</a></li>
1513- <li class=" sub"><a href="authors-charm-quality.html">Charm Quality Rating</a></li>
1514- <li class=" sub"><a href="authors-charm-icon.html">Charm Icons</a></li>
1515- <h1>Reference</h1>
1516- <ul>
1517- <li class="sub"><a href="commands.html">Juju commands</a></li>
1518- <li class="sub"><a href="glossary.html">Glossary</a></li>
1519- <li class="sub"><a href="contributing.html">Contribute to the Docs!</a></li>
1520- </ul>
1521- </nav>
1522- </div>
1523+ <div id="navlinks" class="grid-3 doc-navigation">LINKS</div>
1524 <div class="grid-9 doc-content">
1525 <article>
1526 <section id ="charms-destroy">
1527@@ -213,5 +171,11 @@
1528 <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script>
1529 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
1530 <script type="text/javascript" src="js/main.js"></script>
1531+ <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
1532+
1533+ <script>
1534+ $("#navlinks").load("navigation.html");
1535+ </script>
1536+
1537 </body>
1538 </html>
1539
1540=== modified file 'htmldocs/config-aws.html'
1541--- htmldocs/config-aws.html 2013-08-08 15:29:48 +0000
1542+++ htmldocs/config-aws.html 2013-08-14 17:43:07 +0000
1543@@ -10,17 +10,13 @@
1544 <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/home-new.css" />
1545 <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' />
1546 <link href="css/main.css?1375975745" rel="stylesheet" type="text/css"/>
1547-
1548 <!--[if lt IE 9]>
1549 <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
1550 <![endif]-->
1551+ <script src="http://code.jquery.com/jquery-1.9.1.js"></script>
1552 </head>
1553
1554
1555-
1556-
1557-
1558-
1559 <!-- DO NOT EDIT ABOVE THIS LINE -->
1560
1561 <!-- DO NOT EDIT ABOVE THIS LINE -->
1562@@ -64,49 +60,7 @@
1563
1564 <section id="content" class="container-12">
1565 <div class="grid-12 doc-container">
1566- <div class="grid-3 doc-navigation">
1567- <nav role="navigation">
1568- <h1>User Guide</h1>
1569- <ul>
1570- <li class=""><a href="getting-started.html">Getting Started</a></li>
1571- <li class=" sub"><a href="getting-started.html#intro">Introduction</a></li>
1572- <li class=" sub"><a href="getting-started.html#install">Installation</a></li>
1573- <li class=" sub"><a href="config-aws.html">AWS Configuration</a></li>
1574- <li class=" sub"><a href="config-hpcloud.html">HP Cloud Configuration</a></li>
1575- <li class=" sub"><a href="config-openstack.html">OpenStack Configuration</a></li>
1576- <li class=" sub"><a href="config-maas.html">MAAS Configuration</a></li>
1577- <li class=" sub"><a href="getting-started.html#test">Testing your setup</a></li>
1578- <li class=""><a href="charms.html">Using Charms</a></li>
1579- <li class=" sub"><a href="charms.html#intro">What are Charms?</a></li>
1580- <li class=" sub"><a href="charms-deploying.html">Deploying Services</a></li>
1581- <li class=" sub"><a href="charms-constraints.html">Using constraints</a></li>
1582- <li class=" sub"><a href="charms-config.html">Service Configuration</a></li>
1583- <li class=" sub"><a href="charms-relations.html">Service Relationships</a></li>
1584- <li class=" sub"><a href="charms-exposing.html">Exposing Services</a></li>
1585- <li class=" sub"><a href="charms-scaling.html">Scaling Services</a></li>
1586- <li class=" sub"><a href="charms-destroy.html">Destroying Services</a></li>
1587- </ul>
1588- <h1>Charm Authors</h1>
1589- <ul></ul>
1590- <li class=""><a href="authors-charm-anatomy.html">Anatomy of a charm</a></li>
1591- <li class=""><a href="authors-charm-writing.html">Writing a charm</a></li>
1592- <li class=" sub"><a href="authors-subordinate-services.html">Subordinate services</a></li>
1593- <li class=" sub"><a href="authors-implicit-relations.html">Implicit Relations</a></li>
1594- <li class=" sub"><a href="authors-testing.html">Charm Testing</a></li>
1595- <li class=" sub"><a href="authors-hooks.html">Hook debugging</a></li>
1596- <li class=""><a href="authors-charm-store.html">The Juju Charm Store</a></li>
1597- <li class=" sub"><a href="authors-charm-policy.html">Charm store policy</a></li>
1598- <li class=" sub"><a href="authors-charm-best-practice.html">Best practices</a></li>
1599- <li class=" sub"><a href="authors-charm-quality.html">Charm Quality Rating</a></li>
1600- <li class=" sub"><a href="authors-charm-icon.html">Charm Icons</a></li>
1601- <h1>Reference</h1>
1602- <ul>
1603- <li class="sub"><a href="commands.html">Juju commands</a></li>
1604- <li class="sub"><a href="glossary.html">Glossary</a></li>
1605- <li class="sub"><a href="contributing.html">Contribute to the Docs!</a></li>
1606- </ul>
1607- </nav>
1608- </div>
1609+ <div id="navlinks" class="grid-3 doc-navigation">LINKS</div>
1610 <div class="grid-9 doc-content">
1611 <article>
1612 <section id="config_aws">
1613@@ -114,10 +68,10 @@
1614 <p>This process requires you to have an Amazon Web Services (AWS) account. If you have not signed up for one yet, it can obtained at <a href="http://aws.amazon.com">http://aws.amazon.com</a>.</p>
1615 <p>You should start by generating a generic configuration file for Juju, using the command:
1616 <pre><code>juju generate-config -w</code></pre>
1617- <p>This will generate a file, <strong>environments.yaml</strong>, which will live in your <strong>~/.juju/</strong> directory (and will create the directory if it doesn't already exist).
1618+ <p>This will generate a file, <strong>environments.yaml</strong>, which will live in your <strong>~/.juju/</strong> directory (and will create the directory if it doesn't already exist).
1619 <p>The generic configuration sections generated for AWS will look something like this:</p>
1620 <pre><code>
1621-
1622+
1623 &nbsp;&nbsp;## https://juju.ubuntu.com/get-started/amazon/
1624 &nbsp;&nbsp;amazon:
1625 &nbsp;&nbsp;&nbsp;&nbsp;type: ec2
1626@@ -132,7 +86,7 @@
1627 &nbsp;&nbsp;&nbsp;&nbsp;# access-key: &LT;secret&GT;
1628 &nbsp;&nbsp;&nbsp;&nbsp;# Can be set via the env variable AWS_SECRET_ACCESS_KEY, or specified here
1629 &nbsp;&nbsp;&nbsp;&nbsp;# secret-key: &LT;secret&GT;
1630- </code></pre>
1631+ </code></pre>
1632
1633 <p>This is a simple configuration intended to run on EC2 with S3 permanent storage. Values for the default setting can be changed simply by editing this file, uncommenting the relevant lines and adding your own settings. All you need to do to get this configuration to work is to either set the <span class="pre">AWS_ACCESS_KEY_ID</span> and <span class="pre">AWS_SECRET_ACCESS_KEY</span> via environment variables, or uncomment and add the values to the configuration file.</p>
1634 <p>You can retrieve these values easily from your AWS Management Console at <a href="http://console.aws.amazon.com">http://console.aws.amazon.com</a>. Click on your name in the top-right and then the "Security Credentials" link from the drop down menu.</p>
1635@@ -142,7 +96,7 @@
1636
1637 <p>The <strong>region:</strong> value corresponds to the AWS regions.</p>
1638 </section>
1639-
1640+
1641 </article>
1642 </div>
1643 </div>
1644@@ -206,5 +160,13 @@
1645 <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script>
1646 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
1647 <script type="text/javascript" src="js/main.js"></script>
1648+ <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
1649+
1650+ <script>
1651+ $("#navlinks").load("navigation.html");
1652+ </script>
1653+
1654 </body>
1655 </html>
1656+
1657+
1658
1659=== modified file 'htmldocs/config-hpcloud.html'
1660--- htmldocs/config-hpcloud.html 2013-08-08 15:29:48 +0000
1661+++ htmldocs/config-hpcloud.html 2013-08-14 17:43:07 +0000
1662@@ -64,49 +64,7 @@
1663
1664 <section id="content" class="container-12">
1665 <div class="grid-12 doc-container">
1666- <div class="grid-3 doc-navigation">
1667- <nav role="navigation">
1668- <h1>User Guide</h1>
1669- <ul>
1670- <li class=""><a href="getting-started.html">Getting Started</a></li>
1671- <li class=" sub"><a href="getting-started.html#intro">Introduction</a></li>
1672- <li class=" sub"><a href="getting-started.html#install">Installation</a></li>
1673- <li class=" sub"><a href="config-aws.html">AWS Configuration</a></li>
1674- <li class=" sub"><a href="config-hpcloud.html">HP Cloud Configuration</a></li>
1675- <li class=" sub"><a href="config-openstack.html">OpenStack Configuration</a></li>
1676- <li class=" sub"><a href="config-maas.html">MAAS Configuration</a></li>
1677- <li class=" sub"><a href="getting-started.html#test">Testing your setup</a></li>
1678- <li class=""><a href="charms.html">Using Charms</a></li>
1679- <li class=" sub"><a href="charms.html#intro">What are Charms?</a></li>
1680- <li class=" sub"><a href="charms-deploying.html">Deploying Services</a></li>
1681- <li class=" sub"><a href="charms-constraints.html">Using constraints</a></li>
1682- <li class=" sub"><a href="charms-config.html">Service Configuration</a></li>
1683- <li class=" sub"><a href="charms-relations.html">Service Relationships</a></li>
1684- <li class=" sub"><a href="charms-exposing.html">Exposing Services</a></li>
1685- <li class=" sub"><a href="charms-scaling.html">Scaling Services</a></li>
1686- <li class=" sub"><a href="charms-destroy.html">Destroying Services</a></li>
1687- </ul>
1688- <h1>Charm Authors</h1>
1689- <ul></ul>
1690- <li class=""><a href="authors-charm-anatomy.html">Anatomy of a charm</a></li>
1691- <li class=""><a href="authors-charm-writing.html">Writing a charm</a></li>
1692- <li class=" sub"><a href="authors-subordinate-services.html">Subordinate services</a></li>
1693- <li class=" sub"><a href="authors-implicit-relations.html">Implicit Relations</a></li>
1694- <li class=" sub"><a href="authors-testing.html">Charm Testing</a></li>
1695- <li class=" sub"><a href="authors-hooks.html">Hook debugging</a></li>
1696- <li class=""><a href="authors-charm-store.html">The Juju Charm Store</a></li>
1697- <li class=" sub"><a href="authors-charm-policy.html">Charm store policy</a></li>
1698- <li class=" sub"><a href="authors-charm-best-practice.html">Best practices</a></li>
1699- <li class=" sub"><a href="authors-charm-quality.html">Charm Quality Rating</a></li>
1700- <li class=" sub"><a href="authors-charm-icon.html">Charm Icons</a></li>
1701- <h1>Reference</h1>
1702- <ul>
1703- <li class="sub"><a href="commands.html">Juju commands</a></li>
1704- <li class="sub"><a href="glossary.html">Glossary</a></li>
1705- <li class="sub"><a href="contributing.html">Contribute to the Docs!</a></li>
1706- </ul>
1707- </nav>
1708- </div>
1709+ <div id="navlinks" class="grid-3 doc-navigation">LINKS</div>
1710 <div class="grid-9 doc-content">
1711 <article>
1712 <section id="config_hpcloud">
1713@@ -217,5 +175,11 @@
1714 <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script>
1715 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
1716 <script type="text/javascript" src="js/main.js"></script>
1717+ <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
1718+
1719+ <script>
1720+ $("#navlinks").load("navigation.html");
1721+ </script>
1722+
1723 </body>
1724 </html>
1725
1726=== modified file 'htmldocs/config-maas.html'
1727--- htmldocs/config-maas.html 2013-08-08 15:29:48 +0000
1728+++ htmldocs/config-maas.html 2013-08-14 17:43:07 +0000
1729@@ -64,49 +64,7 @@
1730
1731 <section id="content" class="container-12">
1732 <div class="grid-12 doc-container">
1733- <div class="grid-3 doc-navigation">
1734- <nav role="navigation">
1735- <h1>User Guide</h1>
1736- <ul>
1737- <li class=""><a href="getting-started.html">Getting Started</a></li>
1738- <li class=" sub"><a href="getting-started.html#intro">Introduction</a></li>
1739- <li class=" sub"><a href="getting-started.html#install">Installation</a></li>
1740- <li class=" sub"><a href="config-aws.html">AWS Configuration</a></li>
1741- <li class=" sub"><a href="config-hpcloud.html">HP Cloud Configuration</a></li>
1742- <li class=" sub"><a href="config-openstack.html">OpenStack Configuration</a></li>
1743- <li class=" sub"><a href="config-maas.html">MAAS Configuration</a></li>
1744- <li class=" sub"><a href="getting-started.html#test">Testing your setup</a></li>
1745- <li class=""><a href="charms.html">Using Charms</a></li>
1746- <li class=" sub"><a href="charms.html#intro">What are Charms?</a></li>
1747- <li class=" sub"><a href="charms-deploying.html">Deploying Services</a></li>
1748- <li class=" sub"><a href="charms-constraints.html">Using constraints</a></li>
1749- <li class=" sub"><a href="charms-config.html">Service Configuration</a></li>
1750- <li class=" sub"><a href="charms-relations.html">Service Relationships</a></li>
1751- <li class=" sub"><a href="charms-exposing.html">Exposing Services</a></li>
1752- <li class=" sub"><a href="charms-scaling.html">Scaling Services</a></li>
1753- <li class=" sub"><a href="charms-destroy.html">Destroying Services</a></li>
1754- </ul>
1755- <h1>Charm Authors</h1>
1756- <ul></ul>
1757- <li class=""><a href="authors-charm-anatomy.html">Anatomy of a charm</a></li>
1758- <li class=""><a href="authors-charm-writing.html">Writing a charm</a></li>
1759- <li class=" sub"><a href="authors-subordinate-services.html">Subordinate services</a></li>
1760- <li class=" sub"><a href="authors-implicit-relations.html">Implicit Relations</a></li>
1761- <li class=" sub"><a href="authors-testing.html">Charm Testing</a></li>
1762- <li class=" sub"><a href="authors-hooks.html">Hook debugging</a></li>
1763- <li class=""><a href="authors-charm-store.html">The Juju Charm Store</a></li>
1764- <li class=" sub"><a href="authors-charm-policy.html">Charm store policy</a></li>
1765- <li class=" sub"><a href="authors-charm-best-practice.html">Best practices</a></li>
1766- <li class=" sub"><a href="authors-charm-quality.html">Charm Quality Rating</a></li>
1767- <li class=" sub"><a href="authors-charm-icon.html">Charm Icons</a></li>
1768- <h1>Reference</h1>
1769- <ul>
1770- <li class="sub"><a href="commands.html">Juju commands</a></li>
1771- <li class="sub"><a href="glossary.html">Glossary</a></li>
1772- <li class="sub"><a href="contributing.html">Contribute to the Docs!</a></li>
1773- </ul>
1774- </nav>
1775- </div>
1776+ <div id="navlinks" class="grid-3 doc-navigation">LINKS</div>
1777 <div class="grid-9 doc-content">
1778 <article>
1779 <section id="config_maas">
1780@@ -199,5 +157,11 @@
1781 <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script>
1782 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
1783 <script type="text/javascript" src="js/main.js"></script>
1784+ <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
1785+
1786+ <script>
1787+ $("#navlinks").load("navigation.html");
1788+ </script>
1789+
1790 </body>
1791 </html>
1792
1793=== modified file 'htmldocs/config-openstack.html'
1794--- htmldocs/config-openstack.html 2013-08-08 15:29:48 +0000
1795+++ htmldocs/config-openstack.html 2013-08-14 17:43:07 +0000
1796@@ -64,49 +64,7 @@
1797
1798 <section id="content" class="container-12">
1799 <div class="grid-12 doc-container">
1800- <div class="grid-3 doc-navigation">
1801- <nav role="navigation">
1802- <h1>User Guide</h1>
1803- <ul>
1804- <li class=""><a href="getting-started.html">Getting Started</a></li>
1805- <li class=" sub"><a href="getting-started.html#intro">Introduction</a></li>
1806- <li class=" sub"><a href="getting-started.html#install">Installation</a></li>
1807- <li class=" sub"><a href="config-aws.html">AWS Configuration</a></li>
1808- <li class=" sub"><a href="config-hpcloud.html">HP Cloud Configuration</a></li>
1809- <li class=" sub"><a href="config-openstack.html">OpenStack Configuration</a></li>
1810- <li class=" sub"><a href="config-maas.html">MAAS Configuration</a></li>
1811- <li class=" sub"><a href="getting-started.html#test">Testing your setup</a></li>
1812- <li class=""><a href="charms.html">Using Charms</a></li>
1813- <li class=" sub"><a href="charms.html#intro">What are Charms?</a></li>
1814- <li class=" sub"><a href="charms-deploying.html">Deploying Services</a></li>
1815- <li class=" sub"><a href="charms-constraints.html">Using constraints</a></li>
1816- <li class=" sub"><a href="charms-config.html">Service Configuration</a></li>
1817- <li class=" sub"><a href="charms-relations.html">Service Relationships</a></li>
1818- <li class=" sub"><a href="charms-exposing.html">Exposing Services</a></li>
1819- <li class=" sub"><a href="charms-scaling.html">Scaling Services</a></li>
1820- <li class=" sub"><a href="charms-destroy.html">Destroying Services</a></li>
1821- </ul>
1822- <h1>Charm Authors</h1>
1823- <ul></ul>
1824- <li class=""><a href="authors-charm-anatomy.html">Anatomy of a charm</a></li>
1825- <li class=""><a href="authors-charm-writing.html">Writing a charm</a></li>
1826- <li class=" sub"><a href="authors-subordinate-services.html">Subordinate services</a></li>
1827- <li class=" sub"><a href="authors-implicit-relations.html">Implicit Relations</a></li>
1828- <li class=" sub"><a href="authors-testing.html">Charm Testing</a></li>
1829- <li class=" sub"><a href="authors-hooks.html">Hook debugging</a></li>
1830- <li class=""><a href="authors-charm-store.html">The Juju Charm Store</a></li>
1831- <li class=" sub"><a href="authors-charm-policy.html">Charm store policy</a></li>
1832- <li class=" sub"><a href="authors-charm-best-practice.html">Best practices</a></li>
1833- <li class=" sub"><a href="authors-charm-quality.html">Charm Quality Rating</a></li>
1834- <li class=" sub"><a href="authors-charm-icon.html">Charm Icons</a></li>
1835- <h1>Reference</h1>
1836- <ul>
1837- <li class="sub"><a href="commands.html">Juju commands</a></li>
1838- <li class="sub"><a href="glossary.html">Glossary</a></li>
1839- <li class="sub"><a href="contributing.html">Contribute to the Docs!</a></li>
1840- </ul>
1841- </nav>
1842- </div>
1843+ <div id="navlinks" class="grid-3 doc-navigation">LINKS</div>
1844 <div class="grid-9 doc-content">
1845 <article>
1846 <section id="config_hpcloud">
1847@@ -210,5 +168,11 @@
1848 <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script>
1849 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
1850 <script type="text/javascript" src="js/main.js"></script>
1851+ <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
1852+
1853+ <script>
1854+ $("#navlinks").load("navigation.html");
1855+ </script>
1856+
1857 </body>
1858 </html>
1859
1860=== modified file 'htmldocs/contributing.html'
1861--- htmldocs/contributing.html 2013-08-08 15:29:48 +0000
1862+++ htmldocs/contributing.html 2013-08-14 17:43:07 +0000
1863@@ -64,49 +64,7 @@
1864
1865 <section id="content" class="container-12">
1866 <div class="grid-12 doc-container">
1867- <div class="grid-3 doc-navigation">
1868- <nav role="navigation">
1869- <h1>User Guide</h1>
1870- <ul>
1871- <li class=""><a href="getting-started.html">Getting Started</a></li>
1872- <li class=" sub"><a href="getting-started.html#intro">Introduction</a></li>
1873- <li class=" sub"><a href="getting-started.html#install">Installation</a></li>
1874- <li class=" sub"><a href="config-aws.html">AWS Configuration</a></li>
1875- <li class=" sub"><a href="config-hpcloud.html">HP Cloud Configuration</a></li>
1876- <li class=" sub"><a href="config-openstack.html">OpenStack Configuration</a></li>
1877- <li class=" sub"><a href="config-maas.html">MAAS Configuration</a></li>
1878- <li class=" sub"><a href="getting-started.html#test">Testing your setup</a></li>
1879- <li class=""><a href="charms.html">Using Charms</a></li>
1880- <li class=" sub"><a href="charms.html#intro">What are Charms?</a></li>
1881- <li class=" sub"><a href="charms-deploying.html">Deploying Services</a></li>
1882- <li class=" sub"><a href="charms-constraints.html">Using constraints</a></li>
1883- <li class=" sub"><a href="charms-config.html">Service Configuration</a></li>
1884- <li class=" sub"><a href="charms-relations.html">Service Relationships</a></li>
1885- <li class=" sub"><a href="charms-exposing.html">Exposing Services</a></li>
1886- <li class=" sub"><a href="charms-scaling.html">Scaling Services</a></li>
1887- <li class=" sub"><a href="charms-destroy.html">Destroying Services</a></li>
1888- </ul>
1889- <h1>Charm Authors</h1>
1890- <ul></ul>
1891- <li class=""><a href="authors-charm-anatomy.html">Anatomy of a charm</a></li>
1892- <li class=""><a href="authors-charm-writing.html">Writing a charm</a></li>
1893- <li class=" sub"><a href="authors-subordinate-services.html">Subordinate services</a></li>
1894- <li class=" sub"><a href="authors-implicit-relations.html">Implicit Relations</a></li>
1895- <li class=" sub"><a href="authors-testing.html">Charm Testing</a></li>
1896- <li class=" sub"><a href="authors-hooks.html">Hook debugging</a></li>
1897- <li class=""><a href="authors-charm-store.html">The Juju Charm Store</a></li>
1898- <li class=" sub"><a href="authors-charm-policy.html">Charm store policy</a></li>
1899- <li class=" sub"><a href="authors-charm-best-practice.html">Best practices</a></li>
1900- <li class=" sub"><a href="authors-charm-quality.html">Charm Quality Rating</a></li>
1901- <li class=" sub"><a href="authors-charm-icon.html">Charm Icons</a></li>
1902- <h1>Reference</h1>
1903- <ul>
1904- <li class="sub"><a href="commands.html">Juju commands</a></li>
1905- <li class="sub"><a href="glossary.html">Glossary</a></li>
1906- <li class="sub"><a href="contributing.html">Contribute to the Docs!</a></li>
1907- </ul>
1908- </nav>
1909- </div>
1910+ <div id="navlinks" class="grid-3 doc-navigation">LINKS</div>
1911 <div class="grid-9 doc-content">
1912 <article>
1913 <section id="contributing">
1914@@ -231,5 +189,11 @@
1915 <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script>
1916 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
1917 <script type="text/javascript" src="js/main.js"></script>
1918+ <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
1919+
1920+ <script>
1921+ $("#navlinks").load("navigation.html");
1922+ </script>
1923+
1924 </body>
1925 </html>
1926
1927=== modified file 'htmldocs/getting-started.html'
1928--- htmldocs/getting-started.html 2013-08-13 16:19:39 +0000
1929+++ htmldocs/getting-started.html 2013-08-14 17:43:07 +0000
1930@@ -64,49 +64,7 @@
1931
1932 <section id="content" class="container-12">
1933 <div class="grid-12 doc-container">
1934- <div class="grid-3 doc-navigation">
1935- <nav role="navigation">
1936- <h1>User Guide</h1>
1937- <ul>
1938- <li class="selected"><a href="getting-started.html">Getting Started</a></li>
1939- <li class=" sub"><a href="getting-started.html#intro">Introduction</a></li>
1940- <li class=" sub"><a href="getting-started.html#install">Installation</a></li>
1941- <li class=" sub"><a href="config-aws.html">AWS Configuration</a></li>
1942- <li class=" sub"><a href="config-hpcloud.html">HP Cloud Configuration</a></li>
1943- <li class=" sub"><a href="config-openstack.html">OpenStack Configuration</a></li>
1944- <li class=" sub"><a href="config-maas.html">MAAS Configuration</a></li>
1945- <li class=" sub"><a href="getting-started.html#test">Testing your setup</a></li>
1946- <li class=""><a href="charms.html">Using Charms</a></li>
1947- <li class=" sub"><a href="charms.html#intro">What are Charms?</a></li>
1948- <li class=" sub"><a href="charms-deploying.html">Deploying Services</a></li>
1949- <li class=" sub"><a href="charms-constraints.html">Using constraints</a></li>
1950- <li class=" sub"><a href="charms-config.html">Service Configuration</a></li>
1951- <li class=" sub"><a href="charms-relations.html">Service Relationships</a></li>
1952- <li class=" sub"><a href="charms-exposing.html">Exposing Services</a></li>
1953- <li class=" sub"><a href="charms-scaling.html">Scaling Services</a></li>
1954- <li class=" sub"><a href="charms-destroy.html">Destroying Services</a></li>
1955- </ul>
1956- <h1>Charm Authors</h1>
1957- <ul></ul>
1958- <li class=""><a href="authors-charm-anatomy.html">Anatomy of a charm</a></li>
1959- <li class=""><a href="authors-charm-writing.html">Writing a charm</a></li>
1960- <li class=" sub"><a href="authors-subordinate-services.html">Subordinate services</a></li>
1961- <li class=" sub"><a href="authors-implicit-relations.html">Implicit Relations</a></li>
1962- <li class=" sub"><a href="authors-testing.html">Charm Testing</a></li>
1963- <li class=" sub"><a href="authors-hooks.html">Hook debugging</a></li>
1964- <li class=""><a href="authors-charm-store.html">The Juju Charm Store</a></li>
1965- <li class=" sub"><a href="authors-charm-policy.html">Charm store policy</a></li>
1966- <li class=" sub"><a href="authors-charm-best-practice.html">Best practices</a></li>
1967- <li class=" sub"><a href="authors-charm-quality.html">Charm Quality Rating</a></li>
1968- <li class=" sub"><a href="authors-charm-icon.html">Charm Icons</a></li>
1969- <h1>Reference</h1>
1970- <ul>
1971- <li class="sub"><a href="commands.html">Juju commands</a></li>
1972- <li class="sub"><a href="glossary.html">Glossary</a></li>
1973- <li class="sub"><a href="contributing.html">Contribute to the Docs!</a></li>
1974- </ul>
1975- </nav>
1976- </div>
1977+ <div id="navlinks" class="grid-3 doc-navigation">LINKS</div>
1978 <div class="grid-9 doc-content">
1979 <article>
1980 <section id="intro">
1981@@ -325,5 +283,11 @@
1982 <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script>
1983 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
1984 <script type="text/javascript" src="js/main.js"></script>
1985+ <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
1986+
1987+ <script>
1988+ $("#navlinks").load("navigation.html");
1989+ </script>
1990+
1991 </body>
1992 </html>
1993
1994=== modified file 'htmldocs/glossary.html'
1995--- htmldocs/glossary.html 2013-08-08 15:29:48 +0000
1996+++ htmldocs/glossary.html 2013-08-14 17:43:07 +0000
1997@@ -64,49 +64,7 @@
1998
1999 <section id="content" class="container-12">
2000 <div class="grid-12 doc-container">
2001- <div class="grid-3 doc-navigation">
2002- <nav role="navigation">
2003- <h1>User Guide</h1>
2004- <ul>
2005- <li class=""><a href="getting-started.html">Getting Started</a></li>
2006- <li class=" sub"><a href="getting-started.html#intro">Introduction</a></li>
2007- <li class=" sub"><a href="getting-started.html#install">Installation</a></li>
2008- <li class=" sub"><a href="config-aws.html">AWS Configuration</a></li>
2009- <li class=" sub"><a href="config-hpcloud.html">HP Cloud Configuration</a></li>
2010- <li class=" sub"><a href="config-openstack.html">OpenStack Configuration</a></li>
2011- <li class=" sub"><a href="config-maas.html">MAAS Configuration</a></li>
2012- <li class=" sub"><a href="getting-started.html#test">Testing your setup</a></li>
2013- <li class=""><a href="charms.html">Using Charms</a></li>
2014- <li class=" sub"><a href="charms.html#intro">What are Charms?</a></li>
2015- <li class=" sub"><a href="charms-deploying.html">Deploying Services</a></li>
2016- <li class=" sub"><a href="charms-constraints.html">Using constraints</a></li>
2017- <li class=" sub"><a href="charms-config.html">Service Configuration</a></li>
2018- <li class=" sub"><a href="charms-relations.html">Service Relationships</a></li>
2019- <li class=" sub"><a href="charms-exposing.html">Exposing Services</a></li>
2020- <li class=" sub"><a href="charms-scaling.html">Scaling Services</a></li>
2021- <li class=" sub"><a href="charms-destroy.html">Destroying Services</a></li>
2022- </ul>
2023- <h1>Charm Authors</h1>
2024- <ul></ul>
2025- <li class=""><a href="authors-charm-anatomy.html">Anatomy of a charm</a></li>
2026- <li class=""><a href="authors-charm-writing.html">Writing a charm</a></li>
2027- <li class=" sub"><a href="authors-subordinate-services.html">Subordinate services</a></li>
2028- <li class=" sub"><a href="authors-implicit-relations.html">Implicit Relations</a></li>
2029- <li class=" sub"><a href="authors-testing.html">Charm Testing</a></li>
2030- <li class=" sub"><a href="authors-hooks.html">Hook debugging</a></li>
2031- <li class=""><a href="authors-charm-store.html">The Juju Charm Store</a></li>
2032- <li class=" sub"><a href="authors-charm-policy.html">Charm store policy</a></li>
2033- <li class=" sub"><a href="authors-charm-best-practice.html">Best practices</a></li>
2034- <li class=" sub"><a href="authors-charm-quality.html">Charm Quality Rating</a></li>
2035- <li class=" sub"><a href="authors-charm-icon.html">Charm Icons</a></li>
2036- <h1>Reference</h1>
2037- <ul>
2038- <li class="sub"><a href="commands.html">Juju commands</a></li>
2039- <li class="sub"><a href="glossary.html">Glossary</a></li>
2040- <li class="sub"><a href="contributing.html">Contribute to the Docs!</a></li>
2041- </ul>
2042- </nav>
2043- </div>
2044+ <div id="navlinks" class="grid-3 doc-navigation">LINKS</div>
2045 <div class="grid-9 doc-content">
2046 <article>
2047 <section id ="glossary">
2048@@ -224,5 +182,11 @@
2049 <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script>
2050 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
2051 <script type="text/javascript" src="js/main.js"></script>
2052+ <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
2053+
2054+ <script>
2055+ $("#navlinks").load("navigation.html");
2056+ </script>
2057+
2058 </body>
2059 </html>
2060
2061=== added file 'htmldocs/navigation.html'
2062--- htmldocs/navigation.html 1970-01-01 00:00:00 +0000
2063+++ htmldocs/navigation.html 2013-08-14 17:43:07 +0000
2064@@ -0,0 +1,39 @@
2065+ <h1>User Guide</h1>
2066+ <ul>
2067+ <li class=""><a href="getting-started.html">Getting Started</a></li>
2068+ <li class=" sub"><a href="getting-started.html#intro">Introduction</a></li>
2069+ <li class=" sub"><a href="getting-started.html#install">Installation</a></li>
2070+ <li class=" sub"><a href="config-aws.html">AWS Configuration</a></li>
2071+ <li class=" sub"><a href="config-hpcloud.html">HP Cloud Configuration</a></li>
2072+ <li class=" sub"><a href="config-openstack.html">OpenStack Configuration</a></li>
2073+ <li class=" sub"><a href="config-maas.html">MAAS Configuration</a></li>
2074+ <li class=" sub"><a href="getting-started.html#test">Testing your setup</a></li>
2075+ <li class=""><a href="charms.html">Using Charms</a></li>
2076+ <li class=" sub"><a href="charms.html#intro">What are Charms?</a></li>
2077+ <li class=" sub"><a href="charms-deploying.html">Deploying Services</a></li>
2078+ <li class=" sub"><a href="charms-constraints.html">Using constraints</a></li>
2079+ <li class=" sub"><a href="charms-config.html">Service Configuration</a></li>
2080+ <li class=" sub"><a href="charms-relations.html">Service Relationships</a></li>
2081+ <li class=" sub"><a href="charms-exposing.html">Exposing Services</a></li>
2082+ <li class=" sub"><a href="charms-scaling.html">Scaling Services</a></li>
2083+ <li class=" sub"><a href="charms-destroy.html">Destroying Services</a></li>
2084+ </ul>
2085+ <h1>Charm Authors</h1>
2086+ <ul></ul>
2087+ <li class=""><a href="authors-charm-anatomy.html">Anatomy of a charm</a></li>
2088+ <li class=""><a href="authors-charm-writing.html">Writing a charm</a></li>
2089+ <li class=" sub"><a href="authors-subordinate-services.html">Subordinate services</a></li>
2090+ <li class=" sub"><a href="authors-implicit-relations.html">Implicit Relations</a></li>
2091+ <li class=" sub"><a href="authors-testing.html">Charm Testing</a></li>
2092+ <li class=" sub"><a href="authors-hooks.html">Hook debugging</a></li>
2093+ <li class=""><a href="authors-charm-store.html">The Juju Charm Store</a></li>
2094+ <li class=" sub"><a href="authors-charm-policy.html">Charm store policy</a></li>
2095+ <li class=" sub"><a href="authors-charm-best-practice.html">Best practices</a></li>
2096+ <li class=" sub"><a href="authors-charm-quality.html">Charm Quality Rating</a></li>
2097+ <li class=" sub"><a href="authors-charm-icon.html">Charm Icons</a></li>
2098+ <h1>Reference</h1>
2099+ <ul>
2100+ <li class="sub"><a href="commands.html">Juju commands</a></li>
2101+ <li class="sub"><a href="glossary.html">Glossary</a></li>
2102+ <li class="sub"><a href="contributing.html">Contribute to the Docs!</a></li>
2103+ </ul>
2104
2105=== modified file 'htmldocs/navigation.json'
2106--- htmldocs/navigation.json 2013-08-08 15:29:48 +0000
2107+++ htmldocs/navigation.json 2013-08-14 17:43:07 +0000
2108@@ -31,7 +31,7 @@
2109 "Writing a Charm": {
2110 "link": "authors-charm-writing.html",
2111 "children": {
2112- "Charms in Action": "authors-charms-in-action.html",
2113+ "Charms in Action": "authors-charms-in-action.html",
2114 "Subordinate Services": "authors-subordinate-services.html",
2115 "Implicit Relations": "authors-implicit-relations.html",
2116 "Charm Testing": "authors-testing.html",

Subscribers

People subscribed via source and target branches