diff options
| -rw-r--r-- | nl/appendix/gpl.xml | 140 | ||||
| -rw-r--r-- | nl/install-methods/boot-drive-files.xml | 8 | ||||
| -rw-r--r-- | nl/install-methods/boot-usb-files.xml | 26 | ||||
| -rw-r--r-- | nl/install-methods/create-floppy.xml | 13 | ||||
| -rw-r--r-- | nl/install-methods/install-tftp.xml | 28 | ||||
| -rw-r--r-- | nl/install-methods/ipl-tape.xml | 4 | ||||
| -rw-r--r-- | nl/install-methods/tftp/bootp.xml | 14 | ||||
| -rw-r--r-- | nl/install-methods/usb-setup/i386.xml | 4 |
8 files changed, 123 insertions, 114 deletions
diff --git a/nl/appendix/gpl.xml b/nl/appendix/gpl.xml index ba5782af2..42dc4e884 100644 --- a/nl/appendix/gpl.xml +++ b/nl/appendix/gpl.xml @@ -1,5 +1,5 @@ <!-- retain these comments for translator revision tracking --> -<!-- original version: 29618 untranslated --> +<!-- original version: 36834 untranslated --> <appendix id="appendix-gpl"><title>GNU General Public License</title> @@ -92,12 +92,12 @@ modification follow. <sect1><title>GNU GENERAL PUBLIC LICENSE</title> <para> -TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION +<emphasis role='bold'>TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION +AND MODIFICATION</emphasis> -</para> - -<itemizedlist><listitem><para> +</para><para> +<emphasis role='bold'>0.</emphasis> This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, @@ -117,9 +117,9 @@ Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. -</para></listitem> -<listitem><para> +</para><para> +<emphasis role='bold'>1.</emphasis> You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate @@ -134,29 +134,32 @@ You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. -</para></listitem> -<listitem><para> +</para><para> +<emphasis role='bold'>2.</emphasis> You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: -</para><para> +</para> +<orderedlist numeration='loweralpha'><listitem><para> -a) You must cause the modified files to carry prominent notices +You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. -</para><para> +</para></listitem> +<listitem><para> -b) You must cause any work that you distribute or publish, that in +You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. -</para><para> +</para></listitem> +<listitem><para> -c) If the modified program normally reads commands interactively when +If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is @@ -167,7 +170,8 @@ the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) -</para><para> +</para></listitem></orderedlist> +<para> These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, @@ -194,39 +198,43 @@ Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. -</para></listitem> -<listitem><para> +</para><para> +<emphasis role='bold'>3.</emphasis> You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: -</para><para> +</para> +<orderedlist numeration='loweralpha'><listitem><para> -a) Accompany it with the complete corresponding machine-readable +Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, -</para><para> +</para></listitem> +<listitem><para> -b) Accompany it with a written offer, valid for at least three years, +Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, -</para><para> +</para></listitem> +<listitem><para> -c) Accompany it with the information you received as to the offer to +Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) -</para><para> +</para></listitem></orderedlist> +<para> The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source @@ -247,9 +255,9 @@ access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. -</para></listitem> -<listitem><para> +</para><para> +<emphasis role='bold'>4.</emphasis> You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is @@ -258,9 +266,9 @@ License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. -</para></listitem> -<listitem><para> +</para><para> +<emphasis role='bold'>5.</emphasis> You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are @@ -270,9 +278,9 @@ Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. -</para></listitem> -<listitem><para> +</para><para> +<emphasis role='bold'>6.</emphasis> Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject @@ -281,9 +289,9 @@ restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. -</para></listitem> -<listitem><para> +</para><para> +<emphasis role='bold'>7.</emphasis> If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or @@ -323,9 +331,9 @@ licensee cannot impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. -</para></listitem> -<listitem><para> +</para><para> +<emphasis role='bold'>8.</emphasis> If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License @@ -334,9 +342,9 @@ those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. -</para></listitem> -<listitem><para> +</para><para> +<emphasis role='bold'>9.</emphasis> The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may @@ -349,9 +357,9 @@ Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. -</para></listitem> -<listitem><para> +</para><para> +<emphasis role='bold'>10.</emphasis> If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by @@ -363,40 +371,38 @@ generally. </para><para> -NO WARRANTY +<emphasis role='bold'>NO WARRANTY</emphasis> -</para></listitem> -<listitem><para> +</para><para> -because the program is licensed free of charge, there is no -warranty for the program, to the extent permitted by applicable law. -except when otherwise stated in writing the copyright holders and/or -other parties provide the program "as is" without warranty of any -kind, either expressed or implied, including, but not limited to, the -implied warranties of merchantability and fitness for a particular -purpose. the entire risk as to the quality and performance of the -program is with you. should the program prove defective, you assume -the cost of all necessary servicing, repair or correction. +<emphasis role='bold'>11.</emphasis> +BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. -</para></listitem> -<listitem><para> +</para><para> -in no event unless required by applicable law or agreed to in -writing will any copyright holder, or any other party who may modify -and/or redistribute the program as permitted above, be liable to you -for damages, including any general, special, incidental or -consequential damages arising out of the use or inability to use the -program (including but not limited to loss of data or data being -rendered inaccurate or losses sustained by you or third parties or a -failure of the program to operate with any other programs), even if -such holder or other party has been advised of the possibility of -such damages. +<emphasis role='bold'>12.</emphasis> +IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL AND COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. -</para></listitem> -</itemizedlist> -<para> +</para><para> -END OF TERMS AND CONDITIONS +<emphasis role='bold'>END OF TERMS AND CONDITIONS</emphasis> </para> </sect1> diff --git a/nl/install-methods/boot-drive-files.xml b/nl/install-methods/boot-drive-files.xml index e80cf406a..1cea9d4f6 100644 --- a/nl/install-methods/boot-drive-files.xml +++ b/nl/install-methods/boot-drive-files.xml @@ -1,5 +1,5 @@ <!-- retain these comments for translator revision tracking --> -<!-- original version: 28997 untranslated --> +<!-- original version: 36841 untranslated --> <sect1 condition="bootable-disk" id="boot-drive-files"> <title>Preparing Files for Hard Disk Booting</title> @@ -163,9 +163,9 @@ of your hard drive (this can be accomplished by Make a note of the partition number of the MacOS partition where you place these files. If you have the MacOS <command>pdisk</command> -program, you can use the L command to check for the partition -number. You will need this partition number for the command you type -at the Open Firmware prompt when you boot the installer. +program, you can use the <command>L</command> command to check for the +partition number. You will need this partition number for the command +you type at the Open Firmware prompt when you boot the installer. </para><para> diff --git a/nl/install-methods/boot-usb-files.xml b/nl/install-methods/boot-usb-files.xml index 1ac9adbba..b669d9c2b 100644 --- a/nl/install-methods/boot-usb-files.xml +++ b/nl/install-methods/boot-usb-files.xml @@ -1,22 +1,22 @@ <!-- retain these comments for translator revision tracking --> -<!-- original version: 32124 untranslated --> +<!-- original version: 36841 untranslated --> <sect1 condition="bootable-usb" id="boot-usb-files"> <title>Preparing Files for USB Memory Stick Booting</title> <para> -For preparing the USB stick you will need a system where GNU/Linux is +To prepare the USB stick, you will need a system where GNU/Linux is already running and where USB is supported. You should ensure that the usb-storage kernel module is loaded (<userinput>modprobe usb-storage</userinput>) and try to find out which SCSI device the USB stick has been mapped to (in this example <filename>/dev/sda</filename> is used). To write to your stick, you -will probably have to turn off its write protection switch. +may have to turn off its write protection switch. </para><para> -Note, that the USB stick should be at least 128 MB in size (smaller +Note that the USB stick should be at least 128 MB in size (smaller setups are possible if you follow <xref linkend="usb-copy-flexible"/>). </para> @@ -81,12 +81,15 @@ should use the following method to put the files on your stick. &usb-setup-i386.xml; &usb-setup-powerpc.xml; - <sect3> + </sect2> + <sect2> <title>Adding an ISO image</title> <para> -Now you should put any Debian ISO image (businesscard, netinst or even -a full one) onto your stick (if it fits). The file name of such an +The installer will look for a Debian ISO image on the stick as its source +for additional data needed for the installation. So your next step is to +copy a Debian ISO image (businesscard, netinst or even a full CD image) +onto your stick (be sure to select one that fits). The file name of the image must end in <filename>.iso</filename>. </para><para> @@ -104,11 +107,11 @@ When you are done, unmount the USB memory stick (<userinput>umount /mnt</userinput>) and activate its write protection switch. </para> - </sect3> + </sect2> - <!-- TODO: doesn't this section belong later? --> - <sect3 arch="i386"> - <title>Booting the USB stick</title> + <!-- TODO: doesn't this section belong later? --> + <sect2 arch="i386"> + <title>Booting the USB stick</title> <warning><para> If your system refuses to boot from the memory stick, the stick may @@ -121,6 +124,5 @@ contain an invalid master boot record (MBR). To fix this, use the </screen></informalexample> </para></warning> - </sect3> </sect2> </sect1> diff --git a/nl/install-methods/create-floppy.xml b/nl/install-methods/create-floppy.xml index fbef8b01b..3ce8ca65a 100644 --- a/nl/install-methods/create-floppy.xml +++ b/nl/install-methods/create-floppy.xml @@ -1,5 +1,5 @@ <!-- retain these comments for translator revision tracking --> -<!-- original version: 28672 untranslated --> +<!-- original version: 36841 untranslated --> <sect1 condition="supports-floppy-boot" id="create-floppy"> <title>Creating Floppies from Disk Images</title> @@ -10,11 +10,12 @@ installer on hardware that cannot boot from CD or by other means. </para><para arch="powerpc"> -Floppy disk booting reportedly fails on Mac USB floppy drives. +Booting the installer from floppy disk reportedly fails on Mac USB +floppy drives. </para><para arch="m68k"> -Floppy disk booting is not supported on Amigas or +Booting the installer from floppy disk is not supported on Amigas or 68k Macs. </para><para> @@ -30,9 +31,9 @@ floppy. </para><para> -There are different techniques for creating floppies from disk images, -which depend on your platform. This section describes how to create -floppies from disk images on different platforms. +There are different techniques for creating floppies from disk images. +This section describes how to create floppies from disk images on +different platforms. </para><para> diff --git a/nl/install-methods/install-tftp.xml b/nl/install-methods/install-tftp.xml index 5f4291999..51730ad2a 100644 --- a/nl/install-methods/install-tftp.xml +++ b/nl/install-methods/install-tftp.xml @@ -1,5 +1,5 @@ <!-- retain these comments for translator revision tracking --> -<!-- original version: 35613 untranslated --> +<!-- original version: 36841 untranslated --> <sect1 condition="supports-tftp" id="install-tftp"> <title>Preparing Files for TFTP Net Booting</title> @@ -186,7 +186,8 @@ to <command>tftpd</command> as the filename to boot. For DECstations, there are tftpimage files for each subarchitecture, which contain both kernel and installer in one file. The naming -convention is <replaceable>subarchitecture</replaceable>/netboot-boot.img. +convention is +<filename><replaceable>subarchitecture</replaceable>/netboot-boot.img</filename>. Copy the tftpimage file you would like to use to <userinput>/tftpboot/tftpboot.img</userinput> if you work with the example BOOTP/DHCP setups described above. @@ -262,22 +263,21 @@ these methods. <title>SPARC TFTP Booting</title> <para> -SPARC architectures for instance use the subarchitecture names, such -as <quote>SUN4M</quote> or <quote>SUN4C</quote>; in some cases, the -architecture is left blank, so the file the client looks for is just -<filename>client-ip-in-hex</filename>. Thus, if your system -subarchitecture is a SUN4C, and its IP is 192.168.1.3, the filename -would be <filename>C0A80103.SUN4C</filename>. An easy way to determine -this is to enter the following command in a shell (assuming the -machine's intended IP is 10.0.0.4). +Some SPARC architectures add the subarchitecture names, such as +<quote>SUN4M</quote> or <quote>SUN4C</quote>, to the filename. Thus, +if your system's subarchitecture is a SUN4C, and its IP is 192.168.1.3, +the filename would be <filename>C0A80103.SUN4C</filename>. However, +there are also subarchitectures where the file the client looks for is +just <filename>client-ip-in-hex</filename>. An easy way to determine the +hexadecimal code for the IP address is to enter the following command +in a shell (assuming the machine's intended IP is 10.0.0.4). <informalexample><screen> $ printf '%.2x%.2x%.2x%.2x\n' 10 0 0 4 </screen></informalexample> -This will spit out the IP in hexadecimal; to get to the correct -filename, you will need to change all letters to uppercase and -if necessary append the subarchitecture name. +To get to the correct filename, you will need to change all letters to +uppercase and if necessary append the subarchitecture name. </para><para> @@ -325,7 +325,7 @@ the <userinput>filename=</userinput> option in <para> You don't have to configure DHCP in a special way because you'll pass the -full path of the file to the loaded to CFE. +full path of the file to be loaded to CFE. </para> </sect3> diff --git a/nl/install-methods/ipl-tape.xml b/nl/install-methods/ipl-tape.xml index 246d831b8..c99ac8b98 100644 --- a/nl/install-methods/ipl-tape.xml +++ b/nl/install-methods/ipl-tape.xml @@ -1,5 +1,5 @@ <!-- retain these comments for translator revision tracking --> -<!-- original version: 28672 untranslated --> +<!-- original version: 36841 untranslated --> <sect1 arch="s390" id="ipl-tape"> <title>Creating an IPL tape</title> @@ -17,7 +17,7 @@ need to write to the tape are (in this order): <filename>parmfile.debian</filename> and <filename>initrd.debian</filename>. The files can be downloaded from the <filename>tape</filename> sub-directory, see -<xref linkend="where-files"/>, +<xref linkend="where-files"/>. </para> </sect1> diff --git a/nl/install-methods/tftp/bootp.xml b/nl/install-methods/tftp/bootp.xml index 51c33ed7f..6fc3693b2 100644 --- a/nl/install-methods/tftp/bootp.xml +++ b/nl/install-methods/tftp/bootp.xml @@ -1,16 +1,16 @@ <!-- retain these comments for translator revision tracking --> -<!-- original version: 35613 untranslated --> +<!-- original version: 36841 untranslated --> <sect2 condition="supports-bootp" id="tftp-bootp"> <title>Setting up BOOTP server</title> <para> -There are two BOOTP servers available for GNU/Linux, the CMU -<command>bootpd</command> and the other is actually a DHCP server, ISC -<command>dhcpd</command>, which are contained in the +There are two BOOTP servers available for GNU/Linux. The first is CMU +<command>bootpd</command>. The other is actually a DHCP server: ISC +<command>dhcpd</command>. In &debian; these are contained in the <classname>bootp</classname> and <classname>dhcp</classname> packages -in &debian;. +respectively. </para><para> @@ -18,8 +18,8 @@ To use CMU <command>bootpd</command>, you must first uncomment (or add) the relevant line in <filename>/etc/inetd.conf</filename>. On &debian;, you can run <userinput>update-inetd --enable bootps</userinput>, then <userinput>/etc/init.d/inetd -reload</userinput> to do so. Elsewhere, the line in question should -look like: +reload</userinput> to do so. Just in case your BOOTP server does not +run Debian, the line in question should look like: <informalexample><screen> bootps dgram udp wait root /usr/sbin/bootpd bootpd -i -t 120 diff --git a/nl/install-methods/usb-setup/i386.xml b/nl/install-methods/usb-setup/i386.xml index 220f69dae..a6e062902 100644 --- a/nl/install-methods/usb-setup/i386.xml +++ b/nl/install-methods/usb-setup/i386.xml @@ -1,5 +1,5 @@ <!-- retain these comments for translator revision tracking --> -<!-- original version: 33725 untranslated --> +<!-- original version: 36841 untranslated --> <sect3 arch="i386"> <title>USB stick partitioning on &arch-title;</title> @@ -13,7 +13,7 @@ instead of the entire device. Since most USB sticks come pre-configured with a single FAT16 partition, you probably won't have to repartition or reformat the stick. If you have to do that anyway, use <command>cfdisk</command> -or any other partitioning tool for creating a FAT16 partition and then +or any other partitioning tool to create a FAT16 partition, and then create the filesystem using: <informalexample><screen> |