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

[Doug Smythies]

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.

[Doug Smythies (dsmythies)]

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

[dann frazier (dannf)]

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.

[lp:~dsmythies/installation-guide/xenial]

534. By Doug Smythies on 2016-06-05

revert the manual-release changes

535. By Doug Smythies on 2016-06-05

revert the manual-release changes, but properly this time

[Doug Smythies (dsmythies)]

> 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.

[dann frazier (dannf)]

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

[dann frazier (dannf)]

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

[Doug Smythies (dsmythies)]

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

[Peter Matulis (petermatulis)]

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

=== modified file 'build/arch-options/linux'
--- build/arch-options/linux	2015-12-19 21:18:18 +0000
+++ build/arch-options/linux	2016-06-05 22:39:04 +0000
@@ -4,5 +4,5 @@
 archspec="$archspec;linux-any"
 arch_kernel="Linux"
 arch_parttype="Linux"
-kernelversion="4.3"
+kernelversion="4.4"
 kernelpackage="linux-image"

=== modified file 'build/entities/common.ent'
--- build/entities/common.ent	2015-12-19 21:18:18 +0000
+++ build/entities/common.ent	2016-06-05 22:39:04 +0000
@@ -162,13 +162,13 @@
 <!ENTITY x11ver "7.7">
 
 <!-- version of BRLTTY shipping with the current release -->
-<!ENTITY brlttyver "5.2">
+<!ENTITY brlttyver "5.3.1">
 
 <!-- version of Speakup shipping with the current release -->
 <!ENTITY speakupver "3.1.6">
 
 <!-- version of GNOME shipping with the current release -->
-<!ENTITY gnomeversion "3.12">
+<!ENTITY gnomeversion "3.14">
 
 <!-- an example of adding another image to lilo.conf, cf
      en/post-install.sgml etc. -->

=== modified file 'build/preseed.pl'
--- build/preseed.pl	2015-12-19 21:18:18 +0000
+++ build/preseed.pl	2016-06-05 22:39:04 +0000
@@ -72,7 +72,7 @@
 	$text =~ s/&archive-mirror;/archive.ubuntu.com/g;
 	$text =~ s/&releasename;/$release/g;
 	$text =~ s/&kernelpackage;/linux-image/g;
-	$text =~ s/&kernelversion;/4.3/g;
+	$text =~ s/&kernelversion;/4.4/g;
 	$text =~ s/&gt;/>/g;
 	$text =~ s/&lt;/</g;