Update figures. Update text about root vs /usr

as the latter is now systematically in root.

4 files changed, 63 insertions, 70 deletions

diff --git a/build/entities/common.ent b/build/entities/common.ent
index 5a546c024..1e58745e1 100644
--- a/build/entities/common.ent
+++ b/build/entities/common.ent
@@ -4,7 +4,7 @@
 
 <!-- current year (to be used for copyright declaration). -->
 <!-- When changing this, also change in "debian/copyright" file! -->
-<!ENTITY current-year "2022">
+<!ENTITY current-year "2023">
 
 <!-- short name to use for Debian -->
 <!ENTITY debian "Debian">
@@ -75,7 +75,7 @@
 cleanup, plus minimal ~150MB work space included.
 Also update the value in debian-installer/build/boot/x86/f2.txt
 -->
-<!ENTITY minimum-fs-size "920&notation-megabytes;">
+<!ENTITY minimum-fs-size "1160&notation-megabytes;">
 
 <!--
 Size of install as used in appendix/files.xml; all values based on amd64.
@@ -106,60 +106,64 @@ to first switch tasksel to that DE using the following command, e.g:
 -->
 
 <!-- Size of the basic installation -->
-  <!ENTITY base-system-size   "769">
-  <!ENTITY std-system-size    "971">
+  <!ENTITY base-system-size   "1012">
+  <!ENTITY std-system-size    "1242">
 <!-- Desktop environment task - GNOME -->
-  <!ENTITY task-desktop-gnome-inst "2790">
-  <!ENTITY task-desktop-gnome-dl    "786">
-  <!ENTITY task-desktop-gnome-tot  "3576">
+  <!ENTITY task-desktop-gnome-inst "3216">
+  <!ENTITY task-desktop-gnome-dl    "859">
+  <!ENTITY task-desktop-gnome-tot  "4075">
 <!-- Desktop environment task - KDE -->
-  <!ENTITY task-desktop-kde-inst   "4122">
-  <!ENTITY task-desktop-kde-dl     "1212">
-  <!ENTITY task-desktop-kde-tot    "5334">
+  <!ENTITY task-desktop-kde-inst   "4584">
+  <!ENTITY task-desktop-kde-dl     "1316">
+  <!ENTITY task-desktop-kde-tot    "5900">
 <!-- Desktop environment task - Xfce -->
-  <!ENTITY task-desktop-xfce-inst  "2187">
-  <!ENTITY task-desktop-xfce-dl     "621">
-  <!ENTITY task-desktop-xfce-tot   "2808">
+  <!ENTITY task-desktop-xfce-inst  "2509">
+  <!ENTITY task-desktop-xfce-dl     "683">
+  <!ENTITY task-desktop-xfce-tot   "3192">
 <!-- Desktop environment task - LXDE -->
-  <!ENTITY task-desktop-lxde-inst  "2271">
-  <!ENTITY task-desktop-lxde-dl     "653">
-  <!ENTITY task-desktop-lxde-tot   "2924">
+  <!ENTITY task-desktop-lxde-inst  "2539">
+  <!ENTITY task-desktop-lxde-dl     "693">
+  <!ENTITY task-desktop-lxde-tot   "3232">
 <!-- Desktop environment task - MATE -->
-  <!ENTITY task-desktop-mate-inst  "2574">
-  <!ENTITY task-desktop-mate-dl     "711">
-  <!ENTITY task-desktop-mate-tot   "3285">
+  <!ENTITY task-desktop-mate-inst  "2851">
+  <!ENTITY task-desktop-mate-dl     "762">
+  <!ENTITY task-desktop-mate-tot   "3613">
 <!-- Desktop environment task - Cinnamon -->
-  <!ENTITY task-desktop-cinnamon-inst  "4197">
-  <!ENTITY task-desktop-cinnamon-dl    "1251">
-  <!ENTITY task-desktop-cinnamon-tot   "5448">
+  <!ENTITY task-desktop-cinnamon-inst  "4676">
+  <!ENTITY task-desktop-cinnamon-dl    "1324">
+  <!ENTITY task-desktop-cinnamon-tot   "6000">
 <!-- Web server task -->
-  <!ENTITY task-web-inst       "44">
-  <!ENTITY task-web-dl         "11">
-  <!ENTITY task-web-tot        "55">
+  <!ENTITY task-web-inst       "85">
+  <!ENTITY task-web-dl         "19">
+  <!ENTITY task-web-tot        "104">
 <!-- SSH server task -->
   <!ENTITY task-ssh-inst        "2">
-  <!ENTITY task-ssh-dl          "0">
-  <!ENTITY task-ssh-tot         "2">
+  <!ENTITY task-ssh-dl          "1">
+  <!ENTITY task-ssh-tot         "3">
 
-<!-- Size needed by base and gnome/kde desktop task for / with separate /usr, /var, /boot, for amd64 -->
-  <!ENTITY root-system-size-min     "250">
-  <!ENTITY root-system-size-max     "350">
+<!-- Size needed in MB by base + standard task for / with separate /var, /boot, for amd64 -->
+  <!ENTITY root-system-size-min     "600">
+  <!ENTITY root-system-size-max     "750">
+
+<!-- Size needed in GB by base and gnome/kde desktop task for / with separate /var, /boot, for amd64 -->
+  <!ENTITY root-desktop-system-size-min     "5">
+  <!ENTITY root-desktop-system-size-max     "6">
 
 <!-- number of packages, approx, in the main distribution -->
 <!-- use:
