lp:~jbicha/ubuntu/oneiric/installation-guide/merge-with-debian

Created by Jeremy Bícha and last modified
Get this branch:
bzr branch lp:~jbicha/ubuntu/oneiric/installation-guide/merge-with-debian
Only Jeremy Bícha can upload to this branch. If you are Jeremy Bícha please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Jeremy Bícha
Status:
Development

Recent revisions

42. By Jeremy Bícha

Merge from Debian (LP: #887663). Remaining changes:

41. By Jeremy Bícha

Merged in en/ from Debian

40. By Jeremy Bícha

Merge debian/ and build/ from Debian

39. By Jeremy Bícha

Copied translations and doc/ from Debian

38. By Colin Watson

* Update URL to Red Hat Kickstart documentation.
* Update url-us-keymap (thanks, Manfred Hampl; LP: #741134).
* Document that i586 processors and i686 without cmov are no longer
  supported (LP: #688195).

37. By Colin Watson

* Apply Ubuntu branding to i386 "CPU, Main Boards, and Video Support"
  section; there's one remaining instance of "Debian", but it makes sense
  in context (LP: #689153).
* Apply Ubuntu branding to "Braille Displays", "Hardware Speech
  Synthesis", and powerpc "CPU, Main Boards, and Video Support" sections
  (thanks, Mahyuddin Susanto; LP: #689157).

36. By Colin Watson

* Bump kernelversion to 2.6.37.
* Bump GNOME version to 2.32.
* Bump release version and names for Natty.
* Disable building for ia64 and sparc (LP: #669669).
* Fix formatting error in supported architectures table (LP: #666393).

35. By Colin Watson

* Resynchronise with Debian. Remaining changes:
  - Build only English (for now, until we figure out how to avoid trashing
    translations quite so badly with Ubuntu branding etc.).
  - Build only Ubuntu architectures (amd64, armel, i386, ia64, powerpc,
    sparc).
  - Extensive (although possibly incomplete) Ubuntu branding, adjustments
    for our mirror layout, etc.
  - Add "Ubuntu and Debian" and "What is Ubuntu?" section, text borrowed
    from the Ubuntu web site. Disable the "What is Debian GNU/Linux?"
    section.
  - Direct installation reports to ubuntu-users for now.
  - Adjust various memory and disk space requirements. Talk about the
    default Ubuntu desktop and Ubuntu tasks rather than Debian tasks.
  - Document mounting /sys in various places.
  - Unset supports-floppy-boot for all our architectures.
  - Add a few more supports-floppy-boot and bootable-usb conditionals.
  - Document our root password and sudo arrangements.
  - Document netboot-style USB images. Still mention the hd-media images,
    but they're downplayed since many USB sticks are too small for a full
    Ubuntu ISO image.
  - Document Kickstart installations (currently only the basics, a
    reference to Red Hat's documentation, and the differences from
    Anaconda).
  - Update keyboard preseeding documentation for console-setup.
  - Update chroot-install guide for console-setup and language packs; add
    a bit more advice about installing grub.
  - Disable documentation of win32-loader.
  - Document new simplified partman preseeding.
  - Document mirror/udeb/components.
  - Document apt-setup/security_path.
  - Don't recommend passing http://archive.ubuntu.com/ubuntu to
    debootstrap.
  - Document pkgsel/update-policy.
  - Document preseeding user-setup's home directory encryption facility.
  - Improve examples of tasksel/first preseeding to avoid mentioning
    standard, which is installed by default.
  - Document partman-auto-lvm/guided_size.
  - Document scheme for preseeding the use of CC.archive.ubuntu.com
    mirrors.
  - Document pkgsel/updatedb.
  - Document partman/default_filesystem.
  - Document how to override the weak password check.
  - Remove comments about automatic installation methods that have been
    removed from Ubuntu.
  - Remove documentation of
    base-installer/kernel/linux/initramfs-generators; setting this to
    anything other than the default will cause the installer to fail.
* Adjust list of armel architectures for Ubuntu.
* Bump kernelversion to 2.6.35.
* Bump release version and names for Maverick.
* Update Canonical's copyright years.

34. By Colin Watson

* Backport from trunk:
  - partman/confirm_write_new_label was renamed to
    partman-partitioning/confirm_write_new_label in r50363, December 2007.
    Adjust preseeding documentation to match (LP: #591199).

33. By Colin Watson

Document partman/confirm_nooverwrite.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp:ubuntu/oneiric/installation-guide
This branch contains Public information 
Everyone can see this information.

Subscribers