- Update number of developers, packages and mailing lists

- General revision of minimum hardware requirements throughout the manual
- Update of installed/download size of tasks
- Delete some unused entities in build/entities/common.ent

14 files changed, 35 insertions, 34 deletions

diff --git a/build/arch-options/alpha b/build/arch-options/alpha
index 2997a3531..5b6741dd9 100644
--- a/build/arch-options/alpha
+++ b/build/arch-options/alpha
@@ -5,6 +5,7 @@
 archspec="alpha;not-x86;not-s390;not-m68k;not-powerpc"
 kernelversion="2.6.18"
 arch_listname="alpha"
+minimum_memory=32
 # These two options should be set if condition 'smp' is set below
 smp_config_section="General setup"
 smp_config_option="Symmetric multi-processing support"
diff --git a/build/arch-options/amd64 b/build/arch-options/amd64
index 9af33c4c7..14722a043 100644
--- a/build/arch-options/amd64
+++ b/build/arch-options/amd64
@@ -5,6 +5,7 @@
 archspec="amd64;x86;not-s390;not-m68k;not-powerpc;not-alpha"
 kernelversion="2.6.18"
 arch_listname="amd64"
+minimum_memory=48
 # These two options should be set if condition 'smp' is set below
 smp_config_section="Processor type and features"
 smp_config_option="Symmetric multi-processing support"
diff --git a/build/arch-options/arm b/build/arch-options/arm
index c1aad4753..3ffe74828 100644
--- a/build/arch-options/arm
+++ b/build/arch-options/arm
@@ -5,6 +5,7 @@
 archspec="arm;not-x86;not-s390;not-m68k;not-powerpc;not-alpha"
 kernelversion="2.6.18"
 arch_listname="arm"
+minimum_memory=32
 # These two options should be set if condition 'smp' is set below
 smp_config_section="N/A"
 smp_config_option="N/A"
diff --git a/build/arch-options/hppa b/build/arch-options/hppa
index e275b0d65..52e1ced88 100644
--- a/build/arch-options/hppa
+++ b/build/arch-options/hppa
@@ -5,6 +5,7 @@
 archspec="hppa;not-x86;not-s390;not-m68k;not-powerpc;not-alpha"
 kernelversion="2.6.18"
 arch_listname="hppa"
+minimum_memory=32
 # These two options should be set if condition 'smp' is set below
 smp_config_section="Processor type and features"
 smp_config_option="Symmetric multi-processing support"
diff --git a/build/arch-options/i386 b/build/arch-options/i386
index db3e75a98..97b3d79e4 100644
--- a/build/arch-options/i386
+++ b/build/arch-options/i386
@@ -5,6 +5,7 @@
 archspec="i386;x86;not-s390;not-m68k;not-powerpc;not-alpha"
 kernelversion="2.6.18"
 arch_listname="boot"
+minimum_memory=48
 # These two options should be set if condition 'smp' is set below
 smp_config_section="Processor type and features"
 smp_config_option="Symmetric multi-processing support"
diff --git a/build/arch-options/ia64 b/build/arch-options/ia64
index 1450634f5..62fda7811 100644
--- a/build/arch-options/ia64
+++ b/build/arch-options/ia64
@@ -5,6 +5,7 @@
 archspec="ia64;not-x86;not-s390;not-m68k;not-powerpc;not-alpha"
 kernelversion="2.6.18"
 arch_listname="ia64"
+minimum_memory=32
 # These two options should be set if condition 'smp' is set below
 smp_config_section="General setup"
 smp_config_option="SMP support"
diff --git a/build/arch-options/m68k b/build/arch-options/m68k
index ce44e8880..eb219bd95 100644
--- a/build/arch-options/m68k
+++ b/build/arch-options/m68k
@@ -5,6 +5,7 @@
 archspec="m68k;not-x86;not-s390;not-powerpc;not-alpha"
 kernelversion="2.6.18"
 arch_listname="68k"
+minimum_memory=32
 # These two options should be set if condition 'smp' is set below
 smp_config_section="N/A"
 smp_config_option="N/A"
diff --git a/build/arch-options/mips b/build/arch-options/mips
index d0d31f9d4..14c9288e1 100644
--- a/build/arch-options/mips
+++ b/build/arch-options/mips
@@ -5,6 +5,7 @@
 archspec="mips;not-x86;not-s390;not-m68k;not-powerpc;not-alpha"
 kernelversion="2.6.18"
 arch_listname="mips"
+minimum_memory=32
 # These two options should be set if condition 'smp' is set below
 smp_config_section="N/A"
 smp_config_option="N/A"
diff --git a/build/arch-options/mipsel b/build/arch-options/mipsel
index efb408018..22d668730 100644
--- a/build/arch-options/mipsel
+++ b/build/arch-options/mipsel
@@ -5,6 +5,7 @@
 archspec="mipsel;not-x86;not-s390;not-m68k;not-powerpc;not-alpha"
 kernelversion="2.6.18"
 arch_listname="mips"
+minimum_memory=32
 # These two options should be set if condition 'smp' is set below
 smp_config_section="N/A"
 smp_config_option="N/A"
diff --git a/build/arch-options/powerpc b/build/arch-options/powerpc
index eff2c2447..69ad17303 100644
--- a/build/arch-options/powerpc
+++ b/build/arch-options/powerpc
@@ -5,6 +5,7 @@
 archspec="powerpc;not-s390;not-m68k;not-x86;not-alpha"
 kernelversion="2.6.18"
 arch_listname="powerpc"
+minimum_memory=32
 # These two options should be set if condition 'smp' is set below
 smp_config_section="Platform support"
 smp_config_option="Symmetric multi-processing support"
