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

Proposed by Doug Smythies
Status: Merged
Merge reported by: dann frazier
Merged at revision: not available
Proposed branch: lp://staging/~dsmythies/installation-guide/xenial
Merge into: lp://staging/~ubuntu-core-dev/installation-guide/ubuntu
Diff against target: 42 lines (+4/-4)
3 files modified
build/arch-options/linux (+1/-1)
build/entities/common.ent (+2/-2)
build/preseed.pl (+1/-1)
To merge this branch: bzr merge lp://staging/~dsmythies/installation-guide/xenial
Reviewer Review Type Date Requested Status
dann frazier Needs Fixing
Review via email: mp+288212@code.staging.launchpad.net

Description of the change

Bump version numbers for xenial.
Change some lingering debian stretch references. (it is not clear to me why the package version of the example-preseed.txt file was O.K.)
I am not sure if adding chapter 1 section 7 with the previous revision was intentional or an oversight, but I am adding the new compiled chapter 1 section 8 files that result by the old section 7 being bumped to section 8 to the master help.ubuntu.com bzr branch.

This work is so that we (the doc team) can update the preliminary published 16.04 installation-guide on help.ubuntu.com.

To post a comment you must log in.
Revision history for this message
Doug Smythies (dsmythies) wrote :

I wish you would merge this. In the end, I don't care, I have already published it on help.ubuntu.com.

Revision history for this message
dann frazier (dannf) wrote :

hey Doug - LGTM - though, does changing the $manual_release default have any impact on the produced manuals? I didn't see any effect comparing the .txt versions. If not, I'd suggest leaving it as-is to avoid the merge conflict.

534. By Doug Smythies

revert the manual-release changes

535. By Doug Smythies

revert the manual-release changes, but properly this time

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

> hey Doug - LGTM - though, does changing the $manual_release default have any
> impact on the produced manuals? I didn't see any effect comparing the .txt
> versions. If not, I'd suggest leaving it as-is to avoid the merge conflict.

O.K., I reverted the "$manual_release" changes.

Revision history for this message
dann frazier (dannf) wrote :

Sorry, didn't notice this the first time - but it looks like GNOME 3.18 is in xenial/yakkety:
  https://wiki.ubuntu.com/XenialXerus/ReleaseNotes/UbuntuGNOME

review: Needs Fixing
Revision history for this message
dann frazier (dannf) wrote :

I went ahead and just made the 3.14->3.18 change locally & pushed. Thanks Doug!

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

Dan, thanks. That page you gave a link to did not exist when I did this merge proposal. Also when I search for "gnome" on http://packages.ubuntu.com/ I see a mixture of 3.14 and 3.18, but the actual desktop thing says 3.14. Anyway, I'm not going to re-publish on help.ubuntu.com just yet. Copied:

Exact hits
Package gnome

    xenial (gnome): Full GNOME Desktop Environment, with extra components [universe]
    1:3.14+3ubuntu1: amd64 arm64 armhf i386 powerpc ppc64el s390x

Revision history for this message
Peter Matulis (petermatulis) wrote :

Also beware of this:

$ diff example-preseed.txt /tmp/manual/example-preseed.txt

1c1
< #### Contents of the preconfiguration file (for xenial)
---
> #### Contents of the preconfiguration file (for stretch)
115c115
< #d-i mirror/suite string xenial
---
> #d-i mirror/suite string stretch
117c117
< #d-i mirror/udeb/suite string xenial
---
> #d-i mirror/udeb/suite string stretch
340c340
< # http://local.server/ubuntu xenial main
---
> # http://local.server/ubuntu stretch main

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: