Merge lp://staging/~fheimes/installation-guide/ubuntu-18.04-s390x-appendices_and_more into lp://staging/~ubuntu-core-dev/installation-guide/ubuntu
| Status: | Merged | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Merged at revision: | 548 | ||||||||
| Proposed branch: | lp://staging/~fheimes/installation-guide/ubuntu-18.04-s390x-appendices_and_more | ||||||||
| Merge into: | lp://staging/~ubuntu-core-dev/installation-guide/ubuntu | ||||||||
| Diff against target: |
2313 lines (+1213/-234) 27 files modified
build/entities/common.ent (+2/-0) build/templates/docstruct.ent (+5/-3) doc/cheatsheet.xml (+8/-0) en/appendix/chroot-install.xml (+226/-41) en/appendix/files.xml (+35/-19) en/appendix/preseed.xml (+373/-45) en/boot-installer/intro-firmware.xml (+2/-1) en/boot-installer/trouble.xml (+4/-2) en/hardware/disk-storage.xml (+36/-0) en/hardware/hardware-supported.xml (+4/-3) en/howto/installation-howto.xml (+78/-20) en/install-methods/usb-setup/x86.xml (+4/-2) en/partitioning/device-names.xml (+35/-17) en/partitioning/partition-programs.xml (+4/-4) en/partitioning/schemes.xml (+1/-1) en/partitioning/sizing.xml (+3/-3) en/post-install/rescue.xml (+329/-50) en/preparing/non-debian-partitioning.xml (+6/-5) en/using-d-i/modules/localechooser.xml (+4/-2) en/using-d-i/modules/mdcfg.xml (+4/-2) en/using-d-i/modules/netcfg.xml (+5/-2) en/using-d-i/modules/network-console.xml (+4/-2) en/using-d-i/modules/partman-crypto.xml (+9/-3) en/using-d-i/modules/partman.xml (+7/-5) en/using-d-i/modules/pkgsel.xml (+5/-2) en/using-d-i/modules/s390/dasd.xml (+7/-0) en/using-d-i/modules/s390/fcp.xml (+13/-0) |
||||||||
| To merge this branch: | bzr merge lp://staging/~fheimes/installation-guide/ubuntu-18.04-s390x-appendices_and_more | ||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Core Development Team | Pending | ||
|
Review via email:
|
|||
Commit message
Adjusted and expanded info on IBM Z aka s390x starting with rescue,recovery mode up to the entire appendix;
especially preseed and debootstrap;
fixed some nested xml element usage, that prevents building pdfs under special circumstances
this also solves LP 1564788
Description of the change
worked on, updated and expanded:
- modified docstruct, to add s390x specific disk storage
- 8.7. Recovering a Broken System - en/post-
- fixed <note> element usage issues
Error: build of pdf failed with error code 1
Warning: The following formats failed to build: pdf
- figured out that nested <para> is not a good idea - html generation accepts that, but not tex,dvi,pdf
hard to find a bad nesting situation that happend while including one docbook file into another:
- A. Installation Howto - installation-
- A.1. Booting the installer
- A.2. Installation
- A.3. And finally…
- B.1. Introduction
- B.2. Using preseeding - ./en/appendix/
- B.3. Creating a preconfiguration file (no change)
- 2.1.6. Disk Storage (complete new sub-chapter)
adding en/hardware/
What about the other translations ? They pull-in en if no translation is available.
- ./en/using-
done - ./en/using-
adding en/using-
- Adding a separate s390x preseed example ?
- B.4. Contents of the preconfiguration file (for bionic)
- B.5. Advanced options
- Appendix C. Partitioning for Ubuntu
- C.1. Deciding on Ubuntu Partitions and Sizes
- C.2. The Directory Tree
- C.3. Recommended Partitioning Scheme
- C.4. Device Names in Linux - device-names.xml
- C.5. Ubuntu Partitioning Programs
- Appendix D. Random Bits
- D.1. Linux Devices
- D.2. Disk Space Needed for Tasks
- D.3. Disk Space Needed
- D.4. Installing Ubuntu from a Unix/Linux System
- nothing todo on: Appendix E. Administrivia and the rest
