diff options
Diffstat (limited to 'en')
| -rw-r--r-- | en/administrivia/administrivia.xml | 6 | ||||
| -rw-r--r-- | en/appendix/gpl.xml | 28 | ||||
| -rw-r--r-- | en/appendix/preseed.xml | 8 | ||||
| -rw-r--r-- | en/boot-installer/x86.xml | 2 | ||||
| -rw-r--r-- | en/hardware/hardware-supported.xml | 14 | ||||
| -rw-r--r-- | en/howto/installation-howto.xml | 2 | ||||
| -rw-r--r-- | en/partitioning/schemes.xml | 37 | ||||
| -rw-r--r-- | en/post-install/mail-setup.xml | 9 | ||||
| -rw-r--r-- | en/using-d-i/components.xml | 2 | ||||
| -rw-r--r-- | en/using-d-i/modules/apt-setup.xml | 28 | ||||
| -rw-r--r-- | en/using-d-i/modules/partman-md.xml (renamed from en/using-d-i/modules/mdcfg.xml) | 8 | ||||
| -rw-r--r-- | en/using-d-i/using-d-i.xml | 8 |
12 files changed, 68 insertions, 84 deletions
diff --git a/en/administrivia/administrivia.xml b/en/administrivia/administrivia.xml index e14fc8981..6b6dede80 100644 --- a/en/administrivia/administrivia.xml +++ b/en/administrivia/administrivia.xml @@ -36,12 +36,12 @@ isolate certain bits of text as architecture-specific. Translators can use this paragraph to acknowledge the people responsible for the translation of the manual. Translation teams are advised to just mention the coordinator and maybe -major contributors and thank everybody else in a phrase like "all +major contributors and thank everybody else in a phrase like <quote>all translators and reviewers from the translation team for {your language} -at {your l10n mailinglist}". +at {your l10n mailinglist}</quote>. See build/lang-options/README on how to enable this paragraph. -Its condition is "about-langteam". +Its condition is <quote>about-langteam</quote>. </para> </sect1> diff --git a/en/appendix/gpl.xml b/en/appendix/gpl.xml index bff5fe419..c06f01914 100644 --- a/en/appendix/gpl.xml +++ b/en/appendix/gpl.xml @@ -129,13 +129,13 @@ AND MODIFICATION</emphasis> <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, -refers to any such program or work, and a "work based on the Program" +under the terms of this General Public License. The <quote>Program</quote>, below, +refers to any such program or work, and a <quote>work based on the Program</quote> means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". +the term <quote>modification</quote>.) Each licensee is addressed as <quote>you</quote>. </para><para> @@ -379,8 +379,8 @@ versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. Each version is given a distinguishing version number. If the Program specifies a -version number of this License which applies to it and "any later -version", you have the option of following the terms and conditions +version number of this License which applies to it and <quote>any later +version</quote>, you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the @@ -408,7 +408,7 @@ generally. 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 +OTHER PARTIES PROVIDE THE PROGRAM <quote>AS IS</quote> 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 @@ -449,7 +449,7 @@ these terms. To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. +the <quote>copyright</quote> line and a pointer to where the full notice is found. <informalexample><screen> <replaceable>one line to give the program's name and a brief idea of what it does.</replaceable> @@ -483,28 +483,28 @@ this when it starts in an interactive mode: <informalexample><screen> Gnomovision version 69, Copyright (C) <replaceable>year name of author</replaceable> Gnomovision comes with absolutely no warranty; for details -type `show w'. This is free software, and you are welcome -to redistribute it under certain conditions; type `show c' +type <userinput>show w</userinput>. This is free software, and you are welcome +to redistribute it under certain conditions; type <userinput>show c</userinput> for details. </screen></informalexample> </para><para> -The hypothetical commands `show w' and `show c' should show the +The hypothetical commands <quote>show w</quote> and <quote>show c</quote> should show the appropriate parts of the General Public License. Of course, the -commands you use may be called something other than `show w' and -`show c'; they could even be mouse-clicks or menu items — whatever +commands you use may be called something other than <quote>show w</quote> and +<quote>show c</quote>; they could even be mouse-clicks or menu items — whatever suits your program. </para><para> You should also get your employer (if you work as a programmer) or -your school, if any, to sign a "copyright disclaimer" for the +your school, if any, to sign a <quote>copyright disclaimer</quote> for the program, if necessary. Here is a sample; alter the names: <informalexample><screen> Yoyodyne, Inc., hereby disclaims all copyright interest in the -program `Gnomovision' (which makes passes at compilers) written +program <userinput>Gnomovision</userinput> (which makes passes at compilers) written by James Hacker. <replaceable>signature of Ty Coon</replaceable>, 1 April 1989 diff --git a/en/appendix/preseed.xml b/en/appendix/preseed.xml index 4364d6634..df8f2d841 100644 --- a/en/appendix/preseed.xml +++ b/en/appendix/preseed.xml @@ -602,7 +602,7 @@ if substring (option vendor-class-identifier, 0, 3) = "d-i" { <para> Note that the above example limits this filename to DHCP clients that identify -themselves as "d-i", so it will not affect regular DHCP clients, but only +themselves as <quote>d-i</quote>, so it will not affect regular DHCP clients, but only the installer. You can also put the text in a stanza for only one particular host to avoid preseeding all installs on your network. @@ -1395,8 +1395,12 @@ earlier questions. You can optionally add other (local) repositories. #d-i apt-setup/local0/source boolean true # URL to the public key of the local repository; you must provide a key or # apt will complain about the unauthenticated repository and so the -# sources.list line will be left commented out +# sources.list line will be left commented out. #d-i apt-setup/local0/key string http://local.server/key +# If the provided key file ends in ".asc" the key file needs to be an +# ASCII-armoured PGP key, if it ends in ".gpg" it needs to use the +# "GPG key public keyring" format, the "keybox database" format is +# currently not supported. # By default the installer requires that repositories be authenticated # using a known gpg key. This setting can be used to disable that diff --git a/en/boot-installer/x86.xml b/en/boot-installer/x86.xml index 2e67c3d01..f203f7c7b 100644 --- a/en/boot-installer/x86.xml +++ b/en/boot-installer/x86.xml @@ -367,7 +367,7 @@ changes you made. Choosing the <quote>Help</quote> entry will result in the first help screen being displayed which gives an overview of all available help screens. To return to the boot menu after the help screens have been -displayed, type 'menu' at the boot prompt and press &enterkey;. All +displayed, type <quote>menu</quote> at the boot prompt and press &enterkey;. All help screens have a boot prompt at which the boot command can be typed: <informalexample><screen> diff --git a/en/hardware/hardware-supported.xml b/en/hardware/hardware-supported.xml index 21b72e5ce..7802458d4 100644 --- a/en/hardware/hardware-supported.xml +++ b/en/hardware/hardware-supported.xml @@ -42,6 +42,13 @@ variations of each architecture known as <quote>flavors</quote>. <tbody> <row> + <entry>AMD64 & Intel 64</entry> + <entry>amd64</entry> + <entry></entry> + <entry></entry> +</row> + +<row> <entry morerows="1">Intel x86-based</entry> <entry morerows="1">i386</entry> <entry>default x86 machines</entry> @@ -52,13 +59,6 @@ variations of each architecture known as <quote>flavors</quote>. </row> <row> - <entry>AMD64 & Intel 64</entry> - <entry>amd64</entry> - <entry></entry> - <entry></entry> -</row> - -<row> <entry>ARM</entry> <entry>armel</entry> <entry>Marvell Kirkwood and Orion</entry> diff --git a/en/howto/installation-howto.xml b/en/howto/installation-howto.xml index 695f4b535..609274930 100644 --- a/en/howto/installation-howto.xml +++ b/en/howto/installation-howto.xml @@ -68,7 +68,7 @@ get for each possible means of installation. The netinst CD image is a popular image which can be used to install &releasename; with the &d-i;. This image is intended to boot from CD and -install additional packages over a network; hence the name 'netinst'. +install additional packages over a network; hence the name <quote>netinst</quote>. The image has the software components needed to run the installer and the base packages to provide a minimal &releasename; system. If you'd rather, you can get a full size CD image which will not need the network diff --git a/en/partitioning/schemes.xml b/en/partitioning/schemes.xml index 4edc34e0d..ab9e5feb0 100644 --- a/en/partitioning/schemes.xml +++ b/en/partitioning/schemes.xml @@ -8,10 +8,8 @@ For new users, personal &debian; boxes, home systems, and other single-user setups, a single <filename>/</filename> partition (plus -swap) is probably the easiest, simplest way to go. However, if your -partition is larger than around 6GB, choose ext3 as your partition -type. Ext2 partitions need periodic file system integrity checking, -and this can cause delays during booting when the partition is large. +swap) is probably the easiest, simplest way to go. The recommended +partition type is ext4. </para><para> @@ -26,9 +24,8 @@ partition. You might need a separate <filename>/usr/local</filename> partition if you plan to install many programs that are not part of the &debian; distribution. If your machine will be a mail server, you might need -to make <filename>/var/mail</filename> a separate partition. Often, -putting <filename>/tmp</filename> on its own partition, for instance -20–50MB, is a good idea. If you are setting up a server with lots +to make <filename>/var/mail</filename> a separate partition. +If you are setting up a server with lots of user accounts, it's generally good to have a separate, large <filename>/home</filename> partition. In general, the partitioning situation varies from computer to computer depending on its uses. @@ -44,28 +41,16 @@ of interest to ISPs and people setting up servers. With respect to the issue of swap partition size, there are many views. One rule of thumb which works well is to use as much swap as -you have system memory. It also shouldn't be smaller than 16MB, in -most cases. Of course, there are exceptions to these rules. If you -are trying to solve 10000 simultaneous equations on a machine with -256MB of memory, you may need a gigabyte (or more) of swap. +you have system memory. It also shouldn't be smaller than 512MB, in +most cases. Of course, there are exceptions to these rules. </para><para> -On some 32-bit architectures (m68k and PowerPC), the -maximum size of a swap partition is 2GB. That should be enough for -nearly any installation. However, if your swap requirements are this -high, you should probably try to spread the swap across different -disks (also called <quote>spindles</quote>) and, if possible, different SCSI or -IDE channels. The kernel will balance swap usage between multiple -swap partitions, giving better performance. - -</para><para> - -As an example, an older home machine might have 32MB of RAM and a -1.7GB IDE drive on <filename>/dev/sda</filename>. There might be a -500MB partition for another operating system on -<filename>/dev/sda1</filename>, a 32MB swap partition on -<filename>/dev/sda3</filename> and about 1.2GB on +As an example, an older home machine might have 512MB of RAM and a +20GB SATA drive on <filename>/dev/sda</filename>. There might be a +8GB partition for another operating system on +<filename>/dev/sda1</filename>, a 512MB swap partition on +<filename>/dev/sda3</filename> and about 11.4GB on <filename>/dev/sda2</filename> as the Linux partition. </para><para> diff --git a/en/post-install/mail-setup.xml b/en/post-install/mail-setup.xml index 2b22b9798..5d24fce6c 100644 --- a/en/post-install/mail-setup.xml +++ b/en/post-install/mail-setup.xml @@ -48,8 +48,8 @@ in combination with the traditional Linux tools. <title>Default E-Mail Configuration</title> <para> -Even if you are planning to use a graphical mail program, it is important -that a traditional MTA/MDA is also installed and correctly set up on your +Even if you are planning to use a graphical mail program, it would be useful, +to have a traditional MTA/MDA installed and correctly set up on your &debian-gnu; system. Reason is that various utilities running on the system<footnote> @@ -63,9 +63,8 @@ administrator of (potential) problems or changes. </para><para> -For this reason the packages <classname>exim4</classname> and -<classname>mutt</classname> will be installed by default (provided you -did not unselect the <quote>standard</quote> task during the installation). +For this you can install <classname>exim4</classname> and +<classname>mutt</classname> with <command>apt install exim4 mutt</command>. <classname>exim4</classname> is a combination MTA/MDA that is relatively small but very flexible. By default it will be configured to only handle e-mail local to the system itself and e-mails addressed to the system diff --git a/en/using-d-i/components.xml b/en/using-d-i/components.xml index c7e5e8bad..e1f915c18 100644 --- a/en/using-d-i/components.xml +++ b/en/using-d-i/components.xml @@ -97,7 +97,7 @@ like RAID, LVM or encrypted devices. &module-autopartkit.xml; &module-partitioner.xml; &module-partconf.xml; -&module-mdcfg.xml; +&module-partman-md.xml; &module-partman-lvm.xml; &module-partman-crypto.xml; </sect2> diff --git a/en/using-d-i/modules/apt-setup.xml b/en/using-d-i/modules/apt-setup.xml index b6397a213..fe9151b21 100644 --- a/en/using-d-i/modules/apt-setup.xml +++ b/en/using-d-i/modules/apt-setup.xml @@ -190,17 +190,23 @@ configured. <title>Choosing a network mirror</title> <para> -If you have selected to use a network mirror during the installation -(optional for CD/DVD installs, required for netboot images), you will be -presented with a list of geographically nearby (and therefore hopefully -fast) network mirrors, based upon your country selection earlier in the -installation process. Choosing the offered default is usually fine. +Unless you chose not to use a network mirror, you will be presented +with a list of network mirrors based upon your country selection +earlier in the installation process. Choosing the offered default is +usually fine. + +</para><para> + +The offered default is deb.debian.org, which is not a mirror itself but +will redirect to a mirror that should be up-to-date and fast. These +mirrors support TLS (https protocol) and IPv6. This service is +maintained by the Debian System Administration (DSA) team. </para><para> A mirror can also be specified by hand by choosing <quote>enter information manually</quote> . You can then specify a mirror host name and an optional -port number. As of Wheezy, that actually has to be a URL base, i.e. when +port number. This actually has to be a URL base, i.e. when specifying an IPv6 address, one has to add square brackets around it, for instance <quote>[2001:db8::1]</quote>. @@ -218,16 +224,6 @@ choose the <quote>enter information manually</quote> option. You can then speci a mirror available via IPv6, although it will probably not be the fastest possible one. -</para><para> - -Another option when choosing to specify the mirror manually is to use -<quote>httpredir.debian.org</quote> as your mirror. -<quote>httpredir.debian.org</quote> is not a physical mirror but a mirror -redirection service, i.e. it automatically refers your system to a -real mirror near you in terms of network topology. It takes into account -by which protocol you connect to it, i.e. if you use IPv6, it will -refer you to an IPv6-capable mirror near you. - </para> </sect4> </sect3> diff --git a/en/using-d-i/modules/mdcfg.xml b/en/using-d-i/modules/partman-md.xml index 8d2854ff3..9dffad9f8 100644 --- a/en/using-d-i/modules/mdcfg.xml +++ b/en/using-d-i/modules/partman-md.xml @@ -1,7 +1,7 @@ <!-- retain these comments for translator revision tracking --> <!-- $Id$ --> - <sect3 id="mdcfg"> + <sect3 id="partman-md"> <title>Configuring Multidisk Devices (Software RAID)</title> <para> @@ -11,7 +11,7 @@ To be honest, you can construct an MD device even from partitions residing on single physical drive, but that won't give any benefits. </para></footnote> in your computer, you can use -<command>mdcfg</command> to set up your drives for increased +<command>partman-md</command> to set up your drives for increased performance and/or better reliability of your data. The result is called <firstterm>Multidisk Device</firstterm> (or after its most famous variant <firstterm>software RAID</firstterm>). @@ -228,7 +228,7 @@ Next, you should choose <guimenuitem>Configure software RAID</guimenuitem> from the main <command>partman</command> menu. (The menu will only appear after you mark at least one partition for use as <guimenuitem>physical volume for RAID</guimenuitem>.) -On the first screen of <command>mdcfg</command> simply select +On the first screen of <command>partman-md</command> simply select <guimenuitem>Create MD device</guimenuitem>. You will be presented with a list of supported types of MD devices, from which you should choose one (e.g. RAID1). What follows depends on the type of MD you selected. @@ -292,7 +292,7 @@ and use the other three partitions (2 active and 1 spare) for RAID1 </para><para> After you set up MD devices to your liking, you can -<guimenuitem>Finish</guimenuitem> <command>mdcfg</command> to return +<guimenuitem>Finish</guimenuitem> <command>partman-md</command> to return back to the <command>partman</command> to create filesystems on your new MD devices and assign them the usual attributes like mountpoints. diff --git a/en/using-d-i/using-d-i.xml b/en/using-d-i/using-d-i.xml index 6cb0964e7..ca1872784 100644 --- a/en/using-d-i/using-d-i.xml +++ b/en/using-d-i/using-d-i.xml @@ -211,8 +211,8 @@ in English. <term>console-setup</term><listitem><para> -Shows a list of keyboards, from which the user chooses the model which -matches his own. +Shows a list of keyboard (layouts), from which the user chooses the one which +matches his own model. </para></listitem> </varlistentry> @@ -345,7 +345,7 @@ the selected partitions according to user instructions. </varlistentry> <varlistentry> -<term>lvmcfg</term><listitem><para> +<term>partman-lvm</term><listitem><para> Helps the user with the configuration of the <firstterm>LVM</firstterm> (Logical Volume Manager). @@ -354,7 +354,7 @@ Helps the user with the configuration of the </varlistentry> <varlistentry> -<term>mdcfg</term><listitem><para> +<term>partman-md</term><listitem><para> Allows the user to set up Software <firstterm>RAID</firstterm> (Redundant Array of Inexpensive Disks). This Software RAID is usually |