summaryrefslogtreecommitdiff
path: root/en/appendix
diff options
context:
space:
mode:
Diffstat (limited to 'en/appendix')
-rw-r--r--en/appendix/files.xml10
-rw-r--r--en/appendix/preseed.xml9
2 files changed, 9 insertions, 10 deletions
diff --git a/en/appendix/files.xml b/en/appendix/files.xml
index a92a16526..c6600ca72 100644
--- a/en/appendix/files.xml
+++ b/en/appendix/files.xml
@@ -186,11 +186,11 @@ when your mouse only has one button. Just add the following lines to
<title>Disk Space Needed for Tasks</title>
<!-- Note for d-i and manual maintainers
- Sizes of tasks should be determined by running "tasksel --new-install" on
- a system that been fully installed without selecting any tasks. By selecting
- a task together with the "manual selection" option, aptitude will be started
- and show the sizes for the task. After deselecting the packages to be
- installed, quit aptitude and repeat for other tasks.
+ Sizes of tasks should be determined by running tasksel with the "new-install"
+ option on a system that been fully installed without selecting any tasks. By
+ selecting a task together with the "manual selection" option, aptitude will
+ be started and show the sizes for the task. Use "cancel panding actions" to
+ clear the slate, quit aptitude and repeat for other tasks.
Space requirements need to be determined from tasksel as tasksel will not
install recommended packages while selecting a task from aptitude will.
-->
diff --git a/en/appendix/preseed.xml b/en/appendix/preseed.xml
index 1fa47dd17..b72f69391 100644
--- a/en/appendix/preseed.xml
+++ b/en/appendix/preseed.xml
@@ -408,11 +408,10 @@ to ensure that only the latter are copied onto the target system.
</para>
<note><para>
-The 2.4 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. For kernel 2.6.9 and later,
-you can use 32 command line options and 32 environment options.
+Current linux kernels (2.6.9 and later) accept a maximum of 32 command line
+options and 32 environment options, including any options added by default
+for the installer. If these numbers are exceeded, the kernel will panic
+(crash). (For earlier kernels, these numbers were lower.)
</para></note>
<para>