Merge lp:~davidc3/snappy/oem-docs-formatting into lp:snappy/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
=== modified file 'docs/oem.md'
--- docs/oem.md 2015-09-11 20:13:00 +0000
+++ docs/oem.md 2015-09-18 09:28:22 +0000
@@ -193,48 +193,47 @@
193193
194As an example194As an example
195195
196```yaml196
197name: beagleboneblack.sergiusens197 name: beagleboneblack.sergiusens
198vendor: Sergio Schvezov <sergiusens@gmail.com>198 vendor: Sergio Schvezov <sergiusens@gmail.com>
199icon: meta/element14.png199 icon: meta/element14.png
200version: 1.1200 version: 1.1
201type: oem201 type: oem
202202
203config:203 config:
204 ubuntu-core:204 ubuntu-core:
205 hostname: myhostname205 hostname: myhostname
206 no-cloud: true206 no-cloud: true
207 config-example.canonical:207 config-example.canonical:
208 msg: Yay!208 msg: Yay!
209209
210immutable-config:210 immutable-config:
211 - ubuntu-core/services/*211 - ubuntu-core/services/*
212 - webdm/*212 - webdm/*
213213
214oem:214 oem:
215 store:215 store:
216 id: mystore216 id: mystore
217 branding:217 branding:
218 name: Beagle Bone Black218 name: Beagle Bone Black
219 logo: logo.png219 logo: logo.png
220 software:220 software:
221 built-in:221 built-in:
222 - webdm222 - webdm
223 preinstalled:223 preinstalled:
224 - system-status.victor224 - system-status.victor
225 - pastebinit.mvo225 - pastebinit.mvo
226 - config-example.canonical226 - config-example.canonical
227 hardware:227 hardware:
228 platform: am335x-boneblack228 platform: am335x-boneblack
229 architecture: armhf229 architecture: armhf
230 partition-layout: system-AB230 partition-layout: system-AB
231 bootloader: u-boot231 bootloader: u-boot
232 boot-assets:232 boot-assets:
233 files:233 files:
234 - path: uEnv.txt234 - path: uEnv.txt
235 raw-files:235 raw-files:
236 - path: MLO236 - path: MLO
237 offset: 131072 # 128 * 1024237 offset: 131072 # 128 * 1024
238 - path: u-boot.img238 - path: u-boot.img
239 offset: 393216 # 384 * 1024239 offset: 393216 # 384 * 1024
240```

Subscribers

People subscribed via source and target branches