Merge pull request juju#17 from juju/master

sync

Author: evilnick

src/en/about-juju.md

@@ -1,6 +1,6 @@
 Title: What is Juju?  
 
-##What is Juju?
+#What is Juju?
 Juju is a state-of-the-art, open source, universal model for service oriented architecture and service oriented
 deployments. Juju allows you to deploy, configure, manage, maintain, and scale cloud services quickly and efficiently on public clouds, as well as on physical servers, OpenStack, and containers. You can use Juju from the command line or through its beautiful GUI.
 
@@ -77,7 +77,7 @@ A charm is also a collection of scripts that handle different kinds of events. T
 
 ## What charms are currently available?
 Charms are available for hundreds of common and popular cloud-oriented applications such as MySQL, MongoDB, and others, with new ones being added every day. Check out the public charm store for an up to the minute list of charms:
-jujucharms.com
+[Juju Charm Store](https://jujucharms.com)
 
 ## Are charms open source? Under what license?
 Charms can be published under whatever license the author prefers, there are charms under just about every kind of license out there today. In many cases, charms follow the license of the applications that they deploy, but this is not a requirement. There are open source charms that deploy proprietary software, for example, and the reverse would be possible as well.
@@ -95,7 +95,7 @@ If you want, you can also share your charm with the world and gain feedback and
 
 What are the best workloads to try with Juju?
 
-Juju excels with scale-out workloads like big data, PAAS, cloud infrastructure such as OpenStack, or container management systems. Pick your favourite cloud and launch a juju server, deploy the Juju GUI there and then drop one of the bundles from the charm store into the blank canvas.
+Juju excels with scale-out workloads like big data, PAAS, cloud infrastructure such as OpenStack, or container management systems. Pick your favourite cloud and launch a Juju server, deploy the Juju GUI there and then drop one of the bundles from the charm store into the blank canvas.
 
 <style>.tableicon{width:100px;height:100px;float:right;margin: 5px 5px 40px 20px;}</style>
 <table>

src/en/charms-config.md

@@ -17,15 +17,15 @@ operational.
 Each charm will have its own set of options and possible values. You can
 discover these in several ways:
 
-  - By running the `juju get <service>` command.
-  - By viewing the charm in the [charm store.](https://jujucharms.com)
+  - By running the `juju get-config` command.
+  - By viewing the charm in the [charm store](https://jujucharms.com).
   - By examining the **config.yaml** file in the charm itself.
 
 
 ## Configuring a service at deployment
 
 It is possible to set configuration values when deploying a service by
-providing a yaml-formatted file containing configuration values.
+providing a [yaml-formatted][yaml] file containing configuration values.
 
 For example, upon investigation we discover that the Mediawiki charm allows us
 to set values for the name of the wiki and the 'skin' to use. We can put these
@@ -44,7 +44,7 @@ We can then use this configuration when we deploy the service:
 juju deploy --config myconfig.yaml mediawiki
 ```
 
-**Caution:** If the yaml configuration file cannot be read or contains some
+!!! WARNING: If the yaml configuration file cannot be read or contains some
 syntax errors or invalid options, you will receive an error message to this
 effect. However, **the service will still be deployed **. 
 
@@ -55,10 +55,10 @@ It is possible to set or change configuration of a service which is already
 deployed.
 
 Before you set any of these options, you may want to check what current options
-are already set, using the `juju get <service>` command. For example:
+are already set, using the `juju get-config <service>` command. For example:
 
 ```bash
-juju get mediawiki
+juju get-config mediawiki
 ```
 
 Should return something like this:
@@ -92,18 +92,34 @@ settings:
     description: skin for the Wiki
     type: string
     value: vector
+  use_suffix:
+    description: If we should put '/mediawiki' suffix on the url
+    type: boolean
+    value: false
 ```
 
-You can set the options using the `juju set <service>`, specifying
-multiple key=value pairs if necessary:
+You can set the options using the `juju set-config <service>`, specifying
+multiple space-separated key=value pairs if necessary:
 
 ```bash
-juju set mediawiki skin=monoblock name='Juju Wiki' 
+juju set-config mediawiki skin=monoblock name='Juju Wiki' 
+```
+It is also possible to set the configuration options from a YAML file after
+the service has been deployed:
+  
+```bash
+juju set-config --config=m.yaml mediawiki
 ```
 
-Setting an option back to its default value is done using the `unset` command
-followed by the service and the respective options:
+  
+Setting an option back to its default value is achieved by using the 
+`set-config` command, but with the `--to-default` switch, followed by the 
+service and a space separated list of the values to return to the default
+setting:
 
 ```bash
-juju unset mediawiki admins name 
+juju set-config --to-default mediawiki admins name
 ```
+
+
+[yaml]: http://yaml.org/spec/1.1/current.html "YAML spec page"

src/en/charms-scaling.md

@@ -1,4 +1,5 @@
 Title: Scaling charms  
+TODO: Check final note still relevant for 2.0 release  
 
 # Scaling Charms
 
@@ -10,7 +11,7 @@ front page of hacker news (yet), but it does mean that when you do you can
 reliably scale your services to meet the demand.
 
 
-#  Adding Units
+##  Adding Units
 
 The general usage to scale a service up is via the `add-unit` command:
 
@@ -30,7 +31,7 @@ The command options are:
 ```
 
 
-# Scaling behind a Load Balancer
+## Scaling behind a Load Balancer
 
 Usually you just can't add more units to a service and have it magically scale
 - you need to use a load balancer. In this case you can just deploy a proxy in
@@ -63,7 +64,7 @@ Now that you are behind a load balancer, you can grow the MediaWiki instances
 behind the proxy as you see fit, let's add 5 more:
 
 ```bash
-juju add-unit -n5 mediawiki
+juju add-unit -n 5 mediawiki
 ```
 
 You don't need to worry about manually adding your units to the load balancer.
@@ -73,7 +74,7 @@ are installed and configured _before_ adding them to the load balancer,
 ensuring minimal user disruption of the service.
 
 
-# Scaling Charms with built in Horizontal scaling
+## Scaling Charms with built in Horizontal scaling
 
 Some charms have native scaling built in. For instance, the WordPress charm
 has built in load balancing. In this case, scaling up services is really as
@@ -99,7 +100,7 @@ currently running one. Behind the scenes, Juju is adding an instance to the
 environment (also called a 'machine') and provisioning the specified service
 onto that instance/machine.
 
-Suppose your MySQL service needs hyperscale, you can use the `-n` or `--num-
+Now suppose your MySQL service needs hyperscale, you can use the `-n` or `--num-
 units` options to `add-unit` to specify the desired number of units you want
 added to the service. For example, to scale up your service by 100 units simply
 do:
@@ -114,17 +115,31 @@ or you can use `--num-unit` which has the same result, but is more readable:
 juju add-unit --num-unit 100 mysql
 ```
 
+### Co-location
+
+As with the `juju deploy` command, it is possible to co-locate services on machines.
 If you would like to add a unit to a specific machine just append the `--to`
-option:
+option, for example:
 
 ```bash
-# add unit to machine 23
 juju add-unit mysql --to 23
-# add unit to lxc container 3 on host machine 24
+```
+...adds a unit to machine 23,
+
+```bash 
 juju add-unit mysql --to 24/lxc/3 
-# add unit to a new lxc container on host machine 25
+```
+...adds a unit to lxc container 3 on host machine 24.
+
+It is worth noting that not all services will happily co-exist and it is much 
+safer to create a new container when co-locating:
+  
+```bash
 juju add-unit mysql --to lxc:25
 ```
+...add unit of mysql to a new lxc container on host machine 25
+
+## Constraints
 
 The `add-unit` command deploys a machine matching the constraints of the
 initially deployed service. For example, if MySQL was deployed with the
@@ -141,20 +156,8 @@ juju add-machine --constraints="mem=16G"
 juju add-unit mysql --to 3
 ```
 
-**Note:** Keep in mind you can always use the `-e` or `--environment` options
-to specify which environment/cloud you would like the command to run against.
-In the following example the `-e hpcloud` adds 100 units to the mysql service
-in HP's cloud:
 
-```bash
-juju add-unit -n 100 mysql -e hpcloud
-```
-
-See [deploying to specific machines](charms-deploying.html#deploying-to-
-machines).
-
-
-# Scaling Back
+## Scaling Back
 
 Sometimes you may want to scale back some of your services, and this too is
 easy with Juju.
@@ -165,30 +168,33 @@ The general usage to scale down a service is with the `remove-unit` command:
 juju remove-unit [options] <unit> [...]
 ```
 
-For example, the following scales down the MediaWiki service by one unit:
+For example, the following scales down the MediaWiki service by removing a
+specific unit:
 
 ```bash
 juju remove-unit mediawiki/1
 ```
 
 If you have scaled-up the MediaWiki service by more than one unit you can
-remove multiple units in the same command as long as you know the unit name (ie
-`<service>/#`).
+remove multiple units in the same command:
 
 ```bash
 juju remove-unit mediawiki/1 mediawiki/2 mediawiki/3 mediawiki/4 mediawiki/5
 ```
+!!! Note: the unit numbers may not necessarily be sequential, see the
+[notes on machine/unit numbering](./reference-numbering)
+
 
 The `remove-unit` command can be run to remove running units safely. The
 running services should automatically adjust to the change.
 
-**Note:** After removing a service the machine will still be running. In order
+!!! Note: After removing a service the machine will still be running. In order
 to completely remove the machine that once housed the service you need to issue
-a `destroy-machine`. For example, to remove machine 1 that the unit
+a `remove-machine`. For example, to remove machine 1 that the unit
 `mediawiki/1` was housed on use the command: 
 
 ```bash
-juju destroy-machine 1
+juju remove-machine 1
 ```
 
 For more information on removing services, please see the section on

src/en/command-changes.md

@@ -72,7 +72,7 @@ TODO: Add completely new commands
 | juju service help                    | deprecated                         |
 | juju service set                     | `juju set-config`                  |
 | juju service set-constraints         | `juju set-constraints`             |
-| juju service unset                   | deprecated (use `juju set-config --default`)|
+| juju service unset                   | deprecated (use `juju set-config --to-default`)|
 | juju set-constraints                 | `juju set-constraints`             |
 | juju set-environment                 | deprecated                         |
 | juju ssh                             | UNCHANGED                          |

src/en/reference-releases.md

@@ -76,8 +76,8 @@ agent-stream: proposed
 
 ## Development
 
-2.0-alpha2 is currently in development for testing.
-The previous development release was 1.26-alpha2.
+2.0-beta1 is currently in development for testing.
+The previous development release was 2.0-alpha2.
 
 Development releases provide new features that are being stablised.
 These releases are *not* suitable for production environments. Upgrading
@@ -92,15 +92,15 @@ sudo apt-get install juju-core</pre>
 {: .instruction }
 
 Centos
-: [juju-2.0-alpha2-centos7.tar.gz](https://launchpad.net/juju-core/trunk/2.0-alpha2/+download/juju-2.0-alpha2-centos7.tar.gz) ([md5](https://launchpad.net/juju-core/trunk/2.0-alpha2/+download/juju-2.0-alpha2-centos7.tar.gz/+md5))
+: [juju-2.0-beta1-centos7.tar.gz](https://launchpad.net/juju-core/trunk/2.0-beta1/+download/juju-2.0-beta1-centos7.tar.gz) ([md5](https://launchpad.net/juju-core/trunk/2.0-beta1/+download/juju-2.0-beta1-centos7.tar.gz/+md5))
 {: .instruction }
 
 OS X
-: [juju-2.0-alpha2-osx.tar.gz](https://launchpad.net/juju-core/trunk/2.0-alpha2/+download/juju-2.0-alpha2-osx.tar.gz) ([md5](https://launchpad.net/juju-core/trunk/2.0-alpha2/+download/juju-2.0-alpha2-osx.tar.gz/+md5))
+: [juju-2.0-beta1-osx.tar.gz](https://launchpad.net/juju-core/trunk/2.0-beta1/+download/juju-2.0-beta1-osx.tar.gz) ([md5](https://launchpad.net/juju-core/trunk/2.0-beta1/+download/juju-2.0-beta1-osx.tar.gz/+md5))
 {: .instruction }
 
 Windows
-: [juju-setup-2.0-alpha2.exe](https://launchpad.net/juju-core/trunk/2.0-alpha2/+download/juju-setup-2.0-alpha2.exe) ([md5](https://launchpad.net/juju-core/trunk/2.0-alpha2/+download/juju-setup-2.0-alpha2.exe/+md5))
+: [juju-setup-2.0-beta1.exe](https://launchpad.net/juju-core/trunk/2.0-beta1/+download/juju-setup-2.0-beta1.exe) ([md5](https://launchpad.net/juju-core/trunk/2.0-beta1/+download/juju-setup-2.0-beta1.exe/+md5))
 {: .instruction }
 
 Development releases use the 'devel' simple-streams. You must configure