Merge lp:~jorge/juju-core/lxc-deploy-examples into lp:juju-core/docs

[Jorge Castro]

[Nick Veitch (evilnick)]

This branch reintroduces the section about changing the default environment. AFAIK that feature still isn't implemented, unless you know better?

review: Needs Information

[Jorge Castro (jorge)]

Yep it works, it's also in the client documentation, it just wasn't synced with the online docs.

=== modified file 'htmldocs/charms-deploying.html'
--- htmldocs/charms-deploying.html	2013-10-31 13:35:14 +0000
+++ htmldocs/charms-deploying.html	2013-11-06 20:29:28 +0000
@@ -107,7 +107,7 @@
                         <pre class="prettyprint">juju deploy cs:precise/mysql</pre>
 
                         <p>which follows the format:</p>
-                        <pre class="prettyprint">&LT;repository&GT;:&LT;series&GT;&LT;service&GT;</pre>
+                        <pre class="prettyprint">&LT;repository&GT;:&LT;series&GT;/&LT;service&GT;</pre>
 
                         <h1 id="local">Deploying from a local repository</h1>
 
@@ -148,7 +148,7 @@
                         fetching it from the charm store. If you wish to check
                         where a charm was installed from, it is listed in the
                         <code>juju status</code> output.</p>
-<!--- NOT IMPLEMENTED https://bugs.launchpad.net/pyjuju/+bug/906008
+
                         <h1>Changing the defaults</h1>
 
                         <p>As we have seen, we can specify repositories to
@@ -165,7 +165,7 @@
   - http://charms.ubuntu.com/collection/openstack
   - http://charms.ubuntu.com/people/miked
   - /var/lib/charms</pre>
---->
+
                         <h1>A note about caching...</h1>
 
                         <p>After juju resolves a charm and its dependencies, it
@@ -177,7 +177,7 @@
                     </section>
 
                     <section id="deploying-to-machines">
-                        <h1>Deploying to specific machines</h1>
+                        <h1>Deploying to specific machines and containers</h1>
 
                         <p>Juju has native support for specifying which machine
                         a charm should be deployed to. This is useful for a few
@@ -198,6 +198,14 @@
                         <p>As you can see from the example we've deployed mysql
                         and rabbitmq-server "to" node 0.</p>
 
+                        <p>You can also deploy to containers:</p>
+                        <pre class="prettyprint">
+juju deploy mysql --to 24/lxc/3
+juju deploy mysql --to lxc:25
+</pre>
+
+                        <p>In the previous example we deployed MySQL to container #3 on machine #25. Similarly the 2nd example deploys MySQL to a new container on machine #25.</p>
+
                         <p>Note that you need to know the identifier of the
                         machine that you are going to <code>deploy --to</code> – in all
                         deployments, machine 0 is always the bootstrap node so
@@ -287,7 +295,7 @@
                         <h2>Considerations</h2>
 
                         <p>Charms are running without any separation, so its
-                        entirely possible for Charms to stamp all over each
+                        entirely possible for Charms to stomp all over each
                         others configuration files and try to bind to the same
                         network ports. We are working to containerize
                         everything so that this does not happen and every
@@ -307,6 +315,7 @@
                         dedicated machines when you need to.</p>
                     </section>
                     <section id="references">
+
                         <h2>References and Examples</h2>
 
                         <ul>