Merge lp:~marcoceppi/juju-core/doc-build into lp:juju-core/docs
- doc-build
- Merge into docs
Proposed by
Marco Ceppi
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merged at revision: | 27 | ||||
| Proposed branch: | lp:~marcoceppi/juju-core/doc-build | ||||
| Merge into: | lp:juju-core/docs | ||||
| Diff against target: |
6337 lines (+3274/-2380) 34 files modified
build.py (+61/-0) htmldocs/authors-charm-anatomy.html (+52/-52) htmldocs/authors-charm-best-practice.html (+107/-83) htmldocs/authors-charm-icon.html (+107/-83) htmldocs/authors-charm-policy.html (+107/-83) htmldocs/authors-charm-quality.html (+107/-83) htmldocs/authors-charm-store.html (+107/-83) htmldocs/authors-charm-writing.html (+107/-83) htmldocs/authors-hooks.html (+107/-83) htmldocs/authors-implicit-relations.html (+107/-83) htmldocs/authors-subordinate-services.html (+107/-83) htmldocs/authors-testing.html (+107/-83) htmldocs/charms-config.html (+107/-83) htmldocs/charms-constraints.html (+107/-83) htmldocs/charms-deploying.html (+107/-83) htmldocs/charms-destroy.html (+107/-83) htmldocs/charms-exposing.html (+107/-83) htmldocs/charms-relations.html (+107/-83) htmldocs/charms-scaling.html (+107/-83) htmldocs/charms-upgrading.html (+107/-83) htmldocs/charms.html (+108/-84) htmldocs/commands.html (+107/-83) htmldocs/config-aws.html (+107/-83) htmldocs/config-hpcloud.html (+107/-83) htmldocs/config-maas.html (+107/-83) htmldocs/config-openstack.html (+107/-83) htmldocs/contributing.html (+107/-83) htmldocs/getting-started.html (+109/-85) htmldocs/glossary.html (+107/-83) htmldocs/index.html (+108/-84) htmldocs/navigation.json (+56/-0) skel/footer.tpl (+54/-0) skel/head.tpl (+16/-0) skel/header.tpl (+35/-0) |
||||
| To merge this branch: | bzr merge lp:~marcoceppi/juju-core/doc-build | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Mark Mims (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Build script to mass replace large chunks of the docs
Description of the change
Adds a build script to replace head, header, footer on all doc pages.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === added file 'build.py' | |||
| 2 | --- build.py 1970-01-01 00:00:00 +0000 | |||
| 3 | +++ build.py 2013-07-13 18:35:28 +0000 | |||
| 4 | @@ -0,0 +1,61 @@ | |||
| 5 | 1 | #!/usr/bin/python | ||
| 6 | 2 | |||
| 7 | 3 | # Use this to build out a new header/footer or when you've updated javascript | ||
| 8 | 4 | # Don't use this if you've only updated content. | ||
| 9 | 5 | |||
| 10 | 6 | import os | ||
| 11 | 7 | import re | ||
| 12 | 8 | import sys | ||
| 13 | 9 | import glob | ||
| 14 | 10 | import json | ||
| 15 | 11 | import time | ||
| 16 | 12 | |||
| 17 | 13 | |||
| 18 | 14 | def page_title(page, source=None, itr=None): | ||
| 19 | 15 | if not source: | ||
| 20 | 16 | with open('htmldocs/navigation.json', 'r') as f: | ||
| 21 | 17 | source = json.loads(f.read()) | ||
| 22 | 18 | |||
| 23 | 19 | if 'link' in source: | ||
| 24 | 20 | if source['link'] == page: | ||
| 25 | 21 | return itr | ||
| 26 | 22 | |||
| 27 | 23 | for key, val in source.iteritems(): | ||
| 28 | 24 | if isinstance(val, dict): | ||
| 29 | 25 | code = page_title(page, val, key) | ||
| 30 | 26 | if code: | ||
| 31 | 27 | return code | ||
| 32 | 28 | |||
| 33 | 29 | if val == page: | ||
| 34 | 30 | return key | ||
| 35 | 31 | |||
| 36 | 32 | def fill_tpl(tpl, values={}): | ||
| 37 | 33 | for key, val in values.iteritems(): | ||
| 38 | 34 | tpl = tpl.replace('{{%s}}' % key.upper(), str(val)) | ||
| 39 | 35 | |||
| 40 | 36 | return tpl | ||
| 41 | 37 | |||
| 42 | 38 | if __name__ == '__main__': | ||
| 43 | 39 | if not os.path.exists(os.path.join(os.path.dirname(os.path.abspath(__file__)), 'skel')): | ||
| 44 | 40 | print "Couldn't find skeleton files" | ||
| 45 | 41 | sys.exit(1) | ||
| 46 | 42 | |||
| 47 | 43 | templates = glob.glob('skel/*.tpl') | ||
| 48 | 44 | docs = glob.glob('htmldocs/*.html') | ||
| 49 | 45 | timestamp = int(time.time()) | ||
| 50 | 46 | |||
| 51 | 47 | |||
| 52 | 48 | for template in templates: | ||
| 53 | 49 | with open(template, 'r') as f: | ||
| 54 | 50 | tpl = os.path.splitext(os.path.basename(template))[0] | ||
| 55 | 51 | tpl_file = f.read() | ||
| 56 | 52 | chop = re.compile('<%s>.*?</%s>' % (tpl, tpl), re.DOTALL) | ||
| 57 | 53 | for doc in docs: | ||
| 58 | 54 | with open(doc, 'r+') as d: | ||
| 59 | 55 | print "%s: %s" % (doc, tpl) | ||
| 60 | 56 | opts = {'PAGE': page_title(os.path.basename(doc)), | ||
| 61 | 57 | 'TIMESTAMP': timestamp} | ||
| 62 | 58 | new_html = chop.sub(fill_tpl(tpl_file, opts), d.read()) | ||
| 63 | 59 | d.seek(0) | ||
| 64 | 60 | d.write(new_html) | ||
| 65 | 61 | d.truncate() | ||
| 66 | 0 | 62 | ||
| 67 | === modified file 'htmldocs/authors-charm-anatomy.html' | |||
| 68 | --- htmldocs/authors-charm-anatomy.html 2013-07-11 20:41:29 +0000 | |||
| 69 | +++ htmldocs/authors-charm-anatomy.html 2013-07-13 18:35:28 +0000 | |||
| 70 | @@ -1,61 +1,61 @@ | |||
| 71 | 1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
| 72 | 2 | <html> | 2 | <html> |
| 73 | 3 | <head> | 3 | <head> |
| 92 | 4 | <meta charset="utf-8"> | 4 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> |
| 93 | 5 | <title>Juju Documentation - Contributing!</title> | 5 | <title>Juju Documentation - Anatomy of a Charm</title> |
| 94 | 6 | <link href="//fonts.googleapis.com/css?family=Ubuntu:400,400italic" rel="stylesheet" type="text/css"/> | 6 | <link href='https://fonts.googleapis.com/css?family=Ubuntu:400,300,300italic,400italic,700,700italic|Ubuntu+Mono' rel='stylesheet' type='text/css' /> |
| 95 | 7 | <link href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400" rel="stylesheet" type="text/css"/> | 7 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" /> |
| 96 | 8 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" rel="stylesheet" type="text/css"/> | 8 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" /> |
| 97 | 9 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" rel="stylesheet" type="text/css"/> | 9 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" /> |
| 98 | 10 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" rel="stylesheet" type="text/css"/> | 10 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/home-new.css" /> |
| 99 | 11 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/resources.css" rel="stylesheet" type="text/css"/> | 11 | <link rel='stylesheet' id='stacktack-css' href='//juju.ubuntu.com/wp-content/plugins/stacktack/css/stacktack.min.css?ver=3.4.2' type='text/css' media='all' /> |
| 100 | 12 | <link href="css/main.css" rel="stylesheet" type="text/css"/> | 12 | <link href="css/main.css?1373740025" rel="stylesheet" type="text/css"/> |
| 101 | 13 | <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script> | 13 | |
| 102 | 14 | <script src="http://app.stacktack.com/jquery.stacktack.min.js"></script> | 14 | <!--[if lt IE 9]> |
| 103 | 15 | <script type="text/javascript"> | 15 | <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script> |
| 104 | 16 | $(document).ready(function() { | 16 | <![endif]--> |
| 105 | 17 | $(document).stacktack(); | 17 | </head> |
| 106 | 18 | }); | 18 | <!-- DO NOT EDIT ABOVE THIS LINE --> |
| 107 | 19 | </script><!--[if lt IE 9]> | 19 | |
| 108 | 20 | <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script><![endif]--> | 20 | <!-- DO NOT EDIT ABOVE THIS LINE --> |
| 109 | 21 | </head> | 21 | |
| 110 | 22 | |||
| 111 | 22 | <body class="resources"> | 23 | <body class="resources"> |
| 114 | 23 | <header> | 24 | <header class="global clearfix" role="banner"> |
| 115 | 24 | <div class="header-login"> | 25 | <div class="header-navigation"> |
| 116 | 26 | <div> | ||
| 117 | 27 | <nav role="navigation"> | ||
| 118 | 25 | <ul> | 28 | <ul> |
| 120 | 26 | <li> </li> | 29 | <li class="page_item page-item-6"><a href="https://juju.ubuntu.com/">Home</a></li> |
| 121 | 30 | <li class="page_item page-item-7"><a href="https://juju.ubuntu.com/get-started/">Get started</a></li> | ||
| 122 | 31 | <li class="page_item page-item-9 current_page_item"><a href="https://juju.ubuntu.com/resources/">Resources</a></li> | ||
| 123 | 32 | <li class="page_item page-item-13"><a href="https://juju.ubuntu.com/community/">Community</a></li> | ||
| 124 | 33 | <li class="page_item page-item-3688"><a href="https://juju.ubuntu.com/charm-store/">Charm Store</a></li> | ||
| 125 | 34 | <li class="page_item page-item-3691"><a href="https://juju.ubuntu.com/events/">Events</a></li> | ||
| 126 | 35 | <li class="page_item page-item-4474"><a href="https://juju.ubuntu.com/charm-championship/">Charm Championship</a></li> | ||
| 127 | 36 | <li class="page_item page-item-4249"><a href="https://juju.ubuntu.com/survey/">Survey</a></li> | ||
| 128 | 37 | <li> | ||
| 129 | 38 | <form id="form-search" method="get" action="https://juju.ubuntu.com/"> | ||
| 130 | 39 | <fieldset> | ||
| 131 | 40 | <input id="input-search" type="text" name="s" value="Search" /> | ||
| 132 | 41 | </fieldset> | ||
| 133 | 42 | </form> | ||
| 134 | 43 | </li> | ||
| 135 | 27 | </ul> | 44 | </ul> |
| 167 | 28 | </div> | 45 | </nav> |
| 168 | 29 | <div class="header-navigation"> | 46 | </div> |
| 169 | 30 | <div> | 47 | </div> |
| 170 | 31 | <nav role="navigation"> | 48 | <div class="header-content"> |
| 171 | 32 | <ul> | 49 | <div class="clearfix"> |
| 172 | 33 | <li class="page_item"><a href="https://juju.ubuntu.com/">Home</a></li> | 50 | <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav"> |
| 173 | 34 | <li class="page_item current_page_item"><a href="https://juju.ubuntu.com/">Resources</a></li> | 51 | <div class="header-navigation-secondary"></div> |
| 174 | 35 | <li class="page_item"><a href="https://juju.ubuntu.com/">Community</a></li> | 52 | <div class="header-image"></div> |
| 175 | 36 | <li class="page_item"><a href="https://juju.ubuntu.com/">Charm Store</a></li> | 53 | <h1>Resources</h1> |
| 176 | 37 | <li class="page_item"><a href="https://juju.ubuntu.com/">Events</a></li> | 54 | <h2>A collection of some of the most important online references for Juju users and developers.</h2> |
| 177 | 38 | <li class="page_item"><a href="https://juju.ubuntu.com/">Survey</a></li> | 55 | </div> |
| 178 | 39 | <li> | 56 | </div> |
| 179 | 40 | <form id="form-search" method="get" action="/"> | 57 | </header> |
| 180 | 41 | <fieldset> | 58 | |
| 150 | 42 | <input id="input-search" type="text" name="s" value="Search"> | ||
| 151 | 43 | </fieldset> | ||
| 152 | 44 | </form> | ||
| 153 | 45 | </li> | ||
| 154 | 46 | </ul> | ||
| 155 | 47 | </nav><a href="https://juju.ubuntu.com/" class="logo-ubuntu"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/logo-ubuntu.png"></a> | ||
| 156 | 48 | </div> | ||
| 157 | 49 | </div> | ||
| 158 | 50 | <div class="header-content"> | ||
| 159 | 51 | <div class="clearfix"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav"> | ||
| 160 | 52 | <div class="header-navigation-secondary"></div> | ||
| 161 | 53 | <div class="header-image"></div> | ||
| 162 | 54 | <h1>Resources</h1> | ||
| 163 | 55 | <h2>A collection of some of the most important online references for Juju users and developers.</h2> | ||
| 164 | 56 | </div> | ||
| 165 | 57 | </div> | ||
| 166 | 58 | </header> | ||
| 181 | 59 | <section id="content" class="container-12"> | 59 | <section id="content" class="container-12"> |
| 182 | 60 | <div class="grid-12 doc-container"> | 60 | <div class="grid-12 doc-container"> |
| 183 | 61 | <div class="grid-3 doc-navigation"> | 61 | <div class="grid-3 doc-navigation"> |
| 184 | 62 | 62 | ||
| 185 | === modified file 'htmldocs/authors-charm-best-practice.html' | |||
| 186 | --- htmldocs/authors-charm-best-practice.html 2013-07-12 07:32:14 +0000 | |||
| 187 | +++ htmldocs/authors-charm-best-practice.html 2013-07-13 18:35:28 +0000 | |||
| 188 | @@ -1,56 +1,61 @@ | |||
| 189 | 1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
| 190 | 2 | <html> | 2 | <html> |
| 191 | 3 | <head> | 3 | <head> |
| 205 | 4 | <meta charset="utf-8"> | 4 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> |
| 206 | 5 | <title>Juju Documentation - Best Practice for Charm Authors</title> | 5 | <title>Juju Documentation - None</title> |
| 207 | 6 | <link href="//fonts.googleapis.com/css?family=Ubuntu:400,400italic" rel="stylesheet" type="text/css"/> | 6 | <link href='https://fonts.googleapis.com/css?family=Ubuntu:400,300,300italic,400italic,700,700italic|Ubuntu+Mono' rel='stylesheet' type='text/css' /> |
| 208 | 7 | <link href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400" rel="stylesheet" type="text/css"/> | 7 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" /> |
| 209 | 8 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" rel="stylesheet" type="text/css"/> | 8 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" /> |
| 210 | 9 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" rel="stylesheet" type="text/css"/> | 9 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" /> |
| 211 | 10 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" rel="stylesheet" type="text/css"/> | 10 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/home-new.css" /> |
| 212 | 11 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/resources.css" rel="stylesheet" type="text/css"/> | 11 | <link rel='stylesheet' id='stacktack-css' href='//juju.ubuntu.com/wp-content/plugins/stacktack/css/stacktack.min.css?ver=3.4.2' type='text/css' media='all' /> |
| 213 | 12 | <link href="css/main.css" rel="stylesheet" type="text/css"/> | 12 | <link href="css/main.css?1373740025" rel="stylesheet" type="text/css"/> |
| 214 | 13 | <!--[if lt IE 9]> | 13 | |
| 215 | 14 | <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script> | 14 | <!--[if lt IE 9]> |
| 216 | 15 | <![endif]--> | 15 | <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script> |
| 217 | 16 | </head> | 16 | <![endif]--> |
| 218 | 17 | </head> | ||
| 219 | 18 | <!-- DO NOT EDIT ABOVE THIS LINE --> | ||
| 220 | 19 | |||
| 221 | 20 | <!-- DO NOT EDIT ABOVE THIS LINE --> | ||
| 222 | 21 | |||
| 223 | 22 | |||
| 224 | 17 | <body class="resources"> | 23 | <body class="resources"> |
| 227 | 18 | <header> | 24 | <header class="global clearfix" role="banner"> |
| 228 | 19 | <div class="header-login"> | 25 | <div class="header-navigation"> |
| 229 | 26 | <div> | ||
| 230 | 27 | <nav role="navigation"> | ||
| 231 | 20 | <ul> | 28 | <ul> |
| 233 | 21 | <li> </li> | 29 | <li class="page_item page-item-6"><a href="https://juju.ubuntu.com/">Home</a></li> |
| 234 | 30 | <li class="page_item page-item-7"><a href="https://juju.ubuntu.com/get-started/">Get started</a></li> | ||
| 235 | 31 | <li class="page_item page-item-9 current_page_item"><a href="https://juju.ubuntu.com/resources/">Resources</a></li> | ||
| 236 | 32 | <li class="page_item page-item-13"><a href="https://juju.ubuntu.com/community/">Community</a></li> | ||
| 237 | 33 | <li class="page_item page-item-3688"><a href="https://juju.ubuntu.com/charm-store/">Charm Store</a></li> | ||
| 238 | 34 | <li class="page_item page-item-3691"><a href="https://juju.ubuntu.com/events/">Events</a></li> | ||
| 239 | 35 | <li class="page_item page-item-4474"><a href="https://juju.ubuntu.com/charm-championship/">Charm Championship</a></li> | ||
| 240 | 36 | <li class="page_item page-item-4249"><a href="https://juju.ubuntu.com/survey/">Survey</a></li> | ||
| 241 | 37 | <li> | ||
| 242 | 38 | <form id="form-search" method="get" action="https://juju.ubuntu.com/"> | ||
| 243 | 39 | <fieldset> | ||
| 244 | 40 | <input id="input-search" type="text" name="s" value="Search" /> | ||
| 245 | 41 | </fieldset> | ||
| 246 | 42 | </form> | ||
| 247 | 43 | </li> | ||
| 248 | 22 | </ul> | 44 | </ul> |
| 280 | 23 | </div> | 45 | </nav> |
| 281 | 24 | <div class="header-navigation"> | 46 | </div> |
| 282 | 25 | <div> | 47 | </div> |
| 283 | 26 | <nav role="navigation"> | 48 | <div class="header-content"> |
| 284 | 27 | <ul> | 49 | <div class="clearfix"> |
| 285 | 28 | <li class="page_item"><a href="https://juju.ubuntu.com/">Home</a></li> | 50 | <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav"> |
| 286 | 29 | <li class="page_item current_page_item"><a href="https://juju.ubuntu.com/">Resources</a></li> | 51 | <div class="header-navigation-secondary"></div> |
| 287 | 30 | <li class="page_item"><a href="https://juju.ubuntu.com/">Community</a></li> | 52 | <div class="header-image"></div> |
| 288 | 31 | <li class="page_item"><a href="https://juju.ubuntu.com/">Charm Store</a></li> | 53 | <h1>Resources</h1> |
| 289 | 32 | <li class="page_item"><a href="https://juju.ubuntu.com/">Events</a></li> | 54 | <h2>A collection of some of the most important online references for Juju users and developers.</h2> |
| 290 | 33 | <li class="page_item"><a href="https://juju.ubuntu.com/">Survey</a></li> | 55 | </div> |
| 291 | 34 | <li> | 56 | </div> |
| 292 | 35 | <form id="form-search" method="get" action="/"> | 57 | </header> |
| 293 | 36 | <fieldset> | 58 | |
| 263 | 37 | <input id="input-search" type="text" name="s" value="Search"> | ||
| 264 | 38 | </fieldset> | ||
| 265 | 39 | </form> | ||
| 266 | 40 | </li> | ||
| 267 | 41 | </ul> | ||
| 268 | 42 | </nav><a href="https://juju.ubuntu.com/" class="logo-ubuntu"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/logo-ubuntu.png"></a> | ||
| 269 | 43 | </div> | ||
| 270 | 44 | </div> | ||
| 271 | 45 | <div class="header-content"> | ||
| 272 | 46 | <div class="clearfix"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav"> | ||
| 273 | 47 | <div class="header-navigation-secondary"></div> | ||
| 274 | 48 | <div class="header-image"></div> | ||
| 275 | 49 | <h1>Resources</h1> | ||
| 276 | 50 | <h2>A collection of some of the most important online references for Juju users and developers.</h2> | ||
| 277 | 51 | </div> | ||
| 278 | 52 | </div> | ||
| 279 | 53 | </header> | ||
| 294 | 54 | <section id="content" class="container-12"> | 59 | <section id="content" class="container-12"> |
| 295 | 55 | <div class="grid-12 doc-container"> | 60 | <div class="grid-12 doc-container"> |
| 296 | 56 | <div class="grid-3 doc-navigation"> | 61 | <div class="grid-3 doc-navigation"> |
| 297 | @@ -167,43 +172,62 @@ | |||
| 298 | 167 | </div> | 172 | </div> |
| 299 | 168 | </section> | 173 | </section> |
| 300 | 169 | <div class="shadow"></div> | 174 | <div class="shadow"></div> |
| 336 | 170 | <footer> | 175 | <footer class="global clearfix" role="contentinfo"> |
| 337 | 171 | <div> | 176 | <div class="row"> |
| 338 | 172 | <nav role="navigation" class="clearfix"> | 177 | <div class="inner-wrapper"> |
| 339 | 173 | <ul> | 178 | <nav role="navigation" class="clearfix"> |
| 340 | 174 | <li><a href="https://juju.ubuntu.com/get-started">Get started</a></li> | 179 | <ul class="footer-a"> |
| 341 | 175 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li> | 180 | <li class="grid-3 first-col"> |
| 342 | 176 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li> | 181 | <h4><a href="/get-started">Get started</a></h4> |
| 343 | 177 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li> | 182 | <ul> |
| 344 | 178 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li> | 183 | <li class="page_item page-item-20"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li> |
| 345 | 179 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li> | 184 | <li class="page_item page-item-22"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li> |
| 346 | 180 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li> | 185 | <li class="page_item page-item-18"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li> |
| 347 | 181 | </ul> | 186 | <li class="page_item page-item-16"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li> |
| 348 | 182 | <ul> | 187 | <li class="page_item page-item-3596"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li> |
| 349 | 183 | <li><a href="https://juju.ubuntu.com/resources">Resources</a></li> | 188 | <li class="page_item page-item-3600"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li> |
| 350 | 184 | <li><a href="https://juju.ubuntu.com/docs">Documentation</a></li> | 189 | </ul> |
| 351 | 185 | <li><a href="https://juju.ubuntu.com/resources/videos">Videos</a></li> | 190 | </li> |
| 352 | 186 | <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI Demo</a></li> | 191 | <li class="grid-3"> |
| 353 | 187 | </ul> | 192 | <h4><a href="/resources">Resources</a></h4> |
| 354 | 188 | <ul> | 193 | <ul> |
| 355 | 189 | <li><a href="https://juju.ubuntu.com/community">Community</a></li> | 194 | <li><a href="http://juju.ubuntu.com/docs">Documentation</a></li> |
| 356 | 190 | <li class="page_item"><a href="https://juju.ubuntu.com/community/juju-blog/">Blog</a></li> | 195 | <li><a href="/resources/videos/">Videos</a></li> |
| 357 | 191 | <li class="page_item"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Charm Meetings</a></li> | 196 | <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI demo site</a></li> |
| 358 | 192 | <li class="page_item"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li> | 197 | </ul> |
| 359 | 193 | <li class="page_item"><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li> | 198 | </li> |
| 360 | 194 | <li class="page_item"><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li> | 199 | <li class="grid-3"> |
| 361 | 195 | <li class="page_item"><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&amp;pagesize=50">FAQ</a></li> | 200 | <h4><a href="/community">Community</a></h4> |
| 362 | 196 | </ul> | 201 | <ul> |
| 363 | 197 | <ul class="last"> | 202 | <li class="page_item page-item-28"><a href="https://juju.ubuntu.com/community/juju-blog/">Juju Blog</a></li> |
| 364 | 198 | <li><a href="https://launchpad.net/juju">Code</a></li> | 203 | <li class="page_item page-item-4262"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Weekly Charm Meeting</a></li> |
| 365 | 199 | <li><a href="https://launchpad.net/juju-core">Juju Core</a></li> | 204 | <li class="page_item page-item-4036"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li> |
| 366 | 200 | <li><a href="https://launchpad.net/charms">Charms</a></li> | 205 | <li><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li> |
| 367 | 201 | </ul> | 206 | <li><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li> |
| 368 | 202 | </nav> | 207 | <li><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&pagesize=50">FAQ</a></li> |
| 369 | 203 | </div> | 208 | </ul> |
| 370 | 204 | </footer> | 209 | </li> |
| 371 | 210 | <li class="grid-3 last-col"> | ||
| 372 | 211 | <h4><a href="https://launchpad.net/juju">Code</a></h4> | ||
| 373 | 212 | <ul> | ||
| 374 | 213 | <li><a href="https://launchpad.net/juju-core">Juju Core</a></li> | ||
| 375 | 214 | <li><a href="https://launchpad.net/charms">Charms</a></li> | ||
| 376 | 215 | </ul> | ||
| 377 | 216 | </li> | ||
| 378 | 217 | </ul> | ||
| 379 | 218 | </nav> | ||
| 380 | 219 | </div> | ||
| 381 | 220 | </div> | ||
| 382 | 221 | <div class="row no-border"> | ||
| 383 | 222 | <div class="legal inner-wrapper"> | ||
| 384 | 223 | <p>© 2013 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p> | ||
| 385 | 224 | <p><a href="https://bugs.launchpad.net/juju-website/+filebug">Report a bug on this site</a></p> | ||
| 386 | 225 | </div> | ||
| 387 | 226 | </div> | ||
| 388 | 227 | </footer> | ||
| 389 | 228 | |||
| 390 | 205 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script> | 229 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script> |
| 392 | 206 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.8.14/jquery-ui.min.js"></script> | 230 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script> |
| 393 | 207 | <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script> | 231 | <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script> |
| 394 | 208 | <script type="text/javascript" src="js/main.js"></script> | 232 | <script type="text/javascript" src="js/main.js"></script> |
| 395 | 209 | </body> | 233 | </body> |
| 396 | 210 | 234 | ||
| 397 | === modified file 'htmldocs/authors-charm-icon.html' | |||
| 398 | --- htmldocs/authors-charm-icon.html 2013-07-12 16:05:56 +0000 | |||
| 399 | +++ htmldocs/authors-charm-icon.html 2013-07-13 18:35:28 +0000 | |||
| 400 | @@ -1,56 +1,61 @@ | |||
| 401 | 1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
| 402 | 2 | <html> | 2 | <html> |
| 403 | 3 | <head> | 3 | <head> |
| 417 | 4 | <meta charset="utf-8"> | 4 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> |
| 418 | 5 | <title>Juju Documentation - charm icons</title> | 5 | <title>Juju Documentation - None</title> |
| 419 | 6 | <link href="//fonts.googleapis.com/css?family=Ubuntu:400,400italic" rel="stylesheet" type="text/css"/> | 6 | <link href='https://fonts.googleapis.com/css?family=Ubuntu:400,300,300italic,400italic,700,700italic|Ubuntu+Mono' rel='stylesheet' type='text/css' /> |
| 420 | 7 | <link href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400" rel="stylesheet" type="text/css"/> | 7 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" /> |
| 421 | 8 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" rel="stylesheet" type="text/css"/> | 8 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" /> |
| 422 | 9 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" rel="stylesheet" type="text/css"/> | 9 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" /> |
| 423 | 10 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" rel="stylesheet" type="text/css"/> | 10 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/home-new.css" /> |
| 424 | 11 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/resources.css" rel="stylesheet" type="text/css"/> | 11 | <link rel='stylesheet' id='stacktack-css' href='//juju.ubuntu.com/wp-content/plugins/stacktack/css/stacktack.min.css?ver=3.4.2' type='text/css' media='all' /> |
| 425 | 12 | <link href="css/main.css" rel="stylesheet" type="text/css"/> | 12 | <link href="css/main.css?1373740025" rel="stylesheet" type="text/css"/> |
| 426 | 13 | <!--[if lt IE 9]> | 13 | |
| 427 | 14 | <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script> | 14 | <!--[if lt IE 9]> |
| 428 | 15 | <![endif]--> | 15 | <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script> |
| 429 | 16 | </head> | 16 | <![endif]--> |
| 430 | 17 | </head> | ||
| 431 | 18 | <!-- DO NOT EDIT ABOVE THIS LINE --> | ||
| 432 | 19 | |||
| 433 | 20 | <!-- DO NOT EDIT ABOVE THIS LINE --> | ||
| 434 | 21 | |||
| 435 | 22 | |||
| 436 | 17 | <body class="resources"> | 23 | <body class="resources"> |
| 439 | 18 | <header> | 24 | <header class="global clearfix" role="banner"> |
| 440 | 19 | <div class="header-login"> | 25 | <div class="header-navigation"> |
| 441 | 26 | <div> | ||
| 442 | 27 | <nav role="navigation"> | ||
| 443 | 20 | <ul> | 28 | <ul> |
| 445 | 21 | <li> </li> | 29 | <li class="page_item page-item-6"><a href="https://juju.ubuntu.com/">Home</a></li> |
| 446 | 30 | <li class="page_item page-item-7"><a href="https://juju.ubuntu.com/get-started/">Get started</a></li> | ||
| 447 | 31 | <li class="page_item page-item-9 current_page_item"><a href="https://juju.ubuntu.com/resources/">Resources</a></li> | ||
| 448 | 32 | <li class="page_item page-item-13"><a href="https://juju.ubuntu.com/community/">Community</a></li> | ||
| 449 | 33 | <li class="page_item page-item-3688"><a href="https://juju.ubuntu.com/charm-store/">Charm Store</a></li> | ||
| 450 | 34 | <li class="page_item page-item-3691"><a href="https://juju.ubuntu.com/events/">Events</a></li> | ||
| 451 | 35 | <li class="page_item page-item-4474"><a href="https://juju.ubuntu.com/charm-championship/">Charm Championship</a></li> | ||
| 452 | 36 | <li class="page_item page-item-4249"><a href="https://juju.ubuntu.com/survey/">Survey</a></li> | ||
| 453 | 37 | <li> | ||
| 454 | 38 | <form id="form-search" method="get" action="https://juju.ubuntu.com/"> | ||
| 455 | 39 | <fieldset> | ||
| 456 | 40 | <input id="input-search" type="text" name="s" value="Search" /> | ||
| 457 | 41 | </fieldset> | ||
| 458 | 42 | </form> | ||
| 459 | 43 | </li> | ||
| 460 | 22 | </ul> | 44 | </ul> |
| 492 | 23 | </div> | 45 | </nav> |
| 493 | 24 | <div class="header-navigation"> | 46 | </div> |
| 494 | 25 | <div> | 47 | </div> |
| 495 | 26 | <nav role="navigation"> | 48 | <div class="header-content"> |
| 496 | 27 | <ul> | 49 | <div class="clearfix"> |
| 497 | 28 | <li class="page_item"><a href="https://juju.ubuntu.com/">Home</a></li> | 50 | <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav"> |
| 498 | 29 | <li class="page_item current_page_item"><a href="https://juju.ubuntu.com/">Resources</a></li> | 51 | <div class="header-navigation-secondary"></div> |
| 499 | 30 | <li class="page_item"><a href="https://juju.ubuntu.com/">Community</a></li> | 52 | <div class="header-image"></div> |
| 500 | 31 | <li class="page_item"><a href="https://juju.ubuntu.com/">Charm Store</a></li> | 53 | <h1>Resources</h1> |
| 501 | 32 | <li class="page_item"><a href="https://juju.ubuntu.com/">Events</a></li> | 54 | <h2>A collection of some of the most important online references for Juju users and developers.</h2> |
| 502 | 33 | <li class="page_item"><a href="https://juju.ubuntu.com/">Survey</a></li> | 55 | </div> |
| 503 | 34 | <li> | 56 | </div> |
| 504 | 35 | <form id="form-search" method="get" action="/"> | 57 | </header> |
| 505 | 36 | <fieldset> | 58 | |
| 475 | 37 | <input id="input-search" type="text" name="s" value="Search"> | ||
| 476 | 38 | </fieldset> | ||
| 477 | 39 | </form> | ||
| 478 | 40 | </li> | ||
| 479 | 41 | </ul> | ||
| 480 | 42 | </nav><a href="https://juju.ubuntu.com/" class="logo-ubuntu"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/logo-ubuntu.png"></a> | ||
| 481 | 43 | </div> | ||
| 482 | 44 | </div> | ||
| 483 | 45 | <div class="header-content"> | ||
| 484 | 46 | <div class="clearfix"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav"> | ||
| 485 | 47 | <div class="header-navigation-secondary"></div> | ||
| 486 | 48 | <div class="header-image"></div> | ||
| 487 | 49 | <h1>Resources</h1> | ||
| 488 | 50 | <h2>A collection of some of the most important online references for Juju users and developers.</h2> | ||
| 489 | 51 | </div> | ||
| 490 | 52 | </div> | ||
| 491 | 53 | </header> | ||
| 506 | 54 | <section id="content" class="container-12"> | 59 | <section id="content" class="container-12"> |
| 507 | 55 | <div class="grid-12 doc-container"> | 60 | <div class="grid-12 doc-container"> |
| 508 | 56 | <div class="grid-3 doc-navigation"> | 61 | <div class="grid-3 doc-navigation"> |
| 509 | @@ -190,43 +195,62 @@ | |||
| 510 | 190 | </div> | 195 | </div> |
| 511 | 191 | </section> | 196 | </section> |
| 512 | 192 | <div class="shadow"></div> | 197 | <div class="shadow"></div> |
| 548 | 193 | <footer> | 198 | <footer class="global clearfix" role="contentinfo"> |
| 549 | 194 | <div> | 199 | <div class="row"> |
| 550 | 195 | <nav role="navigation" class="clearfix"> | 200 | <div class="inner-wrapper"> |
| 551 | 196 | <ul> | 201 | <nav role="navigation" class="clearfix"> |
| 552 | 197 | <li><a href="https://juju.ubuntu.com/get-started">Get started</a></li> | 202 | <ul class="footer-a"> |
| 553 | 198 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li> | 203 | <li class="grid-3 first-col"> |
| 554 | 199 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li> | 204 | <h4><a href="/get-started">Get started</a></h4> |
| 555 | 200 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li> | 205 | <ul> |
| 556 | 201 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li> | 206 | <li class="page_item page-item-20"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li> |
| 557 | 202 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li> | 207 | <li class="page_item page-item-22"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li> |
| 558 | 203 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li> | 208 | <li class="page_item page-item-18"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li> |
| 559 | 204 | </ul> | 209 | <li class="page_item page-item-16"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li> |
| 560 | 205 | <ul> | 210 | <li class="page_item page-item-3596"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li> |
| 561 | 206 | <li><a href="https://juju.ubuntu.com/resources">Resources</a></li> | 211 | <li class="page_item page-item-3600"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li> |
| 562 | 207 | <li><a href="https://juju.ubuntu.com/docs">Documentation</a></li> | 212 | </ul> |
| 563 | 208 | <li><a href="https://juju.ubuntu.com/resources/videos">Videos</a></li> | 213 | </li> |
| 564 | 209 | <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI Demo</a></li> | 214 | <li class="grid-3"> |
| 565 | 210 | </ul> | 215 | <h4><a href="/resources">Resources</a></h4> |
| 566 | 211 | <ul> | 216 | <ul> |
| 567 | 212 | <li><a href="https://juju.ubuntu.com/community">Community</a></li> | 217 | <li><a href="http://juju.ubuntu.com/docs">Documentation</a></li> |
| 568 | 213 | <li class="page_item"><a href="https://juju.ubuntu.com/community/juju-blog/">Blog</a></li> | 218 | <li><a href="/resources/videos/">Videos</a></li> |
| 569 | 214 | <li class="page_item"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Charm Meetings</a></li> | 219 | <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI demo site</a></li> |
| 570 | 215 | <li class="page_item"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li> | 220 | </ul> |
| 571 | 216 | <li class="page_item"><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li> | 221 | </li> |
| 572 | 217 | <li class="page_item"><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li> | 222 | <li class="grid-3"> |
| 573 | 218 | <li class="page_item"><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&amp;pagesize=50">FAQ</a></li> | 223 | <h4><a href="/community">Community</a></h4> |
| 574 | 219 | </ul> | 224 | <ul> |
| 575 | 220 | <ul class="last"> | 225 | <li class="page_item page-item-28"><a href="https://juju.ubuntu.com/community/juju-blog/">Juju Blog</a></li> |
| 576 | 221 | <li><a href="https://launchpad.net/juju">Code</a></li> | 226 | <li class="page_item page-item-4262"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Weekly Charm Meeting</a></li> |
| 577 | 222 | <li><a href="https://launchpad.net/juju-core">Juju Core</a></li> | 227 | <li class="page_item page-item-4036"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li> |
| 578 | 223 | <li><a href="https://launchpad.net/charms">Charms</a></li> | 228 | <li><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li> |
| 579 | 224 | </ul> | 229 | <li><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li> |
| 580 | 225 | </nav> | 230 | <li><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&pagesize=50">FAQ</a></li> |
| 581 | 226 | </div> | 231 | </ul> |
| 582 | 227 | </footer> | 232 | </li> |
| 583 | 233 | <li class="grid-3 last-col"> | ||
| 584 | 234 | <h4><a href="https://launchpad.net/juju">Code</a></h4> | ||
| 585 | 235 | <ul> | ||
| 586 | 236 | <li><a href="https://launchpad.net/juju-core">Juju Core</a></li> | ||
| 587 | 237 | <li><a href="https://launchpad.net/charms">Charms</a></li> | ||
| 588 | 238 | </ul> | ||
| 589 | 239 | </li> | ||
| 590 | 240 | </ul> | ||
| 591 | 241 | </nav> | ||
| 592 | 242 | </div> | ||
| 593 | 243 | </div> | ||
| 594 | 244 | <div class="row no-border"> | ||
| 595 | 245 | <div class="legal inner-wrapper"> | ||
| 596 | 246 | <p>© 2013 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p> | ||
| 597 | 247 | <p><a href="https://bugs.launchpad.net/juju-website/+filebug">Report a bug on this site</a></p> | ||
| 598 | 248 | </div> | ||
| 599 | 249 | </div> | ||
| 600 | 250 | </footer> | ||
| 601 | 251 | |||
| 602 | 228 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script> | 252 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script> |
| 604 | 229 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.8.14/jquery-ui.min.js"></script> | 253 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script> |
| 605 | 230 | <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script> | 254 | <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script> |
| 606 | 231 | <script type="text/javascript" src="js/main.js"></script> | 255 | <script type="text/javascript" src="js/main.js"></script> |
| 607 | 232 | </body> | 256 | </body> |
| 608 | 233 | 257 | ||
| 609 | === modified file 'htmldocs/authors-charm-policy.html' | |||
| 610 | --- htmldocs/authors-charm-policy.html 2013-07-12 07:32:14 +0000 | |||
| 611 | +++ htmldocs/authors-charm-policy.html 2013-07-13 18:35:28 +0000 | |||
| 612 | @@ -1,56 +1,61 @@ | |||
| 613 | 1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
| 614 | 2 | <html> | 2 | <html> |
| 615 | 3 | <head> | 3 | <head> |
| 629 | 4 | <meta charset="utf-8"> | 4 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> |
| 630 | 5 | <title>Juju Documentation - Charm Store Policy</title> | 5 | <title>Juju Documentation - Charm Store Policy</title> |
| 631 | 6 | <link href="//fonts.googleapis.com/css?family=Ubuntu:400,400italic" rel="stylesheet" type="text/css"/> | 6 | <link href='https://fonts.googleapis.com/css?family=Ubuntu:400,300,300italic,400italic,700,700italic|Ubuntu+Mono' rel='stylesheet' type='text/css' /> |
| 632 | 7 | <link href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400" rel="stylesheet" type="text/css"/> | 7 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" /> |
| 633 | 8 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" rel="stylesheet" type="text/css"/> | 8 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" /> |
| 634 | 9 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" rel="stylesheet" type="text/css"/> | 9 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" /> |
| 635 | 10 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" rel="stylesheet" type="text/css"/> | 10 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/home-new.css" /> |
| 636 | 11 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/resources.css" rel="stylesheet" type="text/css"/> | 11 | <link rel='stylesheet' id='stacktack-css' href='//juju.ubuntu.com/wp-content/plugins/stacktack/css/stacktack.min.css?ver=3.4.2' type='text/css' media='all' /> |
| 637 | 12 | <link href="css/main.css" rel="stylesheet" type="text/css"/> | 12 | <link href="css/main.css?1373740025" rel="stylesheet" type="text/css"/> |
| 638 | 13 | <!--[if lt IE 9]> | 13 | |
| 639 | 14 | <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script> | 14 | <!--[if lt IE 9]> |
| 640 | 15 | <![endif]--> | 15 | <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script> |
| 641 | 16 | </head> | 16 | <![endif]--> |
| 642 | 17 | </head> | ||
| 643 | 18 | <!-- DO NOT EDIT ABOVE THIS LINE --> | ||
| 644 | 19 | |||
| 645 | 20 | <!-- DO NOT EDIT ABOVE THIS LINE --> | ||
| 646 | 21 | |||
| 647 | 22 | |||
| 648 | 17 | <body class="resources"> | 23 | <body class="resources"> |
| 651 | 18 | <header> | 24 | <header class="global clearfix" role="banner"> |
| 652 | 19 | <div class="header-login"> | 25 | <div class="header-navigation"> |
| 653 | 26 | <div> | ||
| 654 | 27 | <nav role="navigation"> | ||
| 655 | 20 | <ul> | 28 | <ul> |
| 657 | 21 | <li> </li> | 29 | <li class="page_item page-item-6"><a href="https://juju.ubuntu.com/">Home</a></li> |
| 658 | 30 | <li class="page_item page-item-7"><a href="https://juju.ubuntu.com/get-started/">Get started</a></li> | ||
| 659 | 31 | <li class="page_item page-item-9 current_page_item"><a href="https://juju.ubuntu.com/resources/">Resources</a></li> | ||
| 660 | 32 | <li class="page_item page-item-13"><a href="https://juju.ubuntu.com/community/">Community</a></li> | ||
| 661 | 33 | <li class="page_item page-item-3688"><a href="https://juju.ubuntu.com/charm-store/">Charm Store</a></li> | ||
| 662 | 34 | <li class="page_item page-item-3691"><a href="https://juju.ubuntu.com/events/">Events</a></li> | ||
| 663 | 35 | <li class="page_item page-item-4474"><a href="https://juju.ubuntu.com/charm-championship/">Charm Championship</a></li> | ||
| 664 | 36 | <li class="page_item page-item-4249"><a href="https://juju.ubuntu.com/survey/">Survey</a></li> | ||
| 665 | 37 | <li> | ||
| 666 | 38 | <form id="form-search" method="get" action="https://juju.ubuntu.com/"> | ||
| 667 | 39 | <fieldset> | ||
| 668 | 40 | <input id="input-search" type="text" name="s" value="Search" /> | ||
| 669 | 41 | </fieldset> | ||
| 670 | 42 | </form> | ||
| 671 | 43 | </li> | ||
| 672 | 22 | </ul> | 44 | </ul> |
| 704 | 23 | </div> | 45 | </nav> |
| 705 | 24 | <div class="header-navigation"> | 46 | </div> |
| 706 | 25 | <div> | 47 | </div> |
| 707 | 26 | <nav role="navigation"> | 48 | <div class="header-content"> |
| 708 | 27 | <ul> | 49 | <div class="clearfix"> |
| 709 | 28 | <li class="page_item"><a href="https://juju.ubuntu.com/">Home</a></li> | 50 | <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav"> |
| 710 | 29 | <li class="page_item current_page_item"><a href="https://juju.ubuntu.com/">Resources</a></li> | 51 | <div class="header-navigation-secondary"></div> |
| 711 | 30 | <li class="page_item"><a href="https://juju.ubuntu.com/">Community</a></li> | 52 | <div class="header-image"></div> |
| 712 | 31 | <li class="page_item"><a href="https://juju.ubuntu.com/">Charm Store</a></li> | 53 | <h1>Resources</h1> |
| 713 | 32 | <li class="page_item"><a href="https://juju.ubuntu.com/">Events</a></li> | 54 | <h2>A collection of some of the most important online references for Juju users and developers.</h2> |
| 714 | 33 | <li class="page_item"><a href="https://juju.ubuntu.com/">Survey</a></li> | 55 | </div> |
| 715 | 34 | <li> | 56 | </div> |
| 716 | 35 | <form id="form-search" method="get" action="/"> | 57 | </header> |
| 717 | 36 | <fieldset> | 58 | |
| 687 | 37 | <input id="input-search" type="text" name="s" value="Search"> | ||
| 688 | 38 | </fieldset> | ||
| 689 | 39 | </form> | ||
| 690 | 40 | </li> | ||
| 691 | 41 | </ul> | ||
| 692 | 42 | </nav><a href="https://juju.ubuntu.com/" class="logo-ubuntu"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/logo-ubuntu.png"></a> | ||
| 693 | 43 | </div> | ||
| 694 | 44 | </div> | ||
| 695 | 45 | <div class="header-content"> | ||
| 696 | 46 | <div class="clearfix"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav"> | ||
| 697 | 47 | <div class="header-navigation-secondary"></div> | ||
| 698 | 48 | <div class="header-image"></div> | ||
| 699 | 49 | <h1>Resources</h1> | ||
| 700 | 50 | <h2>A collection of some of the most important online references for Juju users and developers.</h2> | ||
| 701 | 51 | </div> | ||
| 702 | 52 | </div> | ||
| 703 | 53 | </header> | ||
| 718 | 54 | <section id="content" class="container-12"> | 59 | <section id="content" class="container-12"> |
| 719 | 55 | <div class="grid-12 doc-container"> | 60 | <div class="grid-12 doc-container"> |
| 720 | 56 | <div class="grid-3 doc-navigation"> | 61 | <div class="grid-3 doc-navigation"> |
| 721 | @@ -161,43 +166,62 @@ | |||
| 722 | 161 | </div> | 166 | </div> |
| 723 | 162 | </section> | 167 | </section> |
| 724 | 163 | <div class="shadow"></div> | 168 | <div class="shadow"></div> |
| 760 | 164 | <footer> | 169 | <footer class="global clearfix" role="contentinfo"> |
| 761 | 165 | <div> | 170 | <div class="row"> |
| 762 | 166 | <nav role="navigation" class="clearfix"> | 171 | <div class="inner-wrapper"> |
| 763 | 167 | <ul> | 172 | <nav role="navigation" class="clearfix"> |
| 764 | 168 | <li><a href="https://juju.ubuntu.com/get-started">Get started</a></li> | 173 | <ul class="footer-a"> |
| 765 | 169 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li> | 174 | <li class="grid-3 first-col"> |
| 766 | 170 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li> | 175 | <h4><a href="/get-started">Get started</a></h4> |
| 767 | 171 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li> | 176 | <ul> |
| 768 | 172 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li> | 177 | <li class="page_item page-item-20"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li> |
| 769 | 173 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li> | 178 | <li class="page_item page-item-22"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li> |
| 770 | 174 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li> | 179 | <li class="page_item page-item-18"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li> |
| 771 | 175 | </ul> | 180 | <li class="page_item page-item-16"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li> |
| 772 | 176 | <ul> | 181 | <li class="page_item page-item-3596"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li> |
| 773 | 177 | <li><a href="https://juju.ubuntu.com/resources">Resources</a></li> | 182 | <li class="page_item page-item-3600"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li> |
| 774 | 178 | <li><a href="https://juju.ubuntu.com/docs">Documentation</a></li> | 183 | </ul> |
| 775 | 179 | <li><a href="https://juju.ubuntu.com/resources/videos">Videos</a></li> | 184 | </li> |
| 776 | 180 | <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI Demo</a></li> | 185 | <li class="grid-3"> |
| 777 | 181 | </ul> | 186 | <h4><a href="/resources">Resources</a></h4> |
| 778 | 182 | <ul> | 187 | <ul> |
| 779 | 183 | <li><a href="https://juju.ubuntu.com/community">Community</a></li> | 188 | <li><a href="http://juju.ubuntu.com/docs">Documentation</a></li> |
| 780 | 184 | <li class="page_item"><a href="https://juju.ubuntu.com/community/juju-blog/">Blog</a></li> | 189 | <li><a href="/resources/videos/">Videos</a></li> |
| 781 | 185 | <li class="page_item"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Charm Meetings</a></li> | 190 | <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI demo site</a></li> |
| 782 | 186 | <li class="page_item"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li> | 191 | </ul> |
| 783 | 187 | <li class="page_item"><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li> | 192 | </li> |
| 784 | 188 | <li class="page_item"><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li> | 193 | <li class="grid-3"> |
| 785 | 189 | <li class="page_item"><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&amp;pagesize=50">FAQ</a></li> | 194 | <h4><a href="/community">Community</a></h4> |
| 786 | 190 | </ul> | 195 | <ul> |
| 787 | 191 | <ul class="last"> | 196 | <li class="page_item page-item-28"><a href="https://juju.ubuntu.com/community/juju-blog/">Juju Blog</a></li> |
| 788 | 192 | <li><a href="https://launchpad.net/juju">Code</a></li> | 197 | <li class="page_item page-item-4262"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Weekly Charm Meeting</a></li> |
| 789 | 193 | <li><a href="https://launchpad.net/juju-core">Juju Core</a></li> | 198 | <li class="page_item page-item-4036"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li> |
| 790 | 194 | <li><a href="https://launchpad.net/charms">Charms</a></li> | 199 | <li><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li> |
| 791 | 195 | </ul> | 200 | <li><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li> |
| 792 | 196 | </nav> | 201 | <li><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&pagesize=50">FAQ</a></li> |
| 793 | 197 | </div> | 202 | </ul> |
| 794 | 198 | </footer> | 203 | </li> |
| 795 | 204 | <li class="grid-3 last-col"> | ||
| 796 | 205 | <h4><a href="https://launchpad.net/juju">Code</a></h4> | ||
| 797 | 206 | <ul> | ||
| 798 | 207 | <li><a href="https://launchpad.net/juju-core">Juju Core</a></li> | ||
| 799 | 208 | <li><a href="https://launchpad.net/charms">Charms</a></li> | ||
| 800 | 209 | </ul> | ||
| 801 | 210 | </li> | ||
| 802 | 211 | </ul> | ||
| 803 | 212 | </nav> | ||
| 804 | 213 | </div> | ||
| 805 | 214 | </div> | ||
| 806 | 215 | <div class="row no-border"> | ||
| 807 | 216 | <div class="legal inner-wrapper"> | ||
| 808 | 217 | <p>© 2013 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p> | ||
| 809 | 218 | <p><a href="https://bugs.launchpad.net/juju-website/+filebug">Report a bug on this site</a></p> | ||
| 810 | 219 | </div> | ||
| 811 | 220 | </div> | ||
| 812 | 221 | </footer> | ||
| 813 | 222 | |||
| 814 | 199 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script> | 223 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script> |
| 816 | 200 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.8.14/jquery-ui.min.js"></script> | 224 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script> |
| 817 | 201 | <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script> | 225 | <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script> |
| 818 | 202 | <script type="text/javascript" src="js/main.js"></script> | 226 | <script type="text/javascript" src="js/main.js"></script> |
| 819 | 203 | </body> | 227 | </body> |
| 820 | 204 | 228 | ||
| 821 | === modified file 'htmldocs/authors-charm-quality.html' | |||
| 822 | --- htmldocs/authors-charm-quality.html 2013-07-12 00:12:30 +0000 | |||
| 823 | +++ htmldocs/authors-charm-quality.html 2013-07-13 18:35:28 +0000 | |||
| 824 | @@ -1,56 +1,61 @@ | |||
| 825 | 1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
| 826 | 2 | <html> | 2 | <html> |
| 827 | 3 | <head> | 3 | <head> |
| 841 | 4 | <meta charset="utf-8"> | 4 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> |
| 842 | 5 | <title>Juju Documentation - Authoring Charms</title> | 5 | <title>Juju Documentation - Charm Quality Rating</title> |
| 843 | 6 | <link href="//fonts.googleapis.com/css?family=Ubuntu:400,400italic" rel="stylesheet" type="text/css"/> | 6 | <link href='https://fonts.googleapis.com/css?family=Ubuntu:400,300,300italic,400italic,700,700italic|Ubuntu+Mono' rel='stylesheet' type='text/css' /> |
| 844 | 7 | <link href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400" rel="stylesheet" type="text/css"/> | 7 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" /> |
| 845 | 8 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" rel="stylesheet" type="text/css"/> | 8 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" /> |
| 846 | 9 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" rel="stylesheet" type="text/css"/> | 9 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" /> |
| 847 | 10 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" rel="stylesheet" type="text/css"/> | 10 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/home-new.css" /> |
| 848 | 11 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/resources.css" rel="stylesheet" type="text/css"/> | 11 | <link rel='stylesheet' id='stacktack-css' href='//juju.ubuntu.com/wp-content/plugins/stacktack/css/stacktack.min.css?ver=3.4.2' type='text/css' media='all' /> |
| 849 | 12 | <link href="css/main.css" rel="stylesheet" type="text/css"/> | 12 | <link href="css/main.css?1373740025" rel="stylesheet" type="text/css"/> |
| 850 | 13 | <!--[if lt IE 9]> | 13 | |
| 851 | 14 | <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script> | 14 | <!--[if lt IE 9]> |
| 852 | 15 | <![endif]--> | 15 | <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script> |
| 853 | 16 | </head> | 16 | <![endif]--> |
| 854 | 17 | </head> | ||
| 855 | 18 | <!-- DO NOT EDIT ABOVE THIS LINE --> | ||
| 856 | 19 | |||
| 857 | 20 | <!-- DO NOT EDIT ABOVE THIS LINE --> | ||
| 858 | 21 | |||
| 859 | 22 | |||
| 860 | 17 | <body class="resources"> | 23 | <body class="resources"> |
| 863 | 18 | <header> | 24 | <header class="global clearfix" role="banner"> |
| 864 | 19 | <div class="header-login"> | 25 | <div class="header-navigation"> |
| 865 | 26 | <div> | ||
| 866 | 27 | <nav role="navigation"> | ||
| 867 | 20 | <ul> | 28 | <ul> |
| 869 | 21 | <li> </li> | 29 | <li class="page_item page-item-6"><a href="https://juju.ubuntu.com/">Home</a></li> |
| 870 | 30 | <li class="page_item page-item-7"><a href="https://juju.ubuntu.com/get-started/">Get started</a></li> | ||
| 871 | 31 | <li class="page_item page-item-9 current_page_item"><a href="https://juju.ubuntu.com/resources/">Resources</a></li> | ||
| 872 | 32 | <li class="page_item page-item-13"><a href="https://juju.ubuntu.com/community/">Community</a></li> | ||
| 873 | 33 | <li class="page_item page-item-3688"><a href="https://juju.ubuntu.com/charm-store/">Charm Store</a></li> | ||
| 874 | 34 | <li class="page_item page-item-3691"><a href="https://juju.ubuntu.com/events/">Events</a></li> | ||
| 875 | 35 | <li class="page_item page-item-4474"><a href="https://juju.ubuntu.com/charm-championship/">Charm Championship</a></li> | ||
| 876 | 36 | <li class="page_item page-item-4249"><a href="https://juju.ubuntu.com/survey/">Survey</a></li> | ||
| 877 | 37 | <li> | ||
| 878 | 38 | <form id="form-search" method="get" action="https://juju.ubuntu.com/"> | ||
| 879 | 39 | <fieldset> | ||
| 880 | 40 | <input id="input-search" type="text" name="s" value="Search" /> | ||
| 881 | 41 | </fieldset> | ||
| 882 | 42 | </form> | ||
| 883 | 43 | </li> | ||
| 884 | 22 | </ul> | 44 | </ul> |
| 916 | 23 | </div> | 45 | </nav> |
| 917 | 24 | <div class="header-navigation"> | 46 | </div> |
| 918 | 25 | <div> | 47 | </div> |
| 919 | 26 | <nav role="navigation"> | 48 | <div class="header-content"> |
| 920 | 27 | <ul> | 49 | <div class="clearfix"> |
| 921 | 28 | <li class="page_item"><a href="https://juju.ubuntu.com/">Home</a></li> | 50 | <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav"> |
| 922 | 29 | <li class="page_item current_page_item"><a href="https://juju.ubuntu.com/">Resources</a></li> | 51 | <div class="header-navigation-secondary"></div> |
| 923 | 30 | <li class="page_item"><a href="https://juju.ubuntu.com/">Community</a></li> | 52 | <div class="header-image"></div> |
| 924 | 31 | <li class="page_item"><a href="https://juju.ubuntu.com/">Charm Store</a></li> | 53 | <h1>Resources</h1> |
| 925 | 32 | <li class="page_item"><a href="https://juju.ubuntu.com/">Events</a></li> | 54 | <h2>A collection of some of the most important online references for Juju users and developers.</h2> |
| 926 | 33 | <li class="page_item"><a href="https://juju.ubuntu.com/">Survey</a></li> | 55 | </div> |
| 927 | 34 | <li> | 56 | </div> |
| 928 | 35 | <form id="form-search" method="get" action="/"> | 57 | </header> |
| 929 | 36 | <fieldset> | 58 | |
| 899 | 37 | <input id="input-search" type="text" name="s" value="Search"> | ||
| 900 | 38 | </fieldset> | ||
| 901 | 39 | </form> | ||
| 902 | 40 | </li> | ||
| 903 | 41 | </ul> | ||
| 904 | 42 | </nav><a href="https://juju.ubuntu.com/" class="logo-ubuntu"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/logo-ubuntu.png"></a> | ||
| 905 | 43 | </div> | ||
| 906 | 44 | </div> | ||
| 907 | 45 | <div class="header-content"> | ||
| 908 | 46 | <div class="clearfix"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav"> | ||
| 909 | 47 | <div class="header-navigation-secondary"></div> | ||
| 910 | 48 | <div class="header-image"></div> | ||
| 911 | 49 | <h1>Resources</h1> | ||
| 912 | 50 | <h2>A collection of some of the most important online references for Juju users and developers.</h2> | ||
| 913 | 51 | </div> | ||
| 914 | 52 | </div> | ||
| 915 | 53 | </header> | ||
| 930 | 54 | <section id="content" class="container-12"> | 59 | <section id="content" class="container-12"> |
| 931 | 55 | <div class="grid-12 doc-container"> | 60 | <div class="grid-12 doc-container"> |
| 932 | 56 | <div class="grid-3 doc-navigation"> | 61 | <div class="grid-3 doc-navigation"> |
| 933 | @@ -243,43 +248,62 @@ | |||
| 934 | 243 | </div> | 248 | </div> |
| 935 | 244 | </section> | 249 | </section> |
| 936 | 245 | <div class="shadow"></div> | 250 | <div class="shadow"></div> |
| 972 | 246 | <footer> | 251 | <footer class="global clearfix" role="contentinfo"> |
| 973 | 247 | <div> | 252 | <div class="row"> |
| 974 | 248 | <nav role="navigation" class="clearfix"> | 253 | <div class="inner-wrapper"> |
| 975 | 249 | <ul> | 254 | <nav role="navigation" class="clearfix"> |
| 976 | 250 | <li><a href="https://juju.ubuntu.com/get-started">Get started</a></li> | 255 | <ul class="footer-a"> |
| 977 | 251 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li> | 256 | <li class="grid-3 first-col"> |
| 978 | 252 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li> | 257 | <h4><a href="/get-started">Get started</a></h4> |
| 979 | 253 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li> | 258 | <ul> |
| 980 | 254 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li> | 259 | <li class="page_item page-item-20"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li> |
| 981 | 255 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li> | 260 | <li class="page_item page-item-22"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li> |
| 982 | 256 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li> | 261 | <li class="page_item page-item-18"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li> |
| 983 | 257 | </ul> | 262 | <li class="page_item page-item-16"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li> |
| 984 | 258 | <ul> | 263 | <li class="page_item page-item-3596"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li> |
| 985 | 259 | <li><a href="https://juju.ubuntu.com/resources">Resources</a></li> | 264 | <li class="page_item page-item-3600"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li> |
| 986 | 260 | <li><a href="https://juju.ubuntu.com/docs">Documentation</a></li> | 265 | </ul> |
| 987 | 261 | <li><a href="https://juju.ubuntu.com/resources/videos">Videos</a></li> | 266 | </li> |
| 988 | 262 | <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI Demo</a></li> | 267 | <li class="grid-3"> |
| 989 | 263 | </ul> | 268 | <h4><a href="/resources">Resources</a></h4> |
| 990 | 264 | <ul> | 269 | <ul> |
| 991 | 265 | <li><a href="https://juju.ubuntu.com/community">Community</a></li> | 270 | <li><a href="http://juju.ubuntu.com/docs">Documentation</a></li> |
| 992 | 266 | <li class="page_item"><a href="https://juju.ubuntu.com/community/juju-blog/">Blog</a></li> | 271 | <li><a href="/resources/videos/">Videos</a></li> |
| 993 | 267 | <li class="page_item"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Charm Meetings</a></li> | 272 | <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI demo site</a></li> |
| 994 | 268 | <li class="page_item"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li> | 273 | </ul> |
| 995 | 269 | <li class="page_item"><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li> | 274 | </li> |
| 996 | 270 | <li class="page_item"><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li> | 275 | <li class="grid-3"> |
| 997 | 271 | <li class="page_item"><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&amp;pagesize=50">FAQ</a></li> | 276 | <h4><a href="/community">Community</a></h4> |
| 998 | 272 | </ul> | 277 | <ul> |
| 999 | 273 | <ul class="last"> | 278 | <li class="page_item page-item-28"><a href="https://juju.ubuntu.com/community/juju-blog/">Juju Blog</a></li> |
| 1000 | 274 | <li><a href="https://launchpad.net/juju">Code</a></li> | 279 | <li class="page_item page-item-4262"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Weekly Charm Meeting</a></li> |
| 1001 | 275 | <li><a href="https://launchpad.net/juju-core">Juju Core</a></li> | 280 | <li class="page_item page-item-4036"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li> |
| 1002 | 276 | <li><a href="https://launchpad.net/charms">Charms</a></li> | 281 | <li><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li> |
| 1003 | 277 | </ul> | 282 | <li><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li> |
| 1004 | 278 | </nav> | 283 | <li><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&pagesize=50">FAQ</a></li> |
| 1005 | 279 | </div> | 284 | </ul> |
| 1006 | 280 | </footer> | 285 | </li> |
| 1007 | 286 | <li class="grid-3 last-col"> | ||
| 1008 | 287 | <h4><a href="https://launchpad.net/juju">Code</a></h4> | ||
| 1009 | 288 | <ul> | ||
| 1010 | 289 | <li><a href="https://launchpad.net/juju-core">Juju Core</a></li> | ||
| 1011 | 290 | <li><a href="https://launchpad.net/charms">Charms</a></li> | ||
| 1012 | 291 | </ul> | ||
| 1013 | 292 | </li> | ||
| 1014 | 293 | </ul> | ||
| 1015 | 294 | </nav> | ||
| 1016 | 295 | </div> | ||
| 1017 | 296 | </div> | ||
| 1018 | 297 | <div class="row no-border"> | ||
| 1019 | 298 | <div class="legal inner-wrapper"> | ||
| 1020 | 299 | <p>© 2013 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p> | ||
| 1021 | 300 | <p><a href="https://bugs.launchpad.net/juju-website/+filebug">Report a bug on this site</a></p> | ||
| 1022 | 301 | </div> | ||
| 1023 | 302 | </div> | ||
| 1024 | 303 | </footer> | ||
| 1025 | 304 | |||
| 1026 | 281 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script> | 305 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script> |
| 1028 | 282 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.8.14/jquery-ui.min.js"></script> | 306 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script> |
| 1029 | 283 | <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script> | 307 | <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script> |
| 1030 | 284 | <script type="text/javascript" src="js/main.js"></script> | 308 | <script type="text/javascript" src="js/main.js"></script> |
| 1031 | 285 | </body> | 309 | </body> |
| 1032 | 286 | 310 | ||
| 1033 | === modified file 'htmldocs/authors-charm-store.html' | |||
| 1034 | --- htmldocs/authors-charm-store.html 2013-07-12 07:32:14 +0000 | |||
| 1035 | +++ htmldocs/authors-charm-store.html 2013-07-13 18:35:28 +0000 | |||
| 1036 | @@ -1,56 +1,61 @@ | |||
| 1037 | 1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
| 1038 | 2 | <html> | 2 | <html> |
| 1039 | 3 | <head> | 3 | <head> |
| 1053 | 4 | <meta charset="utf-8"> | 4 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> |
| 1054 | 5 | <title>Juju Documentation - Authoring Charms</title> | 5 | <title>Juju Documentation - The Juju Charm Store</title> |
| 1055 | 6 | <link href="//fonts.googleapis.com/css?family=Ubuntu:400,400italic" rel="stylesheet" type="text/css"/> | 6 | <link href='https://fonts.googleapis.com/css?family=Ubuntu:400,300,300italic,400italic,700,700italic|Ubuntu+Mono' rel='stylesheet' type='text/css' /> |
| 1056 | 7 | <link href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400" rel="stylesheet" type="text/css"/> | 7 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" /> |
| 1057 | 8 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" rel="stylesheet" type="text/css"/> | 8 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" /> |
| 1058 | 9 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" rel="stylesheet" type="text/css"/> | 9 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" /> |
| 1059 | 10 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" rel="stylesheet" type="text/css"/> | 10 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/home-new.css" /> |
| 1060 | 11 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/resources.css" rel="stylesheet" type="text/css"/> | 11 | <link rel='stylesheet' id='stacktack-css' href='//juju.ubuntu.com/wp-content/plugins/stacktack/css/stacktack.min.css?ver=3.4.2' type='text/css' media='all' /> |
| 1061 | 12 | <link href="css/main.css" rel="stylesheet" type="text/css"/> | 12 | <link href="css/main.css?1373740025" rel="stylesheet" type="text/css"/> |
| 1062 | 13 | <!--[if lt IE 9]> | 13 | |
| 1063 | 14 | <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script> | 14 | <!--[if lt IE 9]> |
| 1064 | 15 | <![endif]--> | 15 | <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script> |
| 1065 | 16 | </head> | 16 | <![endif]--> |
| 1066 | 17 | </head> | ||
| 1067 | 18 | <!-- DO NOT EDIT ABOVE THIS LINE --> | ||
| 1068 | 19 | |||
| 1069 | 20 | <!-- DO NOT EDIT ABOVE THIS LINE --> | ||
| 1070 | 21 | |||
| 1071 | 22 | |||
| 1072 | 17 | <body class="resources"> | 23 | <body class="resources"> |
| 1075 | 18 | <header> | 24 | <header class="global clearfix" role="banner"> |
| 1076 | 19 | <div class="header-login"> | 25 | <div class="header-navigation"> |
| 1077 | 26 | <div> | ||
| 1078 | 27 | <nav role="navigation"> | ||
| 1079 | 20 | <ul> | 28 | <ul> |
| 1081 | 21 | <li> </li> | 29 | <li class="page_item page-item-6"><a href="https://juju.ubuntu.com/">Home</a></li> |
| 1082 | 30 | <li class="page_item page-item-7"><a href="https://juju.ubuntu.com/get-started/">Get started</a></li> | ||
| 1083 | 31 | <li class="page_item page-item-9 current_page_item"><a href="https://juju.ubuntu.com/resources/">Resources</a></li> | ||
| 1084 | 32 | <li class="page_item page-item-13"><a href="https://juju.ubuntu.com/community/">Community</a></li> | ||
| 1085 | 33 | <li class="page_item page-item-3688"><a href="https://juju.ubuntu.com/charm-store/">Charm Store</a></li> | ||
| 1086 | 34 | <li class="page_item page-item-3691"><a href="https://juju.ubuntu.com/events/">Events</a></li> | ||
| 1087 | 35 | <li class="page_item page-item-4474"><a href="https://juju.ubuntu.com/charm-championship/">Charm Championship</a></li> | ||
| 1088 | 36 | <li class="page_item page-item-4249"><a href="https://juju.ubuntu.com/survey/">Survey</a></li> | ||
| 1089 | 37 | <li> | ||
| 1090 | 38 | <form id="form-search" method="get" action="https://juju.ubuntu.com/"> | ||
| 1091 | 39 | <fieldset> | ||
| 1092 | 40 | <input id="input-search" type="text" name="s" value="Search" /> | ||
| 1093 | 41 | </fieldset> | ||
| 1094 | 42 | </form> | ||
| 1095 | 43 | </li> | ||
| 1096 | 22 | </ul> | 44 | </ul> |
| 1128 | 23 | </div> | 45 | </nav> |
| 1129 | 24 | <div class="header-navigation"> | 46 | </div> |
| 1130 | 25 | <div> | 47 | </div> |
| 1131 | 26 | <nav role="navigation"> | 48 | <div class="header-content"> |
| 1132 | 27 | <ul> | 49 | <div class="clearfix"> |
| 1133 | 28 | <li class="page_item"><a href="https://juju.ubuntu.com/">Home</a></li> | 50 | <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav"> |
| 1134 | 29 | <li class="page_item current_page_item"><a href="https://juju.ubuntu.com/">Resources</a></li> | 51 | <div class="header-navigation-secondary"></div> |
| 1135 | 30 | <li class="page_item"><a href="https://juju.ubuntu.com/">Community</a></li> | 52 | <div class="header-image"></div> |
| 1136 | 31 | <li class="page_item"><a href="https://juju.ubuntu.com/">Charm Store</a></li> | 53 | <h1>Resources</h1> |
| 1137 | 32 | <li class="page_item"><a href="https://juju.ubuntu.com/">Events</a></li> | 54 | <h2>A collection of some of the most important online references for Juju users and developers.</h2> |
| 1138 | 33 | <li class="page_item"><a href="https://juju.ubuntu.com/">Survey</a></li> | 55 | </div> |
| 1139 | 34 | <li> | 56 | </div> |
| 1140 | 35 | <form id="form-search" method="get" action="/"> | 57 | </header> |
| 1141 | 36 | <fieldset> | 58 | |
| 1111 | 37 | <input id="input-search" type="text" name="s" value="Search"> | ||
| 1112 | 38 | </fieldset> | ||
| 1113 | 39 | </form> | ||
| 1114 | 40 | </li> | ||
| 1115 | 41 | </ul> | ||
| 1116 | 42 | </nav><a href="https://juju.ubuntu.com/" class="logo-ubuntu"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/logo-ubuntu.png"></a> | ||
| 1117 | 43 | </div> | ||
| 1118 | 44 | </div> | ||
| 1119 | 45 | <div class="header-content"> | ||
| 1120 | 46 | <div class="clearfix"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav"> | ||
| 1121 | 47 | <div class="header-navigation-secondary"></div> | ||
| 1122 | 48 | <div class="header-image"></div> | ||
| 1123 | 49 | <h1>Resources</h1> | ||
| 1124 | 50 | <h2>A collection of some of the most important online references for Juju users and developers.</h2> | ||
| 1125 | 51 | </div> | ||
| 1126 | 52 | </div> | ||
| 1127 | 53 | </header> | ||
| 1142 | 54 | <section id="content" class="container-12"> | 59 | <section id="content" class="container-12"> |
| 1143 | 55 | <div class="grid-12 doc-container"> | 60 | <div class="grid-12 doc-container"> |
| 1144 | 56 | <div class="grid-3 doc-navigation"> | 61 | <div class="grid-3 doc-navigation"> |
| 1145 | @@ -245,43 +250,62 @@ | |||
| 1146 | 245 | </div> | 250 | </div> |
| 1147 | 246 | </section> | 251 | </section> |
| 1148 | 247 | <div class="shadow"></div> | 252 | <div class="shadow"></div> |
| 1184 | 248 | <footer> | 253 | <footer class="global clearfix" role="contentinfo"> |
| 1185 | 249 | <div> | 254 | <div class="row"> |
| 1186 | 250 | <nav role="navigation" class="clearfix"> | 255 | <div class="inner-wrapper"> |
| 1187 | 251 | <ul> | 256 | <nav role="navigation" class="clearfix"> |
| 1188 | 252 | <li><a href="https://juju.ubuntu.com/get-started">Get started</a></li> | 257 | <ul class="footer-a"> |
| 1189 | 253 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li> | 258 | <li class="grid-3 first-col"> |
| 1190 | 254 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li> | 259 | <h4><a href="/get-started">Get started</a></h4> |
| 1191 | 255 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li> | 260 | <ul> |
| 1192 | 256 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li> | 261 | <li class="page_item page-item-20"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li> |
| 1193 | 257 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li> | 262 | <li class="page_item page-item-22"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li> |
| 1194 | 258 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li> | 263 | <li class="page_item page-item-18"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li> |
| 1195 | 259 | </ul> | 264 | <li class="page_item page-item-16"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li> |
| 1196 | 260 | <ul> | 265 | <li class="page_item page-item-3596"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li> |
| 1197 | 261 | <li><a href="https://juju.ubuntu.com/resources">Resources</a></li> | 266 | <li class="page_item page-item-3600"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li> |
| 1198 | 262 | <li><a href="https://juju.ubuntu.com/docs">Documentation</a></li> | 267 | </ul> |
| 1199 | 263 | <li><a href="https://juju.ubuntu.com/resources/videos">Videos</a></li> | 268 | </li> |
| 1200 | 264 | <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI Demo</a></li> | 269 | <li class="grid-3"> |
| 1201 | 265 | </ul> | 270 | <h4><a href="/resources">Resources</a></h4> |
| 1202 | 266 | <ul> | 271 | <ul> |
| 1203 | 267 | <li><a href="https://juju.ubuntu.com/community">Community</a></li> | 272 | <li><a href="http://juju.ubuntu.com/docs">Documentation</a></li> |
| 1204 | 268 | <li class="page_item"><a href="https://juju.ubuntu.com/community/juju-blog/">Blog</a></li> | 273 | <li><a href="/resources/videos/">Videos</a></li> |
| 1205 | 269 | <li class="page_item"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Charm Meetings</a></li> | 274 | <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI demo site</a></li> |
| 1206 | 270 | <li class="page_item"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li> | 275 | </ul> |
| 1207 | 271 | <li class="page_item"><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li> | 276 | </li> |
| 1208 | 272 | <li class="page_item"><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li> | 277 | <li class="grid-3"> |
| 1209 | 273 | <li class="page_item"><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&amp;pagesize=50">FAQ</a></li> | 278 | <h4><a href="/community">Community</a></h4> |
| 1210 | 274 | </ul> | 279 | <ul> |
| 1211 | 275 | <ul class="last"> | 280 | <li class="page_item page-item-28"><a href="https://juju.ubuntu.com/community/juju-blog/">Juju Blog</a></li> |
| 1212 | 276 | <li><a href="https://launchpad.net/juju">Code</a></li> | 281 | <li class="page_item page-item-4262"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Weekly Charm Meeting</a></li> |
| 1213 | 277 | <li><a href="https://launchpad.net/juju-core">Juju Core</a></li> | 282 | <li class="page_item page-item-4036"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li> |
| 1214 | 278 | <li><a href="https://launchpad.net/charms">Charms</a></li> | 283 | <li><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li> |
| 1215 | 279 | </ul> | 284 | <li><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li> |
| 1216 | 280 | </nav> | 285 | <li><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&pagesize=50">FAQ</a></li> |
| 1217 | 281 | </div> | 286 | </ul> |
| 1218 | 282 | </footer> | 287 | </li> |
| 1219 | 288 | <li class="grid-3 last-col"> | ||
| 1220 | 289 | <h4><a href="https://launchpad.net/juju">Code</a></h4> | ||
| 1221 | 290 | <ul> | ||
| 1222 | 291 | <li><a href="https://launchpad.net/juju-core">Juju Core</a></li> | ||
| 1223 | 292 | <li><a href="https://launchpad.net/charms">Charms</a></li> | ||
| 1224 | 293 | </ul> | ||
| 1225 | 294 | </li> | ||
| 1226 | 295 | </ul> | ||
| 1227 | 296 | </nav> | ||
| 1228 | 297 | </div> | ||
| 1229 | 298 | </div> | ||
| 1230 | 299 | <div class="row no-border"> | ||
| 1231 | 300 | <div class="legal inner-wrapper"> | ||
| 1232 | 301 | <p>© 2013 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p> | ||
| 1233 | 302 | <p><a href="https://bugs.launchpad.net/juju-website/+filebug">Report a bug on this site</a></p> | ||
| 1234 | 303 | </div> | ||
| 1235 | 304 | </div> | ||
| 1236 | 305 | </footer> | ||
| 1237 | 306 | |||
| 1238 | 283 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script> | 307 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script> |
| 1240 | 284 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.8.14/jquery-ui.min.js"></script> | 308 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script> |
| 1241 | 285 | <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script> | 309 | <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script> |
| 1242 | 286 | <script type="text/javascript" src="js/main.js"></script> | 310 | <script type="text/javascript" src="js/main.js"></script> |
| 1243 | 287 | </body> | 311 | </body> |
| 1244 | 288 | 312 | ||
| 1245 | === modified file 'htmldocs/authors-charm-writing.html' | |||
| 1246 | --- htmldocs/authors-charm-writing.html 2013-07-12 16:05:56 +0000 | |||
| 1247 | +++ htmldocs/authors-charm-writing.html 2013-07-13 18:35:28 +0000 | |||
| 1248 | @@ -1,56 +1,61 @@ | |||
| 1249 | 1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
| 1250 | 2 | <html> | 2 | <html> |
| 1251 | 3 | <head> | 3 | <head> |
| 1265 | 4 | <meta charset="utf-8"> | 4 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> |
| 1266 | 5 | <title>Juju Documentation - Writing a charm</title> | 5 | <title>Juju Documentation - Writing a Charm</title> |
| 1267 | 6 | <link href="//fonts.googleapis.com/css?family=Ubuntu:400,400italic" rel="stylesheet" type="text/css"/> | 6 | <link href='https://fonts.googleapis.com/css?family=Ubuntu:400,300,300italic,400italic,700,700italic|Ubuntu+Mono' rel='stylesheet' type='text/css' /> |
| 1268 | 7 | <link href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400" rel="stylesheet" type="text/css"/> | 7 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" /> |
| 1269 | 8 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" rel="stylesheet" type="text/css"/> | 8 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" /> |
| 1270 | 9 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" rel="stylesheet" type="text/css"/> | 9 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" /> |
| 1271 | 10 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" rel="stylesheet" type="text/css"/> | 10 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/home-new.css" /> |
| 1272 | 11 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/resources.css" rel="stylesheet" type="text/css"/> | 11 | <link rel='stylesheet' id='stacktack-css' href='//juju.ubuntu.com/wp-content/plugins/stacktack/css/stacktack.min.css?ver=3.4.2' type='text/css' media='all' /> |
| 1273 | 12 | <link href="css/main.css" rel="stylesheet" type="text/css"/> | 12 | <link href="css/main.css?1373740025" rel="stylesheet" type="text/css"/> |
| 1274 | 13 | <!--[if lt IE 9]> | 13 | |
| 1275 | 14 | <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script> | 14 | <!--[if lt IE 9]> |
| 1276 | 15 | <![endif]--> | 15 | <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script> |
| 1277 | 16 | </head> | 16 | <![endif]--> |
| 1278 | 17 | </head> | ||
| 1279 | 18 | <!-- DO NOT EDIT ABOVE THIS LINE --> | ||
| 1280 | 19 | |||
| 1281 | 20 | <!-- DO NOT EDIT ABOVE THIS LINE --> | ||
| 1282 | 21 | |||
| 1283 | 22 | |||
| 1284 | 17 | <body class="resources"> | 23 | <body class="resources"> |
| 1287 | 18 | <header> | 24 | <header class="global clearfix" role="banner"> |
| 1288 | 19 | <div class="header-login"> | 25 | <div class="header-navigation"> |
| 1289 | 26 | <div> | ||
| 1290 | 27 | <nav role="navigation"> | ||
| 1291 | 20 | <ul> | 28 | <ul> |
| 1293 | 21 | <li> </li> | 29 | <li class="page_item page-item-6"><a href="https://juju.ubuntu.com/">Home</a></li> |
| 1294 | 30 | <li class="page_item page-item-7"><a href="https://juju.ubuntu.com/get-started/">Get started</a></li> | ||
| 1295 | 31 | <li class="page_item page-item-9 current_page_item"><a href="https://juju.ubuntu.com/resources/">Resources</a></li> | ||
| 1296 | 32 | <li class="page_item page-item-13"><a href="https://juju.ubuntu.com/community/">Community</a></li> | ||
| 1297 | 33 | <li class="page_item page-item-3688"><a href="https://juju.ubuntu.com/charm-store/">Charm Store</a></li> | ||
| 1298 | 34 | <li class="page_item page-item-3691"><a href="https://juju.ubuntu.com/events/">Events</a></li> | ||
| 1299 | 35 | <li class="page_item page-item-4474"><a href="https://juju.ubuntu.com/charm-championship/">Charm Championship</a></li> | ||
| 1300 | 36 | <li class="page_item page-item-4249"><a href="https://juju.ubuntu.com/survey/">Survey</a></li> | ||
| 1301 | 37 | <li> | ||
| 1302 | 38 | <form id="form-search" method="get" action="https://juju.ubuntu.com/"> | ||
| 1303 | 39 | <fieldset> | ||
| 1304 | 40 | <input id="input-search" type="text" name="s" value="Search" /> | ||
| 1305 | 41 | </fieldset> | ||
| 1306 | 42 | </form> | ||
| 1307 | 43 | </li> | ||
| 1308 | 22 | </ul> | 44 | </ul> |
| 1340 | 23 | </div> | 45 | </nav> |
| 1341 | 24 | <div class="header-navigation"> | 46 | </div> |
| 1342 | 25 | <div> | 47 | </div> |
| 1343 | 26 | <nav role="navigation"> | 48 | <div class="header-content"> |
| 1344 | 27 | <ul> | 49 | <div class="clearfix"> |
| 1345 | 28 | <li class="page_item"><a href="https://juju.ubuntu.com/">Home</a></li> | 50 | <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav"> |
| 1346 | 29 | <li class="page_item current_page_item"><a href="https://juju.ubuntu.com/">Resources</a></li> | 51 | <div class="header-navigation-secondary"></div> |
| 1347 | 30 | <li class="page_item"><a href="https://juju.ubuntu.com/">Community</a></li> | 52 | <div class="header-image"></div> |
| 1348 | 31 | <li class="page_item"><a href="https://juju.ubuntu.com/">Charm Store</a></li> | 53 | <h1>Resources</h1> |
| 1349 | 32 | <li class="page_item"><a href="https://juju.ubuntu.com/">Events</a></li> | 54 | <h2>A collection of some of the most important online references for Juju users and developers.</h2> |
| 1350 | 33 | <li class="page_item"><a href="https://juju.ubuntu.com/">Survey</a></li> | 55 | </div> |
| 1351 | 34 | <li> | 56 | </div> |
| 1352 | 35 | <form id="form-search" method="get" action="/"> | 57 | </header> |
| 1353 | 36 | <fieldset> | 58 | |
| 1323 | 37 | <input id="input-search" type="text" name="s" value="Search"> | ||
| 1324 | 38 | </fieldset> | ||
| 1325 | 39 | </form> | ||
| 1326 | 40 | </li> | ||
| 1327 | 41 | </ul> | ||
| 1328 | 42 | </nav><a href="https://juju.ubuntu.com/" class="logo-ubuntu"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/logo-ubuntu.png"></a> | ||
| 1329 | 43 | </div> | ||
| 1330 | 44 | </div> | ||
| 1331 | 45 | <div class="header-content"> | ||
| 1332 | 46 | <div class="clearfix"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav"> | ||
| 1333 | 47 | <div class="header-navigation-secondary"></div> | ||
| 1334 | 48 | <div class="header-image"></div> | ||
| 1335 | 49 | <h1>Resources</h1> | ||
| 1336 | 50 | <h2>A collection of some of the most important online references for Juju users and developers.</h2> | ||
| 1337 | 51 | </div> | ||
| 1338 | 52 | </div> | ||
| 1339 | 53 | </header> | ||
| 1354 | 54 | <section id="content" class="container-12"> | 59 | <section id="content" class="container-12"> |
| 1355 | 55 | <div class="grid-12 doc-container"> | 60 | <div class="grid-12 doc-container"> |
| 1356 | 56 | <div class="grid-3 doc-navigation"> | 61 | <div class="grid-3 doc-navigation"> |
| 1357 | @@ -440,43 +445,62 @@ | |||
| 1358 | 440 | </div> | 445 | </div> |
| 1359 | 441 | </section> | 446 | </section> |
| 1360 | 442 | <div class="shadow"></div> | 447 | <div class="shadow"></div> |
| 1396 | 443 | <footer> | 448 | <footer class="global clearfix" role="contentinfo"> |
| 1397 | 444 | <div> | 449 | <div class="row"> |
| 1398 | 445 | <nav role="navigation" class="clearfix"> | 450 | <div class="inner-wrapper"> |
| 1399 | 446 | <ul> | 451 | <nav role="navigation" class="clearfix"> |
| 1400 | 447 | <li><a href="https://juju.ubuntu.com/get-started">Get started</a></li> | 452 | <ul class="footer-a"> |
| 1401 | 448 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li> | 453 | <li class="grid-3 first-col"> |
| 1402 | 449 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li> | 454 | <h4><a href="/get-started">Get started</a></h4> |
| 1403 | 450 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li> | 455 | <ul> |
| 1404 | 451 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li> | 456 | <li class="page_item page-item-20"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li> |
| 1405 | 452 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li> | 457 | <li class="page_item page-item-22"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li> |
| 1406 | 453 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li> | 458 | <li class="page_item page-item-18"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li> |
| 1407 | 454 | </ul> | 459 | <li class="page_item page-item-16"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li> |
| 1408 | 455 | <ul> | 460 | <li class="page_item page-item-3596"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li> |
| 1409 | 456 | <li><a href="https://juju.ubuntu.com/resources">Resources</a></li> | 461 | <li class="page_item page-item-3600"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li> |
| 1410 | 457 | <li><a href="https://juju.ubuntu.com/docs">Documentation</a></li> | 462 | </ul> |
| 1411 | 458 | <li><a href="https://juju.ubuntu.com/resources/videos">Videos</a></li> | 463 | </li> |
| 1412 | 459 | <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI Demo</a></li> | 464 | <li class="grid-3"> |
| 1413 | 460 | </ul> | 465 | <h4><a href="/resources">Resources</a></h4> |
| 1414 | 461 | <ul> | 466 | <ul> |
| 1415 | 462 | <li><a href="https://juju.ubuntu.com/community">Community</a></li> | 467 | <li><a href="http://juju.ubuntu.com/docs">Documentation</a></li> |
| 1416 | 463 | <li class="page_item"><a href="https://juju.ubuntu.com/community/juju-blog/">Blog</a></li> | 468 | <li><a href="/resources/videos/">Videos</a></li> |
| 1417 | 464 | <li class="page_item"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Charm Meetings</a></li> | 469 | <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI demo site</a></li> |
| 1418 | 465 | <li class="page_item"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li> | 470 | </ul> |
| 1419 | 466 | <li class="page_item"><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li> | 471 | </li> |
| 1420 | 467 | <li class="page_item"><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li> | 472 | <li class="grid-3"> |
| 1421 | 468 | <li class="page_item"><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&amp;pagesize=50">FAQ</a></li> | 473 | <h4><a href="/community">Community</a></h4> |
| 1422 | 469 | </ul> | 474 | <ul> |
| 1423 | 470 | <ul class="last"> | 475 | <li class="page_item page-item-28"><a href="https://juju.ubuntu.com/community/juju-blog/">Juju Blog</a></li> |
| 1424 | 471 | <li><a href="https://launchpad.net/juju">Code</a></li> | 476 | <li class="page_item page-item-4262"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Weekly Charm Meeting</a></li> |
| 1425 | 472 | <li><a href="https://launchpad.net/juju-core">Juju Core</a></li> | 477 | <li class="page_item page-item-4036"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li> |
| 1426 | 473 | <li><a href="https://launchpad.net/charms">Charms</a></li> | 478 | <li><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li> |
| 1427 | 474 | </ul> | 479 | <li><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li> |
| 1428 | 475 | </nav> | 480 | <li><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&pagesize=50">FAQ</a></li> |
| 1429 | 476 | </div> | 481 | </ul> |
| 1430 | 477 | </footer> | 482 | </li> |
| 1431 | 483 | <li class="grid-3 last-col"> | ||
| 1432 | 484 | <h4><a href="https://launchpad.net/juju">Code</a></h4> | ||
| 1433 | 485 | <ul> | ||
| 1434 | 486 | <li><a href="https://launchpad.net/juju-core">Juju Core</a></li> | ||
| 1435 | 487 | <li><a href="https://launchpad.net/charms">Charms</a></li> | ||
| 1436 | 488 | </ul> | ||
| 1437 | 489 | </li> | ||
| 1438 | 490 | </ul> | ||
| 1439 | 491 | </nav> | ||
| 1440 | 492 | </div> | ||
| 1441 | 493 | </div> | ||
| 1442 | 494 | <div class="row no-border"> | ||
| 1443 | 495 | <div class="legal inner-wrapper"> | ||
| 1444 | 496 | <p>© 2013 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p> | ||
| 1445 | 497 | <p><a href="https://bugs.launchpad.net/juju-website/+filebug">Report a bug on this site</a></p> | ||
| 1446 | 498 | </div> | ||
| 1447 | 499 | </div> | ||
| 1448 | 500 | </footer> | ||
| 1449 | 501 | |||
| 1450 | 478 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script> | 502 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script> |
| 1452 | 479 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.8.14/jquery-ui.min.js"></script> | 503 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script> |
| 1453 | 480 | <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script> | 504 | <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script> |
| 1454 | 481 | <script type="text/javascript" src="js/main.js"></script> | 505 | <script type="text/javascript" src="js/main.js"></script> |
| 1455 | 482 | </body> | 506 | </body> |
| 1456 | 483 | 507 | ||
| 1457 | === modified file 'htmldocs/authors-hooks.html' | |||
| 1458 | --- htmldocs/authors-hooks.html 2013-07-12 00:12:30 +0000 | |||
| 1459 | +++ htmldocs/authors-hooks.html 2013-07-13 18:35:28 +0000 | |||
| 1460 | @@ -1,56 +1,61 @@ | |||
| 1461 | 1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
| 1462 | 2 | <html> | 2 | <html> |
| 1463 | 3 | <head> | 3 | <head> |
| 1477 | 4 | <meta charset="utf-8"> | 4 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> |
| 1478 | 5 | <title>Juju Documentation - Authoring Charms</title> | 5 | <title>Juju Documentation - Hook Debugging</title> |
| 1479 | 6 | <link href="//fonts.googleapis.com/css?family=Ubuntu:400,400italic" rel="stylesheet" type="text/css"/> | 6 | <link href='https://fonts.googleapis.com/css?family=Ubuntu:400,300,300italic,400italic,700,700italic|Ubuntu+Mono' rel='stylesheet' type='text/css' /> |
| 1480 | 7 | <link href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400" rel="stylesheet" type="text/css"/> | 7 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" /> |
| 1481 | 8 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" rel="stylesheet" type="text/css"/> | 8 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" /> |
| 1482 | 9 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" rel="stylesheet" type="text/css"/> | 9 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" /> |
| 1483 | 10 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" rel="stylesheet" type="text/css"/> | 10 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/home-new.css" /> |
| 1484 | 11 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/resources.css" rel="stylesheet" type="text/css"/> | 11 | <link rel='stylesheet' id='stacktack-css' href='//juju.ubuntu.com/wp-content/plugins/stacktack/css/stacktack.min.css?ver=3.4.2' type='text/css' media='all' /> |
| 1485 | 12 | <link href="css/main.css" rel="stylesheet" type="text/css"/> | 12 | <link href="css/main.css?1373740025" rel="stylesheet" type="text/css"/> |
| 1486 | 13 | <!--[if lt IE 9]> | 13 | |
| 1487 | 14 | <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script> | 14 | <!--[if lt IE 9]> |
| 1488 | 15 | <![endif]--> | 15 | <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script> |
| 1489 | 16 | </head> | 16 | <![endif]--> |
| 1490 | 17 | </head> | ||
| 1491 | 18 | <!-- DO NOT EDIT ABOVE THIS LINE --> | ||
| 1492 | 19 | |||
| 1493 | 20 | <!-- DO NOT EDIT ABOVE THIS LINE --> | ||
| 1494 | 21 | |||
| 1495 | 22 | |||
| 1496 | 17 | <body class="resources"> | 23 | <body class="resources"> |
| 1499 | 18 | <header> | 24 | <header class="global clearfix" role="banner"> |
| 1500 | 19 | <div class="header-login"> | 25 | <div class="header-navigation"> |
| 1501 | 26 | <div> | ||
| 1502 | 27 | <nav role="navigation"> | ||
| 1503 | 20 | <ul> | 28 | <ul> |
| 1505 | 21 | <li> </li> | 29 | <li class="page_item page-item-6"><a href="https://juju.ubuntu.com/">Home</a></li> |
| 1506 | 30 | <li class="page_item page-item-7"><a href="https://juju.ubuntu.com/get-started/">Get started</a></li> | ||
| 1507 | 31 | <li class="page_item page-item-9 current_page_item"><a href="https://juju.ubuntu.com/resources/">Resources</a></li> | ||
| 1508 | 32 | <li class="page_item page-item-13"><a href="https://juju.ubuntu.com/community/">Community</a></li> | ||
| 1509 | 33 | <li class="page_item page-item-3688"><a href="https://juju.ubuntu.com/charm-store/">Charm Store</a></li> | ||
| 1510 | 34 | <li class="page_item page-item-3691"><a href="https://juju.ubuntu.com/events/">Events</a></li> | ||
| 1511 | 35 | <li class="page_item page-item-4474"><a href="https://juju.ubuntu.com/charm-championship/">Charm Championship</a></li> | ||
| 1512 | 36 | <li class="page_item page-item-4249"><a href="https://juju.ubuntu.com/survey/">Survey</a></li> | ||
| 1513 | 37 | <li> | ||
| 1514 | 38 | <form id="form-search" method="get" action="https://juju.ubuntu.com/"> | ||
| 1515 | 39 | <fieldset> | ||
| 1516 | 40 | <input id="input-search" type="text" name="s" value="Search" /> | ||
| 1517 | 41 | </fieldset> | ||
| 1518 | 42 | </form> | ||
| 1519 | 43 | </li> | ||
| 1520 | 22 | </ul> | 44 | </ul> |
| 1552 | 23 | </div> | 45 | </nav> |
| 1553 | 24 | <div class="header-navigation"> | 46 | </div> |
| 1554 | 25 | <div> | 47 | </div> |
| 1555 | 26 | <nav role="navigation"> | 48 | <div class="header-content"> |
| 1556 | 27 | <ul> | 49 | <div class="clearfix"> |
| 1557 | 28 | <li class="page_item"><a href="https://juju.ubuntu.com/">Home</a></li> | 50 | <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav"> |
| 1558 | 29 | <li class="page_item current_page_item"><a href="https://juju.ubuntu.com/">Resources</a></li> | 51 | <div class="header-navigation-secondary"></div> |
| 1559 | 30 | <li class="page_item"><a href="https://juju.ubuntu.com/">Community</a></li> | 52 | <div class="header-image"></div> |
| 1560 | 31 | <li class="page_item"><a href="https://juju.ubuntu.com/">Charm Store</a></li> | 53 | <h1>Resources</h1> |
| 1561 | 32 | <li class="page_item"><a href="https://juju.ubuntu.com/">Events</a></li> | 54 | <h2>A collection of some of the most important online references for Juju users and developers.</h2> |
| 1562 | 33 | <li class="page_item"><a href="https://juju.ubuntu.com/">Survey</a></li> | 55 | </div> |
| 1563 | 34 | <li> | 56 | </div> |
| 1564 | 35 | <form id="form-search" method="get" action="/"> | 57 | </header> |
| 1565 | 36 | <fieldset> | 58 | |
| 1535 | 37 | <input id="input-search" type="text" name="s" value="Search"> | ||
| 1536 | 38 | </fieldset> | ||
| 1537 | 39 | </form> | ||
| 1538 | 40 | </li> | ||
| 1539 | 41 | </ul> | ||
| 1540 | 42 | </nav><a href="https://juju.ubuntu.com/" class="logo-ubuntu"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/logo-ubuntu.png"></a> | ||
| 1541 | 43 | </div> | ||
| 1542 | 44 | </div> | ||
| 1543 | 45 | <div class="header-content"> | ||
| 1544 | 46 | <div class="clearfix"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav"> | ||
| 1545 | 47 | <div class="header-navigation-secondary"></div> | ||
| 1546 | 48 | <div class="header-image"></div> | ||
| 1547 | 49 | <h1>Resources</h1> | ||
| 1548 | 50 | <h2>A collection of some of the most important online references for Juju users and developers.</h2> | ||
| 1549 | 51 | </div> | ||
| 1550 | 52 | </div> | ||
| 1551 | 53 | </header> | ||
| 1566 | 54 | <section id="content" class="container-12"> | 59 | <section id="content" class="container-12"> |
| 1567 | 55 | <div class="grid-12 doc-container"> | 60 | <div class="grid-12 doc-container"> |
| 1568 | 56 | <div class="grid-3 doc-navigation"> | 61 | <div class="grid-3 doc-navigation"> |
| 1569 | @@ -133,43 +138,62 @@ | |||
| 1570 | 133 | </div> | 138 | </div> |
| 1571 | 134 | </section> | 139 | </section> |
| 1572 | 135 | <div class="shadow"></div> | 140 | <div class="shadow"></div> |
| 1608 | 136 | <footer> | 141 | <footer class="global clearfix" role="contentinfo"> |
| 1609 | 137 | <div> | 142 | <div class="row"> |
| 1610 | 138 | <nav role="navigation" class="clearfix"> | 143 | <div class="inner-wrapper"> |
| 1611 | 139 | <ul> | 144 | <nav role="navigation" class="clearfix"> |
| 1612 | 140 | <li><a href="https://juju.ubuntu.com/get-started">Get started</a></li> | 145 | <ul class="footer-a"> |
| 1613 | 141 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li> | 146 | <li class="grid-3 first-col"> |
| 1614 | 142 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li> | 147 | <h4><a href="/get-started">Get started</a></h4> |
| 1615 | 143 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li> | 148 | <ul> |
| 1616 | 144 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li> | 149 | <li class="page_item page-item-20"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li> |
| 1617 | 145 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li> | 150 | <li class="page_item page-item-22"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li> |
| 1618 | 146 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li> | 151 | <li class="page_item page-item-18"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li> |
| 1619 | 147 | </ul> | 152 | <li class="page_item page-item-16"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li> |
| 1620 | 148 | <ul> | 153 | <li class="page_item page-item-3596"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li> |
| 1621 | 149 | <li><a href="https://juju.ubuntu.com/resources">Resources</a></li> | 154 | <li class="page_item page-item-3600"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li> |
| 1622 | 150 | <li><a href="https://juju.ubuntu.com/docs">Documentation</a></li> | 155 | </ul> |
| 1623 | 151 | <li><a href="https://juju.ubuntu.com/resources/videos">Videos</a></li> | 156 | </li> |
| 1624 | 152 | <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI Demo</a></li> | 157 | <li class="grid-3"> |
| 1625 | 153 | </ul> | 158 | <h4><a href="/resources">Resources</a></h4> |
| 1626 | 154 | <ul> | 159 | <ul> |
| 1627 | 155 | <li><a href="https://juju.ubuntu.com/community">Community</a></li> | 160 | <li><a href="http://juju.ubuntu.com/docs">Documentation</a></li> |
| 1628 | 156 | <li class="page_item"><a href="https://juju.ubuntu.com/community/juju-blog/">Blog</a></li> | 161 | <li><a href="/resources/videos/">Videos</a></li> |
| 1629 | 157 | <li class="page_item"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Charm Meetings</a></li> | 162 | <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI demo site</a></li> |
| 1630 | 158 | <li class="page_item"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li> | 163 | </ul> |
| 1631 | 159 | <li class="page_item"><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li> | 164 | </li> |
| 1632 | 160 | <li class="page_item"><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li> | 165 | <li class="grid-3"> |
| 1633 | 161 | <li class="page_item"><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&amp;pagesize=50">FAQ</a></li> | 166 | <h4><a href="/community">Community</a></h4> |
| 1634 | 162 | </ul> | 167 | <ul> |
| 1635 | 163 | <ul class="last"> | 168 | <li class="page_item page-item-28"><a href="https://juju.ubuntu.com/community/juju-blog/">Juju Blog</a></li> |
| 1636 | 164 | <li><a href="https://launchpad.net/juju">Code</a></li> | 169 | <li class="page_item page-item-4262"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Weekly Charm Meeting</a></li> |
| 1637 | 165 | <li><a href="https://launchpad.net/juju-core">Juju Core</a></li> | 170 | <li class="page_item page-item-4036"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li> |
| 1638 | 166 | <li><a href="https://launchpad.net/charms">Charms</a></li> | 171 | <li><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li> |
| 1639 | 167 | </ul> | 172 | <li><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li> |
| 1640 | 168 | </nav> | 173 | <li><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&pagesize=50">FAQ</a></li> |
| 1641 | 169 | </div> | 174 | </ul> |
| 1642 | 170 | </footer> | 175 | </li> |
| 1643 | 176 | <li class="grid-3 last-col"> | ||
| 1644 | 177 | <h4><a href="https://launchpad.net/juju">Code</a></h4> | ||
| 1645 | 178 | <ul> | ||
| 1646 | 179 | <li><a href="https://launchpad.net/juju-core">Juju Core</a></li> | ||
| 1647 | 180 | <li><a href="https://launchpad.net/charms">Charms</a></li> | ||
| 1648 | 181 | </ul> | ||
| 1649 | 182 | </li> | ||
| 1650 | 183 | </ul> | ||
| 1651 | 184 | </nav> | ||
| 1652 | 185 | </div> | ||
| 1653 | 186 | </div> | ||
| 1654 | 187 | <div class="row no-border"> | ||
| 1655 | 188 | <div class="legal inner-wrapper"> | ||
| 1656 | 189 | <p>© 2013 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p> | ||
| 1657 | 190 | <p><a href="https://bugs.launchpad.net/juju-website/+filebug">Report a bug on this site</a></p> | ||
| 1658 | 191 | </div> | ||
| 1659 | 192 | </div> | ||
| 1660 | 193 | </footer> | ||
| 1661 | 194 | |||
| 1662 | 171 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script> | 195 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script> |
| 1664 | 172 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.8.14/jquery-ui.min.js"></script> | 196 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script> |
| 1665 | 173 | <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script> | 197 | <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script> |
| 1666 | 174 | <script type="text/javascript" src="js/main.js"></script> | 198 | <script type="text/javascript" src="js/main.js"></script> |
| 1667 | 175 | </body> | 199 | </body> |
| 1668 | 176 | 200 | ||
| 1669 | === modified file 'htmldocs/authors-implicit-relations.html' | |||
| 1670 | --- htmldocs/authors-implicit-relations.html 2013-07-12 00:12:30 +0000 | |||
| 1671 | +++ htmldocs/authors-implicit-relations.html 2013-07-13 18:35:28 +0000 | |||
| 1672 | @@ -1,56 +1,61 @@ | |||
| 1673 | 1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
| 1674 | 2 | <html> | 2 | <html> |
| 1675 | 3 | <head> | 3 | <head> |
| 1689 | 4 | <meta charset="utf-8"> | 4 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> |
| 1690 | 5 | <title>Juju Documentation - Authoring Charms</title> | 5 | <title>Juju Documentation - Implicit Relations</title> |
| 1691 | 6 | <link href="//fonts.googleapis.com/css?family=Ubuntu:400,400italic" rel="stylesheet" type="text/css"/> | 6 | <link href='https://fonts.googleapis.com/css?family=Ubuntu:400,300,300italic,400italic,700,700italic|Ubuntu+Mono' rel='stylesheet' type='text/css' /> |
| 1692 | 7 | <link href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400" rel="stylesheet" type="text/css"/> | 7 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" /> |
| 1693 | 8 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" rel="stylesheet" type="text/css"/> | 8 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" /> |
| 1694 | 9 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" rel="stylesheet" type="text/css"/> | 9 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" /> |
| 1695 | 10 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" rel="stylesheet" type="text/css"/> | 10 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/home-new.css" /> |
| 1696 | 11 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/resources.css" rel="stylesheet" type="text/css"/> | 11 | <link rel='stylesheet' id='stacktack-css' href='//juju.ubuntu.com/wp-content/plugins/stacktack/css/stacktack.min.css?ver=3.4.2' type='text/css' media='all' /> |
| 1697 | 12 | <link href="css/main.css" rel="stylesheet" type="text/css"/> | 12 | <link href="css/main.css?1373740025" rel="stylesheet" type="text/css"/> |
| 1698 | 13 | <!--[if lt IE 9]> | 13 | |
| 1699 | 14 | <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script> | 14 | <!--[if lt IE 9]> |
| 1700 | 15 | <![endif]--> | 15 | <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script> |
| 1701 | 16 | </head> | 16 | <![endif]--> |
| 1702 | 17 | </head> | ||
| 1703 | 18 | <!-- DO NOT EDIT ABOVE THIS LINE --> | ||
| 1704 | 19 | |||
| 1705 | 20 | <!-- DO NOT EDIT ABOVE THIS LINE --> | ||
| 1706 | 21 | |||
| 1707 | 22 | |||
| 1708 | 17 | <body class="resources"> | 23 | <body class="resources"> |
| 1711 | 18 | <header> | 24 | <header class="global clearfix" role="banner"> |
| 1712 | 19 | <div class="header-login"> | 25 | <div class="header-navigation"> |
| 1713 | 26 | <div> | ||
| 1714 | 27 | <nav role="navigation"> | ||
| 1715 | 20 | <ul> | 28 | <ul> |
| 1717 | 21 | <li> </li> | 29 | <li class="page_item page-item-6"><a href="https://juju.ubuntu.com/">Home</a></li> |
| 1718 | 30 | <li class="page_item page-item-7"><a href="https://juju.ubuntu.com/get-started/">Get started</a></li> | ||
| 1719 | 31 | <li class="page_item page-item-9 current_page_item"><a href="https://juju.ubuntu.com/resources/">Resources</a></li> | ||
| 1720 | 32 | <li class="page_item page-item-13"><a href="https://juju.ubuntu.com/community/">Community</a></li> | ||
| 1721 | 33 | <li class="page_item page-item-3688"><a href="https://juju.ubuntu.com/charm-store/">Charm Store</a></li> | ||
| 1722 | 34 | <li class="page_item page-item-3691"><a href="https://juju.ubuntu.com/events/">Events</a></li> | ||
| 1723 | 35 | <li class="page_item page-item-4474"><a href="https://juju.ubuntu.com/charm-championship/">Charm Championship</a></li> | ||
| 1724 | 36 | <li class="page_item page-item-4249"><a href="https://juju.ubuntu.com/survey/">Survey</a></li> | ||
| 1725 | 37 | <li> | ||
| 1726 | 38 | <form id="form-search" method="get" action="https://juju.ubuntu.com/"> | ||
| 1727 | 39 | <fieldset> | ||
| 1728 | 40 | <input id="input-search" type="text" name="s" value="Search" /> | ||
| 1729 | 41 | </fieldset> | ||
| 1730 | 42 | </form> | ||
| 1731 | 43 | </li> | ||
| 1732 | 22 | </ul> | 44 | </ul> |
| 1764 | 23 | </div> | 45 | </nav> |
| 1765 | 24 | <div class="header-navigation"> | 46 | </div> |
| 1766 | 25 | <div> | 47 | </div> |
| 1767 | 26 | <nav role="navigation"> | 48 | <div class="header-content"> |
| 1768 | 27 | <ul> | 49 | <div class="clearfix"> |
| 1769 | 28 | <li class="page_item"><a href="https://juju.ubuntu.com/">Home</a></li> | 50 | <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav"> |
| 1770 | 29 | <li class="page_item current_page_item"><a href="https://juju.ubuntu.com/">Resources</a></li> | 51 | <div class="header-navigation-secondary"></div> |
| 1771 | 30 | <li class="page_item"><a href="https://juju.ubuntu.com/">Community</a></li> | 52 | <div class="header-image"></div> |
| 1772 | 31 | <li class="page_item"><a href="https://juju.ubuntu.com/">Charm Store</a></li> | 53 | <h1>Resources</h1> |
| 1773 | 32 | <li class="page_item"><a href="https://juju.ubuntu.com/">Events</a></li> | 54 | <h2>A collection of some of the most important online references for Juju users and developers.</h2> |
| 1774 | 33 | <li class="page_item"><a href="https://juju.ubuntu.com/">Survey</a></li> | 55 | </div> |
| 1775 | 34 | <li> | 56 | </div> |
| 1776 | 35 | <form id="form-search" method="get" action="/"> | 57 | </header> |
| 1777 | 36 | <fieldset> | 58 | |
| 1747 | 37 | <input id="input-search" type="text" name="s" value="Search"> | ||
| 1748 | 38 | </fieldset> | ||
| 1749 | 39 | </form> | ||
| 1750 | 40 | </li> | ||
| 1751 | 41 | </ul> | ||
| 1752 | 42 | </nav><a href="https://juju.ubuntu.com/" class="logo-ubuntu"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/logo-ubuntu.png"></a> | ||
| 1753 | 43 | </div> | ||
| 1754 | 44 | </div> | ||
| 1755 | 45 | <div class="header-content"> | ||
| 1756 | 46 | <div class="clearfix"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav"> | ||
| 1757 | 47 | <div class="header-navigation-secondary"></div> | ||
| 1758 | 48 | <div class="header-image"></div> | ||
| 1759 | 49 | <h1>Resources</h1> | ||
| 1760 | 50 | <h2>A collection of some of the most important online references for Juju users and developers.</h2> | ||
| 1761 | 51 | </div> | ||
| 1762 | 52 | </div> | ||
| 1763 | 53 | </header> | ||
| 1778 | 54 | <section id="content" class="container-12"> | 59 | <section id="content" class="container-12"> |
| 1779 | 55 | <div class="grid-12 doc-container"> | 60 | <div class="grid-12 doc-container"> |
| 1780 | 56 | <div class="grid-3 doc-navigation"> | 61 | <div class="grid-3 doc-navigation"> |
| 1781 | @@ -134,43 +139,62 @@ | |||
| 1782 | 134 | </div> | 139 | </div> |
| 1783 | 135 | </section> | 140 | </section> |
| 1784 | 136 | <div class="shadow"></div> | 141 | <div class="shadow"></div> |
| 1820 | 137 | <footer> | 142 | <footer class="global clearfix" role="contentinfo"> |
| 1821 | 138 | <div> | 143 | <div class="row"> |
| 1822 | 139 | <nav role="navigation" class="clearfix"> | 144 | <div class="inner-wrapper"> |
| 1823 | 140 | <ul> | 145 | <nav role="navigation" class="clearfix"> |
| 1824 | 141 | <li><a href="https://juju.ubuntu.com/get-started">Get started</a></li> | 146 | <ul class="footer-a"> |
| 1825 | 142 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li> | 147 | <li class="grid-3 first-col"> |
| 1826 | 143 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li> | 148 | <h4><a href="/get-started">Get started</a></h4> |
| 1827 | 144 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li> | 149 | <ul> |
| 1828 | 145 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li> | 150 | <li class="page_item page-item-20"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li> |
| 1829 | 146 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li> | 151 | <li class="page_item page-item-22"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li> |
| 1830 | 147 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li> | 152 | <li class="page_item page-item-18"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li> |
| 1831 | 148 | </ul> | 153 | <li class="page_item page-item-16"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li> |
| 1832 | 149 | <ul> | 154 | <li class="page_item page-item-3596"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li> |
| 1833 | 150 | <li><a href="https://juju.ubuntu.com/resources">Resources</a></li> | 155 | <li class="page_item page-item-3600"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li> |
| 1834 | 151 | <li><a href="https://juju.ubuntu.com/docs">Documentation</a></li> | 156 | </ul> |
| 1835 | 152 | <li><a href="https://juju.ubuntu.com/resources/videos">Videos</a></li> | 157 | </li> |
| 1836 | 153 | <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI Demo</a></li> | 158 | <li class="grid-3"> |
| 1837 | 154 | </ul> | 159 | <h4><a href="/resources">Resources</a></h4> |
| 1838 | 155 | <ul> | 160 | <ul> |
| 1839 | 156 | <li><a href="https://juju.ubuntu.com/community">Community</a></li> | 161 | <li><a href="http://juju.ubuntu.com/docs">Documentation</a></li> |
| 1840 | 157 | <li class="page_item"><a href="https://juju.ubuntu.com/community/juju-blog/">Blog</a></li> | 162 | <li><a href="/resources/videos/">Videos</a></li> |
| 1841 | 158 | <li class="page_item"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Charm Meetings</a></li> | 163 | <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI demo site</a></li> |
| 1842 | 159 | <li class="page_item"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li> | 164 | </ul> |
| 1843 | 160 | <li class="page_item"><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li> | 165 | </li> |
| 1844 | 161 | <li class="page_item"><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li> | 166 | <li class="grid-3"> |
| 1845 | 162 | <li class="page_item"><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&amp;pagesize=50">FAQ</a></li> | 167 | <h4><a href="/community">Community</a></h4> |
| 1846 | 163 | </ul> | 168 | <ul> |
| 1847 | 164 | <ul class="last"> | 169 | <li class="page_item page-item-28"><a href="https://juju.ubuntu.com/community/juju-blog/">Juju Blog</a></li> |
| 1848 | 165 | <li><a href="https://launchpad.net/juju">Code</a></li> | 170 | <li class="page_item page-item-4262"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Weekly Charm Meeting</a></li> |
| 1849 | 166 | <li><a href="https://launchpad.net/juju-core">Juju Core</a></li> | 171 | <li class="page_item page-item-4036"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li> |
| 1850 | 167 | <li><a href="https://launchpad.net/charms">Charms</a></li> | 172 | <li><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li> |
| 1851 | 168 | </ul> | 173 | <li><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li> |
| 1852 | 169 | </nav> | 174 | <li><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&pagesize=50">FAQ</a></li> |
| 1853 | 170 | </div> | 175 | </ul> |
| 1854 | 171 | </footer> | 176 | </li> |
| 1855 | 177 | <li class="grid-3 last-col"> | ||
| 1856 | 178 | <h4><a href="https://launchpad.net/juju">Code</a></h4> | ||
| 1857 | 179 | <ul> | ||
| 1858 | 180 | <li><a href="https://launchpad.net/juju-core">Juju Core</a></li> | ||
| 1859 | 181 | <li><a href="https://launchpad.net/charms">Charms</a></li> | ||
| 1860 | 182 | </ul> | ||
| 1861 | 183 | </li> | ||
| 1862 | 184 | </ul> | ||
| 1863 | 185 | </nav> | ||
| 1864 | 186 | </div> | ||
| 1865 | 187 | </div> | ||
| 1866 | 188 | <div class="row no-border"> | ||
| 1867 | 189 | <div class="legal inner-wrapper"> | ||
| 1868 | 190 | <p>© 2013 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p> | ||
| 1869 | 191 | <p><a href="https://bugs.launchpad.net/juju-website/+filebug">Report a bug on this site</a></p> | ||
| 1870 | 192 | </div> | ||
| 1871 | 193 | </div> | ||
| 1872 | 194 | </footer> | ||
| 1873 | 195 | |||
| 1874 | 172 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script> | 196 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script> |
| 1876 | 173 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.8.14/jquery-ui.min.js"></script> | 197 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script> |
| 1877 | 174 | <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script> | 198 | <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script> |
| 1878 | 175 | <script type="text/javascript" src="js/main.js"></script> | 199 | <script type="text/javascript" src="js/main.js"></script> |
| 1879 | 176 | </body> | 200 | </body> |
| 1880 | 177 | 201 | ||
| 1881 | === modified file 'htmldocs/authors-subordinate-services.html' | |||
| 1882 | --- htmldocs/authors-subordinate-services.html 2013-07-12 00:12:30 +0000 | |||
| 1883 | +++ htmldocs/authors-subordinate-services.html 2013-07-13 18:35:28 +0000 | |||
| 1884 | @@ -1,56 +1,61 @@ | |||
| 1885 | 1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
| 1886 | 2 | <html> | 2 | <html> |
| 1887 | 3 | <head> | 3 | <head> |
| 1901 | 4 | <meta charset="utf-8"> | 4 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> |
| 1902 | 5 | <title>Juju Documentation - Authoring Charms</title> | 5 | <title>Juju Documentation - Subordinate Services</title> |
| 1903 | 6 | <link href="//fonts.googleapis.com/css?family=Ubuntu:400,400italic" rel="stylesheet" type="text/css"/> | 6 | <link href='https://fonts.googleapis.com/css?family=Ubuntu:400,300,300italic,400italic,700,700italic|Ubuntu+Mono' rel='stylesheet' type='text/css' /> |
| 1904 | 7 | <link href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400" rel="stylesheet" type="text/css"/> | 7 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" /> |
| 1905 | 8 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" rel="stylesheet" type="text/css"/> | 8 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" /> |
| 1906 | 9 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" rel="stylesheet" type="text/css"/> | 9 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" /> |
| 1907 | 10 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" rel="stylesheet" type="text/css"/> | 10 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/home-new.css" /> |
| 1908 | 11 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/resources.css" rel="stylesheet" type="text/css"/> | 11 | <link rel='stylesheet' id='stacktack-css' href='//juju.ubuntu.com/wp-content/plugins/stacktack/css/stacktack.min.css?ver=3.4.2' type='text/css' media='all' /> |
| 1909 | 12 | <link href="css/main.css" rel="stylesheet" type="text/css"/> | 12 | <link href="css/main.css?1373740025" rel="stylesheet" type="text/css"/> |
| 1910 | 13 | <!--[if lt IE 9]> | 13 | |
| 1911 | 14 | <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script> | 14 | <!--[if lt IE 9]> |
| 1912 | 15 | <![endif]--> | 15 | <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script> |
| 1913 | 16 | </head> | 16 | <![endif]--> |
| 1914 | 17 | </head> | ||
| 1915 | 18 | <!-- DO NOT EDIT ABOVE THIS LINE --> | ||
| 1916 | 19 | |||
| 1917 | 20 | <!-- DO NOT EDIT ABOVE THIS LINE --> | ||
| 1918 | 21 | |||
| 1919 | 22 | |||
| 1920 | 17 | <body class="resources"> | 23 | <body class="resources"> |
| 1923 | 18 | <header> | 24 | <header class="global clearfix" role="banner"> |
| 1924 | 19 | <div class="header-login"> | 25 | <div class="header-navigation"> |
| 1925 | 26 | <div> | ||
| 1926 | 27 | <nav role="navigation"> | ||
| 1927 | 20 | <ul> | 28 | <ul> |
| 1929 | 21 | <li> </li> | 29 | <li class="page_item page-item-6"><a href="https://juju.ubuntu.com/">Home</a></li> |
| 1930 | 30 | <li class="page_item page-item-7"><a href="https://juju.ubuntu.com/get-started/">Get started</a></li> | ||
| 1931 | 31 | <li class="page_item page-item-9 current_page_item"><a href="https://juju.ubuntu.com/resources/">Resources</a></li> | ||
| 1932 | 32 | <li class="page_item page-item-13"><a href="https://juju.ubuntu.com/community/">Community</a></li> | ||
| 1933 | 33 | <li class="page_item page-item-3688"><a href="https://juju.ubuntu.com/charm-store/">Charm Store</a></li> | ||
| 1934 | 34 | <li class="page_item page-item-3691"><a href="https://juju.ubuntu.com/events/">Events</a></li> | ||
| 1935 | 35 | <li class="page_item page-item-4474"><a href="https://juju.ubuntu.com/charm-championship/">Charm Championship</a></li> | ||
| 1936 | 36 | <li class="page_item page-item-4249"><a href="https://juju.ubuntu.com/survey/">Survey</a></li> | ||
| 1937 | 37 | <li> | ||
| 1938 | 38 | <form id="form-search" method="get" action="https://juju.ubuntu.com/"> | ||
| 1939 | 39 | <fieldset> | ||
| 1940 | 40 | <input id="input-search" type="text" name="s" value="Search" /> | ||
| 1941 | 41 | </fieldset> | ||
| 1942 | 42 | </form> | ||
| 1943 | 43 | </li> | ||
| 1944 | 22 | </ul> | 44 | </ul> |
| 1976 | 23 | </div> | 45 | </nav> |
| 1977 | 24 | <div class="header-navigation"> | 46 | </div> |
| 1978 | 25 | <div> | 47 | </div> |
| 1979 | 26 | <nav role="navigation"> | 48 | <div class="header-content"> |
| 1980 | 27 | <ul> | 49 | <div class="clearfix"> |
| 1981 | 28 | <li class="page_item"><a href="https://juju.ubuntu.com/">Home</a></li> | 50 | <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav"> |
| 1982 | 29 | <li class="page_item current_page_item"><a href="https://juju.ubuntu.com/">Resources</a></li> | 51 | <div class="header-navigation-secondary"></div> |
| 1983 | 30 | <li class="page_item"><a href="https://juju.ubuntu.com/">Community</a></li> | 52 | <div class="header-image"></div> |
| 1984 | 31 | <li class="page_item"><a href="https://juju.ubuntu.com/">Charm Store</a></li> | 53 | <h1>Resources</h1> |
| 1985 | 32 | <li class="page_item"><a href="https://juju.ubuntu.com/">Events</a></li> | 54 | <h2>A collection of some of the most important online references for Juju users and developers.</h2> |
| 1986 | 33 | <li class="page_item"><a href="https://juju.ubuntu.com/">Survey</a></li> | 55 | </div> |
| 1987 | 34 | <li> | 56 | </div> |
| 1988 | 35 | <form id="form-search" method="get" action="/"> | 57 | </header> |
| 1989 | 36 | <fieldset> | 58 | |
| 1959 | 37 | <input id="input-search" type="text" name="s" value="Search"> | ||
| 1960 | 38 | </fieldset> | ||
| 1961 | 39 | </form> | ||
| 1962 | 40 | </li> | ||
| 1963 | 41 | </ul> | ||
| 1964 | 42 | </nav><a href="https://juju.ubuntu.com/" class="logo-ubuntu"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/logo-ubuntu.png"></a> | ||
| 1965 | 43 | </div> | ||
| 1966 | 44 | </div> | ||
| 1967 | 45 | <div class="header-content"> | ||
| 1968 | 46 | <div class="clearfix"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav"> | ||
| 1969 | 47 | <div class="header-navigation-secondary"></div> | ||
| 1970 | 48 | <div class="header-image"></div> | ||
| 1971 | 49 | <h1>Resources</h1> | ||
| 1972 | 50 | <h2>A collection of some of the most important online references for Juju users and developers.</h2> | ||
| 1973 | 51 | </div> | ||
| 1974 | 52 | </div> | ||
| 1975 | 53 | </header> | ||
| 1990 | 54 | <section id="content" class="container-12"> | 59 | <section id="content" class="container-12"> |
| 1991 | 55 | <div class="grid-12 doc-container"> | 60 | <div class="grid-12 doc-container"> |
| 1992 | 56 | <div class="grid-3 doc-navigation"> | 61 | <div class="grid-3 doc-navigation"> |
| 1993 | @@ -182,43 +187,62 @@ | |||
| 1994 | 182 | </div> | 187 | </div> |
| 1995 | 183 | </section> | 188 | </section> |
| 1996 | 184 | <div class="shadow"></div> | 189 | <div class="shadow"></div> |
| 2032 | 185 | <footer> | 190 | <footer class="global clearfix" role="contentinfo"> |
| 2033 | 186 | <div> | 191 | <div class="row"> |
| 2034 | 187 | <nav role="navigation" class="clearfix"> | 192 | <div class="inner-wrapper"> |
| 2035 | 188 | <ul> | 193 | <nav role="navigation" class="clearfix"> |
| 2036 | 189 | <li><a href="https://juju.ubuntu.com/get-started">Get started</a></li> | 194 | <ul class="footer-a"> |
| 2037 | 190 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li> | 195 | <li class="grid-3 first-col"> |
| 2038 | 191 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li> | 196 | <h4><a href="/get-started">Get started</a></h4> |
| 2039 | 192 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li> | 197 | <ul> |
| 2040 | 193 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li> | 198 | <li class="page_item page-item-20"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li> |
| 2041 | 194 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li> | 199 | <li class="page_item page-item-22"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li> |
| 2042 | 195 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li> | 200 | <li class="page_item page-item-18"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li> |
| 2043 | 196 | </ul> | 201 | <li class="page_item page-item-16"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li> |
| 2044 | 197 | <ul> | 202 | <li class="page_item page-item-3596"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li> |
| 2045 | 198 | <li><a href="https://juju.ubuntu.com/resources">Resources</a></li> | 203 | <li class="page_item page-item-3600"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li> |
| 2046 | 199 | <li><a href="https://juju.ubuntu.com/docs">Documentation</a></li> | 204 | </ul> |
| 2047 | 200 | <li><a href="https://juju.ubuntu.com/resources/videos">Videos</a></li> | 205 | </li> |
| 2048 | 201 | <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI Demo</a></li> | 206 | <li class="grid-3"> |
| 2049 | 202 | </ul> | 207 | <h4><a href="/resources">Resources</a></h4> |
| 2050 | 203 | <ul> | 208 | <ul> |
| 2051 | 204 | <li><a href="https://juju.ubuntu.com/community">Community</a></li> | 209 | <li><a href="http://juju.ubuntu.com/docs">Documentation</a></li> |
| 2052 | 205 | <li class="page_item"><a href="https://juju.ubuntu.com/community/juju-blog/">Blog</a></li> | 210 | <li><a href="/resources/videos/">Videos</a></li> |
| 2053 | 206 | <li class="page_item"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Charm Meetings</a></li> | 211 | <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI demo site</a></li> |
| 2054 | 207 | <li class="page_item"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li> | 212 | </ul> |
| 2055 | 208 | <li class="page_item"><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li> | 213 | </li> |
| 2056 | 209 | <li class="page_item"><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li> | 214 | <li class="grid-3"> |
| 2057 | 210 | <li class="page_item"><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&amp;pagesize=50">FAQ</a></li> | 215 | <h4><a href="/community">Community</a></h4> |
| 2058 | 211 | </ul> | 216 | <ul> |
| 2059 | 212 | <ul class="last"> | 217 | <li class="page_item page-item-28"><a href="https://juju.ubuntu.com/community/juju-blog/">Juju Blog</a></li> |
| 2060 | 213 | <li><a href="https://launchpad.net/juju">Code</a></li> | 218 | <li class="page_item page-item-4262"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Weekly Charm Meeting</a></li> |
| 2061 | 214 | <li><a href="https://launchpad.net/juju-core">Juju Core</a></li> | 219 | <li class="page_item page-item-4036"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li> |
| 2062 | 215 | <li><a href="https://launchpad.net/charms">Charms</a></li> | 220 | <li><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li> |
| 2063 | 216 | </ul> | 221 | <li><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li> |
| 2064 | 217 | </nav> | 222 | <li><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&pagesize=50">FAQ</a></li> |
| 2065 | 218 | </div> | 223 | </ul> |
| 2066 | 219 | </footer> | 224 | </li> |
| 2067 | 225 | <li class="grid-3 last-col"> | ||
| 2068 | 226 | <h4><a href="https://launchpad.net/juju">Code</a></h4> | ||
| 2069 | 227 | <ul> | ||
| 2070 | 228 | <li><a href="https://launchpad.net/juju-core">Juju Core</a></li> | ||
| 2071 | 229 | <li><a href="https://launchpad.net/charms">Charms</a></li> | ||
| 2072 | 230 | </ul> | ||
| 2073 | 231 | </li> | ||
| 2074 | 232 | </ul> | ||
| 2075 | 233 | </nav> | ||
| 2076 | 234 | </div> | ||
| 2077 | 235 | </div> | ||
| 2078 | 236 | <div class="row no-border"> | ||
| 2079 | 237 | <div class="legal inner-wrapper"> | ||
| 2080 | 238 | <p>© 2013 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p> | ||
| 2081 | 239 | <p><a href="https://bugs.launchpad.net/juju-website/+filebug">Report a bug on this site</a></p> | ||
| 2082 | 240 | </div> | ||
| 2083 | 241 | </div> | ||
| 2084 | 242 | </footer> | ||
| 2085 | 243 | |||
| 2086 | 220 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script> | 244 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script> |
| 2088 | 221 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.8.14/jquery-ui.min.js"></script> | 245 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script> |
| 2089 | 222 | <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script> | 246 | <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script> |
| 2090 | 223 | <script type="text/javascript" src="js/main.js"></script> | 247 | <script type="text/javascript" src="js/main.js"></script> |
| 2091 | 224 | </body> | 248 | </body> |
| 2092 | 225 | 249 | ||
| 2093 | === modified file 'htmldocs/authors-testing.html' | |||
| 2094 | --- htmldocs/authors-testing.html 2013-07-12 00:12:30 +0000 | |||
| 2095 | +++ htmldocs/authors-testing.html 2013-07-13 18:35:28 +0000 | |||
| 2096 | @@ -1,56 +1,61 @@ | |||
| 2097 | 1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
| 2098 | 2 | <html> | 2 | <html> |
| 2099 | 3 | <head> | 3 | <head> |
| 2113 | 4 | <meta charset="utf-8"> | 4 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> |
| 2114 | 5 | <title>Juju Documentation - Authoring Charms</title> | 5 | <title>Juju Documentation - Charm Testing</title> |
| 2115 | 6 | <link href="//fonts.googleapis.com/css?family=Ubuntu:400,400italic" rel="stylesheet" type="text/css"/> | 6 | <link href='https://fonts.googleapis.com/css?family=Ubuntu:400,300,300italic,400italic,700,700italic|Ubuntu+Mono' rel='stylesheet' type='text/css' /> |
| 2116 | 7 | <link href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400" rel="stylesheet" type="text/css"/> | 7 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" /> |
| 2117 | 8 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" rel="stylesheet" type="text/css"/> | 8 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" /> |
| 2118 | 9 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" rel="stylesheet" type="text/css"/> | 9 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" /> |
| 2119 | 10 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" rel="stylesheet" type="text/css"/> | 10 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/home-new.css" /> |
| 2120 | 11 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/resources.css" rel="stylesheet" type="text/css"/> | 11 | <link rel='stylesheet' id='stacktack-css' href='//juju.ubuntu.com/wp-content/plugins/stacktack/css/stacktack.min.css?ver=3.4.2' type='text/css' media='all' /> |
| 2121 | 12 | <link href="css/main.css" rel="stylesheet" type="text/css"/> | 12 | <link href="css/main.css?1373740025" rel="stylesheet" type="text/css"/> |
| 2122 | 13 | <!--[if lt IE 9]> | 13 | |
| 2123 | 14 | <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script> | 14 | <!--[if lt IE 9]> |
| 2124 | 15 | <![endif]--> | 15 | <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script> |
| 2125 | 16 | </head> | 16 | <![endif]--> |
| 2126 | 17 | </head> | ||
| 2127 | 18 | <!-- DO NOT EDIT ABOVE THIS LINE --> | ||
| 2128 | 19 | |||
| 2129 | 20 | <!-- DO NOT EDIT ABOVE THIS LINE --> | ||
| 2130 | 21 | |||
| 2131 | 22 | |||
| 2132 | 17 | <body class="resources"> | 23 | <body class="resources"> |
| 2135 | 18 | <header> | 24 | <header class="global clearfix" role="banner"> |
| 2136 | 19 | <div class="header-login"> | 25 | <div class="header-navigation"> |
| 2137 | 26 | <div> | ||
| 2138 | 27 | <nav role="navigation"> | ||
| 2139 | 20 | <ul> | 28 | <ul> |
| 2141 | 21 | <li> </li> | 29 | <li class="page_item page-item-6"><a href="https://juju.ubuntu.com/">Home</a></li> |
| 2142 | 30 | <li class="page_item page-item-7"><a href="https://juju.ubuntu.com/get-started/">Get started</a></li> | ||
| 2143 | 31 | <li class="page_item page-item-9 current_page_item"><a href="https://juju.ubuntu.com/resources/">Resources</a></li> | ||
| 2144 | 32 | <li class="page_item page-item-13"><a href="https://juju.ubuntu.com/community/">Community</a></li> | ||
| 2145 | 33 | <li class="page_item page-item-3688"><a href="https://juju.ubuntu.com/charm-store/">Charm Store</a></li> | ||
| 2146 | 34 | <li class="page_item page-item-3691"><a href="https://juju.ubuntu.com/events/">Events</a></li> | ||
| 2147 | 35 | <li class="page_item page-item-4474"><a href="https://juju.ubuntu.com/charm-championship/">Charm Championship</a></li> | ||
| 2148 | 36 | <li class="page_item page-item-4249"><a href="https://juju.ubuntu.com/survey/">Survey</a></li> | ||
| 2149 | 37 | <li> | ||
| 2150 | 38 | <form id="form-search" method="get" action="https://juju.ubuntu.com/"> | ||
| 2151 | 39 | <fieldset> | ||
| 2152 | 40 | <input id="input-search" type="text" name="s" value="Search" /> | ||
| 2153 | 41 | </fieldset> | ||
| 2154 | 42 | </form> | ||
| 2155 | 43 | </li> | ||
| 2156 | 22 | </ul> | 44 | </ul> |
| 2188 | 23 | </div> | 45 | </nav> |
| 2189 | 24 | <div class="header-navigation"> | 46 | </div> |
| 2190 | 25 | <div> | 47 | </div> |
| 2191 | 26 | <nav role="navigation"> | 48 | <div class="header-content"> |
| 2192 | 27 | <ul> | 49 | <div class="clearfix"> |
| 2193 | 28 | <li class="page_item"><a href="https://juju.ubuntu.com/">Home</a></li> | 50 | <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav"> |
| 2194 | 29 | <li class="page_item current_page_item"><a href="https://juju.ubuntu.com/">Resources</a></li> | 51 | <div class="header-navigation-secondary"></div> |
| 2195 | 30 | <li class="page_item"><a href="https://juju.ubuntu.com/">Community</a></li> | 52 | <div class="header-image"></div> |
| 2196 | 31 | <li class="page_item"><a href="https://juju.ubuntu.com/">Charm Store</a></li> | 53 | <h1>Resources</h1> |
| 2197 | 32 | <li class="page_item"><a href="https://juju.ubuntu.com/">Events</a></li> | 54 | <h2>A collection of some of the most important online references for Juju users and developers.</h2> |
| 2198 | 33 | <li class="page_item"><a href="https://juju.ubuntu.com/">Survey</a></li> | 55 | </div> |
| 2199 | 34 | <li> | 56 | </div> |
| 2200 | 35 | <form id="form-search" method="get" action="/"> | 57 | </header> |
| 2201 | 36 | <fieldset> | 58 | |
| 2171 | 37 | <input id="input-search" type="text" name="s" value="Search"> | ||
| 2172 | 38 | </fieldset> | ||
| 2173 | 39 | </form> | ||
| 2174 | 40 | </li> | ||
| 2175 | 41 | </ul> | ||
| 2176 | 42 | </nav><a href="https://juju.ubuntu.com/" class="logo-ubuntu"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/logo-ubuntu.png"></a> | ||
| 2177 | 43 | </div> | ||
| 2178 | 44 | </div> | ||
| 2179 | 45 | <div class="header-content"> | ||
| 2180 | 46 | <div class="clearfix"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav"> | ||
| 2181 | 47 | <div class="header-navigation-secondary"></div> | ||
| 2182 | 48 | <div class="header-image"></div> | ||
| 2183 | 49 | <h1>Resources</h1> | ||
| 2184 | 50 | <h2>A collection of some of the most important online references for Juju users and developers.</h2> | ||
| 2185 | 51 | </div> | ||
| 2186 | 52 | </div> | ||
| 2187 | 53 | </header> | ||
| 2202 | 54 | <section id="content" class="container-12"> | 59 | <section id="content" class="container-12"> |
| 2203 | 55 | <div class="grid-12 doc-container"> | 60 | <div class="grid-12 doc-container"> |
| 2204 | 56 | <div class="grid-3 doc-navigation"> | 61 | <div class="grid-3 doc-navigation"> |
| 2205 | @@ -305,43 +310,62 @@ | |||
| 2206 | 305 | </div> | 310 | </div> |
| 2207 | 306 | </section> | 311 | </section> |
| 2208 | 307 | <div class="shadow"></div> | 312 | <div class="shadow"></div> |
| 2244 | 308 | <footer> | 313 | <footer class="global clearfix" role="contentinfo"> |
| 2245 | 309 | <div> | 314 | <div class="row"> |
| 2246 | 310 | <nav role="navigation" class="clearfix"> | 315 | <div class="inner-wrapper"> |
| 2247 | 311 | <ul> | 316 | <nav role="navigation" class="clearfix"> |
| 2248 | 312 | <li><a href="https://juju.ubuntu.com/get-started">Get started</a></li> | 317 | <ul class="footer-a"> |
| 2249 | 313 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li> | 318 | <li class="grid-3 first-col"> |
| 2250 | 314 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li> | 319 | <h4><a href="/get-started">Get started</a></h4> |
| 2251 | 315 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li> | 320 | <ul> |
| 2252 | 316 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li> | 321 | <li class="page_item page-item-20"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li> |
| 2253 | 317 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li> | 322 | <li class="page_item page-item-22"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li> |
| 2254 | 318 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li> | 323 | <li class="page_item page-item-18"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li> |
| 2255 | 319 | </ul> | 324 | <li class="page_item page-item-16"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li> |
| 2256 | 320 | <ul> | 325 | <li class="page_item page-item-3596"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li> |
| 2257 | 321 | <li><a href="https://juju.ubuntu.com/resources">Resources</a></li> | 326 | <li class="page_item page-item-3600"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li> |
| 2258 | 322 | <li><a href="https://juju.ubuntu.com/docs">Documentation</a></li> | 327 | </ul> |
| 2259 | 323 | <li><a href="https://juju.ubuntu.com/resources/videos">Videos</a></li> | 328 | </li> |
| 2260 | 324 | <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI Demo</a></li> | 329 | <li class="grid-3"> |
| 2261 | 325 | </ul> | 330 | <h4><a href="/resources">Resources</a></h4> |
| 2262 | 326 | <ul> | 331 | <ul> |
| 2263 | 327 | <li><a href="https://juju.ubuntu.com/community">Community</a></li> | 332 | <li><a href="http://juju.ubuntu.com/docs">Documentation</a></li> |
| 2264 | 328 | <li class="page_item"><a href="https://juju.ubuntu.com/community/juju-blog/">Blog</a></li> | 333 | <li><a href="/resources/videos/">Videos</a></li> |
| 2265 | 329 | <li class="page_item"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Charm Meetings</a></li> | 334 | <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI demo site</a></li> |
| 2266 | 330 | <li class="page_item"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li> | 335 | </ul> |
| 2267 | 331 | <li class="page_item"><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li> | 336 | </li> |
| 2268 | 332 | <li class="page_item"><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li> | 337 | <li class="grid-3"> |
| 2269 | 333 | <li class="page_item"><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&amp;pagesize=50">FAQ</a></li> | 338 | <h4><a href="/community">Community</a></h4> |
| 2270 | 334 | </ul> | 339 | <ul> |
| 2271 | 335 | <ul class="last"> | 340 | <li class="page_item page-item-28"><a href="https://juju.ubuntu.com/community/juju-blog/">Juju Blog</a></li> |
| 2272 | 336 | <li><a href="https://launchpad.net/juju">Code</a></li> | 341 | <li class="page_item page-item-4262"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Weekly Charm Meeting</a></li> |
| 2273 | 337 | <li><a href="https://launchpad.net/juju-core">Juju Core</a></li> | 342 | <li class="page_item page-item-4036"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li> |
| 2274 | 338 | <li><a href="https://launchpad.net/charms">Charms</a></li> | 343 | <li><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li> |
| 2275 | 339 | </ul> | 344 | <li><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li> |
| 2276 | 340 | </nav> | 345 | <li><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&pagesize=50">FAQ</a></li> |
| 2277 | 341 | </div> | 346 | </ul> |
| 2278 | 342 | </footer> | 347 | </li> |
| 2279 | 348 | <li class="grid-3 last-col"> | ||
| 2280 | 349 | <h4><a href="https://launchpad.net/juju">Code</a></h4> | ||
| 2281 | 350 | <ul> | ||
| 2282 | 351 | <li><a href="https://launchpad.net/juju-core">Juju Core</a></li> | ||
| 2283 | 352 | <li><a href="https://launchpad.net/charms">Charms</a></li> | ||
| 2284 | 353 | </ul> | ||
| 2285 | 354 | </li> | ||
| 2286 | 355 | </ul> | ||
| 2287 | 356 | </nav> | ||
| 2288 | 357 | </div> | ||
| 2289 | 358 | </div> | ||
| 2290 | 359 | <div class="row no-border"> | ||
| 2291 | 360 | <div class="legal inner-wrapper"> | ||
| 2292 | 361 | <p>© 2013 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p> | ||
| 2293 | 362 | <p><a href="https://bugs.launchpad.net/juju-website/+filebug">Report a bug on this site</a></p> | ||
| 2294 | 363 | </div> | ||
| 2295 | 364 | </div> | ||
| 2296 | 365 | </footer> | ||
| 2297 | 366 | |||
| 2298 | 343 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script> | 367 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script> |
| 2300 | 344 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.8.14/jquery-ui.min.js"></script> | 368 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script> |
| 2301 | 345 | <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script> | 369 | <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script> |
| 2302 | 346 | <script type="text/javascript" src="js/main.js"></script> | 370 | <script type="text/javascript" src="js/main.js"></script> |
| 2303 | 347 | </body> | 371 | </body> |
| 2304 | 348 | 372 | ||
| 2305 | === modified file 'htmldocs/charms-config.html' | |||
| 2306 | --- htmldocs/charms-config.html 2013-07-12 00:12:30 +0000 | |||
| 2307 | +++ htmldocs/charms-config.html 2013-07-13 18:35:28 +0000 | |||
| 2308 | @@ -1,56 +1,61 @@ | |||
| 2309 | 1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
| 2310 | 2 | <html> | 2 | <html> |
| 2311 | 3 | <head> | 3 | <head> |
| 2325 | 4 | <meta charset="utf-8"> | 4 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> |
| 2326 | 5 | <title>Juju Documentation - Exposing Charms</title> | 5 | <title>Juju Documentation - Service Configuration</title> |
| 2327 | 6 | <link href="//fonts.googleapis.com/css?family=Ubuntu:400,400italic" rel="stylesheet" type="text/css"/> | 6 | <link href='https://fonts.googleapis.com/css?family=Ubuntu:400,300,300italic,400italic,700,700italic|Ubuntu+Mono' rel='stylesheet' type='text/css' /> |
| 2328 | 7 | <link href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400" rel="stylesheet" type="text/css"/> | 7 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" /> |
| 2329 | 8 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" rel="stylesheet" type="text/css"/> | 8 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" /> |
| 2330 | 9 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" rel="stylesheet" type="text/css"/> | 9 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" /> |
| 2331 | 10 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" rel="stylesheet" type="text/css"/> | 10 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/home-new.css" /> |
| 2332 | 11 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/resources.css" rel="stylesheet" type="text/css"/> | 11 | <link rel='stylesheet' id='stacktack-css' href='//juju.ubuntu.com/wp-content/plugins/stacktack/css/stacktack.min.css?ver=3.4.2' type='text/css' media='all' /> |
| 2333 | 12 | <link href="css/main.css" rel="stylesheet" type="text/css"/> | 12 | <link href="css/main.css?1373740025" rel="stylesheet" type="text/css"/> |
| 2334 | 13 | <!--[if lt IE 9]> | 13 | |
| 2335 | 14 | <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script> | 14 | <!--[if lt IE 9]> |
| 2336 | 15 | <![endif]--> | 15 | <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script> |
| 2337 | 16 | </head> | 16 | <![endif]--> |
| 2338 | 17 | </head> | ||
| 2339 | 18 | <!-- DO NOT EDIT ABOVE THIS LINE --> | ||
| 2340 | 19 | |||
| 2341 | 20 | <!-- DO NOT EDIT ABOVE THIS LINE --> | ||
| 2342 | 21 | |||
| 2343 | 22 | |||
| 2344 | 17 | <body class="resources"> | 23 | <body class="resources"> |
| 2347 | 18 | <header> | 24 | <header class="global clearfix" role="banner"> |
| 2348 | 19 | <div class="header-login"> | 25 | <div class="header-navigation"> |
| 2349 | 26 | <div> | ||
| 2350 | 27 | <nav role="navigation"> | ||
| 2351 | 20 | <ul> | 28 | <ul> |
| 2353 | 21 | <li> </li> | 29 | <li class="page_item page-item-6"><a href="https://juju.ubuntu.com/">Home</a></li> |
| 2354 | 30 | <li class="page_item page-item-7"><a href="https://juju.ubuntu.com/get-started/">Get started</a></li> | ||
| 2355 | 31 | <li class="page_item page-item-9 current_page_item"><a href="https://juju.ubuntu.com/resources/">Resources</a></li> | ||
| 2356 | 32 | <li class="page_item page-item-13"><a href="https://juju.ubuntu.com/community/">Community</a></li> | ||
| 2357 | 33 | <li class="page_item page-item-3688"><a href="https://juju.ubuntu.com/charm-store/">Charm Store</a></li> | ||
| 2358 | 34 | <li class="page_item page-item-3691"><a href="https://juju.ubuntu.com/events/">Events</a></li> | ||
| 2359 | 35 | <li class="page_item page-item-4474"><a href="https://juju.ubuntu.com/charm-championship/">Charm Championship</a></li> | ||
| 2360 | 36 | <li class="page_item page-item-4249"><a href="https://juju.ubuntu.com/survey/">Survey</a></li> | ||
| 2361 | 37 | <li> | ||
| 2362 | 38 | <form id="form-search" method="get" action="https://juju.ubuntu.com/"> | ||
| 2363 | 39 | <fieldset> | ||
| 2364 | 40 | <input id="input-search" type="text" name="s" value="Search" /> | ||
| 2365 | 41 | </fieldset> | ||
| 2366 | 42 | </form> | ||
| 2367 | 43 | </li> | ||
| 2368 | 22 | </ul> | 44 | </ul> |
| 2400 | 23 | </div> | 45 | </nav> |
| 2401 | 24 | <div class="header-navigation"> | 46 | </div> |
| 2402 | 25 | <div> | 47 | </div> |
| 2403 | 26 | <nav role="navigation"> | 48 | <div class="header-content"> |
| 2404 | 27 | <ul> | 49 | <div class="clearfix"> |
| 2405 | 28 | <li class="page_item"><a href="https://juju.ubuntu.com/">Home</a></li> | 50 | <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav"> |
| 2406 | 29 | <li class="page_item current_page_item"><a href="https://juju.ubuntu.com/">Resources</a></li> | 51 | <div class="header-navigation-secondary"></div> |
| 2407 | 30 | <li class="page_item"><a href="https://juju.ubuntu.com/">Community</a></li> | 52 | <div class="header-image"></div> |
| 2408 | 31 | <li class="page_item"><a href="https://juju.ubuntu.com/">Charm Store</a></li> | 53 | <h1>Resources</h1> |
| 2409 | 32 | <li class="page_item"><a href="https://juju.ubuntu.com/">Events</a></li> | 54 | <h2>A collection of some of the most important online references for Juju users and developers.</h2> |
| 2410 | 33 | <li class="page_item"><a href="https://juju.ubuntu.com/">Survey</a></li> | 55 | </div> |
| 2411 | 34 | <li> | 56 | </div> |
| 2412 | 35 | <form id="form-search" method="get" action="/"> | 57 | </header> |
| 2413 | 36 | <fieldset> | 58 | |
| 2383 | 37 | <input id="input-search" type="text" name="s" value="Search"> | ||
| 2384 | 38 | </fieldset> | ||
| 2385 | 39 | </form> | ||
| 2386 | 40 | </li> | ||
| 2387 | 41 | </ul> | ||
| 2388 | 42 | </nav><a href="https://juju.ubuntu.com/" class="logo-ubuntu"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/logo-ubuntu.png"></a> | ||
| 2389 | 43 | </div> | ||
| 2390 | 44 | </div> | ||
| 2391 | 45 | <div class="header-content"> | ||
| 2392 | 46 | <div class="clearfix"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav"> | ||
| 2393 | 47 | <div class="header-navigation-secondary"></div> | ||
| 2394 | 48 | <div class="header-image"></div> | ||
| 2395 | 49 | <h1>Resources</h1> | ||
| 2396 | 50 | <h2>A collection of some of the most important online references for Juju users and developers.</h2> | ||
| 2397 | 51 | </div> | ||
| 2398 | 52 | </div> | ||
| 2399 | 53 | </header> | ||
| 2414 | 54 | <section id="content" class="container-12"> | 59 | <section id="content" class="container-12"> |
| 2415 | 55 | <div class="grid-12 doc-container"> | 60 | <div class="grid-12 doc-container"> |
| 2416 | 56 | <div class="grid-3 doc-navigation"> | 61 | <div class="grid-3 doc-navigation"> |
| 2417 | @@ -172,43 +177,62 @@ | |||
| 2418 | 172 | </div> | 177 | </div> |
| 2419 | 173 | </section> | 178 | </section> |
| 2420 | 174 | <div class="shadow"></div> | 179 | <div class="shadow"></div> |
| 2456 | 175 | <footer> | 180 | <footer class="global clearfix" role="contentinfo"> |
| 2457 | 176 | <div> | 181 | <div class="row"> |
| 2458 | 177 | <nav role="navigation" class="clearfix"> | 182 | <div class="inner-wrapper"> |
| 2459 | 178 | <ul> | 183 | <nav role="navigation" class="clearfix"> |
| 2460 | 179 | <li><a href="https://juju.ubuntu.com/get-started">Get started</a></li> | 184 | <ul class="footer-a"> |
| 2461 | 180 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li> | 185 | <li class="grid-3 first-col"> |
| 2462 | 181 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li> | 186 | <h4><a href="/get-started">Get started</a></h4> |
| 2463 | 182 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li> | 187 | <ul> |
| 2464 | 183 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li> | 188 | <li class="page_item page-item-20"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li> |
| 2465 | 184 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li> | 189 | <li class="page_item page-item-22"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li> |
| 2466 | 185 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li> | 190 | <li class="page_item page-item-18"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li> |
| 2467 | 186 | </ul> | 191 | <li class="page_item page-item-16"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li> |
| 2468 | 187 | <ul> | 192 | <li class="page_item page-item-3596"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li> |
| 2469 | 188 | <li><a href="https://juju.ubuntu.com/resources">Resources</a></li> | 193 | <li class="page_item page-item-3600"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li> |
| 2470 | 189 | <li><a href="https://juju.ubuntu.com/docs">Documentation</a></li> | 194 | </ul> |
| 2471 | 190 | <li><a href="https://juju.ubuntu.com/resources/videos">Videos</a></li> | 195 | </li> |
| 2472 | 191 | <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI Demo</a></li> | 196 | <li class="grid-3"> |
| 2473 | 192 | </ul> | 197 | <h4><a href="/resources">Resources</a></h4> |
| 2474 | 193 | <ul> | 198 | <ul> |
| 2475 | 194 | <li><a href="https://juju.ubuntu.com/community">Community</a></li> | 199 | <li><a href="http://juju.ubuntu.com/docs">Documentation</a></li> |
| 2476 | 195 | <li class="page_item"><a href="https://juju.ubuntu.com/community/juju-blog/">Blog</a></li> | 200 | <li><a href="/resources/videos/">Videos</a></li> |
| 2477 | 196 | <li class="page_item"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Charm Meetings</a></li> | 201 | <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI demo site</a></li> |
| 2478 | 197 | <li class="page_item"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li> | 202 | </ul> |
| 2479 | 198 | <li class="page_item"><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li> | 203 | </li> |
| 2480 | 199 | <li class="page_item"><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li> | 204 | <li class="grid-3"> |
| 2481 | 200 | <li class="page_item"><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&amp;pagesize=50">FAQ</a></li> | 205 | <h4><a href="/community">Community</a></h4> |
| 2482 | 201 | </ul> | 206 | <ul> |
| 2483 | 202 | <ul class="last"> | 207 | <li class="page_item page-item-28"><a href="https://juju.ubuntu.com/community/juju-blog/">Juju Blog</a></li> |
| 2484 | 203 | <li><a href="https://launchpad.net/juju">Code</a></li> | 208 | <li class="page_item page-item-4262"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Weekly Charm Meeting</a></li> |
| 2485 | 204 | <li><a href="https://launchpad.net/juju-core">Juju Core</a></li> | 209 | <li class="page_item page-item-4036"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li> |
| 2486 | 205 | <li><a href="https://launchpad.net/charms">Charms</a></li> | 210 | <li><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li> |
| 2487 | 206 | </ul> | 211 | <li><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li> |
| 2488 | 207 | </nav> | 212 | <li><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&pagesize=50">FAQ</a></li> |
| 2489 | 208 | </div> | 213 | </ul> |
| 2490 | 209 | </footer> | 214 | </li> |
| 2491 | 215 | <li class="grid-3 last-col"> | ||
| 2492 | 216 | <h4><a href="https://launchpad.net/juju">Code</a></h4> | ||
| 2493 | 217 | <ul> | ||
| 2494 | 218 | <li><a href="https://launchpad.net/juju-core">Juju Core</a></li> | ||
| 2495 | 219 | <li><a href="https://launchpad.net/charms">Charms</a></li> | ||
| 2496 | 220 | </ul> | ||
| 2497 | 221 | </li> | ||
| 2498 | 222 | </ul> | ||
| 2499 | 223 | </nav> | ||
| 2500 | 224 | </div> | ||
| 2501 | 225 | </div> | ||
| 2502 | 226 | <div class="row no-border"> | ||
| 2503 | 227 | <div class="legal inner-wrapper"> | ||
| 2504 | 228 | <p>© 2013 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p> | ||
| 2505 | 229 | <p><a href="https://bugs.launchpad.net/juju-website/+filebug">Report a bug on this site</a></p> | ||
| 2506 | 230 | </div> | ||
| 2507 | 231 | </div> | ||
| 2508 | 232 | </footer> | ||
| 2509 | 233 | |||
| 2510 | 210 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script> | 234 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script> |
| 2512 | 211 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.8.14/jquery-ui.min.js"></script> | 235 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script> |
| 2513 | 212 | <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script> | 236 | <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script> |
| 2514 | 213 | <script type="text/javascript" src="js/main.js"></script> | 237 | <script type="text/javascript" src="js/main.js"></script> |
| 2515 | 214 | </body> | 238 | </body> |
| 2516 | 215 | 239 | ||
| 2517 | === modified file 'htmldocs/charms-constraints.html' | |||
| 2518 | --- htmldocs/charms-constraints.html 2013-07-12 00:12:30 +0000 | |||
| 2519 | +++ htmldocs/charms-constraints.html 2013-07-13 18:35:28 +0000 | |||
| 2520 | @@ -1,56 +1,61 @@ | |||
| 2521 | 1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
| 2522 | 2 | <html> | 2 | <html> |
| 2523 | 3 | <head> | 3 | <head> |
| 2537 | 4 | <meta charset="utf-8"> | 4 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> |
| 2538 | 5 | <title>Juju Documentation - Using Constraints</title> | 5 | <title>Juju Documentation - Using Constraints</title> |
| 2539 | 6 | <link href="//fonts.googleapis.com/css?family=Ubuntu:400,400italic" rel="stylesheet" type="text/css"/> | 6 | <link href='https://fonts.googleapis.com/css?family=Ubuntu:400,300,300italic,400italic,700,700italic|Ubuntu+Mono' rel='stylesheet' type='text/css' /> |
| 2540 | 7 | <link href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400" rel="stylesheet" type="text/css"/> | 7 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" /> |
| 2541 | 8 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" rel="stylesheet" type="text/css"/> | 8 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" /> |
| 2542 | 9 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" rel="stylesheet" type="text/css"/> | 9 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" /> |
| 2543 | 10 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" rel="stylesheet" type="text/css"/> | 10 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/home-new.css" /> |
| 2544 | 11 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/resources.css" rel="stylesheet" type="text/css"/> | 11 | <link rel='stylesheet' id='stacktack-css' href='//juju.ubuntu.com/wp-content/plugins/stacktack/css/stacktack.min.css?ver=3.4.2' type='text/css' media='all' /> |
| 2545 | 12 | <link href="css/main.css" rel="stylesheet" type="text/css"/> | 12 | <link href="css/main.css?1373740025" rel="stylesheet" type="text/css"/> |
| 2546 | 13 | <!--[if lt IE 9]> | 13 | |
| 2547 | 14 | <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script> | 14 | <!--[if lt IE 9]> |
| 2548 | 15 | <![endif]--> | 15 | <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script> |
| 2549 | 16 | </head> | 16 | <![endif]--> |
| 2550 | 17 | </head> | ||
| 2551 | 18 | <!-- DO NOT EDIT ABOVE THIS LINE --> | ||
| 2552 | 19 | |||
| 2553 | 20 | <!-- DO NOT EDIT ABOVE THIS LINE --> | ||
| 2554 | 21 | |||
| 2555 | 22 | |||
| 2556 | 17 | <body class="resources"> | 23 | <body class="resources"> |
| 2559 | 18 | <header> | 24 | <header class="global clearfix" role="banner"> |
| 2560 | 19 | <div class="header-login"> | 25 | <div class="header-navigation"> |
| 2561 | 26 | <div> | ||
| 2562 | 27 | <nav role="navigation"> | ||
| 2563 | 20 | <ul> | 28 | <ul> |
| 2565 | 21 | <li> </li> | 29 | <li class="page_item page-item-6"><a href="https://juju.ubuntu.com/">Home</a></li> |
| 2566 | 30 | <li class="page_item page-item-7"><a href="https://juju.ubuntu.com/get-started/">Get started</a></li> | ||
| 2567 | 31 | <li class="page_item page-item-9 current_page_item"><a href="https://juju.ubuntu.com/resources/">Resources</a></li> | ||
| 2568 | 32 | <li class="page_item page-item-13"><a href="https://juju.ubuntu.com/community/">Community</a></li> | ||
| 2569 | 33 | <li class="page_item page-item-3688"><a href="https://juju.ubuntu.com/charm-store/">Charm Store</a></li> | ||
| 2570 | 34 | <li class="page_item page-item-3691"><a href="https://juju.ubuntu.com/events/">Events</a></li> | ||
| 2571 | 35 | <li class="page_item page-item-4474"><a href="https://juju.ubuntu.com/charm-championship/">Charm Championship</a></li> | ||
| 2572 | 36 | <li class="page_item page-item-4249"><a href="https://juju.ubuntu.com/survey/">Survey</a></li> | ||
| 2573 | 37 | <li> | ||
| 2574 | 38 | <form id="form-search" method="get" action="https://juju.ubuntu.com/"> | ||
| 2575 | 39 | <fieldset> | ||
| 2576 | 40 | <input id="input-search" type="text" name="s" value="Search" /> | ||
| 2577 | 41 | </fieldset> | ||
| 2578 | 42 | </form> | ||
| 2579 | 43 | </li> | ||
| 2580 | 22 | </ul> | 44 | </ul> |
| 2612 | 23 | </div> | 45 | </nav> |
| 2613 | 24 | <div class="header-navigation"> | 46 | </div> |
| 2614 | 25 | <div> | 47 | </div> |
| 2615 | 26 | <nav role="navigation"> | 48 | <div class="header-content"> |
| 2616 | 27 | <ul> | 49 | <div class="clearfix"> |
| 2617 | 28 | <li class="page_item"><a href="https://juju.ubuntu.com/">Home</a></li> | 50 | <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav"> |
| 2618 | 29 | <li class="page_item current_page_item"><a href="https://juju.ubuntu.com/">Resources</a></li> | 51 | <div class="header-navigation-secondary"></div> |
| 2619 | 30 | <li class="page_item"><a href="https://juju.ubuntu.com/">Community</a></li> | 52 | <div class="header-image"></div> |
| 2620 | 31 | <li class="page_item"><a href="https://juju.ubuntu.com/">Charm Store</a></li> | 53 | <h1>Resources</h1> |
| 2621 | 32 | <li class="page_item"><a href="https://juju.ubuntu.com/">Events</a></li> | 54 | <h2>A collection of some of the most important online references for Juju users and developers.</h2> |
| 2622 | 33 | <li class="page_item"><a href="https://juju.ubuntu.com/">Survey</a></li> | 55 | </div> |
| 2623 | 34 | <li> | 56 | </div> |
| 2624 | 35 | <form id="form-search" method="get" action="/"> | 57 | </header> |
| 2625 | 36 | <fieldset> | 58 | |
| 2595 | 37 | <input id="input-search" type="text" name="s" value="Search"> | ||
| 2596 | 38 | </fieldset> | ||
| 2597 | 39 | </form> | ||
| 2598 | 40 | </li> | ||
| 2599 | 41 | </ul> | ||
| 2600 | 42 | </nav><a href="https://juju.ubuntu.com/" class="logo-ubuntu"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/logo-ubuntu.png"></a> | ||
| 2601 | 43 | </div> | ||
| 2602 | 44 | </div> | ||
| 2603 | 45 | <div class="header-content"> | ||
| 2604 | 46 | <div class="clearfix"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav"> | ||
| 2605 | 47 | <div class="header-navigation-secondary"></div> | ||
| 2606 | 48 | <div class="header-image"></div> | ||
| 2607 | 49 | <h1>Resources</h1> | ||
| 2608 | 50 | <h2>A collection of some of the most important online references for Juju users and developers.</h2> | ||
| 2609 | 51 | </div> | ||
| 2610 | 52 | </div> | ||
| 2611 | 53 | </header> | ||
| 2626 | 54 | <section id="content" class="container-12"> | 59 | <section id="content" class="container-12"> |
| 2627 | 55 | <div class="grid-12 doc-container"> | 60 | <div class="grid-12 doc-container"> |
| 2628 | 56 | <div class="grid-3 doc-navigation"> | 61 | <div class="grid-3 doc-navigation"> |
| 2629 | @@ -197,43 +202,62 @@ | |||
| 2630 | 197 | </div> | 202 | </div> |
| 2631 | 198 | </section> | 203 | </section> |
| 2632 | 199 | <div class="shadow"></div> | 204 | <div class="shadow"></div> |
| 2668 | 200 | <footer> | 205 | <footer class="global clearfix" role="contentinfo"> |
| 2669 | 201 | <div> | 206 | <div class="row"> |
| 2670 | 202 | <nav role="navigation" class="clearfix"> | 207 | <div class="inner-wrapper"> |
| 2671 | 203 | <ul> | 208 | <nav role="navigation" class="clearfix"> |
| 2672 | 204 | <li><a href="https://juju.ubuntu.com/get-started">Get started</a></li> | 209 | <ul class="footer-a"> |
| 2673 | 205 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li> | 210 | <li class="grid-3 first-col"> |
| 2674 | 206 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li> | 211 | <h4><a href="/get-started">Get started</a></h4> |
| 2675 | 207 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li> | 212 | <ul> |
| 2676 | 208 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li> | 213 | <li class="page_item page-item-20"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li> |
| 2677 | 209 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li> | 214 | <li class="page_item page-item-22"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li> |
| 2678 | 210 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li> | 215 | <li class="page_item page-item-18"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li> |
| 2679 | 211 | </ul> | 216 | <li class="page_item page-item-16"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li> |
| 2680 | 212 | <ul> | 217 | <li class="page_item page-item-3596"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li> |
| 2681 | 213 | <li><a href="https://juju.ubuntu.com/resources">Resources</a></li> | 218 | <li class="page_item page-item-3600"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li> |
| 2682 | 214 | <li><a href="https://juju.ubuntu.com/docs">Documentation</a></li> | 219 | </ul> |
| 2683 | 215 | <li><a href="https://juju.ubuntu.com/resources/videos">Videos</a></li> | 220 | </li> |
| 2684 | 216 | <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI Demo</a></li> | 221 | <li class="grid-3"> |
| 2685 | 217 | </ul> | 222 | <h4><a href="/resources">Resources</a></h4> |
| 2686 | 218 | <ul> | 223 | <ul> |
| 2687 | 219 | <li><a href="https://juju.ubuntu.com/community">Community</a></li> | 224 | <li><a href="http://juju.ubuntu.com/docs">Documentation</a></li> |
| 2688 | 220 | <li class="page_item"><a href="https://juju.ubuntu.com/community/juju-blog/">Blog</a></li> | 225 | <li><a href="/resources/videos/">Videos</a></li> |
| 2689 | 221 | <li class="page_item"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Charm Meetings</a></li> | 226 | <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI demo site</a></li> |
| 2690 | 222 | <li class="page_item"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li> | 227 | </ul> |
| 2691 | 223 | <li class="page_item"><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li> | 228 | </li> |
| 2692 | 224 | <li class="page_item"><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li> | 229 | <li class="grid-3"> |
| 2693 | 225 | <li class="page_item"><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&amp;pagesize=50">FAQ</a></li> | 230 | <h4><a href="/community">Community</a></h4> |
| 2694 | 226 | </ul> | 231 | <ul> |
| 2695 | 227 | <ul class="last"> | 232 | <li class="page_item page-item-28"><a href="https://juju.ubuntu.com/community/juju-blog/">Juju Blog</a></li> |
| 2696 | 228 | <li><a href="https://launchpad.net/juju">Code</a></li> | 233 | <li class="page_item page-item-4262"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Weekly Charm Meeting</a></li> |
| 2697 | 229 | <li><a href="https://launchpad.net/juju-core">Juju Core</a></li> | 234 | <li class="page_item page-item-4036"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li> |
| 2698 | 230 | <li><a href="https://launchpad.net/charms">Charms</a></li> | 235 | <li><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li> |
| 2699 | 231 | </ul> | 236 | <li><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li> |
| 2700 | 232 | </nav> | 237 | <li><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&pagesize=50">FAQ</a></li> |
| 2701 | 233 | </div> | 238 | </ul> |
| 2702 | 234 | </footer> | 239 | </li> |
| 2703 | 240 | <li class="grid-3 last-col"> | ||
| 2704 | 241 | <h4><a href="https://launchpad.net/juju">Code</a></h4> | ||
| 2705 | 242 | <ul> | ||
| 2706 | 243 | <li><a href="https://launchpad.net/juju-core">Juju Core</a></li> | ||
| 2707 | 244 | <li><a href="https://launchpad.net/charms">Charms</a></li> | ||
| 2708 | 245 | </ul> | ||
| 2709 | 246 | </li> | ||
| 2710 | 247 | </ul> | ||
| 2711 | 248 | </nav> | ||
| 2712 | 249 | </div> | ||
| 2713 | 250 | </div> | ||
| 2714 | 251 | <div class="row no-border"> | ||
| 2715 | 252 | <div class="legal inner-wrapper"> | ||
| 2716 | 253 | <p>© 2013 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p> | ||
| 2717 | 254 | <p><a href="https://bugs.launchpad.net/juju-website/+filebug">Report a bug on this site</a></p> | ||
| 2718 | 255 | </div> | ||
| 2719 | 256 | </div> | ||
| 2720 | 257 | </footer> | ||
| 2721 | 258 | |||
| 2722 | 235 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script> | 259 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script> |
| 2724 | 236 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.8.14/jquery-ui.min.js"></script> | 260 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script> |
| 2725 | 237 | <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script> | 261 | <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script> |
| 2726 | 238 | <script type="text/javascript" src="js/main.js"></script> | 262 | <script type="text/javascript" src="js/main.js"></script> |
| 2727 | 239 | </body> | 263 | </body> |
| 2728 | 240 | 264 | ||
| 2729 | === modified file 'htmldocs/charms-deploying.html' | |||
| 2730 | --- htmldocs/charms-deploying.html 2013-07-12 00:12:30 +0000 | |||
| 2731 | +++ htmldocs/charms-deploying.html 2013-07-13 18:35:28 +0000 | |||
| 2732 | @@ -1,56 +1,61 @@ | |||
| 2733 | 1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
| 2734 | 2 | <html> | 2 | <html> |
| 2735 | 3 | <head> | 3 | <head> |
| 2749 | 4 | <meta charset="utf-8"> | 4 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> |
| 2750 | 5 | <title>Juju Documentation - Deploying charms</title> | 5 | <title>Juju Documentation - Deploying Services</title> |
| 2751 | 6 | <link href="//fonts.googleapis.com/css?family=Ubuntu:400,400italic" rel="stylesheet" type="text/css"/> | 6 | <link href='https://fonts.googleapis.com/css?family=Ubuntu:400,300,300italic,400italic,700,700italic|Ubuntu+Mono' rel='stylesheet' type='text/css' /> |
| 2752 | 7 | <link href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400" rel="stylesheet" type="text/css"/> | 7 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" /> |
| 2753 | 8 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" rel="stylesheet" type="text/css"/> | 8 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" /> |
| 2754 | 9 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" rel="stylesheet" type="text/css"/> | 9 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" /> |
| 2755 | 10 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" rel="stylesheet" type="text/css"/> | 10 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/home-new.css" /> |
| 2756 | 11 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/resources.css" rel="stylesheet" type="text/css"/> | 11 | <link rel='stylesheet' id='stacktack-css' href='//juju.ubuntu.com/wp-content/plugins/stacktack/css/stacktack.min.css?ver=3.4.2' type='text/css' media='all' /> |
| 2757 | 12 | <link href="css/main.css" rel="stylesheet" type="text/css"/> | 12 | <link href="css/main.css?1373740025" rel="stylesheet" type="text/css"/> |
| 2758 | 13 | <!--[if lt IE 9]> | 13 | |
| 2759 | 14 | <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script> | 14 | <!--[if lt IE 9]> |
| 2760 | 15 | <![endif]--> | 15 | <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script> |
| 2761 | 16 | </head> | 16 | <![endif]--> |
| 2762 | 17 | </head> | ||
| 2763 | 18 | <!-- DO NOT EDIT ABOVE THIS LINE --> | ||
| 2764 | 19 | |||
| 2765 | 20 | <!-- DO NOT EDIT ABOVE THIS LINE --> | ||
| 2766 | 21 | |||
| 2767 | 22 | |||
| 2768 | 17 | <body class="resources"> | 23 | <body class="resources"> |
| 2771 | 18 | <header> | 24 | <header class="global clearfix" role="banner"> |
| 2772 | 19 | <div class="header-login"> | 25 | <div class="header-navigation"> |
| 2773 | 26 | <div> | ||
| 2774 | 27 | <nav role="navigation"> | ||
| 2775 | 20 | <ul> | 28 | <ul> |
| 2777 | 21 | <li> </li> | 29 | <li class="page_item page-item-6"><a href="https://juju.ubuntu.com/">Home</a></li> |
| 2778 | 30 | <li class="page_item page-item-7"><a href="https://juju.ubuntu.com/get-started/">Get started</a></li> | ||
| 2779 | 31 | <li class="page_item page-item-9 current_page_item"><a href="https://juju.ubuntu.com/resources/">Resources</a></li> | ||
| 2780 | 32 | <li class="page_item page-item-13"><a href="https://juju.ubuntu.com/community/">Community</a></li> | ||
| 2781 | 33 | <li class="page_item page-item-3688"><a href="https://juju.ubuntu.com/charm-store/">Charm Store</a></li> | ||
| 2782 | 34 | <li class="page_item page-item-3691"><a href="https://juju.ubuntu.com/events/">Events</a></li> | ||
| 2783 | 35 | <li class="page_item page-item-4474"><a href="https://juju.ubuntu.com/charm-championship/">Charm Championship</a></li> | ||
| 2784 | 36 | <li class="page_item page-item-4249"><a href="https://juju.ubuntu.com/survey/">Survey</a></li> | ||
| 2785 | 37 | <li> | ||
| 2786 | 38 | <form id="form-search" method="get" action="https://juju.ubuntu.com/"> | ||
| 2787 | 39 | <fieldset> | ||
| 2788 | 40 | <input id="input-search" type="text" name="s" value="Search" /> | ||
| 2789 | 41 | </fieldset> | ||
| 2790 | 42 | </form> | ||
| 2791 | 43 | </li> | ||
| 2792 | 22 | </ul> | 44 | </ul> |
| 2824 | 23 | </div> | 45 | </nav> |
| 2825 | 24 | <div class="header-navigation"> | 46 | </div> |
| 2826 | 25 | <div> | 47 | </div> |
| 2827 | 26 | <nav role="navigation"> | 48 | <div class="header-content"> |
| 2828 | 27 | <ul> | 49 | <div class="clearfix"> |
| 2829 | 28 | <li class="page_item"><a href="https://juju.ubuntu.com/">Home</a></li> | 50 | <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav"> |
| 2830 | 29 | <li class="page_item current_page_item"><a href="https://juju.ubuntu.com/">Resources</a></li> | 51 | <div class="header-navigation-secondary"></div> |
| 2831 | 30 | <li class="page_item"><a href="https://juju.ubuntu.com/">Community</a></li> | 52 | <div class="header-image"></div> |
| 2832 | 31 | <li class="page_item"><a href="https://juju.ubuntu.com/">Charm Store</a></li> | 53 | <h1>Resources</h1> |
| 2833 | 32 | <li class="page_item"><a href="https://juju.ubuntu.com/">Events</a></li> | 54 | <h2>A collection of some of the most important online references for Juju users and developers.</h2> |
| 2834 | 33 | <li class="page_item"><a href="https://juju.ubuntu.com/">Survey</a></li> | 55 | </div> |
| 2835 | 34 | <li> | 56 | </div> |
| 2836 | 35 | <form id="form-search" method="get" action="/"> | 57 | </header> |
| 2837 | 36 | <fieldset> | 58 | |
| 2807 | 37 | <input id="input-search" type="text" name="s" value="Search"> | ||
| 2808 | 38 | </fieldset> | ||
| 2809 | 39 | </form> | ||
| 2810 | 40 | </li> | ||
| 2811 | 41 | </ul> | ||
| 2812 | 42 | </nav><a href="https://juju.ubuntu.com/" class="logo-ubuntu"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/logo-ubuntu.png"></a> | ||
| 2813 | 43 | </div> | ||
| 2814 | 44 | </div> | ||
| 2815 | 45 | <div class="header-content"> | ||
| 2816 | 46 | <div class="clearfix"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav"> | ||
| 2817 | 47 | <div class="header-navigation-secondary"></div> | ||
| 2818 | 48 | <div class="header-image"></div> | ||
| 2819 | 49 | <h1>Resources</h1> | ||
| 2820 | 50 | <h2>A collection of some of the most important online references for Juju users and developers.</h2> | ||
| 2821 | 51 | </div> | ||
| 2822 | 52 | </div> | ||
| 2823 | 53 | </header> | ||
| 2838 | 54 | <section id="content" class="container-12"> | 59 | <section id="content" class="container-12"> |
| 2839 | 55 | <div class="grid-12 doc-container"> | 60 | <div class="grid-12 doc-container"> |
| 2840 | 56 | <div class="grid-3 doc-navigation"> | 61 | <div class="grid-3 doc-navigation"> |
| 2841 | @@ -144,43 +149,62 @@ | |||
| 2842 | 144 | </div> | 149 | </div> |
| 2843 | 145 | </section> | 150 | </section> |
| 2844 | 146 | <div class="shadow"></div> | 151 | <div class="shadow"></div> |
| 2880 | 147 | <footer> | 152 | <footer class="global clearfix" role="contentinfo"> |
| 2881 | 148 | <div> | 153 | <div class="row"> |
| 2882 | 149 | <nav role="navigation" class="clearfix"> | 154 | <div class="inner-wrapper"> |
| 2883 | 150 | <ul> | 155 | <nav role="navigation" class="clearfix"> |
| 2884 | 151 | <li><a href="https://juju.ubuntu.com/get-started">Get started</a></li> | 156 | <ul class="footer-a"> |
| 2885 | 152 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li> | 157 | <li class="grid-3 first-col"> |
| 2886 | 153 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li> | 158 | <h4><a href="/get-started">Get started</a></h4> |
| 2887 | 154 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li> | 159 | <ul> |
| 2888 | 155 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li> | 160 | <li class="page_item page-item-20"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li> |
| 2889 | 156 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li> | 161 | <li class="page_item page-item-22"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li> |
| 2890 | 157 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li> | 162 | <li class="page_item page-item-18"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li> |
| 2891 | 158 | </ul> | 163 | <li class="page_item page-item-16"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li> |
| 2892 | 159 | <ul> | 164 | <li class="page_item page-item-3596"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li> |
| 2893 | 160 | <li><a href="https://juju.ubuntu.com/resources">Resources</a></li> | 165 | <li class="page_item page-item-3600"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li> |
| 2894 | 161 | <li><a href="https://juju.ubuntu.com/docs">Documentation</a></li> | 166 | </ul> |
| 2895 | 162 | <li><a href="https://juju.ubuntu.com/resources/videos">Videos</a></li> | 167 | </li> |
| 2896 | 163 | <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI Demo</a></li> | 168 | <li class="grid-3"> |
| 2897 | 164 | </ul> | 169 | <h4><a href="/resources">Resources</a></h4> |
| 2898 | 165 | <ul> | 170 | <ul> |
| 2899 | 166 | <li><a href="https://juju.ubuntu.com/community">Community</a></li> | 171 | <li><a href="http://juju.ubuntu.com/docs">Documentation</a></li> |
| 2900 | 167 | <li class="page_item"><a href="https://juju.ubuntu.com/community/juju-blog/">Blog</a></li> | 172 | <li><a href="/resources/videos/">Videos</a></li> |
| 2901 | 168 | <li class="page_item"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Charm Meetings</a></li> | 173 | <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI demo site</a></li> |
| 2902 | 169 | <li class="page_item"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li> | 174 | </ul> |
| 2903 | 170 | <li class="page_item"><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li> | 175 | </li> |
| 2904 | 171 | <li class="page_item"><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li> | 176 | <li class="grid-3"> |
| 2905 | 172 | <li class="page_item"><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&amp;pagesize=50">FAQ</a></li> | 177 | <h4><a href="/community">Community</a></h4> |
| 2906 | 173 | </ul> | 178 | <ul> |
| 2907 | 174 | <ul class="last"> | 179 | <li class="page_item page-item-28"><a href="https://juju.ubuntu.com/community/juju-blog/">Juju Blog</a></li> |
| 2908 | 175 | <li><a href="https://launchpad.net/juju">Code</a></li> | 180 | <li class="page_item page-item-4262"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Weekly Charm Meeting</a></li> |
| 2909 | 176 | <li><a href="https://launchpad.net/juju-core">Juju Core</a></li> | 181 | <li class="page_item page-item-4036"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li> |
| 2910 | 177 | <li><a href="https://launchpad.net/charms">Charms</a></li> | 182 | <li><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li> |
| 2911 | 178 | </ul> | 183 | <li><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li> |
| 2912 | 179 | </nav> | 184 | <li><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&pagesize=50">FAQ</a></li> |
| 2913 | 180 | </div> | 185 | </ul> |
| 2914 | 181 | </footer> | 186 | </li> |
| 2915 | 187 | <li class="grid-3 last-col"> | ||
| 2916 | 188 | <h4><a href="https://launchpad.net/juju">Code</a></h4> | ||
| 2917 | 189 | <ul> | ||
| 2918 | 190 | <li><a href="https://launchpad.net/juju-core">Juju Core</a></li> | ||
| 2919 | 191 | <li><a href="https://launchpad.net/charms">Charms</a></li> | ||
| 2920 | 192 | </ul> | ||
| 2921 | 193 | </li> | ||
| 2922 | 194 | </ul> | ||
| 2923 | 195 | </nav> | ||
| 2924 | 196 | </div> | ||
| 2925 | 197 | </div> | ||
| 2926 | 198 | <div class="row no-border"> | ||
| 2927 | 199 | <div class="legal inner-wrapper"> | ||
| 2928 | 200 | <p>© 2013 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p> | ||
| 2929 | 201 | <p><a href="https://bugs.launchpad.net/juju-website/+filebug">Report a bug on this site</a></p> | ||
| 2930 | 202 | </div> | ||
| 2931 | 203 | </div> | ||
| 2932 | 204 | </footer> | ||
| 2933 | 205 | |||
| 2934 | 182 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script> | 206 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script> |
| 2936 | 183 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.8.14/jquery-ui.min.js"></script> | 207 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script> |
| 2937 | 184 | <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script> | 208 | <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script> |
| 2938 | 185 | <script type="text/javascript" src="js/main.js"></script> | 209 | <script type="text/javascript" src="js/main.js"></script> |
| 2939 | 186 | </body> | 210 | </body> |
| 2940 | 187 | 211 | ||
| 2941 | === modified file 'htmldocs/charms-destroy.html' | |||
| 2942 | --- htmldocs/charms-destroy.html 2013-07-12 00:12:30 +0000 | |||
| 2943 | +++ htmldocs/charms-destroy.html 2013-07-13 18:35:28 +0000 | |||
| 2944 | @@ -1,56 +1,61 @@ | |||
| 2945 | 1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
| 2946 | 2 | <html> | 2 | <html> |
| 2947 | 3 | <head> | 3 | <head> |
| 2961 | 4 | <meta charset="utf-8"> | 4 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> |
| 2962 | 5 | <title>Juju Documentation - Destroying Services</title> | 5 | <title>Juju Documentation - Destroying Services</title> |
| 2963 | 6 | <link href="//fonts.googleapis.com/css?family=Ubuntu:400,400italic" rel="stylesheet" type="text/css"/> | 6 | <link href='https://fonts.googleapis.com/css?family=Ubuntu:400,300,300italic,400italic,700,700italic|Ubuntu+Mono' rel='stylesheet' type='text/css' /> |
| 2964 | 7 | <link href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400" rel="stylesheet" type="text/css"/> | 7 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" /> |
| 2965 | 8 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" rel="stylesheet" type="text/css"/> | 8 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" /> |
| 2966 | 9 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" rel="stylesheet" type="text/css"/> | 9 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" /> |
| 2967 | 10 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" rel="stylesheet" type="text/css"/> | 10 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/home-new.css" /> |
| 2968 | 11 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/resources.css" rel="stylesheet" type="text/css"/> | 11 | <link rel='stylesheet' id='stacktack-css' href='//juju.ubuntu.com/wp-content/plugins/stacktack/css/stacktack.min.css?ver=3.4.2' type='text/css' media='all' /> |
| 2969 | 12 | <link href="css/main.css" rel="stylesheet" type="text/css"/> | 12 | <link href="css/main.css?1373740025" rel="stylesheet" type="text/css"/> |
| 2970 | 13 | <!--[if lt IE 9]> | 13 | |
| 2971 | 14 | <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script> | 14 | <!--[if lt IE 9]> |
| 2972 | 15 | <![endif]--> | 15 | <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script> |
| 2973 | 16 | </head> | 16 | <![endif]--> |
| 2974 | 17 | </head> | ||
| 2975 | 18 | <!-- DO NOT EDIT ABOVE THIS LINE --> | ||
| 2976 | 19 | |||
| 2977 | 20 | <!-- DO NOT EDIT ABOVE THIS LINE --> | ||
| 2978 | 21 | |||
| 2979 | 22 | |||
| 2980 | 17 | <body class="resources"> | 23 | <body class="resources"> |
| 2983 | 18 | <header> | 24 | <header class="global clearfix" role="banner"> |
| 2984 | 19 | <div class="header-login"> | 25 | <div class="header-navigation"> |
| 2985 | 26 | <div> | ||
| 2986 | 27 | <nav role="navigation"> | ||
| 2987 | 20 | <ul> | 28 | <ul> |
| 2989 | 21 | <li> </li> | 29 | <li class="page_item page-item-6"><a href="https://juju.ubuntu.com/">Home</a></li> |
| 2990 | 30 | <li class="page_item page-item-7"><a href="https://juju.ubuntu.com/get-started/">Get started</a></li> | ||
| 2991 | 31 | <li class="page_item page-item-9 current_page_item"><a href="https://juju.ubuntu.com/resources/">Resources</a></li> | ||
| 2992 | 32 | <li class="page_item page-item-13"><a href="https://juju.ubuntu.com/community/">Community</a></li> | ||
| 2993 | 33 | <li class="page_item page-item-3688"><a href="https://juju.ubuntu.com/charm-store/">Charm Store</a></li> | ||
| 2994 | 34 | <li class="page_item page-item-3691"><a href="https://juju.ubuntu.com/events/">Events</a></li> | ||
| 2995 | 35 | <li class="page_item page-item-4474"><a href="https://juju.ubuntu.com/charm-championship/">Charm Championship</a></li> | ||
| 2996 | 36 | <li class="page_item page-item-4249"><a href="https://juju.ubuntu.com/survey/">Survey</a></li> | ||
| 2997 | 37 | <li> | ||
| 2998 | 38 | <form id="form-search" method="get" action="https://juju.ubuntu.com/"> | ||
| 2999 | 39 | <fieldset> | ||
| 3000 | 40 | <input id="input-search" type="text" name="s" value="Search" /> | ||
| 3001 | 41 | </fieldset> | ||
| 3002 | 42 | </form> | ||
| 3003 | 43 | </li> | ||
| 3004 | 22 | </ul> | 44 | </ul> |
| 3036 | 23 | </div> | 45 | </nav> |
| 3037 | 24 | <div class="header-navigation"> | 46 | </div> |
| 3038 | 25 | <div> | 47 | </div> |
| 3039 | 26 | <nav role="navigation"> | 48 | <div class="header-content"> |
| 3040 | 27 | <ul> | 49 | <div class="clearfix"> |
| 3041 | 28 | <li class="page_item"><a href="https://juju.ubuntu.com/">Home</a></li> | 50 | <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav"> |
| 3042 | 29 | <li class="page_item current_page_item"><a href="https://juju.ubuntu.com/">Resources</a></li> | 51 | <div class="header-navigation-secondary"></div> |
| 3043 | 30 | <li class="page_item"><a href="https://juju.ubuntu.com/">Community</a></li> | 52 | <div class="header-image"></div> |
| 3044 | 31 | <li class="page_item"><a href="https://juju.ubuntu.com/">Charm Store</a></li> | 53 | <h1>Resources</h1> |
| 3045 | 32 | <li class="page_item"><a href="https://juju.ubuntu.com/">Events</a></li> | 54 | <h2>A collection of some of the most important online references for Juju users and developers.</h2> |
| 3046 | 33 | <li class="page_item"><a href="https://juju.ubuntu.com/">Survey</a></li> | 55 | </div> |
| 3047 | 34 | <li> | 56 | </div> |
| 3048 | 35 | <form id="form-search" method="get" action="/"> | 57 | </header> |
| 3049 | 36 | <fieldset> | 58 | |
| 3019 | 37 | <input id="input-search" type="text" name="s" value="Search"> | ||
| 3020 | 38 | </fieldset> | ||
| 3021 | 39 | </form> | ||
| 3022 | 40 | </li> | ||
| 3023 | 41 | </ul> | ||
| 3024 | 42 | </nav><a href="https://juju.ubuntu.com/" class="logo-ubuntu"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/logo-ubuntu.png"></a> | ||
| 3025 | 43 | </div> | ||
| 3026 | 44 | </div> | ||
| 3027 | 45 | <div class="header-content"> | ||
| 3028 | 46 | <div class="clearfix"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav"> | ||
| 3029 | 47 | <div class="header-navigation-secondary"></div> | ||
| 3030 | 48 | <div class="header-image"></div> | ||
| 3031 | 49 | <h1>Resources</h1> | ||
| 3032 | 50 | <h2>A collection of some of the most important online references for Juju users and developers.</h2> | ||
| 3033 | 51 | </div> | ||
| 3034 | 52 | </div> | ||
| 3035 | 53 | </header> | ||
| 3050 | 54 | <section id="content" class="container-12"> | 59 | <section id="content" class="container-12"> |
| 3051 | 55 | <div class="grid-12 doc-container"> | 60 | <div class="grid-12 doc-container"> |
| 3052 | 56 | <div class="grid-3 doc-navigation"> | 61 | <div class="grid-3 doc-navigation"> |
| 3053 | @@ -144,43 +149,62 @@ | |||
| 3054 | 144 | </div> | 149 | </div> |
| 3055 | 145 | </section> | 150 | </section> |
| 3056 | 146 | <div class="shadow"></div> | 151 | <div class="shadow"></div> |
| 3092 | 147 | <footer> | 152 | <footer class="global clearfix" role="contentinfo"> |
| 3093 | 148 | <div> | 153 | <div class="row"> |
| 3094 | 149 | <nav role="navigation" class="clearfix"> | 154 | <div class="inner-wrapper"> |
| 3095 | 150 | <ul> | 155 | <nav role="navigation" class="clearfix"> |
| 3096 | 151 | <li><a href="https://juju.ubuntu.com/get-started">Get started</a></li> | 156 | <ul class="footer-a"> |
| 3097 | 152 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li> | 157 | <li class="grid-3 first-col"> |
| 3098 | 153 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li> | 158 | <h4><a href="/get-started">Get started</a></h4> |
| 3099 | 154 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li> | 159 | <ul> |
| 3100 | 155 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li> | 160 | <li class="page_item page-item-20"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li> |
| 3101 | 156 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li> | 161 | <li class="page_item page-item-22"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li> |
| 3102 | 157 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li> | 162 | <li class="page_item page-item-18"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li> |
| 3103 | 158 | </ul> | 163 | <li class="page_item page-item-16"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li> |
| 3104 | 159 | <ul> | 164 | <li class="page_item page-item-3596"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li> |
| 3105 | 160 | <li><a href="https://juju.ubuntu.com/resources">Resources</a></li> | 165 | <li class="page_item page-item-3600"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li> |
| 3106 | 161 | <li><a href="https://juju.ubuntu.com/docs">Documentation</a></li> | 166 | </ul> |
| 3107 | 162 | <li><a href="https://juju.ubuntu.com/resources/videos">Videos</a></li> | 167 | </li> |
| 3108 | 163 | <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI Demo</a></li> | 168 | <li class="grid-3"> |
| 3109 | 164 | </ul> | 169 | <h4><a href="/resources">Resources</a></h4> |
| 3110 | 165 | <ul> | 170 | <ul> |
| 3111 | 166 | <li><a href="https://juju.ubuntu.com/community">Community</a></li> | 171 | <li><a href="http://juju.ubuntu.com/docs">Documentation</a></li> |
| 3112 | 167 | <li class="page_item"><a href="https://juju.ubuntu.com/community/juju-blog/">Blog</a></li> | 172 | <li><a href="/resources/videos/">Videos</a></li> |
| 3113 | 168 | <li class="page_item"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Charm Meetings</a></li> | 173 | <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI demo site</a></li> |
| 3114 | 169 | <li class="page_item"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li> | 174 | </ul> |
| 3115 | 170 | <li class="page_item"><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li> | 175 | </li> |
| 3116 | 171 | <li class="page_item"><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li> | 176 | <li class="grid-3"> |
| 3117 | 172 | <li class="page_item"><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&amp;pagesize=50">FAQ</a></li> | 177 | <h4><a href="/community">Community</a></h4> |
| 3118 | 173 | </ul> | 178 | <ul> |
| 3119 | 174 | <ul class="last"> | 179 | <li class="page_item page-item-28"><a href="https://juju.ubuntu.com/community/juju-blog/">Juju Blog</a></li> |
| 3120 | 175 | <li><a href="https://launchpad.net/juju">Code</a></li> | 180 | <li class="page_item page-item-4262"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Weekly Charm Meeting</a></li> |
| 3121 | 176 | <li><a href="https://launchpad.net/juju-core">Juju Core</a></li> | 181 | <li class="page_item page-item-4036"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li> |
| 3122 | 177 | <li><a href="https://launchpad.net/charms">Charms</a></li> | 182 | <li><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li> |
| 3123 | 178 | </ul> | 183 | <li><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li> |
| 3124 | 179 | </nav> | 184 | <li><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&pagesize=50">FAQ</a></li> |
| 3125 | 180 | </div> | 185 | </ul> |
| 3126 | 181 | </footer> | 186 | </li> |
| 3127 | 187 | <li class="grid-3 last-col"> | ||
| 3128 | 188 | <h4><a href="https://launchpad.net/juju">Code</a></h4> | ||
| 3129 | 189 | <ul> | ||
| 3130 | 190 | <li><a href="https://launchpad.net/juju-core">Juju Core</a></li> | ||
| 3131 | 191 | <li><a href="https://launchpad.net/charms">Charms</a></li> | ||
| 3132 | 192 | </ul> | ||
| 3133 | 193 | </li> | ||
| 3134 | 194 | </ul> | ||
| 3135 | 195 | </nav> | ||
| 3136 | 196 | </div> | ||
| 3137 | 197 | </div> | ||
| 3138 | 198 | <div class="row no-border"> | ||
| 3139 | 199 | <div class="legal inner-wrapper"> | ||
| 3140 | 200 | <p>© 2013 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p> | ||
| 3141 | 201 | <p><a href="https://bugs.launchpad.net/juju-website/+filebug">Report a bug on this site</a></p> | ||
| 3142 | 202 | </div> | ||
| 3143 | 203 | </div> | ||
| 3144 | 204 | </footer> | ||
| 3145 | 205 | |||
| 3146 | 182 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script> | 206 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script> |
| 3148 | 183 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.8.14/jquery-ui.min.js"></script> | 207 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script> |
| 3149 | 184 | <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script> | 208 | <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script> |
| 3150 | 185 | <script type="text/javascript" src="js/main.js"></script> | 209 | <script type="text/javascript" src="js/main.js"></script> |
| 3151 | 186 | </body> | 210 | </body> |
| 3152 | 187 | 211 | ||
| 3153 | === modified file 'htmldocs/charms-exposing.html' | |||
| 3154 | --- htmldocs/charms-exposing.html 2013-07-12 00:12:30 +0000 | |||
| 3155 | +++ htmldocs/charms-exposing.html 2013-07-13 18:35:28 +0000 | |||
| 3156 | @@ -1,56 +1,61 @@ | |||
| 3157 | 1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
| 3158 | 2 | <html> | 2 | <html> |
| 3159 | 3 | <head> | 3 | <head> |
| 3173 | 4 | <meta charset="utf-8"> | 4 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> |
| 3174 | 5 | <title>Juju Documentation - Exposing Charms</title> | 5 | <title>Juju Documentation - Exposing Services</title> |
| 3175 | 6 | <link href="//fonts.googleapis.com/css?family=Ubuntu:400,400italic" rel="stylesheet" type="text/css"/> | 6 | <link href='https://fonts.googleapis.com/css?family=Ubuntu:400,300,300italic,400italic,700,700italic|Ubuntu+Mono' rel='stylesheet' type='text/css' /> |
| 3176 | 7 | <link href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400" rel="stylesheet" type="text/css"/> | 7 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" /> |
| 3177 | 8 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" rel="stylesheet" type="text/css"/> | 8 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" /> |
| 3178 | 9 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" rel="stylesheet" type="text/css"/> | 9 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" /> |
| 3179 | 10 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" rel="stylesheet" type="text/css"/> | 10 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/home-new.css" /> |
| 3180 | 11 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/resources.css" rel="stylesheet" type="text/css"/> | 11 | <link rel='stylesheet' id='stacktack-css' href='//juju.ubuntu.com/wp-content/plugins/stacktack/css/stacktack.min.css?ver=3.4.2' type='text/css' media='all' /> |
| 3181 | 12 | <link href="css/main.css" rel="stylesheet" type="text/css"/> | 12 | <link href="css/main.css?1373740025" rel="stylesheet" type="text/css"/> |
| 3182 | 13 | <!--[if lt IE 9]> | 13 | |
| 3183 | 14 | <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script> | 14 | <!--[if lt IE 9]> |
| 3184 | 15 | <![endif]--> | 15 | <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script> |
| 3185 | 16 | </head> | 16 | <![endif]--> |
| 3186 | 17 | </head> | ||
| 3187 | 18 | <!-- DO NOT EDIT ABOVE THIS LINE --> | ||
| 3188 | 19 | |||
| 3189 | 20 | <!-- DO NOT EDIT ABOVE THIS LINE --> | ||
| 3190 | 21 | |||
| 3191 | 22 | |||
| 3192 | 17 | <body class="resources"> | 23 | <body class="resources"> |
| 3195 | 18 | <header> | 24 | <header class="global clearfix" role="banner"> |
| 3196 | 19 | <div class="header-login"> | 25 | <div class="header-navigation"> |
| 3197 | 26 | <div> | ||
| 3198 | 27 | <nav role="navigation"> | ||
| 3199 | 20 | <ul> | 28 | <ul> |
| 3201 | 21 | <li> </li> | 29 | <li class="page_item page-item-6"><a href="https://juju.ubuntu.com/">Home</a></li> |
| 3202 | 30 | <li class="page_item page-item-7"><a href="https://juju.ubuntu.com/get-started/">Get started</a></li> | ||
| 3203 | 31 | <li class="page_item page-item-9 current_page_item"><a href="https://juju.ubuntu.com/resources/">Resources</a></li> | ||
| 3204 | 32 | <li class="page_item page-item-13"><a href="https://juju.ubuntu.com/community/">Community</a></li> | ||
| 3205 | 33 | <li class="page_item page-item-3688"><a href="https://juju.ubuntu.com/charm-store/">Charm Store</a></li> | ||
| 3206 | 34 | <li class="page_item page-item-3691"><a href="https://juju.ubuntu.com/events/">Events</a></li> | ||
| 3207 | 35 | <li class="page_item page-item-4474"><a href="https://juju.ubuntu.com/charm-championship/">Charm Championship</a></li> | ||
| 3208 | 36 | <li class="page_item page-item-4249"><a href="https://juju.ubuntu.com/survey/">Survey</a></li> | ||
| 3209 | 37 | <li> | ||
| 3210 | 38 | <form id="form-search" method="get" action="https://juju.ubuntu.com/"> | ||
| 3211 | 39 | <fieldset> | ||
| 3212 | 40 | <input id="input-search" type="text" name="s" value="Search" /> | ||
| 3213 | 41 | </fieldset> | ||
| 3214 | 42 | </form> | ||
| 3215 | 43 | </li> | ||
| 3216 | 22 | </ul> | 44 | </ul> |
| 3248 | 23 | </div> | 45 | </nav> |
| 3249 | 24 | <div class="header-navigation"> | 46 | </div> |
| 3250 | 25 | <div> | 47 | </div> |
| 3251 | 26 | <nav role="navigation"> | 48 | <div class="header-content"> |
| 3252 | 27 | <ul> | 49 | <div class="clearfix"> |
| 3253 | 28 | <li class="page_item"><a href="https://juju.ubuntu.com/">Home</a></li> | 50 | <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav"> |
| 3254 | 29 | <li class="page_item current_page_item"><a href="https://juju.ubuntu.com/">Resources</a></li> | 51 | <div class="header-navigation-secondary"></div> |
| 3255 | 30 | <li class="page_item"><a href="https://juju.ubuntu.com/">Community</a></li> | 52 | <div class="header-image"></div> |
| 3256 | 31 | <li class="page_item"><a href="https://juju.ubuntu.com/">Charm Store</a></li> | 53 | <h1>Resources</h1> |
| 3257 | 32 | <li class="page_item"><a href="https://juju.ubuntu.com/">Events</a></li> | 54 | <h2>A collection of some of the most important online references for Juju users and developers.</h2> |
| 3258 | 33 | <li class="page_item"><a href="https://juju.ubuntu.com/">Survey</a></li> | 55 | </div> |
| 3259 | 34 | <li> | 56 | </div> |
| 3260 | 35 | <form id="form-search" method="get" action="/"> | 57 | </header> |
| 3261 | 36 | <fieldset> | 58 | |
| 3231 | 37 | <input id="input-search" type="text" name="s" value="Search"> | ||
| 3232 | 38 | </fieldset> | ||
| 3233 | 39 | </form> | ||
| 3234 | 40 | </li> | ||
| 3235 | 41 | </ul> | ||
| 3236 | 42 | </nav><a href="https://juju.ubuntu.com/" class="logo-ubuntu"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/logo-ubuntu.png"></a> | ||
| 3237 | 43 | </div> | ||
| 3238 | 44 | </div> | ||
| 3239 | 45 | <div class="header-content"> | ||
| 3240 | 46 | <div class="clearfix"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav"> | ||
| 3241 | 47 | <div class="header-navigation-secondary"></div> | ||
| 3242 | 48 | <div class="header-image"></div> | ||
| 3243 | 49 | <h1>Resources</h1> | ||
| 3244 | 50 | <h2>A collection of some of the most important online references for Juju users and developers.</h2> | ||
| 3245 | 51 | </div> | ||
| 3246 | 52 | </div> | ||
| 3247 | 53 | </header> | ||
| 3262 | 54 | <section id="content" class="container-12"> | 59 | <section id="content" class="container-12"> |
| 3263 | 55 | <div class="grid-12 doc-container"> | 60 | <div class="grid-12 doc-container"> |
| 3264 | 56 | <div class="grid-3 doc-navigation"> | 61 | <div class="grid-3 doc-navigation"> |
| 3265 | @@ -135,43 +140,62 @@ | |||
| 3266 | 135 | </div> | 140 | </div> |
| 3267 | 136 | </section> | 141 | </section> |
| 3268 | 137 | <div class="shadow"></div> | 142 | <div class="shadow"></div> |
| 3304 | 138 | <footer> | 143 | <footer class="global clearfix" role="contentinfo"> |
| 3305 | 139 | <div> | 144 | <div class="row"> |
| 3306 | 140 | <nav role="navigation" class="clearfix"> | 145 | <div class="inner-wrapper"> |
| 3307 | 141 | <ul> | 146 | <nav role="navigation" class="clearfix"> |
| 3308 | 142 | <li><a href="https://juju.ubuntu.com/get-started">Get started</a></li> | 147 | <ul class="footer-a"> |
| 3309 | 143 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li> | 148 | <li class="grid-3 first-col"> |
| 3310 | 144 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li> | 149 | <h4><a href="/get-started">Get started</a></h4> |
| 3311 | 145 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li> | 150 | <ul> |
| 3312 | 146 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li> | 151 | <li class="page_item page-item-20"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li> |
| 3313 | 147 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li> | 152 | <li class="page_item page-item-22"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li> |
| 3314 | 148 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li> | 153 | <li class="page_item page-item-18"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li> |
| 3315 | 149 | </ul> | 154 | <li class="page_item page-item-16"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li> |
| 3316 | 150 | <ul> | 155 | <li class="page_item page-item-3596"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li> |
| 3317 | 151 | <li><a href="https://juju.ubuntu.com/resources">Resources</a></li> | 156 | <li class="page_item page-item-3600"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li> |
| 3318 | 152 | <li><a href="https://juju.ubuntu.com/docs">Documentation</a></li> | 157 | </ul> |
| 3319 | 153 | <li><a href="https://juju.ubuntu.com/resources/videos">Videos</a></li> | 158 | </li> |
| 3320 | 154 | <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI Demo</a></li> | 159 | <li class="grid-3"> |
| 3321 | 155 | </ul> | 160 | <h4><a href="/resources">Resources</a></h4> |
| 3322 | 156 | <ul> | 161 | <ul> |
| 3323 | 157 | <li><a href="https://juju.ubuntu.com/community">Community</a></li> | 162 | <li><a href="http://juju.ubuntu.com/docs">Documentation</a></li> |
| 3324 | 158 | <li class="page_item"><a href="https://juju.ubuntu.com/community/juju-blog/">Blog</a></li> | 163 | <li><a href="/resources/videos/">Videos</a></li> |
| 3325 | 159 | <li class="page_item"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Charm Meetings</a></li> | 164 | <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI demo site</a></li> |
| 3326 | 160 | <li class="page_item"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li> | 165 | </ul> |
| 3327 | 161 | <li class="page_item"><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li> | 166 | </li> |
| 3328 | 162 | <li class="page_item"><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li> | 167 | <li class="grid-3"> |
| 3329 | 163 | <li class="page_item"><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&amp;pagesize=50">FAQ</a></li> | 168 | <h4><a href="/community">Community</a></h4> |
| 3330 | 164 | </ul> | 169 | <ul> |
| 3331 | 165 | <ul class="last"> | 170 | <li class="page_item page-item-28"><a href="https://juju.ubuntu.com/community/juju-blog/">Juju Blog</a></li> |
| 3332 | 166 | <li><a href="https://launchpad.net/juju">Code</a></li> | 171 | <li class="page_item page-item-4262"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Weekly Charm Meeting</a></li> |
| 3333 | 167 | <li><a href="https://launchpad.net/juju-core">Juju Core</a></li> | 172 | <li class="page_item page-item-4036"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li> |
| 3334 | 168 | <li><a href="https://launchpad.net/charms">Charms</a></li> | 173 | <li><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li> |
| 3335 | 169 | </ul> | 174 | <li><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li> |
| 3336 | 170 | </nav> | 175 | <li><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&pagesize=50">FAQ</a></li> |
| 3337 | 171 | </div> | 176 | </ul> |
| 3338 | 172 | </footer> | 177 | </li> |
| 3339 | 178 | <li class="grid-3 last-col"> | ||
| 3340 | 179 | <h4><a href="https://launchpad.net/juju">Code</a></h4> | ||
| 3341 | 180 | <ul> | ||
| 3342 | 181 | <li><a href="https://launchpad.net/juju-core">Juju Core</a></li> | ||
| 3343 | 182 | <li><a href="https://launchpad.net/charms">Charms</a></li> | ||
| 3344 | 183 | </ul> | ||
| 3345 | 184 | </li> | ||
| 3346 | 185 | </ul> | ||
| 3347 | 186 | </nav> | ||
| 3348 | 187 | </div> | ||
| 3349 | 188 | </div> | ||
| 3350 | 189 | <div class="row no-border"> | ||
| 3351 | 190 | <div class="legal inner-wrapper"> | ||
| 3352 | 191 | <p>© 2013 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p> | ||
| 3353 | 192 | <p><a href="https://bugs.launchpad.net/juju-website/+filebug">Report a bug on this site</a></p> | ||
| 3354 | 193 | </div> | ||
| 3355 | 194 | </div> | ||
| 3356 | 195 | </footer> | ||
| 3357 | 196 | |||
| 3358 | 173 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script> | 197 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script> |
| 3360 | 174 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.8.14/jquery-ui.min.js"></script> | 198 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script> |
| 3361 | 175 | <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script> | 199 | <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script> |
| 3362 | 176 | <script type="text/javascript" src="js/main.js"></script> | 200 | <script type="text/javascript" src="js/main.js"></script> |
| 3363 | 177 | </body> | 201 | </body> |
| 3364 | 178 | 202 | ||
| 3365 | === modified file 'htmldocs/charms-relations.html' | |||
| 3366 | --- htmldocs/charms-relations.html 2013-07-12 00:12:30 +0000 | |||
| 3367 | +++ htmldocs/charms-relations.html 2013-07-13 18:35:28 +0000 | |||
| 3368 | @@ -1,56 +1,61 @@ | |||
| 3369 | 1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
| 3370 | 2 | <html> | 2 | <html> |
| 3371 | 3 | <head> | 3 | <head> |
| 3385 | 4 | <meta charset="utf-8"> | 4 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> |
| 3386 | 5 | <title>Juju Documentation - Relations</title> | 5 | <title>Juju Documentation - None</title> |
| 3387 | 6 | <link href="//fonts.googleapis.com/css?family=Ubuntu:400,400italic" rel="stylesheet" type="text/css"/> | 6 | <link href='https://fonts.googleapis.com/css?family=Ubuntu:400,300,300italic,400italic,700,700italic|Ubuntu+Mono' rel='stylesheet' type='text/css' /> |
| 3388 | 7 | <link href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400" rel="stylesheet" type="text/css"/> | 7 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" /> |
| 3389 | 8 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" rel="stylesheet" type="text/css"/> | 8 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" /> |
| 3390 | 9 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" rel="stylesheet" type="text/css"/> | 9 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" /> |
| 3391 | 10 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" rel="stylesheet" type="text/css"/> | 10 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/home-new.css" /> |
| 3392 | 11 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/resources.css" rel="stylesheet" type="text/css"/> | 11 | <link rel='stylesheet' id='stacktack-css' href='//juju.ubuntu.com/wp-content/plugins/stacktack/css/stacktack.min.css?ver=3.4.2' type='text/css' media='all' /> |
| 3393 | 12 | <link href="css/main.css" rel="stylesheet" type="text/css"/> | 12 | <link href="css/main.css?1373740025" rel="stylesheet" type="text/css"/> |
| 3394 | 13 | <!--[if lt IE 9]> | 13 | |
| 3395 | 14 | <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script> | 14 | <!--[if lt IE 9]> |
| 3396 | 15 | <![endif]--> | 15 | <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script> |
| 3397 | 16 | </head> | 16 | <![endif]--> |
| 3398 | 17 | </head> | ||
| 3399 | 18 | <!-- DO NOT EDIT ABOVE THIS LINE --> | ||
| 3400 | 19 | |||
| 3401 | 20 | <!-- DO NOT EDIT ABOVE THIS LINE --> | ||
| 3402 | 21 | |||
| 3403 | 22 | |||
| 3404 | 17 | <body class="resources"> | 23 | <body class="resources"> |
| 3407 | 18 | <header> | 24 | <header class="global clearfix" role="banner"> |
| 3408 | 19 | <div class="header-login"> | 25 | <div class="header-navigation"> |
| 3409 | 26 | <div> | ||
| 3410 | 27 | <nav role="navigation"> | ||
| 3411 | 20 | <ul> | 28 | <ul> |
| 3413 | 21 | <li> </li> | 29 | <li class="page_item page-item-6"><a href="https://juju.ubuntu.com/">Home</a></li> |
| 3414 | 30 | <li class="page_item page-item-7"><a href="https://juju.ubuntu.com/get-started/">Get started</a></li> | ||
| 3415 | 31 | <li class="page_item page-item-9 current_page_item"><a href="https://juju.ubuntu.com/resources/">Resources</a></li> | ||
| 3416 | 32 | <li class="page_item page-item-13"><a href="https://juju.ubuntu.com/community/">Community</a></li> | ||
| 3417 | 33 | <li class="page_item page-item-3688"><a href="https://juju.ubuntu.com/charm-store/">Charm Store</a></li> | ||
| 3418 | 34 | <li class="page_item page-item-3691"><a href="https://juju.ubuntu.com/events/">Events</a></li> | ||
| 3419 | 35 | <li class="page_item page-item-4474"><a href="https://juju.ubuntu.com/charm-championship/">Charm Championship</a></li> | ||
| 3420 | 36 | <li class="page_item page-item-4249"><a href="https://juju.ubuntu.com/survey/">Survey</a></li> | ||
| 3421 | 37 | <li> | ||
| 3422 | 38 | <form id="form-search" method="get" action="https://juju.ubuntu.com/"> | ||
| 3423 | 39 | <fieldset> | ||
| 3424 | 40 | <input id="input-search" type="text" name="s" value="Search" /> | ||
| 3425 | 41 | </fieldset> | ||
| 3426 | 42 | </form> | ||
| 3427 | 43 | </li> | ||
| 3428 | 22 | </ul> | 44 | </ul> |
| 3460 | 23 | </div> | 45 | </nav> |
| 3461 | 24 | <div class="header-navigation"> | 46 | </div> |
| 3462 | 25 | <div> | 47 | </div> |
| 3463 | 26 | <nav role="navigation"> | 48 | <div class="header-content"> |
| 3464 | 27 | <ul> | 49 | <div class="clearfix"> |
| 3465 | 28 | <li class="page_item"><a href="https://juju.ubuntu.com/">Home</a></li> | 50 | <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav"> |
| 3466 | 29 | <li class="page_item current_page_item"><a href="https://juju.ubuntu.com/">Resources</a></li> | 51 | <div class="header-navigation-secondary"></div> |
| 3467 | 30 | <li class="page_item"><a href="https://juju.ubuntu.com/">Community</a></li> | 52 | <div class="header-image"></div> |
| 3468 | 31 | <li class="page_item"><a href="https://juju.ubuntu.com/">Charm Store</a></li> | 53 | <h1>Resources</h1> |
| 3469 | 32 | <li class="page_item"><a href="https://juju.ubuntu.com/">Events</a></li> | 54 | <h2>A collection of some of the most important online references for Juju users and developers.</h2> |
| 3470 | 33 | <li class="page_item"><a href="https://juju.ubuntu.com/">Survey</a></li> | 55 | </div> |
| 3471 | 34 | <li> | 56 | </div> |
| 3472 | 35 | <form id="form-search" method="get" action="/"> | 57 | </header> |
| 3473 | 36 | <fieldset> | 58 | |
| 3443 | 37 | <input id="input-search" type="text" name="s" value="Search"> | ||
| 3444 | 38 | </fieldset> | ||
| 3445 | 39 | </form> | ||
| 3446 | 40 | </li> | ||
| 3447 | 41 | </ul> | ||
| 3448 | 42 | </nav><a href="https://juju.ubuntu.com/" class="logo-ubuntu"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/logo-ubuntu.png"></a> | ||
| 3449 | 43 | </div> | ||
| 3450 | 44 | </div> | ||
| 3451 | 45 | <div class="header-content"> | ||
| 3452 | 46 | <div class="clearfix"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav"> | ||
| 3453 | 47 | <div class="header-navigation-secondary"></div> | ||
| 3454 | 48 | <div class="header-image"></div> | ||
| 3455 | 49 | <h1>Resources</h1> | ||
| 3456 | 50 | <h2>A collection of some of the most important online references for Juju users and developers.</h2> | ||
| 3457 | 51 | </div> | ||
| 3458 | 52 | </div> | ||
| 3459 | 53 | </header> | ||
| 3474 | 54 | <section id="content" class="container-12"> | 59 | <section id="content" class="container-12"> |
| 3475 | 55 | <div class="grid-12 doc-container"> | 60 | <div class="grid-12 doc-container"> |
| 3476 | 56 | <div class="grid-3 doc-navigation"> | 61 | <div class="grid-3 doc-navigation"> |
| 3477 | @@ -177,43 +182,62 @@ | |||
| 3478 | 177 | </div> | 182 | </div> |
| 3479 | 178 | </section> | 183 | </section> |
| 3480 | 179 | <div class="shadow"></div> | 184 | <div class="shadow"></div> |
| 3516 | 180 | <footer> | 185 | <footer class="global clearfix" role="contentinfo"> |
| 3517 | 181 | <div> | 186 | <div class="row"> |
| 3518 | 182 | <nav role="navigation" class="clearfix"> | 187 | <div class="inner-wrapper"> |
| 3519 | 183 | <ul> | 188 | <nav role="navigation" class="clearfix"> |
| 3520 | 184 | <li><a href="https://juju.ubuntu.com/get-started">Get started</a></li> | 189 | <ul class="footer-a"> |
| 3521 | 185 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li> | 190 | <li class="grid-3 first-col"> |
| 3522 | 186 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li> | 191 | <h4><a href="/get-started">Get started</a></h4> |
| 3523 | 187 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li> | 192 | <ul> |
| 3524 | 188 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li> | 193 | <li class="page_item page-item-20"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li> |
| 3525 | 189 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li> | 194 | <li class="page_item page-item-22"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li> |
| 3526 | 190 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li> | 195 | <li class="page_item page-item-18"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li> |
| 3527 | 191 | </ul> | 196 | <li class="page_item page-item-16"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li> |
| 3528 | 192 | <ul> | 197 | <li class="page_item page-item-3596"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li> |
| 3529 | 193 | <li><a href="https://juju.ubuntu.com/resources">Resources</a></li> | 198 | <li class="page_item page-item-3600"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li> |
| 3530 | 194 | <li><a href="https://juju.ubuntu.com/docs">Documentation</a></li> | 199 | </ul> |
| 3531 | 195 | <li><a href="https://juju.ubuntu.com/resources/videos">Videos</a></li> | 200 | </li> |
| 3532 | 196 | <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI Demo</a></li> | 201 | <li class="grid-3"> |
| 3533 | 197 | </ul> | 202 | <h4><a href="/resources">Resources</a></h4> |
| 3534 | 198 | <ul> | 203 | <ul> |
| 3535 | 199 | <li><a href="https://juju.ubuntu.com/community">Community</a></li> | 204 | <li><a href="http://juju.ubuntu.com/docs">Documentation</a></li> |
| 3536 | 200 | <li class="page_item"><a href="https://juju.ubuntu.com/community/juju-blog/">Blog</a></li> | 205 | <li><a href="/resources/videos/">Videos</a></li> |
| 3537 | 201 | <li class="page_item"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Charm Meetings</a></li> | 206 | <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI demo site</a></li> |
| 3538 | 202 | <li class="page_item"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li> | 207 | </ul> |
| 3539 | 203 | <li class="page_item"><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li> | 208 | </li> |
| 3540 | 204 | <li class="page_item"><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li> | 209 | <li class="grid-3"> |
| 3541 | 205 | <li class="page_item"><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&amp;pagesize=50">FAQ</a></li> | 210 | <h4><a href="/community">Community</a></h4> |
| 3542 | 206 | </ul> | 211 | <ul> |
| 3543 | 207 | <ul class="last"> | 212 | <li class="page_item page-item-28"><a href="https://juju.ubuntu.com/community/juju-blog/">Juju Blog</a></li> |
| 3544 | 208 | <li><a href="https://launchpad.net/juju">Code</a></li> | 213 | <li class="page_item page-item-4262"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Weekly Charm Meeting</a></li> |
| 3545 | 209 | <li><a href="https://launchpad.net/juju-core">Juju Core</a></li> | 214 | <li class="page_item page-item-4036"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li> |
| 3546 | 210 | <li><a href="https://launchpad.net/charms">Charms</a></li> | 215 | <li><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li> |
| 3547 | 211 | </ul> | 216 | <li><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li> |
| 3548 | 212 | </nav> | 217 | <li><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&pagesize=50">FAQ</a></li> |
| 3549 | 213 | </div> | 218 | </ul> |
| 3550 | 214 | </footer> | 219 | </li> |
| 3551 | 220 | <li class="grid-3 last-col"> | ||
| 3552 | 221 | <h4><a href="https://launchpad.net/juju">Code</a></h4> | ||
| 3553 | 222 | <ul> | ||
| 3554 | 223 | <li><a href="https://launchpad.net/juju-core">Juju Core</a></li> | ||
| 3555 | 224 | <li><a href="https://launchpad.net/charms">Charms</a></li> | ||
| 3556 | 225 | </ul> | ||
| 3557 | 226 | </li> | ||
| 3558 | 227 | </ul> | ||
| 3559 | 228 | </nav> | ||
| 3560 | 229 | </div> | ||
| 3561 | 230 | </div> | ||
| 3562 | 231 | <div class="row no-border"> | ||
| 3563 | 232 | <div class="legal inner-wrapper"> | ||
| 3564 | 233 | <p>© 2013 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p> | ||
| 3565 | 234 | <p><a href="https://bugs.launchpad.net/juju-website/+filebug">Report a bug on this site</a></p> | ||
| 3566 | 235 | </div> | ||
| 3567 | 236 | </div> | ||
| 3568 | 237 | </footer> | ||
| 3569 | 238 | |||
| 3570 | 215 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script> | 239 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script> |
| 3572 | 216 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.8.14/jquery-ui.min.js"></script> | 240 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script> |
| 3573 | 217 | <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script> | 241 | <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script> |
| 3574 | 218 | <script type="text/javascript" src="js/main.js"></script> | 242 | <script type="text/javascript" src="js/main.js"></script> |
| 3575 | 219 | </body> | 243 | </body> |
| 3576 | 220 | 244 | ||
| 3577 | === modified file 'htmldocs/charms-scaling.html' | |||
| 3578 | --- htmldocs/charms-scaling.html 2013-07-12 00:12:30 +0000 | |||
| 3579 | +++ htmldocs/charms-scaling.html 2013-07-13 18:35:28 +0000 | |||
| 3580 | @@ -1,56 +1,61 @@ | |||
| 3581 | 1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
| 3582 | 2 | <html> | 2 | <html> |
| 3583 | 3 | <head> | 3 | <head> |
| 3597 | 4 | <meta charset="utf-8"> | 4 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> |
| 3598 | 5 | <title>Juju Documentation - scaling charms</title> | 5 | <title>Juju Documentation - Scaling Services</title> |
| 3599 | 6 | <link href="//fonts.googleapis.com/css?family=Ubuntu:400,400italic" rel="stylesheet" type="text/css"/> | 6 | <link href='https://fonts.googleapis.com/css?family=Ubuntu:400,300,300italic,400italic,700,700italic|Ubuntu+Mono' rel='stylesheet' type='text/css' /> |
| 3600 | 7 | <link href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400" rel="stylesheet" type="text/css"/> | 7 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" /> |
| 3601 | 8 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" rel="stylesheet" type="text/css"/> | 8 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" /> |
| 3602 | 9 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" rel="stylesheet" type="text/css"/> | 9 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" /> |
| 3603 | 10 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" rel="stylesheet" type="text/css"/> | 10 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/home-new.css" /> |
| 3604 | 11 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/resources.css" rel="stylesheet" type="text/css"/> | 11 | <link rel='stylesheet' id='stacktack-css' href='//juju.ubuntu.com/wp-content/plugins/stacktack/css/stacktack.min.css?ver=3.4.2' type='text/css' media='all' /> |
| 3605 | 12 | <link href="css/main.css" rel="stylesheet" type="text/css"/> | 12 | <link href="css/main.css?1373740025" rel="stylesheet" type="text/css"/> |
| 3606 | 13 | <!--[if lt IE 9]> | 13 | |
| 3607 | 14 | <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script> | 14 | <!--[if lt IE 9]> |
| 3608 | 15 | <![endif]--> | 15 | <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script> |
| 3609 | 16 | </head> | 16 | <![endif]--> |
| 3610 | 17 | </head> | ||
| 3611 | 18 | <!-- DO NOT EDIT ABOVE THIS LINE --> | ||
| 3612 | 19 | |||
| 3613 | 20 | <!-- DO NOT EDIT ABOVE THIS LINE --> | ||
| 3614 | 21 | |||
| 3615 | 22 | |||
| 3616 | 17 | <body class="resources"> | 23 | <body class="resources"> |
| 3619 | 18 | <header> | 24 | <header class="global clearfix" role="banner"> |
| 3620 | 19 | <div class="header-login"> | 25 | <div class="header-navigation"> |
| 3621 | 26 | <div> | ||
| 3622 | 27 | <nav role="navigation"> | ||
| 3623 | 20 | <ul> | 28 | <ul> |
| 3625 | 21 | <li> </li> | 29 | <li class="page_item page-item-6"><a href="https://juju.ubuntu.com/">Home</a></li> |
| 3626 | 30 | <li class="page_item page-item-7"><a href="https://juju.ubuntu.com/get-started/">Get started</a></li> | ||
| 3627 | 31 | <li class="page_item page-item-9 current_page_item"><a href="https://juju.ubuntu.com/resources/">Resources</a></li> | ||
| 3628 | 32 | <li class="page_item page-item-13"><a href="https://juju.ubuntu.com/community/">Community</a></li> | ||
| 3629 | 33 | <li class="page_item page-item-3688"><a href="https://juju.ubuntu.com/charm-store/">Charm Store</a></li> | ||
| 3630 | 34 | <li class="page_item page-item-3691"><a href="https://juju.ubuntu.com/events/">Events</a></li> | ||
| 3631 | 35 | <li class="page_item page-item-4474"><a href="https://juju.ubuntu.com/charm-championship/">Charm Championship</a></li> | ||
| 3632 | 36 | <li class="page_item page-item-4249"><a href="https://juju.ubuntu.com/survey/">Survey</a></li> | ||
| 3633 | 37 | <li> | ||
| 3634 | 38 | <form id="form-search" method="get" action="https://juju.ubuntu.com/"> | ||
| 3635 | 39 | <fieldset> | ||
| 3636 | 40 | <input id="input-search" type="text" name="s" value="Search" /> | ||
| 3637 | 41 | </fieldset> | ||
| 3638 | 42 | </form> | ||
| 3639 | 43 | </li> | ||
| 3640 | 22 | </ul> | 44 | </ul> |
| 3672 | 23 | </div> | 45 | </nav> |
| 3673 | 24 | <div class="header-navigation"> | 46 | </div> |
| 3674 | 25 | <div> | 47 | </div> |
| 3675 | 26 | <nav role="navigation"> | 48 | <div class="header-content"> |
| 3676 | 27 | <ul> | 49 | <div class="clearfix"> |
| 3677 | 28 | <li class="page_item"><a href="https://juju.ubuntu.com/">Home</a></li> | 50 | <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav"> |
| 3678 | 29 | <li class="page_item current_page_item"><a href="https://juju.ubuntu.com/">Resources</a></li> | 51 | <div class="header-navigation-secondary"></div> |
| 3679 | 30 | <li class="page_item"><a href="https://juju.ubuntu.com/">Community</a></li> | 52 | <div class="header-image"></div> |
| 3680 | 31 | <li class="page_item"><a href="https://juju.ubuntu.com/">Charm Store</a></li> | 53 | <h1>Resources</h1> |
| 3681 | 32 | <li class="page_item"><a href="https://juju.ubuntu.com/">Events</a></li> | 54 | <h2>A collection of some of the most important online references for Juju users and developers.</h2> |
| 3682 | 33 | <li class="page_item"><a href="https://juju.ubuntu.com/">Survey</a></li> | 55 | </div> |
| 3683 | 34 | <li> | 56 | </div> |
| 3684 | 35 | <form id="form-search" method="get" action="/"> | 57 | </header> |
| 3685 | 36 | <fieldset> | 58 | |
| 3655 | 37 | <input id="input-search" type="text" name="s" value="Search"> | ||
| 3656 | 38 | </fieldset> | ||
| 3657 | 39 | </form> | ||
| 3658 | 40 | </li> | ||
| 3659 | 41 | </ul> | ||
| 3660 | 42 | </nav><a href="https://juju.ubuntu.com/" class="logo-ubuntu"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/logo-ubuntu.png"></a> | ||
| 3661 | 43 | </div> | ||
| 3662 | 44 | </div> | ||
| 3663 | 45 | <div class="header-content"> | ||
| 3664 | 46 | <div class="clearfix"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav"> | ||
| 3665 | 47 | <div class="header-navigation-secondary"></div> | ||
| 3666 | 48 | <div class="header-image"></div> | ||
| 3667 | 49 | <h1>Resources</h1> | ||
| 3668 | 50 | <h2>A collection of some of the most important online references for Juju users and developers.</h2> | ||
| 3669 | 51 | </div> | ||
| 3670 | 52 | </div> | ||
| 3671 | 53 | </header> | ||
| 3686 | 54 | <section id="content" class="container-12"> | 59 | <section id="content" class="container-12"> |
| 3687 | 55 | <div class="grid-12 doc-container"> | 60 | <div class="grid-12 doc-container"> |
| 3688 | 56 | <div class="grid-3 doc-navigation"> | 61 | <div class="grid-3 doc-navigation"> |
| 3689 | @@ -131,43 +136,62 @@ | |||
| 3690 | 131 | </div> | 136 | </div> |
| 3691 | 132 | </section> | 137 | </section> |
| 3692 | 133 | <div class="shadow"></div> | 138 | <div class="shadow"></div> |
| 3728 | 134 | <footer> | 139 | <footer class="global clearfix" role="contentinfo"> |
| 3729 | 135 | <div> | 140 | <div class="row"> |
| 3730 | 136 | <nav role="navigation" class="clearfix"> | 141 | <div class="inner-wrapper"> |
| 3731 | 137 | <ul> | 142 | <nav role="navigation" class="clearfix"> |
| 3732 | 138 | <li><a href="https://juju.ubuntu.com/get-started">Get started</a></li> | 143 | <ul class="footer-a"> |
| 3733 | 139 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li> | 144 | <li class="grid-3 first-col"> |
| 3734 | 140 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li> | 145 | <h4><a href="/get-started">Get started</a></h4> |
| 3735 | 141 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li> | 146 | <ul> |
| 3736 | 142 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li> | 147 | <li class="page_item page-item-20"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li> |
| 3737 | 143 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li> | 148 | <li class="page_item page-item-22"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li> |
| 3738 | 144 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li> | 149 | <li class="page_item page-item-18"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li> |
| 3739 | 145 | </ul> | 150 | <li class="page_item page-item-16"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li> |
| 3740 | 146 | <ul> | 151 | <li class="page_item page-item-3596"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li> |
| 3741 | 147 | <li><a href="https://juju.ubuntu.com/resources">Resources</a></li> | 152 | <li class="page_item page-item-3600"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li> |
| 3742 | 148 | <li><a href="https://juju.ubuntu.com/docs">Documentation</a></li> | 153 | </ul> |
| 3743 | 149 | <li><a href="https://juju.ubuntu.com/resources/videos">Videos</a></li> | 154 | </li> |
| 3744 | 150 | <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI Demo</a></li> | 155 | <li class="grid-3"> |
| 3745 | 151 | </ul> | 156 | <h4><a href="/resources">Resources</a></h4> |
| 3746 | 152 | <ul> | 157 | <ul> |
| 3747 | 153 | <li><a href="https://juju.ubuntu.com/community">Community</a></li> | 158 | <li><a href="http://juju.ubuntu.com/docs">Documentation</a></li> |
| 3748 | 154 | <li class="page_item"><a href="https://juju.ubuntu.com/community/juju-blog/">Blog</a></li> | 159 | <li><a href="/resources/videos/">Videos</a></li> |
| 3749 | 155 | <li class="page_item"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Charm Meetings</a></li> | 160 | <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI demo site</a></li> |
| 3750 | 156 | <li class="page_item"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li> | 161 | </ul> |
| 3751 | 157 | <li class="page_item"><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li> | 162 | </li> |
| 3752 | 158 | <li class="page_item"><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li> | 163 | <li class="grid-3"> |
| 3753 | 159 | <li class="page_item"><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&amp;pagesize=50">FAQ</a></li> | 164 | <h4><a href="/community">Community</a></h4> |
| 3754 | 160 | </ul> | 165 | <ul> |
| 3755 | 161 | <ul class="last"> | 166 | <li class="page_item page-item-28"><a href="https://juju.ubuntu.com/community/juju-blog/">Juju Blog</a></li> |
| 3756 | 162 | <li><a href="https://launchpad.net/juju">Code</a></li> | 167 | <li class="page_item page-item-4262"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Weekly Charm Meeting</a></li> |
| 3757 | 163 | <li><a href="https://launchpad.net/juju-core">Juju Core</a></li> | 168 | <li class="page_item page-item-4036"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li> |
| 3758 | 164 | <li><a href="https://launchpad.net/charms">Charms</a></li> | 169 | <li><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li> |
| 3759 | 165 | </ul> | 170 | <li><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li> |
| 3760 | 166 | </nav> | 171 | <li><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&pagesize=50">FAQ</a></li> |
| 3761 | 167 | </div> | 172 | </ul> |
| 3762 | 168 | </footer> | 173 | </li> |
| 3763 | 174 | <li class="grid-3 last-col"> | ||
| 3764 | 175 | <h4><a href="https://launchpad.net/juju">Code</a></h4> | ||
| 3765 | 176 | <ul> | ||
| 3766 | 177 | <li><a href="https://launchpad.net/juju-core">Juju Core</a></li> | ||
| 3767 | 178 | <li><a href="https://launchpad.net/charms">Charms</a></li> | ||
| 3768 | 179 | </ul> | ||
| 3769 | 180 | </li> | ||
| 3770 | 181 | </ul> | ||
| 3771 | 182 | </nav> | ||
| 3772 | 183 | </div> | ||
| 3773 | 184 | </div> | ||
| 3774 | 185 | <div class="row no-border"> | ||
| 3775 | 186 | <div class="legal inner-wrapper"> | ||
| 3776 | 187 | <p>© 2013 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p> | ||
| 3777 | 188 | <p><a href="https://bugs.launchpad.net/juju-website/+filebug">Report a bug on this site</a></p> | ||
| 3778 | 189 | </div> | ||
| 3779 | 190 | </div> | ||
| 3780 | 191 | </footer> | ||
| 3781 | 192 | |||
| 3782 | 169 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script> | 193 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script> |
| 3784 | 170 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.8.14/jquery-ui.min.js"></script> | 194 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script> |
| 3785 | 171 | <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script> | 195 | <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script> |
| 3786 | 172 | <script type="text/javascript" src="js/main.js"></script> | 196 | <script type="text/javascript" src="js/main.js"></script> |
| 3787 | 173 | </body> | 197 | </body> |
| 3788 | 174 | 198 | ||
| 3789 | === modified file 'htmldocs/charms-upgrading.html' | |||
| 3790 | --- htmldocs/charms-upgrading.html 2013-07-12 00:12:30 +0000 | |||
| 3791 | +++ htmldocs/charms-upgrading.html 2013-07-13 18:35:28 +0000 | |||
| 3792 | @@ -1,56 +1,61 @@ | |||
| 3793 | 1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
| 3794 | 2 | <html> | 2 | <html> |
| 3795 | 3 | <head> | 3 | <head> |
| 3809 | 4 | <meta charset="utf-8"> | 4 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> |
| 3810 | 5 | <title>Juju Documentation - Upgrading</title> | 5 | <title>Juju Documentation - None</title> |
| 3811 | 6 | <link href="//fonts.googleapis.com/css?family=Ubuntu:400,400italic" rel="stylesheet" type="text/css"/> | 6 | <link href='https://fonts.googleapis.com/css?family=Ubuntu:400,300,300italic,400italic,700,700italic|Ubuntu+Mono' rel='stylesheet' type='text/css' /> |
| 3812 | 7 | <link href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400" rel="stylesheet" type="text/css"/> | 7 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" /> |
| 3813 | 8 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" rel="stylesheet" type="text/css"/> | 8 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" /> |
| 3814 | 9 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" rel="stylesheet" type="text/css"/> | 9 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" /> |
| 3815 | 10 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" rel="stylesheet" type="text/css"/> | 10 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/home-new.css" /> |
| 3816 | 11 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/resources.css" rel="stylesheet" type="text/css"/> | 11 | <link rel='stylesheet' id='stacktack-css' href='//juju.ubuntu.com/wp-content/plugins/stacktack/css/stacktack.min.css?ver=3.4.2' type='text/css' media='all' /> |
| 3817 | 12 | <link href="css/main.css" rel="stylesheet" type="text/css"/> | 12 | <link href="css/main.css?1373740025" rel="stylesheet" type="text/css"/> |
| 3818 | 13 | <!--[if lt IE 9]> | 13 | |
| 3819 | 14 | <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script> | 14 | <!--[if lt IE 9]> |
| 3820 | 15 | <![endif]--> | 15 | <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script> |
| 3821 | 16 | </head> | 16 | <![endif]--> |
| 3822 | 17 | </head> | ||
| 3823 | 18 | <!-- DO NOT EDIT ABOVE THIS LINE --> | ||
| 3824 | 19 | |||
| 3825 | 20 | <!-- DO NOT EDIT ABOVE THIS LINE --> | ||
| 3826 | 21 | |||
| 3827 | 22 | |||
| 3828 | 17 | <body class="resources"> | 23 | <body class="resources"> |
| 3831 | 18 | <header> | 24 | <header class="global clearfix" role="banner"> |
| 3832 | 19 | <div class="header-login"> | 25 | <div class="header-navigation"> |
| 3833 | 26 | <div> | ||
| 3834 | 27 | <nav role="navigation"> | ||
| 3835 | 20 | <ul> | 28 | <ul> |
| 3837 | 21 | <li> </li> | 29 | <li class="page_item page-item-6"><a href="https://juju.ubuntu.com/">Home</a></li> |
| 3838 | 30 | <li class="page_item page-item-7"><a href="https://juju.ubuntu.com/get-started/">Get started</a></li> | ||
| 3839 | 31 | <li class="page_item page-item-9 current_page_item"><a href="https://juju.ubuntu.com/resources/">Resources</a></li> | ||
| 3840 | 32 | <li class="page_item page-item-13"><a href="https://juju.ubuntu.com/community/">Community</a></li> | ||
| 3841 | 33 | <li class="page_item page-item-3688"><a href="https://juju.ubuntu.com/charm-store/">Charm Store</a></li> | ||
| 3842 | 34 | <li class="page_item page-item-3691"><a href="https://juju.ubuntu.com/events/">Events</a></li> | ||
| 3843 | 35 | <li class="page_item page-item-4474"><a href="https://juju.ubuntu.com/charm-championship/">Charm Championship</a></li> | ||
| 3844 | 36 | <li class="page_item page-item-4249"><a href="https://juju.ubuntu.com/survey/">Survey</a></li> | ||
| 3845 | 37 | <li> | ||
| 3846 | 38 | <form id="form-search" method="get" action="https://juju.ubuntu.com/"> | ||
| 3847 | 39 | <fieldset> | ||
| 3848 | 40 | <input id="input-search" type="text" name="s" value="Search" /> | ||
| 3849 | 41 | </fieldset> | ||
| 3850 | 42 | </form> | ||
| 3851 | 43 | </li> | ||
| 3852 | 22 | </ul> | 44 | </ul> |
| 3884 | 23 | </div> | 45 | </nav> |
| 3885 | 24 | <div class="header-navigation"> | 46 | </div> |
| 3886 | 25 | <div> | 47 | </div> |
| 3887 | 26 | <nav role="navigation"> | 48 | <div class="header-content"> |
| 3888 | 27 | <ul> | 49 | <div class="clearfix"> |
| 3889 | 28 | <li class="page_item"><a href="https://juju.ubuntu.com/">Home</a></li> | 50 | <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav"> |
| 3890 | 29 | <li class="page_item current_page_item"><a href="https://juju.ubuntu.com/">Resources</a></li> | 51 | <div class="header-navigation-secondary"></div> |
| 3891 | 30 | <li class="page_item"><a href="https://juju.ubuntu.com/">Community</a></li> | 52 | <div class="header-image"></div> |
| 3892 | 31 | <li class="page_item"><a href="https://juju.ubuntu.com/">Charm Store</a></li> | 53 | <h1>Resources</h1> |
| 3893 | 32 | <li class="page_item"><a href="https://juju.ubuntu.com/">Events</a></li> | 54 | <h2>A collection of some of the most important online references for Juju users and developers.</h2> |
| 3894 | 33 | <li class="page_item"><a href="https://juju.ubuntu.com/">Survey</a></li> | 55 | </div> |
| 3895 | 34 | <li> | 56 | </div> |
| 3896 | 35 | <form id="form-search" method="get" action="/"> | 57 | </header> |
| 3897 | 36 | <fieldset> | 58 | |
| 3867 | 37 | <input id="input-search" type="text" name="s" value="Search"> | ||
| 3868 | 38 | </fieldset> | ||
| 3869 | 39 | </form> | ||
| 3870 | 40 | </li> | ||
| 3871 | 41 | </ul> | ||
| 3872 | 42 | </nav><a href="https://juju.ubuntu.com/" class="logo-ubuntu"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/logo-ubuntu.png"></a> | ||
| 3873 | 43 | </div> | ||
| 3874 | 44 | </div> | ||
| 3875 | 45 | <div class="header-content"> | ||
| 3876 | 46 | <div class="clearfix"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav"> | ||
| 3877 | 47 | <div class="header-navigation-secondary"></div> | ||
| 3878 | 48 | <div class="header-image"></div> | ||
| 3879 | 49 | <h1>Resources</h1> | ||
| 3880 | 50 | <h2>A collection of some of the most important online references for Juju users and developers.</h2> | ||
| 3881 | 51 | </div> | ||
| 3882 | 52 | </div> | ||
| 3883 | 53 | </header> | ||
| 3898 | 54 | <section id="content" class="container-12"> | 59 | <section id="content" class="container-12"> |
| 3899 | 55 | <div class="grid-12 doc-container"> | 60 | <div class="grid-12 doc-container"> |
| 3900 | 56 | <div class="grid-3 doc-navigation"> | 61 | <div class="grid-3 doc-navigation"> |
| 3901 | @@ -109,43 +114,62 @@ | |||
| 3902 | 109 | </div> | 114 | </div> |
| 3903 | 110 | </section> | 115 | </section> |
| 3904 | 111 | <div class="shadow"></div> | 116 | <div class="shadow"></div> |
| 3940 | 112 | <footer> | 117 | <footer class="global clearfix" role="contentinfo"> |
| 3941 | 113 | <div> | 118 | <div class="row"> |
| 3942 | 114 | <nav role="navigation" class="clearfix"> | 119 | <div class="inner-wrapper"> |
| 3943 | 115 | <ul> | 120 | <nav role="navigation" class="clearfix"> |
| 3944 | 116 | <li><a href="https://juju.ubuntu.com/get-started">Get started</a></li> | 121 | <ul class="footer-a"> |
| 3945 | 117 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li> | 122 | <li class="grid-3 first-col"> |
| 3946 | 118 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li> | 123 | <h4><a href="/get-started">Get started</a></h4> |
| 3947 | 119 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li> | 124 | <ul> |
| 3948 | 120 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li> | 125 | <li class="page_item page-item-20"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li> |
| 3949 | 121 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li> | 126 | <li class="page_item page-item-22"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li> |
| 3950 | 122 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li> | 127 | <li class="page_item page-item-18"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li> |
| 3951 | 123 | </ul> | 128 | <li class="page_item page-item-16"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li> |
| 3952 | 124 | <ul> | 129 | <li class="page_item page-item-3596"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li> |
| 3953 | 125 | <li><a href="https://juju.ubuntu.com/resources">Resources</a></li> | 130 | <li class="page_item page-item-3600"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li> |
| 3954 | 126 | <li><a href="https://juju.ubuntu.com/docs">Documentation</a></li> | 131 | </ul> |
| 3955 | 127 | <li><a href="https://juju.ubuntu.com/resources/videos">Videos</a></li> | 132 | </li> |
| 3956 | 128 | <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI Demo</a></li> | 133 | <li class="grid-3"> |
| 3957 | 129 | </ul> | 134 | <h4><a href="/resources">Resources</a></h4> |
| 3958 | 130 | <ul> | 135 | <ul> |
| 3959 | 131 | <li><a href="https://juju.ubuntu.com/community">Community</a></li> | 136 | <li><a href="http://juju.ubuntu.com/docs">Documentation</a></li> |
| 3960 | 132 | <li class="page_item"><a href="https://juju.ubuntu.com/community/juju-blog/">Blog</a></li> | 137 | <li><a href="/resources/videos/">Videos</a></li> |
| 3961 | 133 | <li class="page_item"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Charm Meetings</a></li> | 138 | <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI demo site</a></li> |
| 3962 | 134 | <li class="page_item"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li> | 139 | </ul> |
| 3963 | 135 | <li class="page_item"><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li> | 140 | </li> |
| 3964 | 136 | <li class="page_item"><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li> | 141 | <li class="grid-3"> |
| 3965 | 137 | <li class="page_item"><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&amp;pagesize=50">FAQ</a></li> | 142 | <h4><a href="/community">Community</a></h4> |
| 3966 | 138 | </ul> | 143 | <ul> |
| 3967 | 139 | <ul class="last"> | 144 | <li class="page_item page-item-28"><a href="https://juju.ubuntu.com/community/juju-blog/">Juju Blog</a></li> |
| 3968 | 140 | <li><a href="https://launchpad.net/juju">Code</a></li> | 145 | <li class="page_item page-item-4262"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Weekly Charm Meeting</a></li> |
| 3969 | 141 | <li><a href="https://launchpad.net/juju-core">Juju Core</a></li> | 146 | <li class="page_item page-item-4036"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li> |
| 3970 | 142 | <li><a href="https://launchpad.net/charms">Charms</a></li> | 147 | <li><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li> |
| 3971 | 143 | </ul> | 148 | <li><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li> |
| 3972 | 144 | </nav> | 149 | <li><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&pagesize=50">FAQ</a></li> |
| 3973 | 145 | </div> | 150 | </ul> |
| 3974 | 146 | </footer> | 151 | </li> |
| 3975 | 152 | <li class="grid-3 last-col"> | ||
| 3976 | 153 | <h4><a href="https://launchpad.net/juju">Code</a></h4> | ||
| 3977 | 154 | <ul> | ||
| 3978 | 155 | <li><a href="https://launchpad.net/juju-core">Juju Core</a></li> | ||
| 3979 | 156 | <li><a href="https://launchpad.net/charms">Charms</a></li> | ||
| 3980 | 157 | </ul> | ||
| 3981 | 158 | </li> | ||
| 3982 | 159 | </ul> | ||
| 3983 | 160 | </nav> | ||
| 3984 | 161 | </div> | ||
| 3985 | 162 | </div> | ||
| 3986 | 163 | <div class="row no-border"> | ||
| 3987 | 164 | <div class="legal inner-wrapper"> | ||
| 3988 | 165 | <p>© 2013 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p> | ||
| 3989 | 166 | <p><a href="https://bugs.launchpad.net/juju-website/+filebug">Report a bug on this site</a></p> | ||
| 3990 | 167 | </div> | ||
| 3991 | 168 | </div> | ||
| 3992 | 169 | </footer> | ||
| 3993 | 170 | |||
| 3994 | 147 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script> | 171 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script> |
| 3996 | 148 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.8.14/jquery-ui.min.js"></script> | 172 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script> |
| 3997 | 149 | <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script> | 173 | <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script> |
| 3998 | 150 | <script type="text/javascript" src="js/main.js"></script> | 174 | <script type="text/javascript" src="js/main.js"></script> |
| 3999 | 151 | </body> | 175 | </body> |
| 4000 | 152 | 176 | ||
| 4001 | === modified file 'htmldocs/charms.html' | |||
| 4002 | --- htmldocs/charms.html 2013-07-12 00:12:30 +0000 | |||
| 4003 | +++ htmldocs/charms.html 2013-07-13 18:35:28 +0000 | |||
| 4004 | @@ -1,56 +1,61 @@ | |||
| 4005 | 1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
| 4006 | 2 | <html> | 2 | <html> |
| 4007 | 3 | <head> | 3 | <head> |
| 4021 | 4 | <meta charset="utf-8"> | 4 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> |
| 4022 | 5 | <title>Juju Documentation - Charms!</title> | 5 | <title>Juju Documentation - Using Charms</title> |
| 4023 | 6 | <link href="//fonts.googleapis.com/css?family=Ubuntu:400,400italic" rel="stylesheet" type="text/css"/> | 6 | <link href='https://fonts.googleapis.com/css?family=Ubuntu:400,300,300italic,400italic,700,700italic|Ubuntu+Mono' rel='stylesheet' type='text/css' /> |
| 4024 | 7 | <link href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400" rel="stylesheet" type="text/css"/> | 7 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" /> |
| 4025 | 8 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" rel="stylesheet" type="text/css"/> | 8 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" /> |
| 4026 | 9 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" rel="stylesheet" type="text/css"/> | 9 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" /> |
| 4027 | 10 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" rel="stylesheet" type="text/css"/> | 10 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/home-new.css" /> |
| 4028 | 11 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/resources.css" rel="stylesheet" type="text/css"/> | 11 | <link rel='stylesheet' id='stacktack-css' href='//juju.ubuntu.com/wp-content/plugins/stacktack/css/stacktack.min.css?ver=3.4.2' type='text/css' media='all' /> |
| 4029 | 12 | <link href="css/main.css" rel="stylesheet" type="text/css"/> | 12 | <link href="css/main.css?1373740025" rel="stylesheet" type="text/css"/> |
| 4030 | 13 | <!--[if lt IE 9]> | 13 | |
| 4031 | 14 | <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script> | 14 | <!--[if lt IE 9]> |
| 4032 | 15 | <![endif]--> | 15 | <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script> |
| 4033 | 16 | </head> | 16 | <![endif]--> |
| 4034 | 17 | </head> | ||
| 4035 | 18 | <!-- DO NOT EDIT ABOVE THIS LINE --> | ||
| 4036 | 19 | |||
| 4037 | 20 | <!-- DO NOT EDIT ABOVE THIS LINE --> | ||
| 4038 | 21 | |||
| 4039 | 22 | |||
| 4040 | 17 | <body class="resources"> | 23 | <body class="resources"> |
| 4043 | 18 | <header> | 24 | <header class="global clearfix" role="banner"> |
| 4044 | 19 | <div class="header-login"> | 25 | <div class="header-navigation"> |
| 4045 | 26 | <div> | ||
| 4046 | 27 | <nav role="navigation"> | ||
| 4047 | 20 | <ul> | 28 | <ul> |
| 4049 | 21 | <li> </li> | 29 | <li class="page_item page-item-6"><a href="https://juju.ubuntu.com/">Home</a></li> |
| 4050 | 30 | <li class="page_item page-item-7"><a href="https://juju.ubuntu.com/get-started/">Get started</a></li> | ||
| 4051 | 31 | <li class="page_item page-item-9 current_page_item"><a href="https://juju.ubuntu.com/resources/">Resources</a></li> | ||
| 4052 | 32 | <li class="page_item page-item-13"><a href="https://juju.ubuntu.com/community/">Community</a></li> | ||
| 4053 | 33 | <li class="page_item page-item-3688"><a href="https://juju.ubuntu.com/charm-store/">Charm Store</a></li> | ||
| 4054 | 34 | <li class="page_item page-item-3691"><a href="https://juju.ubuntu.com/events/">Events</a></li> | ||
| 4055 | 35 | <li class="page_item page-item-4474"><a href="https://juju.ubuntu.com/charm-championship/">Charm Championship</a></li> | ||
| 4056 | 36 | <li class="page_item page-item-4249"><a href="https://juju.ubuntu.com/survey/">Survey</a></li> | ||
| 4057 | 37 | <li> | ||
| 4058 | 38 | <form id="form-search" method="get" action="https://juju.ubuntu.com/"> | ||
| 4059 | 39 | <fieldset> | ||
| 4060 | 40 | <input id="input-search" type="text" name="s" value="Search" /> | ||
| 4061 | 41 | </fieldset> | ||
| 4062 | 42 | </form> | ||
| 4063 | 43 | </li> | ||
| 4064 | 22 | </ul> | 44 | </ul> |
| 4096 | 23 | </div> | 45 | </nav> |
| 4097 | 24 | <div class="header-navigation"> | 46 | </div> |
| 4098 | 25 | <div> | 47 | </div> |
| 4099 | 26 | <nav role="navigation"> | 48 | <div class="header-content"> |
| 4100 | 27 | <ul> | 49 | <div class="clearfix"> |
| 4101 | 28 | <li class="page_item"><a href="https://juju.ubuntu.com/">Home</a></li> | 50 | <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav"> |
| 4102 | 29 | <li class="page_item current_page_item"><a href="https://juju.ubuntu.com/">Resources</a></li> | 51 | <div class="header-navigation-secondary"></div> |
| 4103 | 30 | <li class="page_item"><a href="https://juju.ubuntu.com/">Community</a></li> | 52 | <div class="header-image"></div> |
| 4104 | 31 | <li class="page_item"><a href="https://juju.ubuntu.com/">Charm Store</a></li> | 53 | <h1>Resources</h1> |
| 4105 | 32 | <li class="page_item"><a href="https://juju.ubuntu.com/">Events</a></li> | 54 | <h2>A collection of some of the most important online references for Juju users and developers.</h2> |
| 4106 | 33 | <li class="page_item"><a href="https://juju.ubuntu.com/">Survey</a></li> | 55 | </div> |
| 4107 | 34 | <li> | 56 | </div> |
| 4108 | 35 | <form id="form-search" method="get" action="/"> | 57 | </header> |
| 4109 | 36 | <fieldset> | 58 | |
| 4079 | 37 | <input id="input-search" type="text" name="s" value="Search"> | ||
| 4080 | 38 | </fieldset> | ||
| 4081 | 39 | </form> | ||
| 4082 | 40 | </li> | ||
| 4083 | 41 | </ul> | ||
| 4084 | 42 | </nav><a href="https://juju.ubuntu.com/" class="logo-ubuntu"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/logo-ubuntu.png"></a> | ||
| 4085 | 43 | </div> | ||
| 4086 | 44 | </div> | ||
| 4087 | 45 | <div class="header-content"> | ||
| 4088 | 46 | <div class="clearfix"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav"> | ||
| 4089 | 47 | <div class="header-navigation-secondary"></div> | ||
| 4090 | 48 | <div class="header-image"></div> | ||
| 4091 | 49 | <h1>Resources</h1> | ||
| 4092 | 50 | <h2>A collection of some of the most important online references for Juju users and developers.</h2> | ||
| 4093 | 51 | </div> | ||
| 4094 | 52 | </div> | ||
| 4095 | 53 | </header> | ||
| 4110 | 54 | <section id="content" class="container-12"> | 59 | <section id="content" class="container-12"> |
| 4111 | 55 | <div class="grid-12 doc-container"> | 60 | <div class="grid-12 doc-container"> |
| 4112 | 56 | <div class="grid-3 doc-navigation"> | 61 | <div class="grid-3 doc-navigation"> |
| 4113 | @@ -101,7 +106,7 @@ | |||
| 4114 | 101 | <section id="charms"> | 106 | <section id="charms"> |
| 4115 | 102 | <h1>Introducing Charms</h1> | 107 | <h1>Introducing Charms</h1> |
| 4116 | 103 | <aside> | 108 | <aside> |
| 4118 | 104 | <iframe class="youtube-player" type="text/html" width="400" height="300" src="http://www.youtube.com/embed/0AT6qKyam9I" frameborder="0"> | 109 | <iframe class="youtube-player" type="text/html" width="400" height="300" src="//www.youtube.com/embed/0AT6qKyam9I" frameborder="0"> |
| 4119 | 105 | </iframe> | 110 | </iframe> |
| 4120 | 106 | </aside> | 111 | </aside> |
| 4121 | 107 | 112 | ||
| 4122 | @@ -128,43 +133,62 @@ | |||
| 4123 | 128 | </div> | 133 | </div> |
| 4124 | 129 | </section> | 134 | </section> |
| 4125 | 130 | <div class="shadow"></div> | 135 | <div class="shadow"></div> |
| 4161 | 131 | <footer> | 136 | <footer class="global clearfix" role="contentinfo"> |
| 4162 | 132 | <div> | 137 | <div class="row"> |
| 4163 | 133 | <nav role="navigation" class="clearfix"> | 138 | <div class="inner-wrapper"> |
| 4164 | 134 | <ul> | 139 | <nav role="navigation" class="clearfix"> |
| 4165 | 135 | <li><a href="https://juju.ubuntu.com/get-started">Get started</a></li> | 140 | <ul class="footer-a"> |
| 4166 | 136 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li> | 141 | <li class="grid-3 first-col"> |
| 4167 | 137 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li> | 142 | <h4><a href="/get-started">Get started</a></h4> |
| 4168 | 138 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li> | 143 | <ul> |
| 4169 | 139 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li> | 144 | <li class="page_item page-item-20"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li> |
| 4170 | 140 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li> | 145 | <li class="page_item page-item-22"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li> |
| 4171 | 141 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li> | 146 | <li class="page_item page-item-18"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li> |
| 4172 | 142 | </ul> | 147 | <li class="page_item page-item-16"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li> |
| 4173 | 143 | <ul> | 148 | <li class="page_item page-item-3596"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li> |
| 4174 | 144 | <li><a href="https://juju.ubuntu.com/resources">Resources</a></li> | 149 | <li class="page_item page-item-3600"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li> |
| 4175 | 145 | <li><a href="https://juju.ubuntu.com/docs">Documentation</a></li> | 150 | </ul> |
| 4176 | 146 | <li><a href="https://juju.ubuntu.com/resources/videos">Videos</a></li> | 151 | </li> |
| 4177 | 147 | <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI Demo</a></li> | 152 | <li class="grid-3"> |
| 4178 | 148 | </ul> | 153 | <h4><a href="/resources">Resources</a></h4> |
| 4179 | 149 | <ul> | 154 | <ul> |
| 4180 | 150 | <li><a href="https://juju.ubuntu.com/community">Community</a></li> | 155 | <li><a href="http://juju.ubuntu.com/docs">Documentation</a></li> |
| 4181 | 151 | <li class="page_item"><a href="https://juju.ubuntu.com/community/juju-blog/">Blog</a></li> | 156 | <li><a href="/resources/videos/">Videos</a></li> |
| 4182 | 152 | <li class="page_item"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Charm Meetings</a></li> | 157 | <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI demo site</a></li> |
| 4183 | 153 | <li class="page_item"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li> | 158 | </ul> |
| 4184 | 154 | <li class="page_item"><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li> | 159 | </li> |
| 4185 | 155 | <li class="page_item"><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li> | 160 | <li class="grid-3"> |
| 4186 | 156 | <li class="page_item"><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&amp;pagesize=50">FAQ</a></li> | 161 | <h4><a href="/community">Community</a></h4> |
| 4187 | 157 | </ul> | 162 | <ul> |
| 4188 | 158 | <ul class="last"> | 163 | <li class="page_item page-item-28"><a href="https://juju.ubuntu.com/community/juju-blog/">Juju Blog</a></li> |
| 4189 | 159 | <li><a href="https://launchpad.net/juju">Code</a></li> | 164 | <li class="page_item page-item-4262"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Weekly Charm Meeting</a></li> |
| 4190 | 160 | <li><a href="https://launchpad.net/juju-core">Juju Core</a></li> | 165 | <li class="page_item page-item-4036"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li> |
| 4191 | 161 | <li><a href="https://launchpad.net/charms">Charms</a></li> | 166 | <li><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li> |
| 4192 | 162 | </ul> | 167 | <li><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li> |
| 4193 | 163 | </nav> | 168 | <li><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&pagesize=50">FAQ</a></li> |
| 4194 | 164 | </div> | 169 | </ul> |
| 4195 | 165 | </footer> | 170 | </li> |
| 4196 | 171 | <li class="grid-3 last-col"> | ||
| 4197 | 172 | <h4><a href="https://launchpad.net/juju">Code</a></h4> | ||
| 4198 | 173 | <ul> | ||
| 4199 | 174 | <li><a href="https://launchpad.net/juju-core">Juju Core</a></li> | ||
| 4200 | 175 | <li><a href="https://launchpad.net/charms">Charms</a></li> | ||
| 4201 | 176 | </ul> | ||
| 4202 | 177 | </li> | ||
| 4203 | 178 | </ul> | ||
| 4204 | 179 | </nav> | ||
| 4205 | 180 | </div> | ||
| 4206 | 181 | </div> | ||
| 4207 | 182 | <div class="row no-border"> | ||
| 4208 | 183 | <div class="legal inner-wrapper"> | ||
| 4209 | 184 | <p>© 2013 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p> | ||
| 4210 | 185 | <p><a href="https://bugs.launchpad.net/juju-website/+filebug">Report a bug on this site</a></p> | ||
| 4211 | 186 | </div> | ||
| 4212 | 187 | </div> | ||
| 4213 | 188 | </footer> | ||
| 4214 | 189 | |||
| 4215 | 166 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script> | 190 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script> |
| 4217 | 167 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.8.14/jquery-ui.min.js"></script> | 191 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script> |
| 4218 | 168 | <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script> | 192 | <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script> |
| 4219 | 169 | <script type="text/javascript" src="js/main.js"></script> | 193 | <script type="text/javascript" src="js/main.js"></script> |
| 4220 | 170 | </body> | 194 | </body> |
| 4221 | 171 | 195 | ||
| 4222 | === modified file 'htmldocs/commands.html' | |||
| 4223 | --- htmldocs/commands.html 2013-07-12 00:12:30 +0000 | |||
| 4224 | +++ htmldocs/commands.html 2013-07-13 18:35:28 +0000 | |||
| 4225 | @@ -1,56 +1,61 @@ | |||
| 4226 | 1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
| 4227 | 2 | <html> | 2 | <html> |
| 4228 | 3 | <head> | 3 | <head> |
| 4242 | 4 | <meta charset="utf-8"> | 4 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> |
| 4243 | 5 | <title>Juju Documentation - Destroying Services</title> | 5 | <title>Juju Documentation - Juju Commands</title> |
| 4244 | 6 | <link href="//fonts.googleapis.com/css?family=Ubuntu:400,400italic" rel="stylesheet" type="text/css"/> | 6 | <link href='https://fonts.googleapis.com/css?family=Ubuntu:400,300,300italic,400italic,700,700italic|Ubuntu+Mono' rel='stylesheet' type='text/css' /> |
| 4245 | 7 | <link href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400" rel="stylesheet" type="text/css"/> | 7 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" /> |
| 4246 | 8 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" rel="stylesheet" type="text/css"/> | 8 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" /> |
| 4247 | 9 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" rel="stylesheet" type="text/css"/> | 9 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" /> |
| 4248 | 10 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" rel="stylesheet" type="text/css"/> | 10 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/home-new.css" /> |
| 4249 | 11 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/resources.css" rel="stylesheet" type="text/css"/> | 11 | <link rel='stylesheet' id='stacktack-css' href='//juju.ubuntu.com/wp-content/plugins/stacktack/css/stacktack.min.css?ver=3.4.2' type='text/css' media='all' /> |
| 4250 | 12 | <link href="css/main.css" rel="stylesheet" type="text/css"/> | 12 | <link href="css/main.css?1373740025" rel="stylesheet" type="text/css"/> |
| 4251 | 13 | <!--[if lt IE 9]> | 13 | |
| 4252 | 14 | <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script> | 14 | <!--[if lt IE 9]> |
| 4253 | 15 | <![endif]--> | 15 | <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script> |
| 4254 | 16 | </head> | 16 | <![endif]--> |
| 4255 | 17 | </head> | ||
| 4256 | 18 | <!-- DO NOT EDIT ABOVE THIS LINE --> | ||
| 4257 | 19 | |||
| 4258 | 20 | <!-- DO NOT EDIT ABOVE THIS LINE --> | ||
| 4259 | 21 | |||
| 4260 | 22 | |||
| 4261 | 17 | <body class="resources"> | 23 | <body class="resources"> |
| 4264 | 18 | <header> | 24 | <header class="global clearfix" role="banner"> |
| 4265 | 19 | <div class="header-login"> | 25 | <div class="header-navigation"> |
| 4266 | 26 | <div> | ||
| 4267 | 27 | <nav role="navigation"> | ||
| 4268 | 20 | <ul> | 28 | <ul> |
| 4270 | 21 | <li> </li> | 29 | <li class="page_item page-item-6"><a href="https://juju.ubuntu.com/">Home</a></li> |
| 4271 | 30 | <li class="page_item page-item-7"><a href="https://juju.ubuntu.com/get-started/">Get started</a></li> | ||
| 4272 | 31 | <li class="page_item page-item-9 current_page_item"><a href="https://juju.ubuntu.com/resources/">Resources</a></li> | ||
| 4273 | 32 | <li class="page_item page-item-13"><a href="https://juju.ubuntu.com/community/">Community</a></li> | ||
| 4274 | 33 | <li class="page_item page-item-3688"><a href="https://juju.ubuntu.com/charm-store/">Charm Store</a></li> | ||
| 4275 | 34 | <li class="page_item page-item-3691"><a href="https://juju.ubuntu.com/events/">Events</a></li> | ||
| 4276 | 35 | <li class="page_item page-item-4474"><a href="https://juju.ubuntu.com/charm-championship/">Charm Championship</a></li> | ||
| 4277 | 36 | <li class="page_item page-item-4249"><a href="https://juju.ubuntu.com/survey/">Survey</a></li> | ||
| 4278 | 37 | <li> | ||
| 4279 | 38 | <form id="form-search" method="get" action="https://juju.ubuntu.com/"> | ||
| 4280 | 39 | <fieldset> | ||
| 4281 | 40 | <input id="input-search" type="text" name="s" value="Search" /> | ||
| 4282 | 41 | </fieldset> | ||
| 4283 | 42 | </form> | ||
| 4284 | 43 | </li> | ||
| 4285 | 22 | </ul> | 44 | </ul> |
| 4317 | 23 | </div> | 45 | </nav> |
| 4318 | 24 | <div class="header-navigation"> | 46 | </div> |
| 4319 | 25 | <div> | 47 | </div> |
| 4320 | 26 | <nav role="navigation"> | 48 | <div class="header-content"> |
| 4321 | 27 | <ul> | 49 | <div class="clearfix"> |
| 4322 | 28 | <li class="page_item"><a href="https://juju.ubuntu.com/">Home</a></li> | 50 | <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav"> |
| 4323 | 29 | <li class="page_item current_page_item"><a href="https://juju.ubuntu.com/">Resources</a></li> | 51 | <div class="header-navigation-secondary"></div> |
| 4324 | 30 | <li class="page_item"><a href="https://juju.ubuntu.com/">Community</a></li> | 52 | <div class="header-image"></div> |
| 4325 | 31 | <li class="page_item"><a href="https://juju.ubuntu.com/">Charm Store</a></li> | 53 | <h1>Resources</h1> |
| 4326 | 32 | <li class="page_item"><a href="https://juju.ubuntu.com/">Events</a></li> | 54 | <h2>A collection of some of the most important online references for Juju users and developers.</h2> |
| 4327 | 33 | <li class="page_item"><a href="https://juju.ubuntu.com/">Survey</a></li> | 55 | </div> |
| 4328 | 34 | <li> | 56 | </div> |
| 4329 | 35 | <form id="form-search" method="get" action="/"> | 57 | </header> |
| 4330 | 36 | <fieldset> | 58 | |
| 4300 | 37 | <input id="input-search" type="text" name="s" value="Search"> | ||
| 4301 | 38 | </fieldset> | ||
| 4302 | 39 | </form> | ||
| 4303 | 40 | </li> | ||
| 4304 | 41 | </ul> | ||
| 4305 | 42 | </nav><a href="https://juju.ubuntu.com/" class="logo-ubuntu"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/logo-ubuntu.png"></a> | ||
| 4306 | 43 | </div> | ||
| 4307 | 44 | </div> | ||
| 4308 | 45 | <div class="header-content"> | ||
| 4309 | 46 | <div class="clearfix"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav"> | ||
| 4310 | 47 | <div class="header-navigation-secondary"></div> | ||
| 4311 | 48 | <div class="header-image"></div> | ||
| 4312 | 49 | <h1>Resources</h1> | ||
| 4313 | 50 | <h2>A collection of some of the most important online references for Juju users and developers.</h2> | ||
| 4314 | 51 | </div> | ||
| 4315 | 52 | </div> | ||
| 4316 | 53 | </header> | ||
| 4331 | 54 | <section id="content" class="container-12"> | 59 | <section id="content" class="container-12"> |
| 4332 | 55 | <div class="grid-12 doc-container"> | 60 | <div class="grid-12 doc-container"> |
| 4333 | 56 | <div class="grid-3 doc-navigation"> | 61 | <div class="grid-3 doc-navigation"> |
| 4334 | @@ -144,43 +149,62 @@ | |||
| 4335 | 144 | </div> | 149 | </div> |
| 4336 | 145 | </section> | 150 | </section> |
| 4337 | 146 | <div class="shadow"></div> | 151 | <div class="shadow"></div> |
| 4373 | 147 | <footer> | 152 | <footer class="global clearfix" role="contentinfo"> |
| 4374 | 148 | <div> | 153 | <div class="row"> |
| 4375 | 149 | <nav role="navigation" class="clearfix"> | 154 | <div class="inner-wrapper"> |
| 4376 | 150 | <ul> | 155 | <nav role="navigation" class="clearfix"> |
| 4377 | 151 | <li><a href="https://juju.ubuntu.com/get-started">Get started</a></li> | 156 | <ul class="footer-a"> |
| 4378 | 152 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li> | 157 | <li class="grid-3 first-col"> |
| 4379 | 153 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li> | 158 | <h4><a href="/get-started">Get started</a></h4> |
| 4380 | 154 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li> | 159 | <ul> |
| 4381 | 155 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li> | 160 | <li class="page_item page-item-20"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li> |
| 4382 | 156 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li> | 161 | <li class="page_item page-item-22"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li> |
| 4383 | 157 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li> | 162 | <li class="page_item page-item-18"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li> |
| 4384 | 158 | </ul> | 163 | <li class="page_item page-item-16"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li> |
| 4385 | 159 | <ul> | 164 | <li class="page_item page-item-3596"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li> |
| 4386 | 160 | <li><a href="https://juju.ubuntu.com/resources">Resources</a></li> | 165 | <li class="page_item page-item-3600"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li> |
| 4387 | 161 | <li><a href="https://juju.ubuntu.com/docs">Documentation</a></li> | 166 | </ul> |
| 4388 | 162 | <li><a href="https://juju.ubuntu.com/resources/videos">Videos</a></li> | 167 | </li> |
| 4389 | 163 | <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI Demo</a></li> | 168 | <li class="grid-3"> |
| 4390 | 164 | </ul> | 169 | <h4><a href="/resources">Resources</a></h4> |
| 4391 | 165 | <ul> | 170 | <ul> |
| 4392 | 166 | <li><a href="https://juju.ubuntu.com/community">Community</a></li> | 171 | <li><a href="http://juju.ubuntu.com/docs">Documentation</a></li> |
| 4393 | 167 | <li class="page_item"><a href="https://juju.ubuntu.com/community/juju-blog/">Blog</a></li> | 172 | <li><a href="/resources/videos/">Videos</a></li> |
| 4394 | 168 | <li class="page_item"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Charm Meetings</a></li> | 173 | <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI demo site</a></li> |
| 4395 | 169 | <li class="page_item"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li> | 174 | </ul> |
| 4396 | 170 | <li class="page_item"><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li> | 175 | </li> |
| 4397 | 171 | <li class="page_item"><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li> | 176 | <li class="grid-3"> |
| 4398 | 172 | <li class="page_item"><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&amp;pagesize=50">FAQ</a></li> | 177 | <h4><a href="/community">Community</a></h4> |
| 4399 | 173 | </ul> | 178 | <ul> |
| 4400 | 174 | <ul class="last"> | 179 | <li class="page_item page-item-28"><a href="https://juju.ubuntu.com/community/juju-blog/">Juju Blog</a></li> |
| 4401 | 175 | <li><a href="https://launchpad.net/juju">Code</a></li> | 180 | <li class="page_item page-item-4262"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Weekly Charm Meeting</a></li> |
| 4402 | 176 | <li><a href="https://launchpad.net/juju-core">Juju Core</a></li> | 181 | <li class="page_item page-item-4036"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li> |
| 4403 | 177 | <li><a href="https://launchpad.net/charms">Charms</a></li> | 182 | <li><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li> |
| 4404 | 178 | </ul> | 183 | <li><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li> |
| 4405 | 179 | </nav> | 184 | <li><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&pagesize=50">FAQ</a></li> |
| 4406 | 180 | </div> | 185 | </ul> |
| 4407 | 181 | </footer> | 186 | </li> |
| 4408 | 187 | <li class="grid-3 last-col"> | ||
| 4409 | 188 | <h4><a href="https://launchpad.net/juju">Code</a></h4> | ||
| 4410 | 189 | <ul> | ||
| 4411 | 190 | <li><a href="https://launchpad.net/juju-core">Juju Core</a></li> | ||
| 4412 | 191 | <li><a href="https://launchpad.net/charms">Charms</a></li> | ||
| 4413 | 192 | </ul> | ||
| 4414 | 193 | </li> | ||
| 4415 | 194 | </ul> | ||
| 4416 | 195 | </nav> | ||
| 4417 | 196 | </div> | ||
| 4418 | 197 | </div> | ||
| 4419 | 198 | <div class="row no-border"> | ||
| 4420 | 199 | <div class="legal inner-wrapper"> | ||
| 4421 | 200 | <p>© 2013 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p> | ||
| 4422 | 201 | <p><a href="https://bugs.launchpad.net/juju-website/+filebug">Report a bug on this site</a></p> | ||
| 4423 | 202 | </div> | ||
| 4424 | 203 | </div> | ||
| 4425 | 204 | </footer> | ||
| 4426 | 205 | |||
| 4427 | 182 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script> | 206 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script> |
| 4429 | 183 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.8.14/jquery-ui.min.js"></script> | 207 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script> |
| 4430 | 184 | <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script> | 208 | <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script> |
| 4431 | 185 | <script type="text/javascript" src="js/main.js"></script> | 209 | <script type="text/javascript" src="js/main.js"></script> |
| 4432 | 186 | </body> | 210 | </body> |
| 4433 | 187 | 211 | ||
| 4434 | === modified file 'htmldocs/config-aws.html' | |||
| 4435 | --- htmldocs/config-aws.html 2013-07-12 00:12:30 +0000 | |||
| 4436 | +++ htmldocs/config-aws.html 2013-07-13 18:35:28 +0000 | |||
| 4437 | @@ -1,56 +1,61 @@ | |||
| 4438 | 1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
| 4439 | 2 | <html> | 2 | <html> |
| 4440 | 3 | <head> | 3 | <head> |
| 4454 | 4 | <meta charset="utf-8"> | 4 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> |
| 4455 | 5 | <title>Juju Documentation - Configuring Juju to work with AWS</title> | 5 | <title>Juju Documentation - AWS Configuration</title> |
| 4456 | 6 | <link href="//fonts.googleapis.com/css?family=Ubuntu:400,400italic" rel="stylesheet" type="text/css"/> | 6 | <link href='https://fonts.googleapis.com/css?family=Ubuntu:400,300,300italic,400italic,700,700italic|Ubuntu+Mono' rel='stylesheet' type='text/css' /> |
| 4457 | 7 | <link href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400" rel="stylesheet" type="text/css"/> | 7 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" /> |
| 4458 | 8 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" rel="stylesheet" type="text/css"/> | 8 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" /> |
| 4459 | 9 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" rel="stylesheet" type="text/css"/> | 9 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" /> |
| 4460 | 10 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" rel="stylesheet" type="text/css"/> | 10 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/home-new.css" /> |
| 4461 | 11 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/resources.css" rel="stylesheet" type="text/css"/> | 11 | <link rel='stylesheet' id='stacktack-css' href='//juju.ubuntu.com/wp-content/plugins/stacktack/css/stacktack.min.css?ver=3.4.2' type='text/css' media='all' /> |
| 4462 | 12 | <link href="css/main.css" rel="stylesheet" type="text/css"/> | 12 | <link href="css/main.css?1373740025" rel="stylesheet" type="text/css"/> |
| 4463 | 13 | <!--[if lt IE 9]> | 13 | |
| 4464 | 14 | <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script> | 14 | <!--[if lt IE 9]> |
| 4465 | 15 | <![endif]--> | 15 | <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script> |
| 4466 | 16 | </head> | 16 | <![endif]--> |
| 4467 | 17 | </head> | ||
| 4468 | 18 | <!-- DO NOT EDIT ABOVE THIS LINE --> | ||
| 4469 | 19 | |||
| 4470 | 20 | <!-- DO NOT EDIT ABOVE THIS LINE --> | ||
| 4471 | 21 | |||
| 4472 | 22 | |||
| 4473 | 17 | <body class="resources"> | 23 | <body class="resources"> |
| 4476 | 18 | <header> | 24 | <header class="global clearfix" role="banner"> |
| 4477 | 19 | <div class="header-login"> | 25 | <div class="header-navigation"> |
| 4478 | 26 | <div> | ||
| 4479 | 27 | <nav role="navigation"> | ||
| 4480 | 20 | <ul> | 28 | <ul> |
| 4482 | 21 | <li> </li> | 29 | <li class="page_item page-item-6"><a href="https://juju.ubuntu.com/">Home</a></li> |
| 4483 | 30 | <li class="page_item page-item-7"><a href="https://juju.ubuntu.com/get-started/">Get started</a></li> | ||
| 4484 | 31 | <li class="page_item page-item-9 current_page_item"><a href="https://juju.ubuntu.com/resources/">Resources</a></li> | ||
| 4485 | 32 | <li class="page_item page-item-13"><a href="https://juju.ubuntu.com/community/">Community</a></li> | ||
| 4486 | 33 | <li class="page_item page-item-3688"><a href="https://juju.ubuntu.com/charm-store/">Charm Store</a></li> | ||
| 4487 | 34 | <li class="page_item page-item-3691"><a href="https://juju.ubuntu.com/events/">Events</a></li> | ||
| 4488 | 35 | <li class="page_item page-item-4474"><a href="https://juju.ubuntu.com/charm-championship/">Charm Championship</a></li> | ||
| 4489 | 36 | <li class="page_item page-item-4249"><a href="https://juju.ubuntu.com/survey/">Survey</a></li> | ||
| 4490 | 37 | <li> | ||
| 4491 | 38 | <form id="form-search" method="get" action="https://juju.ubuntu.com/"> | ||
| 4492 | 39 | <fieldset> | ||
| 4493 | 40 | <input id="input-search" type="text" name="s" value="Search" /> | ||
| 4494 | 41 | </fieldset> | ||
| 4495 | 42 | </form> | ||
| 4496 | 43 | </li> | ||
| 4497 | 22 | </ul> | 44 | </ul> |
| 4529 | 23 | </div> | 45 | </nav> |
| 4530 | 24 | <div class="header-navigation"> | 46 | </div> |
| 4531 | 25 | <div> | 47 | </div> |
| 4532 | 26 | <nav role="navigation"> | 48 | <div class="header-content"> |
| 4533 | 27 | <ul> | 49 | <div class="clearfix"> |
| 4534 | 28 | <li class="page_item"><a href="https://juju.ubuntu.com/">Home</a></li> | 50 | <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav"> |
| 4535 | 29 | <li class="page_item current_page_item"><a href="https://juju.ubuntu.com/">Resources</a></li> | 51 | <div class="header-navigation-secondary"></div> |
| 4536 | 30 | <li class="page_item"><a href="https://juju.ubuntu.com/">Community</a></li> | 52 | <div class="header-image"></div> |
| 4537 | 31 | <li class="page_item"><a href="https://juju.ubuntu.com/">Charm Store</a></li> | 53 | <h1>Resources</h1> |
| 4538 | 32 | <li class="page_item"><a href="https://juju.ubuntu.com/">Events</a></li> | 54 | <h2>A collection of some of the most important online references for Juju users and developers.</h2> |
| 4539 | 33 | <li class="page_item"><a href="https://juju.ubuntu.com/">Survey</a></li> | 55 | </div> |
| 4540 | 34 | <li> | 56 | </div> |
| 4541 | 35 | <form id="form-search" method="get" action="/"> | 57 | </header> |
| 4542 | 36 | <fieldset> | 58 | |
| 4512 | 37 | <input id="input-search" type="text" name="s" value="Search"> | ||
| 4513 | 38 | </fieldset> | ||
| 4514 | 39 | </form> | ||
| 4515 | 40 | </li> | ||
| 4516 | 41 | </ul> | ||
| 4517 | 42 | </nav><a href="https://juju.ubuntu.com/" class="logo-ubuntu"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/logo-ubuntu.png"></a> | ||
| 4518 | 43 | </div> | ||
| 4519 | 44 | </div> | ||
| 4520 | 45 | <div class="header-content"> | ||
| 4521 | 46 | <div class="clearfix"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav"> | ||
| 4522 | 47 | <div class="header-navigation-secondary"></div> | ||
| 4523 | 48 | <div class="header-image"></div> | ||
| 4524 | 49 | <h1>Resources</h1> | ||
| 4525 | 50 | <h2>A collection of some of the most important online references for Juju users and developers.</h2> | ||
| 4526 | 51 | </div> | ||
| 4527 | 52 | </div> | ||
| 4528 | 53 | </header> | ||
| 4543 | 54 | <section id="content" class="container-12"> | 59 | <section id="content" class="container-12"> |
| 4544 | 55 | <div class="grid-12 doc-container"> | 60 | <div class="grid-12 doc-container"> |
| 4545 | 56 | <div class="grid-3 doc-navigation"> | 61 | <div class="grid-3 doc-navigation"> |
| 4546 | @@ -134,43 +139,62 @@ | |||
| 4547 | 134 | </div> | 139 | </div> |
| 4548 | 135 | </section> | 140 | </section> |
| 4549 | 136 | <div class="shadow"></div> | 141 | <div class="shadow"></div> |
| 4585 | 137 | <footer> | 142 | <footer class="global clearfix" role="contentinfo"> |
| 4586 | 138 | <div> | 143 | <div class="row"> |
| 4587 | 139 | <nav role="navigation" class="clearfix"> | 144 | <div class="inner-wrapper"> |
| 4588 | 140 | <ul> | 145 | <nav role="navigation" class="clearfix"> |
| 4589 | 141 | <li><a href="https://juju.ubuntu.com/get-started">Get started</a></li> | 146 | <ul class="footer-a"> |
| 4590 | 142 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li> | 147 | <li class="grid-3 first-col"> |
| 4591 | 143 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li> | 148 | <h4><a href="/get-started">Get started</a></h4> |
| 4592 | 144 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li> | 149 | <ul> |
| 4593 | 145 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li> | 150 | <li class="page_item page-item-20"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li> |
| 4594 | 146 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li> | 151 | <li class="page_item page-item-22"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li> |
| 4595 | 147 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li> | 152 | <li class="page_item page-item-18"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li> |
| 4596 | 148 | </ul> | 153 | <li class="page_item page-item-16"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li> |
| 4597 | 149 | <ul> | 154 | <li class="page_item page-item-3596"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li> |
| 4598 | 150 | <li><a href="https://juju.ubuntu.com/resources">Resources</a></li> | 155 | <li class="page_item page-item-3600"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li> |
| 4599 | 151 | <li><a href="https://juju.ubuntu.com/docs">Documentation</a></li> | 156 | </ul> |
| 4600 | 152 | <li><a href="https://juju.ubuntu.com/resources/videos">Videos</a></li> | 157 | </li> |
| 4601 | 153 | <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI Demo</a></li> | 158 | <li class="grid-3"> |
| 4602 | 154 | </ul> | 159 | <h4><a href="/resources">Resources</a></h4> |
| 4603 | 155 | <ul> | 160 | <ul> |
| 4604 | 156 | <li><a href="https://juju.ubuntu.com/community">Community</a></li> | 161 | <li><a href="http://juju.ubuntu.com/docs">Documentation</a></li> |
| 4605 | 157 | <li class="page_item"><a href="https://juju.ubuntu.com/community/juju-blog/">Blog</a></li> | 162 | <li><a href="/resources/videos/">Videos</a></li> |
| 4606 | 158 | <li class="page_item"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Charm Meetings</a></li> | 163 | <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI demo site</a></li> |
| 4607 | 159 | <li class="page_item"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li> | 164 | </ul> |
| 4608 | 160 | <li class="page_item"><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li> | 165 | </li> |
| 4609 | 161 | <li class="page_item"><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li> | 166 | <li class="grid-3"> |
| 4610 | 162 | <li class="page_item"><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&amp;pagesize=50">FAQ</a></li> | 167 | <h4><a href="/community">Community</a></h4> |
| 4611 | 163 | </ul> | 168 | <ul> |
| 4612 | 164 | <ul class="last"> | 169 | <li class="page_item page-item-28"><a href="https://juju.ubuntu.com/community/juju-blog/">Juju Blog</a></li> |
| 4613 | 165 | <li><a href="https://launchpad.net/juju">Code</a></li> | 170 | <li class="page_item page-item-4262"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Weekly Charm Meeting</a></li> |
| 4614 | 166 | <li><a href="https://launchpad.net/juju-core">Juju Core</a></li> | 171 | <li class="page_item page-item-4036"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li> |
| 4615 | 167 | <li><a href="https://launchpad.net/charms">Charms</a></li> | 172 | <li><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li> |
| 4616 | 168 | </ul> | 173 | <li><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li> |
| 4617 | 169 | </nav> | 174 | <li><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&pagesize=50">FAQ</a></li> |
| 4618 | 170 | </div> | 175 | </ul> |
| 4619 | 171 | </footer> | 176 | </li> |
| 4620 | 177 | <li class="grid-3 last-col"> | ||
| 4621 | 178 | <h4><a href="https://launchpad.net/juju">Code</a></h4> | ||
| 4622 | 179 | <ul> | ||
| 4623 | 180 | <li><a href="https://launchpad.net/juju-core">Juju Core</a></li> | ||
| 4624 | 181 | <li><a href="https://launchpad.net/charms">Charms</a></li> | ||
| 4625 | 182 | </ul> | ||
| 4626 | 183 | </li> | ||
| 4627 | 184 | </ul> | ||
| 4628 | 185 | </nav> | ||
| 4629 | 186 | </div> | ||
| 4630 | 187 | </div> | ||
| 4631 | 188 | <div class="row no-border"> | ||
| 4632 | 189 | <div class="legal inner-wrapper"> | ||
| 4633 | 190 | <p>© 2013 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p> | ||
| 4634 | 191 | <p><a href="https://bugs.launchpad.net/juju-website/+filebug">Report a bug on this site</a></p> | ||
| 4635 | 192 | </div> | ||
| 4636 | 193 | </div> | ||
| 4637 | 194 | </footer> | ||
| 4638 | 195 | |||
| 4639 | 172 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script> | 196 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script> |
| 4641 | 173 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.8.14/jquery-ui.min.js"></script> | 197 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script> |
| 4642 | 174 | <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script> | 198 | <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script> |
| 4643 | 175 | <script type="text/javascript" src="js/main.js"></script> | 199 | <script type="text/javascript" src="js/main.js"></script> |
| 4644 | 176 | </body> | 200 | </body> |
| 4645 | 177 | 201 | ||
| 4646 | === modified file 'htmldocs/config-hpcloud.html' | |||
| 4647 | --- htmldocs/config-hpcloud.html 2013-07-12 00:12:30 +0000 | |||
| 4648 | +++ htmldocs/config-hpcloud.html 2013-07-13 18:35:28 +0000 | |||
| 4649 | @@ -1,56 +1,61 @@ | |||
| 4650 | 1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
| 4651 | 2 | <html> | 2 | <html> |
| 4652 | 3 | <head> | 3 | <head> |
| 4666 | 4 | <meta charset="utf-8"> | 4 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> |
| 4667 | 5 | <title>Juju Documentation - Configuring Juju to work with HPCloud</title> | 5 | <title>Juju Documentation - HP Cloud Configuration</title> |
| 4668 | 6 | <link href="//fonts.googleapis.com/css?family=Ubuntu:400,400italic" rel="stylesheet" type="text/css"/> | 6 | <link href='https://fonts.googleapis.com/css?family=Ubuntu:400,300,300italic,400italic,700,700italic|Ubuntu+Mono' rel='stylesheet' type='text/css' /> |
| 4669 | 7 | <link href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400" rel="stylesheet" type="text/css"/> | 7 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" /> |
| 4670 | 8 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" rel="stylesheet" type="text/css"/> | 8 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" /> |
| 4671 | 9 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" rel="stylesheet" type="text/css"/> | 9 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" /> |
| 4672 | 10 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" rel="stylesheet" type="text/css"/> | 10 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/home-new.css" /> |
| 4673 | 11 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/resources.css" rel="stylesheet" type="text/css"/> | 11 | <link rel='stylesheet' id='stacktack-css' href='//juju.ubuntu.com/wp-content/plugins/stacktack/css/stacktack.min.css?ver=3.4.2' type='text/css' media='all' /> |
| 4674 | 12 | <link href="css/main.css" rel="stylesheet" type="text/css"/> | 12 | <link href="css/main.css?1373740025" rel="stylesheet" type="text/css"/> |
| 4675 | 13 | <!--[if lt IE 9]> | 13 | |
| 4676 | 14 | <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script> | 14 | <!--[if lt IE 9]> |
| 4677 | 15 | <![endif]--> | 15 | <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script> |
| 4678 | 16 | </head> | 16 | <![endif]--> |
| 4679 | 17 | </head> | ||
| 4680 | 18 | <!-- DO NOT EDIT ABOVE THIS LINE --> | ||
| 4681 | 19 | |||
| 4682 | 20 | <!-- DO NOT EDIT ABOVE THIS LINE --> | ||
| 4683 | 21 | |||
| 4684 | 22 | |||
| 4685 | 17 | <body class="resources"> | 23 | <body class="resources"> |
| 4688 | 18 | <header> | 24 | <header class="global clearfix" role="banner"> |
| 4689 | 19 | <div class="header-login"> | 25 | <div class="header-navigation"> |
| 4690 | 26 | <div> | ||
| 4691 | 27 | <nav role="navigation"> | ||
| 4692 | 20 | <ul> | 28 | <ul> |
| 4694 | 21 | <li> </li> | 29 | <li class="page_item page-item-6"><a href="https://juju.ubuntu.com/">Home</a></li> |
| 4695 | 30 | <li class="page_item page-item-7"><a href="https://juju.ubuntu.com/get-started/">Get started</a></li> | ||
| 4696 | 31 | <li class="page_item page-item-9 current_page_item"><a href="https://juju.ubuntu.com/resources/">Resources</a></li> | ||
| 4697 | 32 | <li class="page_item page-item-13"><a href="https://juju.ubuntu.com/community/">Community</a></li> | ||
| 4698 | 33 | <li class="page_item page-item-3688"><a href="https://juju.ubuntu.com/charm-store/">Charm Store</a></li> | ||
| 4699 | 34 | <li class="page_item page-item-3691"><a href="https://juju.ubuntu.com/events/">Events</a></li> | ||
| 4700 | 35 | <li class="page_item page-item-4474"><a href="https://juju.ubuntu.com/charm-championship/">Charm Championship</a></li> | ||
| 4701 | 36 | <li class="page_item page-item-4249"><a href="https://juju.ubuntu.com/survey/">Survey</a></li> | ||
| 4702 | 37 | <li> | ||
| 4703 | 38 | <form id="form-search" method="get" action="https://juju.ubuntu.com/"> | ||
| 4704 | 39 | <fieldset> | ||
| 4705 | 40 | <input id="input-search" type="text" name="s" value="Search" /> | ||
| 4706 | 41 | </fieldset> | ||
| 4707 | 42 | </form> | ||
| 4708 | 43 | </li> | ||
| 4709 | 22 | </ul> | 44 | </ul> |
| 4741 | 23 | </div> | 45 | </nav> |
| 4742 | 24 | <div class="header-navigation"> | 46 | </div> |
| 4743 | 25 | <div> | 47 | </div> |
| 4744 | 26 | <nav role="navigation"> | 48 | <div class="header-content"> |
| 4745 | 27 | <ul> | 49 | <div class="clearfix"> |
| 4746 | 28 | <li class="page_item"><a href="https://juju.ubuntu.com/">Home</a></li> | 50 | <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav"> |
| 4747 | 29 | <li class="page_item current_page_item"><a href="https://juju.ubuntu.com/">Resources</a></li> | 51 | <div class="header-navigation-secondary"></div> |
| 4748 | 30 | <li class="page_item"><a href="https://juju.ubuntu.com/">Community</a></li> | 52 | <div class="header-image"></div> |
| 4749 | 31 | <li class="page_item"><a href="https://juju.ubuntu.com/">Charm Store</a></li> | 53 | <h1>Resources</h1> |
| 4750 | 32 | <li class="page_item"><a href="https://juju.ubuntu.com/">Events</a></li> | 54 | <h2>A collection of some of the most important online references for Juju users and developers.</h2> |
| 4751 | 33 | <li class="page_item"><a href="https://juju.ubuntu.com/">Survey</a></li> | 55 | </div> |
| 4752 | 34 | <li> | 56 | </div> |
| 4753 | 35 | <form id="form-search" method="get" action="/"> | 57 | </header> |
| 4754 | 36 | <fieldset> | 58 | |
| 4724 | 37 | <input id="input-search" type="text" name="s" value="Search"> | ||
| 4725 | 38 | </fieldset> | ||
| 4726 | 39 | </form> | ||
| 4727 | 40 | </li> | ||
| 4728 | 41 | </ul> | ||
| 4729 | 42 | </nav><a href="https://juju.ubuntu.com/" class="logo-ubuntu"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/logo-ubuntu.png"></a> | ||
| 4730 | 43 | </div> | ||
| 4731 | 44 | </div> | ||
| 4732 | 45 | <div class="header-content"> | ||
| 4733 | 46 | <div class="clearfix"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav"> | ||
| 4734 | 47 | <div class="header-navigation-secondary"></div> | ||
| 4735 | 48 | <div class="header-image"></div> | ||
| 4736 | 49 | <h1>Resources</h1> | ||
| 4737 | 50 | <h2>A collection of some of the most important online references for Juju users and developers.</h2> | ||
| 4738 | 51 | </div> | ||
| 4739 | 52 | </div> | ||
| 4740 | 53 | </header> | ||
| 4755 | 54 | <section id="content" class="container-12"> | 59 | <section id="content" class="container-12"> |
| 4756 | 55 | <div class="grid-12 doc-container"> | 60 | <div class="grid-12 doc-container"> |
| 4757 | 56 | <div class="grid-3 doc-navigation"> | 61 | <div class="grid-3 doc-navigation"> |
| 4758 | @@ -148,43 +153,62 @@ | |||
| 4759 | 148 | </div> | 153 | </div> |
| 4760 | 149 | </section> | 154 | </section> |
| 4761 | 150 | <div class="shadow"></div> | 155 | <div class="shadow"></div> |
| 4797 | 151 | <footer> | 156 | <footer class="global clearfix" role="contentinfo"> |
| 4798 | 152 | <div> | 157 | <div class="row"> |
| 4799 | 153 | <nav role="navigation" class="clearfix"> | 158 | <div class="inner-wrapper"> |
| 4800 | 154 | <ul> | 159 | <nav role="navigation" class="clearfix"> |
| 4801 | 155 | <li><a href="https://juju.ubuntu.com/get-started">Get started</a></li> | 160 | <ul class="footer-a"> |
| 4802 | 156 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li> | 161 | <li class="grid-3 first-col"> |
| 4803 | 157 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li> | 162 | <h4><a href="/get-started">Get started</a></h4> |
| 4804 | 158 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li> | 163 | <ul> |
| 4805 | 159 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li> | 164 | <li class="page_item page-item-20"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li> |
| 4806 | 160 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li> | 165 | <li class="page_item page-item-22"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li> |
| 4807 | 161 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li> | 166 | <li class="page_item page-item-18"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li> |
| 4808 | 162 | </ul> | 167 | <li class="page_item page-item-16"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li> |
| 4809 | 163 | <ul> | 168 | <li class="page_item page-item-3596"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li> |
| 4810 | 164 | <li><a href="https://juju.ubuntu.com/resources">Resources</a></li> | 169 | <li class="page_item page-item-3600"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li> |
| 4811 | 165 | <li><a href="https://juju.ubuntu.com/docs">Documentation</a></li> | 170 | </ul> |
| 4812 | 166 | <li><a href="https://juju.ubuntu.com/resources/videos">Videos</a></li> | 171 | </li> |
| 4813 | 167 | <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI Demo</a></li> | 172 | <li class="grid-3"> |
| 4814 | 168 | </ul> | 173 | <h4><a href="/resources">Resources</a></h4> |
| 4815 | 169 | <ul> | 174 | <ul> |
| 4816 | 170 | <li><a href="https://juju.ubuntu.com/community">Community</a></li> | 175 | <li><a href="http://juju.ubuntu.com/docs">Documentation</a></li> |
| 4817 | 171 | <li class="page_item"><a href="https://juju.ubuntu.com/community/juju-blog/">Blog</a></li> | 176 | <li><a href="/resources/videos/">Videos</a></li> |
| 4818 | 172 | <li class="page_item"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Charm Meetings</a></li> | 177 | <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI demo site</a></li> |
| 4819 | 173 | <li class="page_item"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li> | 178 | </ul> |
| 4820 | 174 | <li class="page_item"><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li> | 179 | </li> |
| 4821 | 175 | <li class="page_item"><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li> | 180 | <li class="grid-3"> |
| 4822 | 176 | <li class="page_item"><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&amp;pagesize=50">FAQ</a></li> | 181 | <h4><a href="/community">Community</a></h4> |
| 4823 | 177 | </ul> | 182 | <ul> |
| 4824 | 178 | <ul class="last"> | 183 | <li class="page_item page-item-28"><a href="https://juju.ubuntu.com/community/juju-blog/">Juju Blog</a></li> |
| 4825 | 179 | <li><a href="https://launchpad.net/juju">Code</a></li> | 184 | <li class="page_item page-item-4262"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Weekly Charm Meeting</a></li> |
| 4826 | 180 | <li><a href="https://launchpad.net/juju-core">Juju Core</a></li> | 185 | <li class="page_item page-item-4036"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li> |
| 4827 | 181 | <li><a href="https://launchpad.net/charms">Charms</a></li> | 186 | <li><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li> |
| 4828 | 182 | </ul> | 187 | <li><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li> |
| 4829 | 183 | </nav> | 188 | <li><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&pagesize=50">FAQ</a></li> |
| 4830 | 184 | </div> | 189 | </ul> |
| 4831 | 185 | </footer> | 190 | </li> |
| 4832 | 191 | <li class="grid-3 last-col"> | ||
| 4833 | 192 | <h4><a href="https://launchpad.net/juju">Code</a></h4> | ||
| 4834 | 193 | <ul> | ||
| 4835 | 194 | <li><a href="https://launchpad.net/juju-core">Juju Core</a></li> | ||
| 4836 | 195 | <li><a href="https://launchpad.net/charms">Charms</a></li> | ||
| 4837 | 196 | </ul> | ||
| 4838 | 197 | </li> | ||
| 4839 | 198 | </ul> | ||
| 4840 | 199 | </nav> | ||
| 4841 | 200 | </div> | ||
| 4842 | 201 | </div> | ||
| 4843 | 202 | <div class="row no-border"> | ||
| 4844 | 203 | <div class="legal inner-wrapper"> | ||
| 4845 | 204 | <p>© 2013 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p> | ||
| 4846 | 205 | <p><a href="https://bugs.launchpad.net/juju-website/+filebug">Report a bug on this site</a></p> | ||
| 4847 | 206 | </div> | ||
| 4848 | 207 | </div> | ||
| 4849 | 208 | </footer> | ||
| 4850 | 209 | |||
| 4851 | 186 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script> | 210 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script> |
| 4853 | 187 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.8.14/jquery-ui.min.js"></script> | 211 | <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script> |
| 4854 | 188 | <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script> | 212 | <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script> |
| 4855 | 189 | <script type="text/javascript" src="js/main.js"></script> | 213 | <script type="text/javascript" src="js/main.js"></script> |
| 4856 | 190 | </body> | 214 | </body> |
| 4857 | 191 | 215 | ||
| 4858 | === modified file 'htmldocs/config-maas.html' | |||
| 4859 | --- htmldocs/config-maas.html 2013-07-12 00:12:30 +0000 | |||
| 4860 | +++ htmldocs/config-maas.html 2013-07-13 18:35:28 +0000 | |||
| 4861 | @@ -1,56 +1,61 @@ | |||
| 4862 | 1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
| 4863 | 2 | <html> | 2 | <html> |
| 4864 | 3 | <head> | 3 | <head> |
| 4878 | 4 | <meta charset="utf-8"> | 4 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> |
| 4879 | 5 | <title>Juju Documentation - Configuring Juju to work with MAAS</title> | 5 | <title>Juju Documentation - MAAS Configuration</title> |
| 4880 | 6 | <link href="//fonts.googleapis.com/css?family=Ubuntu:400,400italic" rel="stylesheet" type="text/css"/> | 6 | <link href='https://fonts.googleapis.com/css?family=Ubuntu:400,300,300italic,400italic,700,700italic|Ubuntu+Mono' rel='stylesheet' type='text/css' /> |
| 4881 | 7 | <link href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400" rel="stylesheet" type="text/css"/> | 7 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" /> |
| 4882 | 8 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/reset.css" rel="stylesheet" type="text/css"/> | 8 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" /> |
| 4883 | 9 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/960.css" rel="stylesheet" type="text/css"/> | 9 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" /> |
| 4884 | 10 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/base.css" rel="stylesheet" type="text/css"/> | 10 | <link rel="stylesheet" type="text/css" media="screen" href="//juju.ubuntu.com/wp-content/themes/juju-website/css/home-new.css" /> |
| 4885 | 11 | <link href="https://juju.ubuntu.com/wp-content/themes/juju-website/css/resources.css" rel="stylesheet" type="text/css"/> | 11 | <link rel='stylesheet' id='stacktack-css' href='//juju.ubuntu.com/wp-content/plugins/stacktack/css/stacktack.min.css?ver=3.4.2' type='text/css' media='all' /> |
| 4886 | 12 | <link href="css/main.css" rel="stylesheet" type="text/css"/> | 12 | <link href="css/main.css?1373740025" rel="stylesheet" type="text/css"/> |
| 4887 | 13 | <!--[if lt IE 9]> | 13 | |
| 4888 | 14 | <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script> | 14 | <!--[if lt IE 9]> |
| 4889 | 15 | <![endif]--> | 15 | <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script> |
| 4890 | 16 | </head> | 16 | <![endif]--> |
| 4891 | 17 | </head> | ||
| 4892 | 18 | <!-- DO NOT EDIT ABOVE THIS LINE --> | ||
| 4893 | 19 | |||
| 4894 | 20 | <!-- DO NOT EDIT ABOVE THIS LINE --> | ||
| 4895 | 21 | |||
| 4896 | 22 | |||
| 4897 | 17 | <body class="resources"> | 23 | <body class="resources"> |
| 4900 | 18 | <header> | 24 | <header class="global clearfix" role="banner"> |
| 4901 | 19 | <div class="header-login"> | 25 | <div class="header-navigation"> |
| 4902 | 26 | <div> | ||
| 4903 | 27 | <nav role="navigation"> | ||
| 4904 | 20 | <ul> | 28 | <ul> |
| 4906 | 21 | <li> </li> | 29 | <li class="page_item page-item-6"><a href="https://juju.ubuntu.com/">Home</a></li> |
| 4907 | 30 | <li class="page_item page-item-7"><a href="https://juju.ubuntu.com/get-started/">Get started</a></li> | ||
| 4908 | 31 | <li class="page_item page-item-9 current_page_item"><a href="https://juju.ubuntu.com/resources/">Resources</a></li> | ||
| 4909 | 32 | <li class="page_item page-item-13"><a href="https://juju.ubuntu.com/community/">Community</a></li> | ||
| 4910 | 33 | <li class="page_item page-item-3688"><a href="https://juju.ubuntu.com/charm-store/">Charm Store</a></li> | ||
| 4911 | 34 | <li class="page_item page-item-3691"><a href="https://juju.ubuntu.com/events/">Events</a></li> | ||
| 4912 | 35 | <li class="page_item page-item-4474"><a href="https://juju.ubuntu.com/charm-championship/">Charm Championship</a></li> | ||
| 4913 | 36 | <li class="page_item page-item-4249"><a href="https://juju.ubuntu.com/survey/">Survey</a></li> | ||
| 4914 | 37 | <li> | ||
| 4915 | 38 | <form id="form-search" method="get" action="https://juju.ubuntu.com/"> | ||
| 4916 | 39 | <fieldset> | ||
| 4917 | 40 | <input id="input-search" type="text" name="s" value="Search" /> | ||
| 4918 | 41 | </fieldset> | ||
| 4919 | 42 | </form> | ||
| 4920 | 43 | </li> | ||
| 4921 | 22 | </ul> | 44 | </ul> |
| 4953 | 23 | </div> | 45 | </nav> |
| 4954 | 24 | <div class="header-navigation"> | 46 | </div> |
| 4955 | 25 | <div> | 47 | </div> |
| 4956 | 26 | <nav role="navigation"> | 48 | <div class="header-content"> |
| 4957 | 27 | <ul> | 49 | <div class="clearfix"> |
| 4958 | 28 | <li class="page_item"><a href="https://juju.ubuntu.com/">Home</a></li> | 50 | <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav"> |
| 4959 | 29 | <li class="page_item current_page_item"><a href="https://juju.ubuntu.com/">Resources</a></li> | 51 | <div class="header-navigation-secondary"></div> |
| 4960 | 30 | <li class="page_item"><a href="https://juju.ubuntu.com/">Community</a></li> | 52 | <div class="header-image"></div> |
| 4961 | 31 | <li class="page_item"><a href="https://juju.ubuntu.com/">Charm Store</a></li> | 53 | <h1>Resources</h1> |
| 4962 | 32 | <li class="page_item"><a href="https://juju.ubuntu.com/">Events</a></li> | 54 | <h2>A collection of some of the most important online references for Juju users and developers.</h2> |
| 4963 | 33 | <li class="page_item"><a href="https://juju.ubuntu.com/">Survey</a></li> | 55 | </div> |
| 4964 | 34 | <li> | 56 | </div> |
| 4965 | 35 | <form id="form-search" method="get" action="/"> | 57 | </header> |
| 4966 | 36 | <fieldset> | 58 | |
| 4936 | 37 | <input id="input-search" type="text" name="s" value="Search"> | ||
| 4937 | 38 | </fieldset> | ||
| 4938 | 39 | </form> | ||
| 4939 | 40 | </li> | ||
| 4940 | 41 | </ul> | ||
| 4941 | 42 | </nav><a href="https://juju.ubuntu.com/" class="logo-ubuntu"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/logo-ubuntu.png"></a> | ||
| 4942 | 43 | </div> | ||
| 4943 | 44 | </div> | ||
| 4944 | 45 | <div class="header-content"> | ||
| 4945 | 46 | <div class="clearfix"><img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav"> | ||
| 4946 | 47 | <div class="header-navigation-secondary"></div> | ||
| 4947 | 48 | <div class="header-image"></div> | ||
| 4948 | 49 | <h1>Resources</h1> | ||
| 4949 | 50 | <h2>A collection of some of the most important online references for Juju users and developers.</h2> | ||
| 4950 | 51 | </div> | ||
| 4951 | 52 | </div> | ||
| 4952 | 53 | </header> | ||
| 4967 | 54 | <section id="content" class="container-12"> | 59 | <section id="content" class="container-12"> |
| 4968 | 55 | <div class="grid-12 doc-container"> | 60 | <div class="grid-12 doc-container"> |
| 4969 | 56 | <div class="grid-3 doc-navigation"> | 61 | <div class="grid-3 doc-navigation"> |
| 4970 | @@ -129,43 +134,62 @@ | |||
| 4971 | 129 | </div> | 134 | </div> |
| 4972 | 130 | </section> | 135 | </section> |
| 4973 | 131 | <div class="shadow"></div> | 136 | <div class="shadow"></div> |
| 4974 | 132 | <footer> | ||
| 4975 | 133 | <div> | ||
| 4976 | 134 | <nav role="navigation" class="clearfix"> | ||
| 4977 | 135 | <ul> | ||
| 4978 | 136 | <li><a href="https://juju.ubuntu.com/get-started">Get started</a></li> | ||
| 4979 | 137 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li> | ||
| 4980 | 138 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li> | ||
| 4981 | 139 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li> | ||
| 4982 | 140 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li> | ||
| 4983 | 141 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li> | ||
| 4984 | 142 | <li class="page_item"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li> | ||
| 4985 | 143 | </ul> | ||
| 4986 | 144 | <ul> | ||
| 4987 | 145 | <li><a href="https://juju.ubuntu.com/resources">Resources</a></li> | ||
| 4988 | 146 | <li><a href="https://juju.ubuntu.com/docs">Documentation</a></li> | ||
| 4989 | 147 | <li><a href="https://juju.ubuntu.com/resources/videos">Videos</a></li> | ||
| 4990 | 148 | <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI Demo</a></li> | ||
| 4991 | 149 | </ul> | ||
| 4992 | 150 | <ul> | ||
| 4993 | 151 | <li><a href="https://juju.ubuntu.com/community">Community</a></li> | ||
| 4994 | 152 | <li class="page_item"><a href="https://juju.ubuntu.com/community/juju-blog/">Blog</a></li> | ||
| 4995 | 153 | <li class="page_item"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Charm Meetings</a></li> | ||
| 4996 | 154 | <li class="page_item"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li> | ||
| 4997 | 155 | <li class="page_item"><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li> | ||
| 4998 | 156 | <li class="page_item"><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li> | ||
| 4999 | 157 | <li class="page_item"><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&amp;pagesize=50">FAQ</a></li> | ||
| 5000 | 158 | </ul> | ||
The diff has been truncated for viewing.
Just looked like the build file and a bunch of header changes. It's _really_ hard to deal with content this way. html is an output format.