lp://staging/~dsmythies/installation-guide/trusty12

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/~ubuntu-core-dev/installation-guide/ubuntu

Iain Lane (community): Approve on 2014-05-01

Diff: 70 lines (+44/-3) (has conflicts)

3 files modified

build/arch-options/armhf (+25/-0)
build/build.sh (+1/-2)
debian/changelog (+18/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

531. By Doug Smythies on 2014-04-11

attempt to fix bzr conflict complaints, again

530. By Doug Smythies on 2014-04-11

attempt to fix bzr conflict complaints

529. By Doug Smythies on 2014-04-02

merge differences between branch rev 44 and core rev 515; relates to armhf build issue

528. By Doug Smythies on 2014-04-02

restore armhf build

527. By Doug Smythies on 2014-03-31

14.04 edits; Plus Quinn Balazs edits fixed to build; Plus fixed Changelog

526. By Doug Smythies on 2014-03-21

14.04 edits; Plus Quinn Balazs edits fixed to build

525. By Quinn Balazs <email address hidden> on 2013-10-15

Fixed typo, Mandriva, not Mandravia.
Fixed 3 or 4 issues where whitespace was inadvertantly added or removed.
Fixed typo, Yield, not Yeild

524. By Quinn Balazs <email address hidden> on 2013-10-15

Fixed typo, Mandriva, not Mandravia.
Fixed 3 or 4 issues where whitespace was inadvertantly added or removed.

523. By Quinn Balazs <email address hidden> on 2013-10-15

Fixed typo, Mandriva, not Mandravia.
Fixed 3 or 4 issues where whitespace was inadvertantly added or removed.

522. By Quinn Balazs <email address hidden> on 2013-10-12

Small tweaks across the board
Addressed some bugs that have existed in the documentation for a while
Removed ambiguous language, added some more specifics to a few sections
*This will be expounded upon in a merge proposal following this commit*
*Forgot to ignore .DS_store files*