-     for i in binary-*; do echo -n "$i: "; zgrep '^Package:' ./binary-all/Packages.gz ./$i/Packages.gz | wc -l; done
+     coccia:/srv/ftp.debian.org/mirror/dists/testing/main% for i in binary-*; do echo -n "$i: "; zgrep '^Package:' ./binary-all/Packages.gz ./$i/Packages.gz | wc -l; done
 -->
-<!-- last updated: 2021-02-19 for Bullseye (Samuel Thibault) -->
+<!-- last updated: 2023-02-20 for Bullseye (Samuel Thibault) -->
 <!ENTITY num-of-distrib-pkgs
-  "<phrase arch='amd64'>87573</phrase>
-   <phrase arch='arm64'>86695</phrase>
-   <phrase arch='armel'>85052</phrase>
-   <phrase arch='armhf'>85593</phrase>
-   <phrase arch='i386'>87131</phrase>
-   <phrase arch='mips64el'>85348</phrase>
-   <phrase arch='mipsel'>85368</phrase>
-   <phrase arch='ppc64el'>86423</phrase>
-   <phrase arch='s390x'>85044</phrase>
+  "<phrase arch='amd64'>96607</phrase>
+   <phrase arch='arm64'>95584</phrase>
+   <phrase arch='armel'>93245</phrase>
+   <phrase arch='armhf'>93672</phrase>
+   <phrase arch='i386'>95821</phrase>
+   <phrase arch='mips64el'>93953</phrase>
+   <phrase arch='mipsel'>93732</phrase>
+   <phrase arch='ppc64el'>95196</phrase>
+   <phrase arch='s390x'>93368</phrase>
    ">
 
 <!-- Number of current Debian developers -->
@@ -169,13 +173,13 @@ to first switch tasksel to that DE using the following command, e.g:
 
 <!-- Number of current Debian maillists (see
      http://lists.debian.org/completeindex.html) -->
-<!ENTITY num-of-debian-maillists "322">
+<!ENTITY num-of-debian-maillists "327">
 
 <!-- version of X11 shipping with the current release, see version of the xorg package -->
 <!ENTITY x11ver "7.7">
 
 <!-- version of BRLTTY shipping with the current release, see version of the brltty package -->
-<!ENTITY brlttyver "6.3">
+<!ENTITY brlttyver "6.5">
 
 <!-- version of Speakup shipping with the current release, see version of the speakup-doc package -->
 <!ENTITY speakupver "3.1.6">
@@ -194,4 +198,4 @@ to first switch tasksel to that DE using the following command, e.g:
    "install.<filename arch='i386'>386</filename><filename arch='amd64'>amd</filename>">
 
 <!-- prefix for files that can be downloaded -->
-                          <!ENTITY downloadable-file "&url-debian-installer;">
+<!ENTITY downloadable-file "&url-debian-installer;">
diff --git a/debian/changelog b/debian/changelog
index 270874f82..9c7efebce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+installation-guide (20230216) UNRELEASED; urgency=medium
+
+  * Update figures. Update text about root vs /usr, as the latter is now
+    systematically in root.
+
+ -- Samuel Thibault <sthibault@debian.org>  Mon, 20 Feb 2023 23:09:12 +0100
+
 installation-guide (20230215) unstable; urgency=medium
 
   [ Holger Wansing ]
diff --git a/debian/copyright b/debian/copyright
index 82991bf3d..cd4922abd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
 The Installation Guide is copyright 1996 Bruce Perens; 1996, 1997 Sven Rudolph;
 1998 Igor Grobman, James Treacy; 1998-2002 Adam Di Carlo; 2003 Chris Tillman;
-2004-2021 by the Debian Installer team, and by other contributors. It is
+2004-2023 by the Debian Installer team, and by other contributors. It is
 licensed under the terms of the GNU GPL, version 2.
 
 A copy of the GPL is included in an appendix of the Installation Guide and can
diff --git a/en/partitioning/tree.xml b/en/partitioning/tree.xml
index b653527c2..27653e3aa 100644
--- a/en/partitioning/tree.xml
+++ b/en/partitioning/tree.xml
@@ -95,31 +95,13 @@ partitioning.
 
 The root partition <filename>/</filename> must always physically
 contain <filename>/etc</filename>, <filename>/bin</filename>,
-<filename>/sbin</filename>, <filename>/lib</filename> and
-<filename>/dev</filename>, otherwise you won't be able to boot.
-Typically &root-system-size-min;&ndash;&root-system-size-max;MB is needed for the root partition.
-
-</para></listitem>
-<listitem><para>
-
-<filename>/usr</filename>: contains all user programs
-(<filename>/usr/bin</filename>), libraries
-(<filename>/usr/lib</filename>), documentation
-(<filename>/usr/share/doc</filename>), etc.
-This is the part of the file system that generally takes up most space.
-You should provide at least 500MB of disk space. This amount should
-be increased depending on the number and type of packages you plan
-to install. A generous workstation or server installation should allow
-4&ndash;6GB.
-
-</para></listitem>
-<listitem><para>
-
-It is now recommended to have <filename>/usr</filename> on the 
-root partition <filename>/</filename>, otherwise it could 
-cause some trouble at boot time.
-This means that you should provide at least 600&ndash;750MB of disk space
-for the root partition including <filename>/usr</filename>, or 5&ndash;6GB 
+<filename>/sbin</filename>, <filename>/lib</filename>,
+<filename>/dev</filename> and <filename>/usr</filename>,
+otherwise you won't be able to boot.
+This means that you should provide at least
+&root-system-size-min;&ndash;&root-system-size-max;MB
+of disk space for the root partition including <filename>/usr</filename>, or
+&root-desktop-system-size-min;&ndash;&root-desktop-system-size-max;
 for a workstation or a server installation.
 
 </para></listitem>