Skip to content

Commit 2b1fa7a

Browse files
Merge pull request #9189 from ThomasWaldmann/backport-9188-to-1.4-maint
[1.4-maint] Backport PR #9188: docs: some fixes/update to the FAQ
2 parents 9ff4f5d + 3e7ecd6 commit 2b1fa7a

File tree

1 file changed

+8
-10
lines changed

1 file changed

+8
-10
lines changed

docs/faq.rst

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,8 @@ sure you have an up-to-date version of borgbackup if you want to continue
210210
instead of retransferring a huge file. In some cases, there is only an outdated
211211
version shipped with your distribution (e.g. Debian). See :ref:`installation`.
212212

213-
How can I backup huge file(s) over a unstable connection?
214-
---------------------------------------------------------
213+
How can I back up huge file(s) over an unstable connection?
214+
-----------------------------------------------------------
215215

216216
This is not a problem anymore.
217217

@@ -381,9 +381,7 @@ Checking processors
381381
operate hardware outside its specifications for productive use.
382382

383383
Tools to verify correct processor operation include Prime95 (mprime), linpack,
384-
and the `Intel Processor Diagnostic Tool
385-
<https://downloadcenter.intel.com/download/19792/Intel-Processor-Diagnostic-Tool>`_
386-
(applies only to Intel processors).
384+
and stress-ng.
387385

388386
.. rubric:: Repairing a damaged repository
389387

@@ -706,7 +704,7 @@ all your files/dirs data and metadata are stored in their encrypted form
706704
into the repository.
707705

708706
Yes, as an attacker with access to the remote server could delete (or
709-
otherwise make unavailable) all your backups.
707+
otherwise make unavailable) all your backups on that server.
710708

711709
How can I protect against a hacked backup client?
712710
-------------------------------------------------
@@ -962,16 +960,16 @@ Then you do the backup and look at the log output:
962960

963961
When borg runs inside a virtual machine, there are some more things to look at:
964962

965-
Some hypervisors (e.g. kvm on proxmox) give some broadly compatible CPU type to the
963+
Some hypervisors (e.g. kvm on older proxmox) give some broadly compatible CPU type to the
966964
VM (usually to ease migration between VM hosts of potentially different hardware CPUs).
967965

968966
It is broadly compatible because they leave away modern CPU features that could be
969967
not present in older or other CPUs, e.g. hardware acceleration for AES crypto, for
970968
sha2 hashes, for (P)CLMUL(QDQ) computations useful for crc32.
971969

972970
So, basically you pay for compatibility with bad performance. If you prefer better
973-
performance, you should try to expose the host CPU's misc. hw acceleration features
974-
to the VM which runs borg.
971+
performance, you should try to use the x86-64-v2-AES VCPU or the "host" VCPU,
972+
exposing misc. hw acceleration features to the VM which runs borg.
975973

976974
On Linux, check ``/proc/cpuinfo`` for the CPU flags inside the VM.
977975
For kvm check the docs about "Host model" and "Host passthrough".
@@ -1295,7 +1293,7 @@ Miscellaneous
12951293
macOS: borg mounts not shown in Finder's side bar
12961294
-------------------------------------------------
12971295

1298-
https://github.com/osxfuse/osxfuse/wiki/Mount-options#local
1296+
https://github.com/macfuse/macfuse/wiki/Mount-options#local
12991297

13001298
Read the above first and use this on your own risk::
13011299

0 commit comments

Comments
 (0)