installation-guide

Merge lp://staging/~dsmythies/installation-guide/trusty into lp://staging/~ubuntu-core-dev/installation-guide/ubuntu

  1. trusty
  2. Merge into ubuntu
Proposed by Doug Smythies
Status: Merged
Merged at revision: 517
Proposed branch: lp://staging/~dsmythies/installation-guide/trusty
Merge into: lp://staging/~ubuntu-core-dev/installation-guide/ubuntu
Diff against target: 419 lines (+98/-75)
16 files modified
build/build.sh (+2/-1)
build/entities/common.ent (+6/-6)
debian/changelog (+8/-0)
en/appendix/chroot-install.xml (+11/-13)
en/appendix/files.xml (+1/-1)
en/appendix/preseed.xml (+2/-2)
en/boot-installer/boot-installer.xml (+1/-1)
en/boot-installer/intro-firmware.xml (+1/-1)
en/boot-installer/parameters.xml (+12/-0)
en/boot-new/boot-new.xml (+28/-33)
en/hardware/buying-hardware.xml (+2/-3)
en/hardware/installation-media.xml (+9/-5)
en/hardware/supported-peripherals.xml (+2/-2)
en/install-methods/boot-usb-files.xml (+11/-5)
en/post-install/kernel-baking.xml (+1/-1)
en/preparing/minimum-hardware-reqts.xml (+1/-1)
To merge this branch: bzr merge lp://staging/~dsmythies/installation-guide/trusty
Reviewer Review Type Date Requested Status
Sebastien Bacher Needs Fixing
Review via email: mp+212095@code.staging.launchpad.net

Description of the change

The trusty edits. Also include a build-able version of MP 190783, as Quinn couldn't get it to build.

Reference:
https://code.launchpad.net/~qbalazs/installation-guide/trunk/+merge/190783

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

Thanks Doug, the changes look fine but I can't merge the branch because your changelog entry is incorrectly formatted

"bzr: ERROR: There was an error parsing the changelog: Could not parse changelog: Unexpected line while looking for more change data or trailer: -- Doug Smythies <<email address hidden> Thu, 20 Mar 2014 23:06:07 -0700"

Could you add the missing ">" there?

I'm also unsure who is maintaining the installatiuon-guide/should ack those changes, but they look fine to me so I'm wanting to merge/upload (once the changelog entry is valid)

review: Needs Fixing
lp://staging/~dsmythies/installation-guide/trusty updated
527. By Doug Smythies

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

Revision history for this message
Doug Smythies (dsmythies) wrote :

Fixed the changelog mistake, sorry for any inconvenience.

Revision history for this message
Sebastien Bacher (seb128) wrote :

the upload got rejected with that comment

"Rejected by Adam Conrad: The current version in the archive builds the armhf guide just fine, if changes here broke that, removing it isn't the answer"

Revision history for this message
Doug Smythies (dsmythies) wrote :

armhf has never built for me and I never publish it anyhow. I have what I need for help.ubuntu.com, and have already published the preliminary 14.04 version.

I'll put back the armhf build shortly and start a new merge proposal.

Revision history for this message
Doug Smythies (dsmythies) wrote :

This:

http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/trusty/installation-guide/trusty/revision/44

And this:

http://bazaar.launchpad.net/~ubuntu-core-dev/installation-guide/ubuntu/revision/515

Are not the same. As far as I know (which I don't know much) they should be the same. The rev 44 one seems to have the armhf stuff defined and such. The revision 515 one does not.

Myself, I do not know which one is supposed to be the "master" code, or even why there are two branches instead of just one.

This is going to take me awhile.

Revision history for this message
Sebastien Bacher (seb128) wrote :

Thanks, let us know if you need any help figuring the details out there

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: