backup: clarify that CLI means FS-level and highlight retention-note

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

diff --git a/pve-faq.adoc b/pve-faq.adoc
index 9d1d708d0f18de4f30bd46602f39dfdf4079a03f..8e203f4c0176a5b2e8667a424d2fe56a4ae7f935 100644 (file)
--- a/pve-faq.adoc
+++ b/pve-faq.adoc
@@ -17,7 +17,7 @@ ADD NEW FAQS TO THE BOTTOM OF THIS SECTION TO MAINTAIN NUMBERING
 
 What distribution is {pve} based on?::
 
-{pve} is based on http://www.debian.org[Debian GNU/Linux]
+{pve} is based on https://www.debian.org[Debian GNU/Linux]
 
 What license does the {pve} project use?::
 
@@ -43,13 +43,14 @@ egrep '(vmx|svm)' /proc/cpuinfo
 Supported Intel CPUs::
 
 64-bit processors with
-http://en.wikipedia.org/wiki/Virtualization_Technology#Intel_virtualization_.28VT-x.29[Intel
-Virtualization Technology (Intel VT-x)] support. (http://ark.intel.com/search/advanced/?s=t&VTX=true&InstructionSet=64-bit[List of processors with Intel VT and 64-bit])
+https://en.wikipedia.org/wiki/Virtualization_Technology#Intel_virtualization_.28VT-x.29[Intel
+Virtualization Technology (Intel VT-x)] support.
+(https://ark.intel.com/content/www/us/en/ark/search/featurefilter.html?productType=873&2_VTX=True&2_InstructionSet=64-bit[List of processors with Intel VT and 64-bit])
 
 Supported AMD CPUs::
 
 64-bit processors with
-http://en.wikipedia.org/wiki/Virtualization_Technology#AMD_virtualization_.28AMD-V.29[AMD
+https://en.wikipedia.org/wiki/Virtualization_Technology#AMD_virtualization_.28AMD-V.29[AMD
 Virtualization Technology (AMD-V)] support.
 
 What is a container/virtual environment (VE)/virtual private server (VPS)?::
@@ -86,15 +87,16 @@ rolling release model and using the latest stable version is always
 recommended.
 +
 [width="100%",cols="5*d",options="header"]
-|===========================================================
-| {pve} Version | Debian Version    | First Release | Debian EOL | Proxmox EOL
-| {pve} 6.x     | Debian 10 (Buster)| 2019-07       | tba        | tba
-| {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} Version | Debian Version      | First Release | Debian EOL | Proxmox EOL
+| {pve} 7.x     | Debian 11 (Bullseye)| 2021-07       | 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
+|===============================================================================
 
 [[faq-upgrade]]
 How can I upgrade {pve} to the next release?::
@@ -119,6 +121,8 @@ 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_6.x_to_7.0[Upgrade from {pve} 6.x to 7.0]
+
 * 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_4.x_to_5.0[Upgrade from {pve} 4.x to 5.0]