[31/50] brooklyn-docs git commit: SSH Keys: Mention no password.

[he...@apache.org]

SSH Keys: Mention no password.

Conflicts:

	docs/use/guide/quickstart/index.md


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/8ac14159
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/8ac14159
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/8ac14159

Branch: refs/heads/0.5.0
Commit: 8ac141598433ce5c7d7012985fbea3841e5e880a
Parents: a2ae7d7
Author: David Toy <d...@vidtoy.co.uk>
Authored: Fri Apr 19 10:53:39 2013 +0100
Committer: David Toy <d...@vidtoy.co.uk>
Committed: Mon Apr 22 12:52:48 2013 +0100

----------------------------------------------------------------------
 docs/use/guide/quickstart/index.md | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/8ac14159/docs/use/guide/quickstart/index.md
----------------------------------------------------------------------
diff --git a/docs/use/guide/quickstart/index.md b/docs/use/guide/quickstart/index.md
index ea66060..d8a40fd 100644
--- a/docs/use/guide/quickstart/index.md
+++ b/docs/use/guide/quickstart/index.md
@@ -13,9 +13,13 @@ You are going to need some basic tools (that are normally installed by default).
 ### Download Brooklyn
 Download the Brooklyn distribution. This contains Brooklyn, ready to run.
 
+<<<<<<< HEAD
 [Download Page]({{site.url}}/start/download.html#distro) (Get the Distro as a tgz.)
 
 Save the Distro tgz file to your home directory `~/`, or a location of your choice. 
+=======
+Save the [Distro tgz]({{ this_dist_url_tgz }}) file to your home directory `~/`, or a location of your choice. (Other [download options]({{site.url}}/start/download.html) are available.)
+>>>>>>> 7f47f59... SSH Keys: Mention no password.
 
 Untar the tgz. Each Distro is timestamped, so your filename will be different. 
 
@@ -54,27 +58,25 @@ Create a .brooklyn folder:
 Then download the following default/template files.
 
 ### brooklyn.properties
-Download the [brooklyn.properties example](brooklyn.properties) (to `~/.brooklyn`).
+Download the template [brooklyn.properties](brooklyn.properties) (to `~/.brooklyn`).
 
 brooklyn.properties is a standard java .properties file. 
 
 Edit this file (in any text editor) to add credentials for your favorite cloud.
 
 ### catalog.xml
-Download the [catalog.xml example](catalog.xml) (to `~/.brooklyn`).
+Download the template [catalog.xml](catalog.xml) (to `~/.brooklyn`).
 
 catalog.xml is catalog of application or service blueprints. The example file contains two demos which will be automatically downloaded from the web if you run them.
 
 Edit this file (text editor) and check that the links to the demo applications' .jars are valid. At the time of writing these were for version `0.5.0-SNAPSHOT`, but if this has changed you may need to update the links.
 
-### SSH Keys
-If this is a new machine, or you haven't used SSH before, you will need to create keys for Brooklyn to use.
+### SSH Key
+If this is a new machine, or you haven't used SSH before, you will need to create keys for Brooklyn to use. (Accept all default options, as this will setup password-less keys in the default location and Brooklyn will find them.)
 
 	$ ssh-keygen -t rsa
-	$ ssh-keygen -t dsa
-
-These commands will setup keys in the default directories, and Brooklyn will find them.
 
+It is advisable *not* to set a password for this key. If you are using an existing key that already has a password please add it to your `brooklyn.properties` file.
 
 ### 3-2-1 Go!