X-Git-Url: https://git.proxmox.com/?p=pve-docs.git;a=blobdiff_plain;f=pve-faq.adoc;h=f5547ab3b7050ba92be2ef7d2a026ec52571bd24;hp=82709093e0ae8c151e653cc62bdee88538b37731;hb=7d6078845fa6a3bd308c7dc843273e56be33f315;hpb=92a08560ce4de841db4a69b9b938677299aebac2

diff --git a/pve-faq.adoc b/pve-faq.adoc
index 8270909..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,36 +86,68 @@ 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
-features. Through a powerful API and simple tools, it lets Linux users easily
-create and manage system containers.
-+
-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 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.
+features. Through a powerful API and simple tools, it lets Linux users
+easily create and manage system containers. LXC, as well as the former
+OpenVZ, aims at *system virtualization*, i.e. allows you to run a
+complete OS inside a container, where you log in as ssh, add users,
+run apache, etc...
 +
-LXC, as well as the former OpenVZ, aims at *system virtualization*, ie
-allows you to run a 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
+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 VE aims at system virtualization, and thus uses LXC as the basis of its
-own container offer. LXC provides countless options, and it would be too
-difficult to use LXC tools directly. Instead, we provide a small wrapper called
-`pct`, the "Proxmox Container Toolkit", using LXC as a low-level library.
+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
+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
+the HA framework. Everything can be controlled over the network using
+the {pve} API.
 +
 Docker aims at running a *single* application running in a contained
 environment. Hence you're managing a docker instance from the host with the
-docker toolkit.
+docker toolkit. It is not recommended to run docker directly on your
+{pve} host.
 +
 NOTE: You can however perfectly install and use docker inside a Proxmox Qemu
 VM, and thus getting the benefit of software containerization with the very