hosts updates revision

docs/full_backups.md

@@ -7,6 +7,15 @@ You can schedule full backups of your VMs, by exporting them to the local XOA fi
 :::tip
 Full backups are space consuming! But they allow a very simple restoration without anything to think of (the file will contain all the VM disks and information). To use less space and data transferred, take a look at the [delta backups](delta_backups.md) feature.
 :::
+<<<<<<< HEAD
+## Backup without snapshot
+
+In some cases you will need to do a backup without doing a snapshot.  
+The most common use case for this is a large Vm on a small local SR where you just don't have the space to do a snapshot before backup .  
+So for that you need to open the advanced settings of your backup job, and check the offline backup check box.  
+
+![](./assets/backupnosnap.png)
+=======
 
 ## Backup without snapshot
 
@@ -16,3 +25,4 @@ The most common use case for this is a large VM on a small local SR where you ju
 So for that you need to open the advanced settings of your backup job, and check the offline backup check box:
 
 ![](./assets/backupnosnap.png)
+>>>>>>> b17ec9731a2f260fd35cfbdd66fc1462360a08fb

docs/manage_infrastructure.md

@@ -481,7 +481,7 @@ If you are behind a proxy, please update your `xo-server` configuration to add a
 ### Notes on patching
 
 - Xen Orchestra won't reboot your hosts automatically. That's your call to choose when to do it.
-- Patching doesn't always require rebooting. Check the "Guidance" row: if "restartHost" is displayed, it means you need to reboot to have the patch fully applied (see screenshot below)
+- Patching doesn't always require rebooting. Check in the host view if the reboot warning is displayed, it means you need to reboot to have the patch fully applied (see screenshot below)
 - XO will install all patches without rebooting: that's not an issue. Even applying patches manually, **it's not mandatory to reboot after each patch**.
 
 ![](./assets/xo5patching.png)
@@ -492,7 +492,7 @@ If you are behind a proxy, please update your `xo-server` configuration to add a
 As specified in the [documentation](https://xcp-ng.org/docs/requirements.html#pool-requirements) your pool shouldn't consist of hosts from different CPU vendors.
 :::
 ::: warning
-- Even with matching CPU vendors, in the case of different CPU models XCP-ng will scale the pool CPU ability to the CPU having the least instructions. 
+- Even with matching CPU vendors, in the case of different CPU models XCP-ng will scale the pool CPU ability to the CPU having the least instructions.
 - All the hosts in a pool must run the same XCP-ng version.
 :::
 ### Creating a pool
@@ -625,4 +625,4 @@ xscontainer-prepare-vm -v <VM_UUID> -u <username>
 
 :::tip
 Because "prepare-vm" is not exposed outside of the Dom0 (yet?), we can't use Xen Orchestra to give you a one-click solution as of now.
-:::
+:::