totp: fix copy/paste mistake

[pve-docs.git] / pve-faq.adoc

diff --git a/pve-faq.adoc b/pve-faq.adoc
index 343a6e92f5d84b4675fe73580c9157473042fb9f..6f39c3d78b1dd3e6c12fbc6dc23f7fb26b737f22 100644 (file)
--- a/pve-faq.adoc
+++ b/pve-faq.adoc
@@ -89,21 +89,26 @@ recommended.
 [width="100%",cols="5*d",options="header"]
 |===============================================================================
 | {pve} Version | Debian Version      | First Release | Debian EOL | Proxmox EOL
-| {pve} 7.x     | Debian 11 (Bullseye)| tba           | tba        | tba
-| {pve} 6.x     | Debian 10 (Buster)  | 2019-07       | 2022-07    | 2022-07
-| {pve} 5.x     | Debian 9 (Stretch)  | 2017-07       | 2020-07    | 2020-07
-| {pve} 4.x     | Debian 8 (Jessie)   | 2015-10       | 2018-06    | 2018-06
-| {pve} 3.x     | Debian 7 (Wheezy)   | 2013-05       | 2016-04    | 2017-02
-| {pve} 2.x     | Debian 6 (Squeeze)  | 2012-04       | 2014-05    | 2014-05
-| {pve} 1.x     | Debian 5 (Lenny)    | 2008-10       | 2012-03    | 2013-01
+| {pve} 8       | Debian 12 (Bookworm)| 2023-06       | tba        | tba
+| {pve} 7       | Debian 11 (Bullseye)| 2021-07       | 2024-07    | 2024-07
+| {pve} 6       | Debian 10 (Buster)  | 2019-07       | 2022-09    | 2022-09
+| {pve} 5       | Debian 9 (Stretch)  | 2017-07       | 2020-07    | 2020-07
+| {pve} 4       | Debian 8 (Jessie)   | 2015-10       | 2018-06    | 2018-06
+| {pve} 3       | Debian 7 (Wheezy)   | 2013-05       | 2016-04    | 2017-02
+| {pve} 2       | Debian 6 (Squeeze)  | 2012-04       | 2014-05    | 2014-05
+| {pve} 1       | Debian 5 (Lenny)    | 2008-10       | 2012-03    | 2013-01
 |===============================================================================
 
 [[faq-upgrade]]
-How can I upgrade {pve} to the next release?::
+How can I upgrade {pve} to the next point release?::
 
-Minor version upgrades, for example upgrading from {pve} in version 5.1
-to 5.2, can be done just like any normal update, either through the Web
-GUI __Node -> Updates__ panel or through the CLI with:
+Minor version upgrades, for example upgrading from {pve} in version 7.1
+to 7.2 or 7.3, can be done just like any normal update.
+But you should still check the https://pve.proxmox.com/wiki/Roadmap[release notes]
+for any relevant noteable, or breaking change.
++
+For the update itself use either the Web UI __Node -> Updates__ panel or
+through the CLI with:
 +
 ----
 apt update
@@ -113,21 +118,27 @@ apt full-upgrade
 NOTE: Always ensure you correctly setup the
 xref:sysadmin_package_repositories[package repositories] and only
 continue with the actual upgrade if `apt update` did not hit any error.
+
+[[faq-upgrade-major]]
+How can I upgrade {pve} to the next major release?::
+
+Major version upgrades, for example going from {pve} 4.4 to 5.0, are also
+supported.
+They must be carefully planned and tested and should *never* be started without
+having a current backup ready.
 +
-Major version upgrades, for example going from {pve} 4.4 to 5.0, are
-also supported. They must be carefully planned and tested and should
-*never* be started without having a current backup ready.
-Although the specific upgrade steps depend on your respective setup, we
-provide general instructions and advice of how a upgrade should be
-performed:
+Although the specific upgrade steps depend on your respective setup, we provide
+general instructions and advice of how a upgrade should be performed:
 +
-* https://pve.proxmox.com/wiki/Upgrade_from_5.x_to_6.0[Upgrade from {pve} 6.x to 7.0]
+* https://pve.proxmox.com/wiki/Upgrade_from_7_to_8[Upgrade from {pve} 7 to 8]
+
+* https://pve.proxmox.com/wiki/Upgrade_from_6.x_to_7.0[Upgrade from {pve} 6 to 7]
 
-* https://pve.proxmox.com/wiki/Upgrade_from_5.x_to_6.0[Upgrade from {pve} 5.x to 6.0]
+* https://pve.proxmox.com/wiki/Upgrade_from_5.x_to_6.0[Upgrade from {pve} 5 to 6]
 
-* https://pve.proxmox.com/wiki/Upgrade_from_4.x_to_5.0[Upgrade from {pve} 4.x to 5.0]
+* https://pve.proxmox.com/wiki/Upgrade_from_4.x_to_5.0[Upgrade from {pve} 4 to 5]
 
-* https://pve.proxmox.com/wiki/Upgrade_from_3.x_to_4.0[Upgrade from {pve} 3.x to 4.0]
+* https://pve.proxmox.com/wiki/Upgrade_from_3.x_to_4.0[Upgrade from {pve} 3 to 4]
 
 LXC vs LXD vs Proxmox Containers vs Docker::
 
@@ -157,8 +168,8 @@ the {pve} API.
 Docker aims at running a *single* application in an isolated, self-contained
 environment. These are generally referred to as ``Application Containers'', rather
 than ``System Containers''. You manage a Docker instance from the host, using the
-Docker Engine command line interface. It is not recommended to run docker
+Docker Engine command-line interface. It is not recommended to run docker
 directly on your {pve} host.
 +
 NOTE: If you want to run application containers, for example, 'Docker' images, it
-is best to run them inside a Proxmox Qemu VM.
+is best to run them inside a Proxmox QEMU VM.