Attached is a patch for some touch-up on the woody install manual. This revision includes changes per E Benson on the list. Notable changes: Removed reference to install.txt for powermac (incorporated content into the manual in hardware and rescue-boot). install.txt for powermac itself should be removed also. Fixed up list of whats to come in welcome.sgml Corrected tagging, several docs -- ran make lint-docs Removed reference to powerpc FAQ from preparing.sgml -- that link just talks about LinuxPPC and MkLinux, nothing germane Removed caveat #2 from tasksel discussion, it does all standard packages during the base install now.
Index: defaults.ent =================================================================== RCS file: /cvs/debian-boot/boot-floppies/documentation/defaults.ent,v retrieving revision 1.102 diff -u -r1.102 defaults.ent --- defaults.ent 2001/08/14 16:41:18 1.102 +++ defaults.ent 2001/09/05 04:22:16 @@ -106,11 +106,9 @@ <!-- threshold, below which, we are a low memory system --> <!entity low-mem-threshold "5MB"> -<!-- minimum size of root disk (i.e., just enough for base system) --> -<!-- karlheg - As of 2000.03.19 (2.2.8), as measured with du on --> -<!-- untarred base2_2.tgz + work space added. --> -<![ %alpha [ <!entity minimum-fs-size "100MB">]]> - <!entity minimum-fs-size "64MB"> +<!-- minimum hard disk size for base system --> +<!-- As measured on a completed woody install, work space included. --> +<!entity minimum-fs-size "100MB"> <!-- minimum total memory (RAM + swap is ok) needed, i.e., for kernel --> <!-- module config --> @@ -1000,19 +998,7 @@ '> ]]> -<!-- powerpc non-merged docs 2.2.19-2000-12-03 --> -<![ %powerpc [ - <!entity % has-non-merged-docs "INCLUDE"> - <!entity non-merged-docs ' - <url id="&downloadable-file;apus/install.txt" name=".../current/apus/install.txt"> - <tag><url id="&downloadable-file;chrp/install.txt" name=".../current/chrp/install.txt"> - <tag><url id="&downloadable-file;powermac/install.txt" name=".../current/powermac/install.txt"> - <tag><url id="&downloadable-file;prep/install.txt" name=".../current/prep/install.txt"> - '> -]]> - <!entity % has-non-merged-docs "IGNORE"> - <!-- --> Index: urls.ent =================================================================== RCS file: /cvs/debian-boot/boot-floppies/documentation/urls.ent,v retrieving revision 1.69 diff -u -r1.69 urls.ent --- urls.ent 2001/08/09 03:24:51 1.69 +++ urls.ent 2001/09/05 04:22:17 @@ -54,8 +54,8 @@ <!entity email-boot-floppies-list "[EMAIL PROTECTED]"> <!-- base for the current distribution --> -<!entity disturlftp "ftp://&ftp-debian-org;/debian/dists/potato/"> -<!entity disturl "http://http.us.debian.org/debian/dists/potato/"> +<!entity disturlftp "ftp://&ftp-debian-org;/debian/dists/woody/"> +<!entity disturl "http://http.us.debian.org/debian/dists/woody/"> <!entity url-readme-non-us "ftp://&ftp-debian-org;/debian/README.non-US"> @@ -97,8 +97,8 @@ <!entity url-local-install-manual "install"> <!entity url-local-dselect-beginner "dselect-beginner"> ]]> - <!entity url-local-install-manual "install$langext.html"> - <!entity url-local-dselect-beginner "dselect-beginner$langext.html"> + <!entity url-local-install-manual "install&langext;.html"> + <!entity url-local-dselect-beginner "dselect-beginner&langext;.html"> <!entity url-debian-list-archives "http://lists.debian.org/"> Index: en/appendix.sgml =================================================================== RCS file: /cvs/debian-boot/boot-floppies/documentation/en/appendix.sgml,v retrieving revision 1.7 diff -u -r1.7 appendix.sgml --- en/appendix.sgml 2001/08/24 16:09:09 1.7 +++ en/appendix.sgml 2001/09/05 04:22:17 @@ -72,8 +72,8 @@ special action to download directly to a file, in raw binary mode. For example, in Netscape you need to hold the shift key when clicking on the URL to retrieve the file. Files can be downloaded from the URLs -in this document, which are within the www server's <file><url -id="&url-boot-floppies;" name=".../current"></file> directory, or you can +in this document, which are within the www server's <file><url +id="&url-boot-floppies;" name=".../current/"></file> directory, or you can retrieve them via ftp from "&disturlftp;main/disks-&architecture;/current/">. You can also use the corresponding directory on any of the <url @@ -311,18 +311,18 @@ <sect id="linuxdevices"> <heading>Linux Devices</heading> <p> -In Linux you have various special files in <tt>/dev</tt>. These files are +In Linux you have various special files in <file>/dev</file>. These files are called devices files. In the Unix world accessing hardware is different. There you have a special file which actually runs a driver which in turn accesses the hardware. The device file is an interface to the actual -system component. Files under <tt>/dev</tt> also behave differently than +system component. Files under <file>/dev</file> also behave differently than ordinary files. Below are the most important device files listed. </p> <p> <example> -fd0 1. Floppy Drive -fd1 2. Floppy Drive +fd0 First Floppy Drive +fd1 Second Floppy Drive </example> <example> @@ -330,16 +330,16 @@ hdb IDE Harddisk / CD-ROM on the first IDE port (Slave) hdc IDE Harddisk / CD-ROM on the second IDE port (Master) hdd IDE Harddisk / CD-ROM on the second IDE port (Slave) -hda1 1. partition of the first IDE harddisk -hdd15 15. partition of the fourth IDE harddisk +hda1 First partition of the first IDE harddisk +hdd15 Fifteenth partition of the fourth IDE harddisk </example> <example> sda SCSI Harddisk with lowest SCSI ID (e.g. 0) sdb SCSI Harddisk with next higher SCSI ID (e.g. 1) sdc SCSI Harddisk with next higher SCSI ID (e.g. 2) -sda1 1. partition of the first SCSI harddisk -sdd10 10. partition of the fourth SCSI harddisk +sda1 First partition of the first SCSI harddisk +sdd10 Tenth partition of the fourth SCSI harddisk </example> <example> Index: en/boot-new.sgml =================================================================== RCS file: /cvs/debian-boot/boot-floppies/documentation/en/boot-new.sgml,v retrieving revision 1.3 diff -u -r1.3 boot-new.sgml --- en/boot-new.sgml 2001/08/18 11:51:15 1.3 +++ en/boot-new.sgml 2001/09/05 04:22:18 @@ -474,44 +474,32 @@ If you chose ``simple'' installation, you will next be thrown into the Task Installer (<prgn>tasksel</prgn>). This technique offers you a number of pre-rolled software configurations offered by Debian. You -could always choose, package by package, what do you want to install +could always choose, package by package, what you want to install on your new machine. This is the purpose of the <prgn>dselect</prgn> program, described below. But this can be a long task with around &num-of-distrib-pkgs; packages available in Debian! <p> -So, you have the ability to choose <em>tasks</em> instead. These -loosely represent a number of different jobs or things you want to do -with your computer, such as ``Samba'' for SAMBA servers, or ``Gnome -Desktop'' for the GNOME desktop environment. +So, you have the ability to choose <em>tasks</em> first, and then add +on more individual packages later. These tasks loosely represent a +number of different jobs or things you want to do with your computer, +such as `desktop environment', `development in C', or `file server'. <p> For each task, you can highlight that task and select ``Task Info'' to see more information on that task. This will show you an extended -description and the list of packages included for that task. +description and the list of packages which will be installed for that +task. <p> Once you've selected your tasks, select ``Finish''. At this point, -<prgn>apt-get</prgn> will be run to install the packages you've -selected. You will be shown the number of packages to be installed, -and how many kilobytes of packages, if any, need to be downloaded. +<prgn>apt-get</prgn> will install the packages you've selected. You +will be shown the number of packages to be installed, and how many +kilobytes of packages, if any, need to be downloaded. <p> -There are two caveats to be mentioned at this point. Firstly, of the -&num-of-distrib-pkgs; packages available in Debian, only a small -minority of those are covered by tasks offered in the Task Installer. +Of the &num-of-distrib-pkgs; packages available in Debian, only a small +minority are covered by tasks offered in the Task Installer. To see information on more packages, either use <tt>apt-cache search <var>search-string</var></tt> for some given search string (see the <manref name="apt-cache" section="8"> man page), or run <prgn>dselect</prgn> as described below. - <p> -The second caveat is that some so-called ``standard'' packages are not -installed by default. Thus, some software, which we consider basic to -any Linux system, may not be installed.<footnote> - <p> -This is due to a bug in <package>base-config</package> which we have -fixed for the next release. We decided not to change this after -Potato release, since it was a rather large change, and too likely to -cause problems.</p> - </footnote> -In order to install that software, simply run <tt>tasksel -s</tt>, -without selecting any packages, then select ``Finish''. <sect id="install-advanced"> @@ -522,11 +510,6 @@ id="&url-local-dselect-beginner;" name="dselect Tutorial"> is required reading before you run <prgn>dselect</prgn>. <prgn>dselect</prgn> allows you to select <em>packages</em> to be installed on your -system. If you have a CD-ROM or hard disk containing the additional -Debian packages that you want to install on your system, or you are -connected to the Internet, this will be useful to you right -away. Otherwise, you may want to quit <prgn>dselect</prgn> and start -it later, once you have transported the Debian package files to your system. You must be the super-user (root) when you run <prgn>dselect</prgn>. Index: en/hardware.sgml =================================================================== RCS file: /cvs/debian-boot/boot-floppies/documentation/en/hardware.sgml,v retrieving revision 1.29 diff -u -r1.29 hardware.sgml --- en/hardware.sgml 2001/08/14 16:43:22 1.29 +++ en/hardware.sgml 2001/09/05 04:22:19 @@ -284,13 +284,35 @@ ]]> <![ %powerpc [ - <p> + <p> There are three major supported <em>&architecture;</em> flavors: CHRP, PMac (Power-Macintosh) and PReP machines. Ports to other <em>&architecture;</em> architectures, such as the Apus, Be-Box and MBX architecture, are underway but not yet supported by Debian. We may have a 64bit port (Power3) in the future. -]]> + <p> +Apple (and briefly a few other manufacturers - Power Computing, for +example) makes a series of Macintosh computers based on the PowerPC +processor. For purposes of architecture support, they are categorized +as Nubus, OldWorld PCI, and NewWorld. + <p> +Nubus systems are not currently supported by debian/powerpc. The +monolithic Linux/PPC kernel architecture does not have support for +these machines; instead, one must use the MkLinux Mach microkernel, +which Debian does not yet support. These include the 6100/7100/8100 +line of Power Macintoshes. + <p> +OldWorld systems are most Power Macintoshes with a floppy drive and a +PCI bus. Most 603, 603e, 604, and 604e based Power Macintoshes, +including the 7200, 7300, 7500, 7600, 8500, 8600, 9500, and 9600 are +OldWorld machines. The beige colored G3 systems are also OldWorld. + <p> +The so called NewWorld PowerMacs are any PowerMacs in translucent +colored plastic cases. That includes all iMacs, iBooks, G4 systems, +blue colored G3 systems, and most PowerBooks manufactured in and after +1999. The NewWorld PowerMacs are also known for using the `ROM in RAM' +system for MacOS, and were manufactured from mid-1998 onwards. + ]]> <![ %arm [ <p> Index: en/inst-methods.sgml =================================================================== RCS file: /cvs/debian-boot/boot-floppies/documentation/en/inst-methods.sgml,v retrieving revision 1.69 diff -u -r1.69 inst-methods.sgml --- en/inst-methods.sgml 2001/08/16 23:57:53 1.69 +++ en/inst-methods.sgml 2001/09/05 04:22:21 @@ -182,12 +182,7 @@ <![ %powerpc [ <p> It cannot access files on an HFS+ filesystem. MacOS -System 8.1 and above may use HFS+ filesystems; NewWorld <footnote>The so called -`NewWorld' PowerMacs are any <em>PowerMac</em>s in translucent colored -plastic cases. That includes all <em>iMac</em>s, <em>iBook</em>s, -<em>G4</em>s, blue colored <em>G3</em>s, and most <em>PowerBook</em>s -manufactured in and after 1999. The `NewWorld' PowerMacs are also -known for using the `ROM in RAM' system for MacOS.</footnote> PowerMacs all +System 8.1 and above may use HFS+ filesystems; NewWorld PowerMacs all use HFS+ by default. To determine whether your existing filesystem is HFS+, select <tt>Get Info</tt> for the volume in question. HFS filesystems appear as <tt>Mac OS Standard</tt>, while HFS+ filesystems say <tt>Mac @@ -565,21 +560,35 @@ files between MacOS and Linux, in particular the installation files you download. - <sect1>Booting from OpenFirmware on PowerMacs - <p> -OpenFirmware is a BIOS-system for modern systems. Variants of it are + <sect1>Booting from Open Firmware on PowerMacs + <p> +Open Firmware is a BIOS-system for modern systems. Variants of it are also used in SPARC machines, for instance. - <p> -However, on PowerMacs, the procedures for installation vary -pretty radically depending on whether the system is a ``NewWorld'' or -an ``OldWorld'' model. + <p> +However, on PowerMacs, the procedures for installation vary pretty +radically depending on whether the system is a ``NewWorld'' or an +``OldWorld'' model. + <p> +OldWorld systems use an older, buggier revision of Open Firmware. They +can boot Linux either directly via <prgn>quik</prgn>, from the MacOS +ROM via <prgn>miBoot</prgn>, or from within MacOS via +<prgn>BootX</prgn>. Of these, only the BootX method flexibly supports +dual-booting. + <p> +The NewWorld PowerMacs use a more complete Open Firmware bootloader, +which supports booting from a network or an ISO9660 CD-ROM, as well as +ELF binary loading. These machines will boot Linux directly via +<prgn>yaboot</prgn>, which supports loading a kernel and ramdisk +directly from an ext2 partition, as well as dual-booting with MacOS. +<prgn>BootX</prgn> is not supported and must not be used on NewWorld +PowerMacs. - <sect2>Files for OpenFirmware Booting in OldWorld Macs + <sect2>Files for Open Firmware Booting in OldWorld Macs <p> <![ %FIXME; [ <em>Not yet written.</em> ]]> - <sect2 id="files-newworld">Files for OpenFirmware Booting in NewWorld Macs + <sect2 id="files-newworld">Files for Open Firmware Booting in NewWorld Macs <p> For NewWorld Macs, you can boot the installer directly from files placed on an HFS partition. This method is particularly appropriate Index: en/partitioning.sgml =================================================================== RCS file: /cvs/debian-boot/boot-floppies/documentation/en/partitioning.sgml,v retrieving revision 1.35 diff -u -r1.35 partitioning.sgml --- en/partitioning.sgml 2001/08/16 23:57:53 1.35 +++ en/partitioning.sgml 2001/09/05 04:22:22 @@ -6,9 +6,8 @@ The &MSG-PARTITION-DISK; menu item presents you with a list of disk drives you can partition, and runs a partitioning application. You must create at least one ``Linux native'' (type 83) disk partition, -and you probably want at least one ``Linux swap`` (type 82) partition. +and you probably want at least one ``Linux swap'' (type 82) partition. - <sect id="partition-intro">Deciding on Debian Partitions and Sizes <p> At a bare minimum, GNU/Linux needs one partition for itself. You can @@ -362,7 +361,6 @@ is used by the boot loader (either SILO, or Sun's). ]]> - <sect id="partition-programs">Debian Partitioning Programs <p> Several varieties of partitioning programs have been adapted by Debian @@ -480,7 +478,6 @@ from the shell using <prgn>mkdosfs</prgn> before attempting to install the bootloader. ]]> - <![ %powerpc [ <sect>Partitioning Newer PowerMacs Index: en/preparing.sgml =================================================================== RCS file: /cvs/debian-boot/boot-floppies/documentation/en/preparing.sgml,v retrieving revision 1.30 diff -u -r1.30 preparing.sgml --- en/preparing.sgml 2001/08/16 23:57:53 1.30 +++ en/preparing.sgml 2001/09/05 04:22:23 @@ -16,8 +16,7 @@ <item>Set up boot floppies or place boot files (except most Debian CD users can boot from one of the CDs) <item>Boot the installation system - <item>Answer a series of questions to perform the initial - system configuration + <item>Configure the keyboard, create and mount Debian partitions <item>Point the installer to the location of the kernel and drivers <item>Select which peripheral drivers to load <item>Configure the network interface @@ -27,7 +26,8 @@ <item>Boot the newly installed system and do some final configuration <item>Install additional tasks and packages, at your discretion </enumlist> - <sect id="backup">Back Up Your Existing Data! + +<sect id="backup">Back Up Your Existing Data! <p> Before you start, make sure to back up every file that is now on your system. If this is the first time a non-native operating system has @@ -63,73 +63,69 @@ <sect1>Documentation <p> <taglist> - <tag><strong>Installation Manual:</strong></tag> - <tag>&install-manual-files;</tag> + <tag><strong>Installation Manual:</strong></tag> + <tag>&install-manual-files;</tag> <item> <p> This file you are now reading, in plain ASCII, HTML or PDF format.</p> </item> <![ %has-non-merged-docs [ - <tag><strong>Platform-specific Installation Notes:</strong></tag> - <tag>&non-merged-docs;</tag> - <item> - <p> -Quick reference describing the installation on the corresponding -systems step by step, like a condensed version of <ref -id="install-methods"> through <ref id="init-config"> of this manual. + <tag><strong>Platform-specific Installation Notes:</strong></tag> + <tag>&non-merged-docs;</tag> + <item> <p> +Quick reference describing special considerations for your platform. Note that these documents are deprecated and only here temporarily until they can be merged in substance to the main Installation Manual. + </item> ]]> - <tag> -<url id="&url-local-dselect-beginner;" name="dselect Tutorial"></tag> + <tag> +<url id="&url-local-dselect-beginner;" name="dselect Tutorial"> + </tag> <item> <p> Tutorial for using the <prgn>dselect</prgn> program. This is one means of installing addition packages onto your system after the basic -install is complete.</p> +install is complete. </item> <![ %i386 [ - <tag> -<url id="&url-hardware-howto;" name="Linux Hardware Compatibility - HOWTO"></tag> + <tag> +<url id="&url-hardware-howto;" name="Linux Hardware Compatibility HOWTO"> + </tag> <item> <p> -Hardware compatability information for &arch-title; hardware.</p> +Hardware compatibility information for &arch-title; hardware. </item> ]]> <![ %m68k [ - <tag> -<url id="&url-m68k-faq;" name="Linux/m68k FAQ"> ]]> + <tag> +<url id="&url-m68k-faq;" name="Linux/m68k FAQ"> + </tag> ]]> <![ %alpha [ - <tag> -<url id="&url-alpha-faq;" name="Linux/Alpha FAQ"> ]]> + <tag> +<url id="&url-alpha-faq;" name="Linux/Alpha FAQ"> + </tag> ]]> <![ %sparc [ - <tag> + <tag> <url id="&url-sparc-linux-faq;" name="Linux for SPARC -Processors FAQ"> ]]> +Processors FAQ"> + </tag> ]]> -<![ %powerpc [ - <tag> -<url id="&url-powerpc-linux-faq;" name="Linux/PowerPC FAQ"> ]]> - -<![ %m68k %alpha %sparc %powerpc [ +<![ %m68k %alpha %sparc [ <item> <p> -Frequently asked questions for &arch-title;. Often contains useful -information on configuring or using your hardware.</p> +Frequently asked questions for &arch-title;. Often contains useful +information on configuring or using your hardware. </item> ]]> - - - <tag> + <tag> <strong>Partitioning Program Manual Pages:</strong> <![ %fdisk.txt [ <tag><url id="fdisk.txt"> ]]> @@ -143,18 +139,19 @@ <![ %mac-fdisk.txt [ <tag><url id="mac-fdisk.txt"> ]]> <![ %pmac-fdisk.txt [ <tag><url id="pmac-fdisk.txt"> ]]> + </tag> <item> <p> Manual pages for the partitioning software used during the -installation process.</p> +installation process. </item> - <tag>&md5sum.txt;</tag> -<item> + <tag>&md5sum.txt;</tag> + <item> <p> List of MD5 checksums for the binary files. If you have the <prgn>md5sum</prgn> program, you can ensure that your files are not -corrupt by running <tt>md5sum -v -c md5sum.txt</tt>.</p> +corrupt by running <tt>md5sum -v -c md5sum.txt</tt>. </item> </taglist> @@ -194,9 +191,11 @@ <p> If your computer's only network connection is via a serial line, using PPP or an equivalent dialup connection, you will not be able to -install the base system over the network. In this case, you must use a -CD to install the system. See <ref id="PPP"> below for information on -setting up PPP under Debian once the system is installed. +install the base system over the network. To install the system in this +case, you must use a CD, pre-load the base packages on an existing hard +disk partition, or prepare floppy disks containing the base packages. +See <ref id="PPP"> below for information on setting up PPP under Debian +once the system is installed. <sect id="planning-use">Planning Use of the System Index: en/welcome.sgml =================================================================== RCS file: /cvs/debian-boot/boot-floppies/documentation/en/welcome.sgml,v retrieving revision 1.27 diff -u -r1.27 welcome.sgml --- en/welcome.sgml 2001/06/28 16:03:34 1.27 +++ en/welcome.sgml 2001/09/05 04:22:24 @@ -3,7 +3,7 @@ <chapt id="welcome">Welcome to Debian <p> -We are delighted that you have decided to try Debian, and sure that +We are delighted that you have decided to try Debian, and are sure that you will find that Debian's GNU/Linux distribution is unique. &debian; brings together high-quality free software from around the world, integrating it into a coherent whole. We believe that you will @@ -223,32 +223,34 @@ Determine whether your hardware meets the requirements for using the installation system, in <ref id="hardware-req">. <item> -Backup your system, and perform any necessary planning and hardware -configuration prior to installing Debian, in <ref id="preparing">. +Backup your system, perform any necessary planning and hardware +configuration prior to installing Debian, in <ref id="preparing">. If +you are preparing a multi-boot system, you may need to create +partitionable space on your hard disk for Debian to use. <item> -Getting the partitions on your system set up correctly is very -important, because once you've done the install, you may have to live -with your choices for a long time. - <item> -In <ref id="install-methods">, several different ways to install -Debian are presented and discussed. Select your favorite method and -prepare your installation media as described. +In <ref id="install-methods">, you will obtain the necessary +installation files for your method of installation. <item> <ref id="rescue-boot">, describes booting into the installation system. This chapter also discusses troubleshooting procedures in case you have problems with this step. <item> -Perform the initial system configuration, which is discussed in <ref -id="init-config"> (Sections <ref id="dbootstrap-intro"> through <ref -id="configure-network">). +Install the kernel and configure peripheral driver modules in +<ref id="install-system">. Configure your network connection so that +remaining installation files can be obtained directly from the Debian +server, if you are not installing from a CD. <item> +Initiate automatic download/install/setup of the base system in <ref id="install-base">. <item> Boot into your newly installed base system and run through some -additional configuration tasks, from <ref id="base-boot">. +additional configuration tasks, from <ref id="init-config">. <item> -Install the rest of the system, using <prgn>dselect</prgn> or -<prgn>apt-get</prgn>, in <ref id="install-packages">. +Install additional software in <ref id="install-packages">. +Use <prgn>tasksel</prgn> to install groups of packages which form a +computer `task', <prgn>dselect</prgn> to select individual packages +from a long list, or <prgn>apt-get</prgn> to install individual +packages when you already know the package names you want. </enumlist> <p>