X-Git-Url: https://git.proxmox.com/?p=pve-docs.git;a=blobdiff_plain;f=pve-faq.adoc;h=f5547ab3b7050ba92be2ef7d2a026ec52571bd24;hp=c412b05bf3efcfa37565d973962d196c61b67c9e;hb=508a8bd7f8b8925766b3a074241fde09c8fb35d8;hpb=8e5f15bedc5e7ac0785e289949fe304e95b8b260

diff --git a/pve-faq.adoc b/pve-faq.adoc
index c412b05..f5547ab 100644
--- a/pve-faq.adoc
+++ b/pve-faq.adoc
@@ -1,6 +1,11 @@
 Frequently Asked Questions
 ==========================
-include::attributes.txt[]
+ifndef::manvolnum[]
+:pve-toplevel:
+endif::manvolnum[]
+ifdef::wiki[]
+:title: FAQ
+endif::wiki[]
 
 NOTE: New FAQs are appended to the bottom of this section.
 
@@ -21,15 +26,15 @@ version 3.
 
 Will {pve} run on a 32bit processor?::
 
-{pve} works only on 64-bit CPU´s (AMD or Intel). There is no plan
+{pve} works only on 64-bit CPUs (AMD or Intel). There is no plan
 for 32-bit for the platform.
 +
 NOTE: VMs and Containers can be both 32-bit and/or 64-bit.
 
 Does my CPU support virtualization?::
 
-To check if your CPU is virtualization compatible, check for the "vmx"
-or "svm" tag in this command output:
+To check if your CPU is virtualization compatible, check for the `vmx`
+or `svm` tag in this command output:
 +
 ----
 egrep '(vmx|svm)' /proc/cpuinfo
@@ -69,6 +74,7 @@ CPU.
 It is not limited to Linux guests but allows arbitrary operating systems
 to run.
 
+[[faq-support-table]]
 How long will my {pve} version be supported?::
 
 {pve} versions are supported at least as long as the corresponding
@@ -80,12 +86,40 @@ recommended.
 [width="100%",cols="5*d",options="header"]
 |===========================================================
 | {pve} Version | Debian Version    | First Release | Debian EOL | Proxmox EOL
-| {pve} 4.x     | Debian 8 (Jessie) | 2015-10       | 2018-05    | tba
+| {pve} 5.x     | Debian 9 (Stretch)| 2017-07       | tba        | tba
+| {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?::
+
+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:
++
+----
+apt update
+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.
++
+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:
++
+* 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_3.x_to_4.0[Upgrade from {pve} 3.x to 4.0]
+
 LXC vs LXD vs Proxmox Containers vs Docker::
 
 LXC is a userspace interface for the Linux kernel containment
@@ -96,14 +130,14 @@ complete OS inside a container, where you log in as ssh, add users,
 run apache, etc...
 +
 LXD is building on top of LXC to provide a new, better user
-experience. Under the hood, LXD uses LXC through 'liblxc' and its Go
+experience. Under the hood, LXD uses LXC through `liblxc` and its Go
 binding to create and manage the containers. It's basically an
 alternative to LXC's tools and distribution template system with the
 added features that come from being controllable over the network.
 +
 Proxmox Containers also aims at *system virtualization*, and thus uses
 LXC as the basis of its own container offer. The Proxmox Container
-Toolkit is called 'pct', and is tightly coupled with {pve}. That means
+Toolkit is called `pct`, and is tightly coupled with {pve}. That means
 that it is aware of the cluster setup, and it can use the same network
 and storage resources as fully virtualized VMs. You can even use the
 {pve} firewall, create and restore backups, or manage containers using