Merge lp:~nskaggs/pyjuju/juju-doc-write-charm-deploy-info into lp:~charm-contributors/pyjuju/docs

[Nicholas Skaggs]

Add details about deploying local charms to the writing charms walkthrough

[Benjamin Kerensa (bkerensa)]

Looks good... Thanks for the contribution

review: Approve

=== modified file 'source/getting-started.rst'
--- source/getting-started.rst	2012-04-04 19:32:23 +0000
+++ source/getting-started.rst	2012-05-04 17:47:18 +0000
@@ -37,13 +37,13 @@
 
 The juju environment can now be configured.
 
-Configuring your environment
+Configuring your environment using EC2
 ----------------------------
 
 Run the command-line utility with no arguments to create a sample
 environment::
 
-  juju
+  juju bootstrap
 
 This will create the file ``~/.juju/environments.yaml``, which will look
 something like this::

=== modified file 'source/write-charm.rst'
--- source/write-charm.rst	2012-04-04 14:09:57 +0000
+++ source/write-charm.rst	2012-05-04 17:47:18 +0000
@@ -208,6 +208,15 @@
 
   $ juju deploy --repository=examples local:oneiric/mysql
   $ juju deploy --repository=examples local:oneiric/drupal
+  
+This deploy is telling juju to look in a local repository for our charm,
+specifically in the examples/oneiric/mysql and examples/oneiric/drupal folders.
+Local repositories specified with the --repository switch must point to a
+directory which contains sub-directories named after an Ubuntu series
+(e.g. oneiric/) and the charms. The repository can be named anything you wish.
+Thus, when creating charms locally, this syntax should be followed
+
+	repositoryName/ubuntuReleaseName/charmName
 
 Once the machines are started (hint: check the debug-log), issue a status
 command::