diff options
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | en/appendix/chroot-install.xml | 6 | ||||
| -rw-r--r-- | en/appendix/preseed.xml | 14 | ||||
| -rw-r--r-- | en/post-install/orientation.xml | 4 | ||||
| -rw-r--r-- | en/preparing/bios-setup/s390.xml | 12 | ||||
| -rw-r--r-- | en/preparing/nondeb-part/alpha.xml | 2 | ||||
| -rw-r--r-- | en/preparing/nondeb-part/m68k.xml | 4 | ||||
| -rw-r--r-- | en/preparing/nondeb-part/sparc.xml | 4 | ||||
| -rw-r--r-- | en/preparing/nondeb-part/x86.xml | 6 | ||||
| -rw-r--r-- | en/preparing/pre-install-bios-setup.xml | 9 | ||||
| -rw-r--r-- | en/using-d-i/modules/partman-crypto.xml | 2 |
11 files changed, 34 insertions, 36 deletions
diff --git a/debian/changelog b/debian/changelog index a24f0f727..554442f4c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -97,6 +97,8 @@ installation-guide (2006xxxx) UNRELEASED; urgency=low [ Frans Pop ] * Update all arches to kernel version 2.6.18. + * Minor corrections and some rewrites based on suggestions from + Clytie Siddall. Closes: #367861, #380588. * hardware: - Remove ancient section on parity RAM. Closes: #403035. - Update documenation for Sparc, based on patch by Jurij Smakov. @@ -115,9 +117,6 @@ installation-guide (2006xxxx) UNRELEASED; urgency=low - Use dhcp3-server for examples rather than dhcp (version 2). - tftpd-hpa does not use /tftpboot by default; allow for this in examples. Closes: #342076. - * using-d-i: - - Minor corrections and some rewrites based on suggestions from - Clytie Siddall. Closes: #367861. * boot-new: - Remove reference to apt guide (not installed by default) and obsolete debian-guide. Thanks, Philippe Batailler. Closes: #402492. @@ -135,7 +134,7 @@ installation-guide (2006xxxx) UNRELEASED; urgency=low * appendix/chroot-install: - Changes suggested in review by Wiktor Wandachowicz. Closes: #394929. - -- Frans Pop <fjp@debian.org> Wed, 27 Dec 2006 03:08:09 +0100 + -- Frans Pop <fjp@debian.org> Wed, 27 Dec 2006 04:32:51 +0100 installation-guide (20060726) unstable; urgency=low diff --git a/en/appendix/chroot-install.xml b/en/appendix/chroot-install.xml index 13b782696..40e008190 100644 --- a/en/appendix/chroot-install.xml +++ b/en/appendix/chroot-install.xml @@ -39,7 +39,7 @@ install destop environments like GNOME or KDE). </para><para> -Create file systems on your partitions. For example, to create an +Next, create file systems on the partitions. For example, to create an ext3 file system on partition <filename>/dev/hda6</filename> (that's our example root partition): @@ -234,8 +234,8 @@ proc /proc proc defaults 0 0 </screen></informalexample> Use <userinput>mount -a</userinput> to mount all the file systems you -have specified in your <filename>/etc/fstab</filename>, or to mount -file systems individually use: +have specified in your <filename>/etc/fstab</filename>, or, to mount +file systems individually, use: <informalexample><screen> # mount /path # e.g.: mount /usr diff --git a/en/appendix/preseed.xml b/en/appendix/preseed.xml index bf3e77731..f3bf7d152 100644 --- a/en/appendix/preseed.xml +++ b/en/appendix/preseed.xml @@ -805,9 +805,9 @@ d-i netcfg/wireless_wep string <title>Mirror settings</title> <para> -Depending on the installation method you use, a mirror may be used both to -download additional components of the installer, the base system and to -set up the <filename>/etc/apt/sources.list</filename> for the installed +Depending on the installation method you use, a mirror may be used to +download additional components of the installer, to install the base system, +and to set up the <filename>/etc/apt/sources.list</filename> for the installed system. </para><para> @@ -846,8 +846,8 @@ d-i mirror/http/proxy string <para> Using preseeding to partition the harddisk is very much limited to what is -supported by <classname>partman-auto</classname>. You can choose to either -partition existing free space on a disk or a whole disk. The layout of the +supported by <classname>partman-auto</classname>. You can choose to partition +either existing free space on a disk or a whole disk. The layout of the disk can be determined by using a predefined recipe, a custom recipe from a recipe file or a recipe included in the preconfiguration file. It is currently not possible to partition multiple disks using preseeding. @@ -1142,8 +1142,8 @@ installation. The only questions asked concern the installation of the kernel. # if no other operating system is detected on the machine. d-i grub-installer/only_debian boolean true -# This one makes grub-installer install to the MBR if if finds some other OS -# too, which is less safe as it might not be able to boot that other OS. +# This one makes grub-installer install to the MBR if it also finds some other +# OS, which is less safe as it might not be able to boot that other OS. d-i grub-installer/with_other_os boolean true # Alternatively, if you want to install to a location other than the mbr, diff --git a/en/post-install/orientation.xml b/en/post-install/orientation.xml index 680979342..288da7e4b 100644 --- a/en/post-install/orientation.xml +++ b/en/post-install/orientation.xml @@ -94,8 +94,8 @@ On the other hand, if you have a cron job that (a) needs to run as a special user, or (b) needs to run at a special time or frequency, you can use either <filename>/etc/crontab</filename>, or, better yet, <filename>/etc/cron.d/whatever</filename>. These particular files -also have an extra field that allows you to stipulate the user under -which the cron job runs. +also have an extra field that allows you to stipulate the user account +under which the cron job runs. </para><para> diff --git a/en/preparing/bios-setup/s390.xml b/en/preparing/bios-setup/s390.xml index cd36b61ef..6802ec4b9 100644 --- a/en/preparing/bios-setup/s390.xml +++ b/en/preparing/bios-setup/s390.xml @@ -30,13 +30,13 @@ an LPAR if the HMC and this option is available for you. Before you actually perform an installation, you have to go over some design and preparation steps. IBM has made documentation available about the whole process, e.g. how to prepare an installation medium -and how actually boot from that medium. Duplicating that information +and how actually to boot from that medium. Duplicating that information here is neither possible nor necessary. However, we will describe -here which kind of Debian-specific data is needed and where do you -find them. Based on both sources of information you have to prepare -your machine and the installation medium and to perform a boot from -it. When you see the welcome message in your client session join this -document again for the Debian-specific installation steps. +here which kind of Debian-specific data is needed and where to find it. +Using both sources of information you have to prepare your machine +and the installation medium do you can perform a boot from it. +When you see the welcome message in your client session, return to this +document to go through the Debian-specific installation steps. </para> </sect2> diff --git a/en/preparing/nondeb-part/alpha.xml b/en/preparing/nondeb-part/alpha.xml index 39b6f876d..2743367ba 100644 --- a/en/preparing/nondeb-part/alpha.xml +++ b/en/preparing/nondeb-part/alpha.xml @@ -65,7 +65,7 @@ native Windows NT tools (or, more conveniently, you can also repartition your disk from the AlphaBIOS setup menu). Otherwise, it is not really necessary to partition from Windows; the Linux partitioning tools will generally do a better job. Note that when you -run NT, the Disk Administrator may offer you to write a <quote>harmless +run NT, the Disk Administrator may offer to write a <quote>harmless signature</quote> on non-Windows disks if you have any. <emphasis>Never</emphasis> let it do that, as this signature will destroy the partition information. diff --git a/en/preparing/nondeb-part/m68k.xml b/en/preparing/nondeb-part/m68k.xml index 09f677851..37734ca55 100644 --- a/en/preparing/nondeb-part/m68k.xml +++ b/en/preparing/nondeb-part/m68k.xml @@ -119,8 +119,8 @@ SC Setup</command> using <command>ResEdit</command> can be found at For IDE based Macs, you need to use <command>Apple Drive Setup</command> to create empty space for the Linux partitions, and complete the partitioning under -Linux, or use the MacOS version of pdisk available from the MkLinux FTP -server. +Linux, or use the MacOS version of pdisk available for download from +<ulink url="http://homepage.mac.com/alk/downloads/pdisk.sit.hqx">Alsoft</ulink>. </para> </sect2> diff --git a/en/preparing/nondeb-part/sparc.xml b/en/preparing/nondeb-part/sparc.xml index 2784f6a2b..2fd599773 100644 --- a/en/preparing/nondeb-part/sparc.xml +++ b/en/preparing/nondeb-part/sparc.xml @@ -13,8 +13,8 @@ kernel understands Sun disk labels, so there are no problems there. Just make sure you leave room for the Debian root partition within the first 1GB area of the boot disk. You can also place the kernel image on a UFS partition if that is easier than putting the root partition there. -SILO supports booting Linux and SunOS from either EXT2 (Linux), UFS -(SunOS), romfs and iso9660 (CDROM) partitions. +SILO supports booting Linux and SunOS from any of EXT2 (Linux), UFS +(SunOS), romfs or iso9660 (CDROM) partitions. </para> </sect2> diff --git a/en/preparing/nondeb-part/x86.xml b/en/preparing/nondeb-part/x86.xml index 95315fef5..edc98ecb7 100644 --- a/en/preparing/nondeb-part/x86.xml +++ b/en/preparing/nondeb-part/x86.xml @@ -13,12 +13,12 @@ job. </para><para> -But if you have a large IDE disk, and are using neither LBA addressing, -overlay drivers (sometimes provided by hard disk manufacturers), nor a +But if you have a large IDE disk, and are not using LBA addressing, +overlay drivers (sometimes provided by hard disk manufacturers), or a new (post 1998) BIOS that supports large disk access extensions, then you must locate your Debian boot partition carefully. In this case, you will have to put the boot partition into the first 1024 cylinders -of your hard drive (usually around 524 megabytes, without BIOS +of your hard disk (usually around 524 megabytes, without BIOS translation). This may require that you move an existing FAT or NTFS partition. diff --git a/en/preparing/pre-install-bios-setup.xml b/en/preparing/pre-install-bios-setup.xml index 224b66f8f..8b0304b26 100644 --- a/en/preparing/pre-install-bios-setup.xml +++ b/en/preparing/pre-install-bios-setup.xml @@ -138,14 +138,13 @@ this is the case please look at <xref linkend="boot-parms"/>. </sect3> <sect3 arch="powerpc"> - <title>Display visibility on OldWorld Powermacs</title> + <title>Display-visibility on OldWorld Powermacs</title> <para> Some OldWorld Powermacs, most notably those with the <quote>control</quote> -display driver but possibly others as well, may not produce a colormap with -reliably results in visible output under Linux when the display is -configured for more than 256 colors. If you are experiencing such issues -with your display after rebooting (you can sometimes see data on +display driver, may not reliable produce a colormap under Linux when the +display is configured for more than 256 colors. If you are experiencing such +issues with your display after rebooting (you can sometimes see data on the monitor, but on other occasions cannot see anything) or, if the screen turns black after booting the installer instead of showing you the user interface, try changing your display settings under MacOS to use 256 diff --git a/en/using-d-i/modules/partman-crypto.xml b/en/using-d-i/modules/partman-crypto.xml index f12b6671a..2004bff48 100644 --- a/en/using-d-i/modules/partman-crypto.xml +++ b/en/using-d-i/modules/partman-crypto.xml @@ -42,7 +42,7 @@ depends on your CPU speed, chosen cipher and a key length. To use encryption, you have to create a new partition by selecting some free space in the main partitioning menu. Another option is to choose an existing partition (e.g. a regular partition, an LVM logical -volume or a RAID volume). In the <guimenu>Partition setting</guimenu> +volume or a RAID volume). In the <guimenu>Partition settings</guimenu> menu, you need to select <guimenuitem>physical volume for encryption</guimenuitem> at the <menuchoice> <guimenu>Use as:</guimenu> </menuchoice> option. The menu will then change to |