diff --git a/build/arch-options/s390 b/build/arch-options/s390
index e9925bf1b..0945f2665 100644
--- a/build/arch-options/s390
+++ b/build/arch-options/s390
@@ -5,6 +5,7 @@
 archspec="s390;not-powerpc;not-m68k;not-x86;not-alpha"
 kernelversion="2.6.18"
 arch_listname="s390"
+minimum_memory=20
 # These two options should be set if condition 'smp' is set below
 smp_config_section="Processor type and features"
 smp_config_option="Symmetric multi-processing support"
diff --git a/build/arch-options/sparc b/build/arch-options/sparc
index ed65c595f..8138400ce 100644
--- a/build/arch-options/sparc
+++ b/build/arch-options/sparc
@@ -5,6 +5,7 @@
 archspec="sparc;not-x86;not-s390;not-m68k;not-powerpc;not-alpha"
 kernelversion="2.6.18"
 arch_listname="sparc"
+minimum-memory=32
 # These two options should be set if condition 'smp' is set below
 smp_config_section="General setup"
 smp_config_option="Symmetric multi-processing support"
diff --git a/build/buildone.sh b/build/buildone.sh
index bedb81c4e..37a6d8278 100755
--- a/build/buildone.sh
+++ b/build/buildone.sh
@@ -89,6 +89,8 @@ create_profiled () {
     echo "<!ENTITY altkernelversion \"${altkernelversion}\">" >> $dynamic
     echo "<!ENTITY smp-config-section \"${smp_config_section}\">" >> $dynamic
     echo "<!ENTITY smp-config-option \"${smp_config_option}\">" >> $dynamic
+    echo "<!ENTITY minimum-memory \"${minimum_memory}&notation-megabytes;\">" >> $dynamic
+
     sed "s:##SRCPATH##:$source_path:" templates/docstruct.ent >> $dynamic
 
     sed "s:##LANG##:$language:g" templates/install.xml.template | \
diff --git a/build/entities/common.ent b/build/entities/common.ent
index 09c4a270a..32594087f 100644
--- a/build/entities/common.ent
+++ b/build/entities/common.ent
@@ -24,52 +24,39 @@
 <!ENTITY MSG-YES "<userinput>Yes</userinput>">
 <!ENTITY MSG-NO "<userinput>No</userinput>">
 
-<!-- available language codes for 'setlang [code]' -->
-<!ENTITY setlang-language-code-list "ca cs da de eo es fi fr gl hr hu it ko ja pl pt ru sk sv tr zh_CN">
-
 <!-- notation used for 'megabytes' -->
 <!ENTITY notation-megabytes "MB">
 
-<!-- minimum memory -->
-<!ENTITY minimum-memory "32&notation-megabytes;">
-
 <!-- minimum hard disk size for base system -->
-<!-- As measured on a completed woody install, work space included. -->
-<!ENTITY minimum-fs-size "110&notation-megabytes;">
-
-<!-- minimum total memory (RAM + swap is ok) needed, i.e., for kernel -->
-<!-- module config -->
-<!ENTITY minimum-memory-with-swap "9&notation-megabytes;">
-
-<!-- minimum memory for diskless workstations (NFS root) -->
-<!ENTITY minimum-memory-with-nfsroot "16&notation-megabytes;">
+<!-- As measured on a completed etch install, minimal work space included. -->
+<!ENTITY minimum-fs-size "500&notation-megabytes;">
 
 
 <!-- number of packages, approx, in the main distribution -->
-<!-- do:  grep '^Package:' Packages | wc -l -->
-<!-- might be fun to generate this dynamically -->
-<!-- last updated: May 15 2005 (FJP) -->
+<!-- use:
+     for i in binary-*; do echo -n "$i: "; zgrep '^Package:' $i/Packages.gz | wc -l; done
+-->
+<!-- last updated: January 1 2007 for Etch (FJP) -->
 <!ENTITY num-of-distrib-pkgs
-  "<phrase arch='alpha'>14750</phrase>
-   <phrase arch='arm'>14650</phrase>
-   <phrase arch='hppa'>14700</phrase>
-   <phrase arch='i386'>15250</phrase>
-   <phrase arch='ia64'>14700</phrase>
-   <phrase arch='m68k'>14700</phrase>
-   <phrase arch='mips'>14650</phrase>
-   <phrase arch='mipsel'>14600</phrase>
-   <phrase arch='powerpc'>14900</phrase>
-   <phrase arch='sparc'>14800</phrase>
-   <phrase arch='s390'>14700</phrase>">
+  "<phrase arch='alpha'>17600</phrase>
+   <phrase arch='amd64'>17850</phrase>
+   <phrase arch='arm'>17550</phrase>
+   <phrase arch='hppa'>17600</phrase>
+   <phrase arch='i386'>18150</phrase>
+   <phrase arch='ia64'>17650</phrase>
+   <phrase arch='m68k'>17450</phrase>
+   <phrase arch='mips'>17550</phrase>
+   <phrase arch='mipsel'>17550</phrase>
+   <phrase arch='powerpc'>17850</phrase>
+   <phrase arch='s390'>17500</phrase>
+   <phrase arch='sparc'>17700</phrase>">
 
 <!-- Number of current Debian developers -->
-<!ENTITY num-of-debian-developers "900">
+<!-- Can be found for example on vote.debian.org (use last vote) -->
+<!ENTITY num-of-debian-developers "1000">
 
 <!-- Number of current Debian maillists -->
-<!ENTITY num-of-debian-maillists "160">
-
-<!-- threshold, below which, we are a low memory system  -->
-<!ENTITY low-mem-threshold "5&notation-megabytes;">
+<!ENTITY num-of-debian-maillists "215">
 
 <!-- version of X11 shipping with the current release -->
 <!ENTITY x11ver "7.1">