diff options
29 files changed, 38 insertions, 298 deletions
diff --git a/build/build.sh b/build/build.sh index c14b852ae..c46032cdd 100755 --- a/build/build.sh +++ b/build/build.sh @@ -68,11 +68,9 @@ for lang in $languages; do [ -n "$USES_PO" ] && rm -r ../$lang || true done -if [ "$manual_release" != "sarge" ] ; then - PRESEED="../en/appendix/preseed.xml" - if [ -f $PRESEED ] && [ -f preseed.pl ] ; then - ./preseed.pl -r $manual_release $PRESEED >$destination/example-preseed.txt - fi +PRESEED="../en/appendix/preseed.xml" +if [ -f $PRESEED ] && [ -f preseed.pl ] ; then + ./preseed.pl -r $manual_release $PRESEED >$destination/example-preseed.txt fi clear_po diff --git a/build/buildone.sh b/build/buildone.sh index 48982cfd8..a1d3d0ea3 100755 --- a/build/buildone.sh +++ b/build/buildone.sh @@ -53,7 +53,7 @@ create_profiled () { fi if [ -z "$manual_release" ]; then - manual_release="sarge" + manual_release="etch" fi if [ -z "$manual_target" ]; then manual_target="for_cd" diff --git a/build/buildweb.sh b/build/buildweb.sh index 5426b59ed..43ec4dfae 100755 --- a/build/buildweb.sh +++ b/build/buildweb.sh @@ -66,15 +66,9 @@ for lang in $languages; do [ -n "$USES_PO" ] && rm -r ../$lang || true done -if [ "$manual_release" = "etch" ] ; then - PRESEED="../en/appendix/example-preseed-etch.xml" - LCKEEP="-v lckeep=1" -else - PRESEED="../en/appendix/example-preseed-sarge.xml" - LCKEEP="" -fi -if [ -f $PRESEED ] && [ -f preseed.awk ] ; then - gawk -f preseed.awk $LCKEEP $PRESEED >$destination/example-preseed.txt +PRESEED="../en/appendix/preseed.xml" +if [ -f $PRESEED ] && [ -f preseed.pl ] ; then + ./preseed.pl -r $manual_release $PRESEED >$destination/example-preseed.txt fi clear_po diff --git a/build/entities/install-docs.ent b/build/entities/install-docs.ent index e0e490778..7ccd4431e 100644 --- a/build/entities/install-docs.ent +++ b/build/entities/install-docs.ent @@ -28,10 +28,6 @@ </para></listitem> '> -<!-- base-contents not used anymore, but still defined for legacy --> -<!-- <!ENTITY list-base-contents-file 'no longer exists'> --> - - <!-- --> <!-- Miscellaneous files --> <!-- A catch-all, so that every file in --> diff --git a/build/entities/urls.ent b/build/entities/urls.ent index 65930bd7d..25965b849 100644 --- a/build/entities/urls.ent +++ b/build/entities/urls.ent @@ -48,10 +48,6 @@ <!-- where to get the current debian-installer --> <!ENTITY url-debian-installer "&disturl;main/installer-&architecture;/current/"> -<!-- debian-installer CVSweb - OBSOLETED: should be removed when no longer used --> -<!-- <!ENTITY url-d-i-cvsweb "http://svn.debian.org/viewcvs/d-i/"> --> -<!ENTITY url-d-i-cvsweb "http://svn.debian.org/wsvn/d-i/"> - <!-- debian-installer WebSVN --> <!ENTITY url-d-i-websvn "http://svn.debian.org/wsvn/d-i/"> @@ -253,9 +249,6 @@ <!-- this link is bad and not sure how to replace it! --> <!ENTITY url-linux-mca "http://www.dgmicro.com/mca/general-goods.html"> -<!-- Archives are dead; link below is no longer used --> -<!ENTITY url-linux-mca-discussion - "http://www.dgmicro.com/linux_frm.htm"> <!-- "the link is valid but information is stale. The archive has been removed and text documention at link directs one to a URL that is broken." --> @@ -271,9 +264,6 @@ removed and text documention at link directs one to a URL that is broken." --> http://metalab.unc.edu/LDP/HOWTO/Multiboot-with-LILO.html --> -<!-- Link no longer exists, should be removed --> -<!ENTITY url-windows-refund "http://www.windowsrefund.net/"> - <!ENTITY url-xfree86 "http://www.xfree86.org/"> <!ENTITY url-xfree "&url-xfree86;"> diff --git a/build/preseed.awk b/build/preseed.awk deleted file mode 100644 index 1619865fe..000000000 --- a/build/preseed.awk +++ /dev/null @@ -1,61 +0,0 @@ -# Extract the preseeding example from appendix/example-preseed-*.xml. -# During extraction "line continuations" - that were added for improved -# readability - will be removed, rejoining the split lines. - -# If variable lckeep is passed with value "1", line continuations are -# ignored, i.e. the lines in the example are not reformatted. - -BEGIN { - inexample="0" - inseq="0" - totline="" -} - -# Ignore everything before the line opening the example -# Note: this assumes that <informalexample><screen> is on one line -/<informalexample.*><screen>/ { - inexample="1" - getline -} - -# Ignore everything after the line closing the example -# Note: this assumes that </screen></informalexample> is on one line -/<\/screen><\/informalexample>/ { - inexample="0" -} - -# Handling of lines not ending with a line continuation character -! /\\[[:space:]]*$/ { - if ( inexample == "1" ) { - if ( lckeep == "1" ) { - print $0 - } else { - if ( inseq == "1" ) { - sub(/^[[:space:]]*/, "") - sub(/^#[[:space:]]*/, "") - } - totline = totline $0 - - print totline - totline="" - inseq="0" - } - } -} - -# Handling of lines ending with a line continuation character -/\\[[:space:]]*$/ { - if ( inexample == "1" ) { - if ( lckeep == "1" ) { - print $0 - } else { - if ( inseq == "1" ) { - sub(/^[[:space:]]*/, "") - sub(/^#[[:space:]]*/, "") - } - inseq="1" - gsub(/[[:space:]]*\\[[:space:]]*$/, " ") - totline = totline $0 - } - } -} diff --git a/build/templates/docstruct.ent b/build/templates/docstruct.ent index 915e362e5..2c3a726eb 100644 --- a/build/templates/docstruct.ent +++ b/build/templates/docstruct.ent @@ -96,8 +96,6 @@ <!ENTITY using-d-i.xml SYSTEM "##SRCPATH##/using-d-i/using-d-i.xml"> <!ENTITY using-d-i-components.xml SYSTEM "##SRCPATH##/using-d-i/components.xml"> - <!ENTITY module-languagechooser.xml SYSTEM "##SRCPATH##/using-d-i/modules/languagechooser.xml"> - <!ENTITY module-countrychooser.xml SYSTEM "##SRCPATH##/using-d-i/modules/countrychooser.xml"> <!ENTITY module-localechooser.xml SYSTEM "##SRCPATH##/using-d-i/modules/localechooser.xml"> <!ENTITY module-s390-netdevice.xml SYSTEM "##SRCPATH##/using-d-i/modules/s390/netdevice.xml"> <!ENTITY module-s390-dasd.xml SYSTEM "##SRCPATH##/using-d-i/modules/s390/dasd.xml"> diff --git a/debian/changelog b/debian/changelog index 3258cba2e..9d1ffb804 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,7 +6,7 @@ installation-guide (2006XXXX) UNRELEASED; urgency=low preseeding. * Remove the sarge preseeding docs. * Remove mentions of base-config and move base-config stuff to elsewhere. - * Add documentation of apt-setup, user-setup, clock-setup, tzsetup, and + * Add documentation of apt-setup, user-setup, clock-setup, tzsetup, and pkgsel. * Change some references to tty3 (messages) to instead refer to tty4 (syslog). @@ -14,7 +14,12 @@ installation-guide (2006XXXX) UNRELEASED; urgency=low * Remove docs for baseconfig-udeb; going away with base-config. * Removed various bits of sarge cruft when it made things easier. - -- Frans Pop <fjp@debian.org> Mon, 2 Jan 2006 23:06:51 +0100 + [ Frans Pop ] + * Change default build to Etch. + * Remove all Sarge specific content and make Etch specific content default. + * Delete some obsolete entities. + + -- Frans Pop <fjp@debian.org> Tue, 3 Jan 2006 20:34:09 +0100 installation-guide (20060102) unstable; urgency=low diff --git a/en/appendix/preseed.xml b/en/appendix/preseed.xml index 496db7e83..741b3b3b3 100644 --- a/en/appendix/preseed.xml +++ b/en/appendix/preseed.xml @@ -12,7 +12,7 @@ attribute is in force that does not match the specified release or if an Currently only a single variant of the example file is generated (for i386). --> -<appendix id="appendix-preseed" condition="etch"> +<appendix id="appendix-preseed"> <title>Automating the installation using preseeding</title> <para> diff --git a/en/boot-installer/i386.xml b/en/boot-installer/i386.xml index 1f38b7112..ed89407a9 100644 --- a/en/boot-installer/i386.xml +++ b/en/boot-installer/i386.xml @@ -157,7 +157,7 @@ image=/boot/newinstall/vmlinuz label=newinstall initrd=/boot/newinstall/initrd.gz root=/dev/ram0 - append="<phrase condition="sarge">devfs=mount,dall </phrase>ramdisk_size=12000" + append="ramdisk_size=12000" </screen></informalexample> For more details, refer to the @@ -180,9 +180,7 @@ kernel (hd0,0)/boot/newinstall/vmlinuz root=/dev/ram0 ramdisk_size=12000 initrd (hd0,0)/boot/newinstall/initrd.gz </screen></informalexample> -and reboot. <phrase condition="sarge">If the boot fails, you can try adding -<userinput>devfs=mount,dall</userinput> to the <quote>kernel</quote> line. -</phrase> +and reboot. </para><para> @@ -342,8 +340,7 @@ parameters. Information on available boot methods and on boot parameters which might be useful can be found by pressing <keycap>F2</keycap> through -<phrase condition="sarge"><keycap>F7</keycap></phrase><phrase -condition="etch"><keycap>F8</keycap></phrase>. If you add any parameters to +<keycap>F8</keycap>. If you add any parameters to the boot command line, be sure to type the boot method (the default is <userinput>linux</userinput>) and a space before the first parameter (e.g., <userinput>linux debconf/priority=medium</userinput>). diff --git a/en/boot-installer/m68k.xml b/en/boot-installer/m68k.xml index 1bf0f0201..62f11cb39 100644 --- a/en/boot-installer/m68k.xml +++ b/en/boot-installer/m68k.xml @@ -11,23 +11,13 @@ linux kernel. The installer should also require less memory when using a 2.4.x linux kernel as 2.2.x support requires a fixed-sized ramdisk and 2.4.x uses tmpfs. -</para><para condition="etch"> +</para><para> If you are using a 2.2.x linux kernel, then you need to use the &ramdisksize; kernel parameter. </para><para> -</para><para condition="sarge"> - -Also, if you are using a 2.2.x linux kernel, then you must make sure you -are using a ramdisk built to accommodate it, see the -<ulink url="&disturl;/main/installer-&architecture;/current/images/MANIFEST">MANIFEST</ulink>. -In general, this means you need to use the initrd22.gz ramdisk from the respective -directory. - -</para><para> - Make sure <userinput>root=/dev/ram</userinput> is one of your kernel parameters. diff --git a/en/boot-installer/parameters.xml b/en/boot-installer/parameters.xml index 90188ad34..a2c2e7e58 100644 --- a/en/boot-installer/parameters.xml +++ b/en/boot-installer/parameters.xml @@ -77,9 +77,8 @@ The installation system recognizes a few additional boot parameters<footnote> Note that the kernel accepts a maximum of 8 command line options and 8 environment options (including any options added by default for the installer). If these numbers are exceeded, 2.4 kernels will drop any -excess options and 2.6 kernels will panic. -<phrase condition="etch">With kernel 2.6.9 or newer, you can use 32 -command line options and 32 environment options.</phrase> +excess options and 2.6 kernels will panic. With kernel 2.6.9 or newer, +you can use 32 command line options and 32 environment options. </para> @@ -305,7 +304,7 @@ automating the install. See <xref linkend="automatic-install"/>. </para></listitem> </varlistentry> -<varlistentry condition="etch"> +<varlistentry> <term>cdrom-detect/eject</term> <listitem><para> @@ -335,7 +334,7 @@ If you are using a 2.2.x kernel, you may need to set &ramdisksize;. </para></listitem> </varlistentry> -<varlistentry condition="etch"> +<varlistentry> <term>rescue/enable</term> <listitem><para> diff --git a/en/boot-installer/trouble.xml b/en/boot-installer/trouble.xml index 9f94ef49d..843f29201 100644 --- a/en/boot-installer/trouble.xml +++ b/en/boot-installer/trouble.xml @@ -199,15 +199,9 @@ custom kernel later (see <xref linkend="kernel-baking"/>). If you get through the initial boot phase but cannot complete the install, the bug reporter menu choice may be helpful. -<phrase condition="sarge"> -It copies system error logs and configuration information to a user-supplied -floppy. -</phrase> -<phrase condition="etch"> It lets you store system error logs and configuration information from the installer to a floppy, or download them in a web browser. -</phrase> - + This information may provide clues as to what went wrong and how to fix it. If you are submitting a bug report you may want to attach this information to the bug report. @@ -231,7 +225,7 @@ encourage installation reports to be sent even if the installation is successful, so that we can get as much information as possible on the largest number of hardware configurations. -</para><para condition="etch"> +</para><para> If you have a working Debian system, the easiest way to send an installation report is to install the installation-report and reportbug packages diff --git a/en/boot-new/boot-new.xml b/en/boot-new/boot-new.xml index c9b30b719..d2452f3d2 100644 --- a/en/boot-new/boot-new.xml +++ b/en/boot-new/boot-new.xml @@ -19,10 +19,8 @@ you will probably need to add some boot arguments like <userinput>root=<replaceable>root</replaceable></userinput>, where <replaceable>root</replaceable> is your root partition, such as <filename>/dev/sda1</filename>. -<phrase condition="etch"> Alternatively, see <xref linkend="rescue"/> for instructions on using the installer's built-in rescue mode. -</phrase> </para> diff --git a/en/howto/installation-howto.xml b/en/howto/installation-howto.xml index fa454bec8..62cf57877 100644 --- a/en/howto/installation-howto.xml +++ b/en/howto/installation-howto.xml @@ -215,24 +215,12 @@ Once the installer starts, you will be greeted with an initial screen. Press &enterkey; to boot, or read the instructions for other boot methods and parameters (see <xref linkend="boot-parms" />). <phrase arch="i386"> -<phrase condition="sarge"> -If you want a 2.6 kernel, type <userinput>linux26</userinput> at the -<prompt>boot:</prompt> prompt. -</phrase> -<phrase condition="etch"> If you want a 2.4 kernel, type <userinput>install24</userinput> at the <prompt>boot:</prompt> prompt. -</phrase> <footnote><para> -<phrase condition="sarge"> -The 2.6 kernel is available for most boot methods, but not when booting from -a floppy. -</phrase> -<phrase condition="etch"> The 2.6 kernel is the default for most boot methods, but is not available when booting from a floppy. -</phrase> </para></footnote> </phrase> @@ -321,19 +309,9 @@ If you need more information on the install process, see If you successfully managed an installation with &d-i;, please take time to provide us with a report. -<phrase condition="sarge"> -There is a template -named <filename>install-report.template</filename> in the -<filename>/root</filename> directory of a freshly -installed system. Please fill it out and file it as a bug against the -package <classname>installation-reports</classname>, as explained in -<xref linkend="submit-bug" />. -</phrase> -<phrase condition="etch"> The simplest way to do so is to install the reportbug package (<command>apt-get install reportbug</command>), and run <command>reportbug installation-report</command>. -</phrase> </para><para> diff --git a/en/install-methods/automatic-install.xml b/en/install-methods/automatic-install.xml index 8cc630867..72ccbc3da 100644 --- a/en/install-methods/automatic-install.xml +++ b/en/install-methods/automatic-install.xml @@ -24,7 +24,7 @@ files. A preconfiguration file can be loaded from the network or from removable media, and used to fill in answers to questions asked during the installation process. -</para><para condition="etch"> +</para><para> Full documentation on preseeding including a working example that you can edit is in <xref linkend="appendix-preseed"/>. diff --git a/en/install-methods/usb-setup/i386.xml b/en/install-methods/usb-setup/i386.xml index 6fc993403..47c81e4ec 100644 --- a/en/install-methods/usb-setup/i386.xml +++ b/en/install-methods/usb-setup/i386.xml @@ -92,10 +92,6 @@ append initrd=initrd.gz ramdisk_size=12000 root=/dev/ram rw Please note that the <userinput>ramdisk_size</userinput> parameter may need to be increased, depending on the image you are booting. -<phrase condition="sarge"> -If the boot fails, you can try adding <userinput>devfs=mount,dall</userinput> -to the <quote>append</quote> line. -</phrase> </para> </sect3> diff --git a/en/install-methods/usb-setup/powerpc.xml b/en/install-methods/usb-setup/powerpc.xml index 12e1284b9..08d01e057 100644 --- a/en/install-methods/usb-setup/powerpc.xml +++ b/en/install-methods/usb-setup/powerpc.xml @@ -99,8 +99,7 @@ message=/boot.msg image=/vmlinux label=install initrd=/initrd.gz - initrd-size=10000<phrase condition="sarge"> - append="devfs=mount,dall --"</phrase> + initrd-size=10000 read-only </screen></informalexample> diff --git a/en/post-install/kernel-baking.xml b/en/post-install/kernel-baking.xml index a3c4fb9bb..5b53006f0 100644 --- a/en/post-install/kernel-baking.xml +++ b/en/post-install/kernel-baking.xml @@ -181,9 +181,8 @@ above step may have produced, then <userinput>shutdown -r now</userinput>. </para><para> -<phrase condition="etch">For more information on Debian kernels and kernel -compilation, see the <ulink url="&url-kernel-handbook;">Debian Linux Kernel -Handbook</ulink>.</phrase> +For more information on Debian kernels and kernel compilation, see the +<ulink url="&url-kernel-handbook;">Debian Linux Kernel Handbook</ulink>. For more information on <classname>kernel-package</classname>, read the fine documentation in <filename>/usr/share/doc/kernel-package</filename>. diff --git a/en/post-install/rescue.xml b/en/post-install/rescue.xml index f920f6078..c774069ba 100644 --- a/en/post-install/rescue.xml +++ b/en/post-install/rescue.xml @@ -1,7 +1,7 @@ <!-- retain these comments for translator revision tracking --> <!-- $Id$ --> - <sect1 id="rescue" condition="etch"> + <sect1 id="rescue"> <title>Recovering a Broken System</title> <para> diff --git a/en/using-d-i/components.xml b/en/using-d-i/components.xml index ff023a345..8d58adf72 100644 --- a/en/using-d-i/components.xml +++ b/en/using-d-i/components.xml @@ -40,8 +40,6 @@ hardware detection needs to be repeated later in the process. </para> &module-lowmem.xml; -&module-languagechooser.xml; -&module-countrychooser.xml; &module-localechooser.xml; &module-kbd-chooser.xml; &module-s390-netdevice.xml; diff --git a/en/using-d-i/modules/countrychooser.xml b/en/using-d-i/modules/countrychooser.xml deleted file mode 100644 index dd767b701..000000000 --- a/en/using-d-i/modules/countrychooser.xml +++ /dev/null @@ -1,25 +0,0 @@ -<!-- retain these comments for translator revision tracking --> -<!-- $Id$ --> - - - <sect3 id="country-chooser" condition="sarge"> - <title>Country selection</title> - -<para> - -If you selected a language in <xref linkend="lang-chooser"/> which has -more than one country associated with it (true for Chinese, English, -French, and many other languages), you can specify the country here. -If you choose <guimenuitem>Other</guimenuitem> at the bottom of the list, -you will be presented with a list of all countries, grouped by continent. - -</para><para> - -This selection will be used later in the installation process to pick the -default timezone and a Debian mirror appropriate for your geographic -location. If the defaults proposed by the installer are not suitable, you -can make a different choice. The selected country, together with the selected -language, may also affect locale settings for your new Debian system. - -</para> - </sect3> diff --git a/en/using-d-i/modules/languagechooser.xml b/en/using-d-i/modules/languagechooser.xml deleted file mode 100644 index c0cc95c39..000000000 --- a/en/using-d-i/modules/languagechooser.xml +++ /dev/null @@ -1,25 +0,0 @@ -<!-- retain these comments for translator revision tracking --> -<!-- $Id$ --> - - - <sect3 id="lang-chooser" condition="sarge"> - <title>Language selection</title> - -<para> - -As the first step of the installation, select the language in which -you want the installation process to proceed. The language names -are listed in both English (left side) and in the language itself -(right side); the names on the right side are also shown in the proper -script for the language. The list is sorted on the English names. - -</para><para> - -The language you choose will be used for the rest of the installation -process, provided a translation of the different dialogs is available. -If no valid translation is available for the selected language, the -installer will default to English. The selected language will also be -used to help select a suitable keyboard layout. - -</para> - </sect3> diff --git a/en/using-d-i/modules/localechooser.xml b/en/using-d-i/modules/localechooser.xml index d17dd4dcb..c867a606f 100644 --- a/en/using-d-i/modules/localechooser.xml +++ b/en/using-d-i/modules/localechooser.xml @@ -2,7 +2,7 @@ <!-- $Id$ --> - <sect3 id="localechooser" condition="etch"> + <sect3 id="localechooser"> <title>Selecting Localization Options</title> <para> diff --git a/en/using-d-i/modules/lvmcfg.xml b/en/using-d-i/modules/lvmcfg.xml index 19b77f53c..6d7fae931 100644 --- a/en/using-d-i/modules/lvmcfg.xml +++ b/en/using-d-i/modules/lvmcfg.xml @@ -47,43 +47,6 @@ volume groups (VG)</guimenuitem> menu. After that, you should create logical volumes on the top of volume groups from the menu <guimenuitem>Modify logical volumes (LV)</guimenuitem>. -<note arch="powerpc" condition="sarge"><para> - -There is no widely accepted standard to identify partitions containing -LVM data on Apple Power Macintosh hardware. On this particular -hardware, the above procedure for creating physical volumes and volume -groups will not work. There is a good workaround for this limitation, -provided you are familiar with the underlying LVM tools. - -</para><para> - -To install using logical volumes on Power Macintosh hardware you -should create all the disk partitions for your logical volumes as -usual. In the <guimenu>Partition settings</guimenu> menu you should -choose <menuchoice><guimenu>Use as:</guimenu> <guimenuitem>Do Not -Use</guimenuitem></menuchoice> for these partitions (you will not be -offered the option to use the partition as a physical volume). When -you are done with creating all your partitions, you should start the -logical volume manager as usual. However, since no physical volumes -have been created you must now access the command shell available on -the second virtual terminal (see <xref linkend="shell"/>) and create -them manually. - -</para><para> - -Use the <command>pvcreate</command> command at the shell command prompt -to create a physical volume on each of your chosen partitions. Then use -the <command>vgcreate</command> command to create each volume group -you want. You can safely ignore any errors about incorrect metadata -area header checksums and fsync failures while doing this. When you -have finished creating all your volume groups, you should go back to -the first virtual terminal and skip directly to the -<command>lvmcfg</command> menu items for logical volume -management. You will see your volume groups and you can create the -logical volumes you need as usual. - -</para></note> - </para><para> After returning from <command>lvmcfg</command> back to diff --git a/en/using-d-i/modules/mdcfg.xml b/en/using-d-i/modules/mdcfg.xml index 6365a3fa1..e39e403bb 100644 --- a/en/using-d-i/modules/mdcfg.xml +++ b/en/using-d-i/modules/mdcfg.xml @@ -146,14 +146,6 @@ To sum it up: If you want to know the whole truth about Software RAID, have a look at <ulink url="&url-software-raid-howto;">Software RAID HOWTO</ulink>. -<note arch="powerpc" condition="sarge"><para> - -There is no widely accepted standard to identify partitions containing -RAID data on Apple Power Macintosh hardware. This means that &d-i; -currently does not support setting up RAID on this platform. - -</para></note> - </para><para> To create a MD device, you need to have the desired partitions it diff --git a/en/using-d-i/modules/os-prober.xml b/en/using-d-i/modules/os-prober.xml index 03aa06176..43c761c04 100644 --- a/en/using-d-i/modules/os-prober.xml +++ b/en/using-d-i/modules/os-prober.xml @@ -23,15 +23,4 @@ boot manager's documentation for more information. <!-- TODO: Maybe include some arch-dependent tables with supported OS'es here --> </para> - -<note condition="sarge"><para> - -The installer may fail to detect other operating systems if the partitions on -which they reside are mounted when the detection takes place. This may occur if -you select a mountpoint (e.g. /win) for a partition containing another operating -system in <command>partman</command>, or if you have mounted partitions manually -from a console. - -</para></note> - </sect3> diff --git a/en/using-d-i/modules/save-logs.xml b/en/using-d-i/modules/save-logs.xml index a930db4fa..2addf18a3 100644 --- a/en/using-d-i/modules/save-logs.xml +++ b/en/using-d-i/modules/save-logs.xml @@ -14,9 +14,8 @@ Debian system. </para><para> Choosing <guimenuitem>Save debug logs</guimenuitem> from the main -menu allows you to save the log files to a floppy -disk<phrase condition="etch">, network, hard disk, or other -media</phrase>. This can be useful if you encounter fatal problems +menu allows you to save the log files to a floppy disk, network, hard +disk, or other media. This can be useful if you encounter fatal problems during the installation and wish to study the logs on another system or attach them to an installation report. diff --git a/en/using-d-i/using-d-i.xml b/en/using-d-i/using-d-i.xml index 97e142b84..51cb4bcd5 100644 --- a/en/using-d-i/using-d-i.xml +++ b/en/using-d-i/using-d-i.xml @@ -132,27 +132,7 @@ repeatedly to back all the way out of the currently running component. </para></listitem> </varlistentry> -<varlistentry condition="sarge"> - -<term>languagechooser</term><listitem><para> - -Shows a list of languages and language variants. The installer will -display messages in the chosen language, unless the translation for -that language is not complete. When a translation is not complete, -English messages are shown. - -</para></listitem> -</varlistentry> -<varlistentry condition="sarge"> - -<term>countrychooser</term><listitem><para> - -Shows a list of countries. The user may choose the country he lives -in. - -</para></listitem> -</varlistentry> -<varlistentry condition="etch"> +<varlistentry> <term>localechooser</term><listitem><para> @@ -389,12 +369,11 @@ console. </varlistentry> <varlistentry> -<term condition="sarge">bugreporter</term><term condition="etch">save-logs</term><listitem><para> +<term>save-logs</term><listitem><para> -Provides a way for the user to record information on a floppy -disk<phrase condition="etch">, network, hard disk, or other media</phrase> -when trouble is encountered, in order to accurately report installer -software problems to Debian developers later. +Provides a way for the user to record information on a floppy disk, network, +hard disk, or other media when trouble is encountered, in order to accurately +report installer software problems to Debian developers later. </para></listitem> </varlistentry> |