Merge lp:~adam-collard/clouddocs/fix-landscape-yaml-formatting into lp:~jujudocs/clouddocs/trunk

Proposed by Adam Collard
Status: Merged
Merged at revision: 44
Proposed branch: lp:~adam-collard/clouddocs/fix-landscape-yaml-formatting
Merge into: lp:~jujudocs/clouddocs/trunk
Diff against target: 39 lines (+5/-1)
1 file modified
Clouddocs/Installing-Landscape.md (+5/-1)
To merge this branch: bzr merge lp:~adam-collard/clouddocs/fix-landscape-yaml-formatting
Reviewer Review Type Date Requested Status
Nick Veitch Approve
Review via email: mp+220769@code.launchpad.net

Description of the change

Fix formatting of YAML for Landscape related charms.

To post a comment you must log in.
Revision history for this message
Nick Veitch (evilnick) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Clouddocs/Installing-Landscape.md'
2--- Clouddocs/Installing-Landscape.md 2014-05-03 18:18:40 +0000
3+++ Clouddocs/Installing-Landscape.md 2014-05-23 09:05:28 +0000
4@@ -128,8 +128,10 @@
5 desired configuration values in a standard YAML format. For the hosted service, this would
6 look like:
7
8+```
9 landscape-client:
10 account-name: <name>
11+```
12
13 where the <name> is your account named used to access https://landscape.canonical.com
14 This configuration should be saved in a suitably named file, e.g. landscape-configuration.yami
15@@ -140,6 +142,7 @@
16 The Landscape client requires some extra configuration data when used with a Landscape
17 Dedicated Server. For example:
18
19+```
20 landscape-client
21 origin: distro
22 url: https://10.0.10.140/message-system
23@@ -150,6 +153,7 @@
24 base64:LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0Ck1SUlwVEN
25 ZJQ0FURS0tLS0Ck1JSUlwVENDQVRxZ0lKQVBFV011eUhJ
26 ...
27+```
28
29
30
31@@ -162,7 +166,7 @@
32 Normally https://fqdn/message-system
33
34 *ping-url:* The ping server URL to perform lightweight exchange
35-initiation with. Normally http://fqdn/ping.
36+initiation with. Normally http://fqdn/ping
37
38 *ssl-public-key:* If you configured the server with a self-signed SSL
39 certificate (which is the default) you will need to set this value.

Subscribers

People subscribed via source and target branches