Snappy

Merge lp:~davidc3/snappy/oem-docs-formatting into lp:snappy/15.04

  1. oem-docs-formatting
  2. Merge into 15.04
Proposed by David Callé
Status: Merged
Approved by: Michael Vogt
Approved revision: 709
Merged at revision: 709
Proposed branch: lp:~davidc3/snappy/oem-docs-formatting
Merge into: lp:snappy/15.04
Diff against target: 96 lines (+44/-45)
1 file modified
docs/oem.md (+44/-45)
To merge this branch: bzr merge lp:~davidc3/snappy/oem-docs-formatting
Reviewer Review Type Date Requested Status
Michael Vogt (community) Approve
Review via email: mp+271624@code.launchpad.net

Commit message

Markdown fix in docs/oem.md

Description of the change

Markdown fix

To post a comment you must log in.
Revision history for this message
Michael Vogt (mvo) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'docs/oem.md'
2--- docs/oem.md 2015-09-11 20:13:00 +0000
3+++ docs/oem.md 2015-09-18 09:28:22 +0000
4@@ -193,48 +193,47 @@
5
6 As an example
7
8-```yaml
9-name: beagleboneblack.sergiusens
10-vendor: Sergio Schvezov <sergiusens@gmail.com>
11-icon: meta/element14.png
12-version: 1.1
13-type: oem
14-
15-config:
16- ubuntu-core:
17- hostname: myhostname
18- no-cloud: true
19- config-example.canonical:
20- msg: Yay!
21-
22-immutable-config:
23- - ubuntu-core/services/*
24- - webdm/*
25-
26-oem:
27- store:
28- id: mystore
29- branding:
30- name: Beagle Bone Black
31- logo: logo.png
32- software:
33- built-in:
34- - webdm
35- preinstalled:
36- - system-status.victor
37- - pastebinit.mvo
38- - config-example.canonical
39- hardware:
40- platform: am335x-boneblack
41- architecture: armhf
42- partition-layout: system-AB
43- bootloader: u-boot
44- boot-assets:
45- files:
46- - path: uEnv.txt
47- raw-files:
48- - path: MLO
49- offset: 131072 # 128 * 1024
50- - path: u-boot.img
51- offset: 393216 # 384 * 1024
52-```
53+
54+ name: beagleboneblack.sergiusens
55+ vendor: Sergio Schvezov <sergiusens@gmail.com>
56+ icon: meta/element14.png
57+ version: 1.1
58+ type: oem
59+
60+ config:
61+ ubuntu-core:
62+ hostname: myhostname
63+ no-cloud: true
64+ config-example.canonical:
65+ msg: Yay!
66+
67+ immutable-config:
68+ - ubuntu-core/services/*
69+ - webdm/*
70+
71+ oem:
72+ store:
73+ id: mystore
74+ branding:
75+ name: Beagle Bone Black
76+ logo: logo.png
77+ software:
78+ built-in:
79+ - webdm
80+ preinstalled:
81+ - system-status.victor
82+ - pastebinit.mvo
83+ - config-example.canonical
84+ hardware:
85+ platform: am335x-boneblack
86+ architecture: armhf
87+ partition-layout: system-AB
88+ bootloader: u-boot
89+ boot-assets:
90+ files:
91+ - path: uEnv.txt
92+ raw-files:
93+ - path: MLO
94+ offset: 131072 # 128 * 1024
95+ - path: u-boot.img
96+ offset: 393216 # 384 * 1024

Subscribers

People subscribed via source and target branches