diff options
| -rw-r--r-- | build/templates/docstruct.ent | 1 | ||||
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | en/post-install/post-install.xml | 1 | ||||
| -rw-r--r-- | en/post-install/reactivating-win.xml | 72 |
4 files changed, 4 insertions, 75 deletions
diff --git a/build/templates/docstruct.ent b/build/templates/docstruct.ent index 6719b4ad4..a2fc5625a 100644 --- a/build/templates/docstruct.ent +++ b/build/templates/docstruct.ent @@ -176,7 +176,6 @@ <!ENTITY shutdown.xml SYSTEM "##SRCPATH##/post-install/shutdown.xml"> <!ENTITY new-to-unix.xml SYSTEM "##SRCPATH##/post-install/new-to-unix.xml"> <!ENTITY orientation.xml SYSTEM "##SRCPATH##/post-install/orientation.xml"> - <!ENTITY reactivating-win.xml SYSTEM "##SRCPATH##/post-install/reactivating-win.xml"> <!ENTITY further-reading.xml SYSTEM "##SRCPATH##/post-install/further-reading.xml"> <!ENTITY kernel-baking.xml SYSTEM "##SRCPATH##/post-install/kernel-baking.xml"> <!ENTITY rescue.xml SYSTEM "##SRCPATH##/post-install/rescue.xml"> diff --git a/debian/changelog b/debian/changelog index 0caca152b..0da393600 100644 --- a/debian/changelog +++ b/debian/changelog @@ -110,8 +110,11 @@ installation-guide (2006xxxx) UNRELEASED; urgency=low - Add a note that installation reports will be published. * hardware: - Remove ancient section on parity RAM. Closes: #403035. + * post-install: + - Remove section on reactivating Windows; the installer should detect it + automatically after all. Closes: #402437. - -- Frans Pop <fjp@debian.org> Sun, 24 Dec 2006 19:57:16 +0100 + -- Frans Pop <fjp@debian.org> Sun, 24 Dec 2006 20:07:49 +0100 installation-guide (20060726) unstable; urgency=low diff --git a/en/post-install/post-install.xml b/en/post-install/post-install.xml index 1ae693078..f444de205 100644 --- a/en/post-install/post-install.xml +++ b/en/post-install/post-install.xml @@ -7,7 +7,6 @@ &shutdown.xml; &new-to-unix.xml; &orientation.xml; -&reactivating-win.xml; &further-reading.xml; &kernel-baking.xml; &rescue.xml; diff --git a/en/post-install/reactivating-win.xml b/en/post-install/reactivating-win.xml deleted file mode 100644 index 8559462c3..000000000 --- a/en/post-install/reactivating-win.xml +++ /dev/null @@ -1,72 +0,0 @@ -<!-- retain these comments for translator revision tracking --> -<!-- $Id$ --> - - - <sect1 arch="x86" id="reactivating-win"> - <title>Reactivating DOS and Windows</title> -<para> - -After installing the base system and writing to the <emphasis>Master Boot -Record</emphasis>, you will be able to boot Linux, but probably nothing else. -This depends what you have chosen during the installation. This chapter -will describe how you can reactivate your old systems so that you can also -boot your DOS or Windows again. - -</para><para> - -<command>LILO</command> is a boot manager with which you can also boot -other operating systems than Linux, which complies to PC -conventions. The boot manager is configured via -<filename>/etc/lilo.conf</filename> file. Whenever you edited this -file you have to run <command>lilo</command> afterwards. The reason -for this is that the changes will take place only when you call the -program. - -</para><para> - -Important parts of the <filename>lilo.conf</filename> file are the -lines containing the <userinput>image</userinput> and -<userinput>other</userinput> keywords, as well as the lines following -those. They can be used to describe a system which can be booted by -<command>LILO</command>. Such a system can include a kernel -(<userinput>image</userinput>), a root partition, additional kernel -parameters, etc. as well as a configuration to boot another, non-Linux -(<userinput>other</userinput>) operating system. These keywords can -also be used more than once. The ordering of these systems within the -configuration file is important because it determines which system -will be booted automatically after, for instance, a timeout -(<userinput>delay</userinput>) presuming <command>LILO</command> -wasn't stopped by pressing the <keycap>shift</keycap> key. - -</para><para> - -After a fresh install of Debian, just the current system is configured -for booting with <command>LILO</command>. If you want to boot another -Linux kernel, you have to edit the configuration file -<filename>/etc/lilo.conf</filename> to add the following lines: - -<informalexample><screen> -&additional-lilo-image; -</screen></informalexample> - -For a basic setup just the first two lines are necessary. If you want -to know more about the other two options please have a look at the -<command>LILO</command> documentation. This can be found in -<filename>/usr/share/doc/lilo/</filename>. The file which should be -read is <filename>Manual.txt</filename>. To have a quicker start into -the world of booting a system you can also look at the -<command>LILO</command> man pages <filename>lilo.conf</filename> for -an overview of configuration keywords and <filename>lilo</filename> -for description of the installation of the new configuration into the -boot sector. - -</para><para> - -Notice that there are other boot loaders available in &debian;, such as -GRUB (in <classname>grub</classname> package), -CHOS (in <classname>chos</classname> package), -Extended-IPL (in <classname>extipl</classname> package), -loadlin (in <classname>loadlin</classname> package) etc. - -</para> - </sect1> |