diff options
| author | Joerg Steffens <joerg.steffens@bareos.com> | 2017-10-12 17:28:09 +0300 |
|---|---|---|
| committer | Joerg Steffens <joerg.steffens@bareos.com> | 2017-10-12 17:28:09 +0300 |
| commit | 757b863fe3171a85fe82cd49bd119a842bab0674 (patch) | |
| tree | 8dce86e5951c8fe755b50e4c7aa3bb11c9dec4bb | |
| parent | a5ebfa4f06101990a2ad935998d4d8afb6ce5832 (diff) | |
| parent | abde7a4a86e9bbb25dfeeff9ff4f18d1e899b0d5 (diff) | |
Merge branch 'bareos-16.2' into bareos-17.2
| -rw-r--r-- | manuals/en/main/bareos.sty | 4 | ||||
| -rw-r--r-- | manuals/en/main/plugins-vmware-plugin.tex | 8 | ||||
| -rw-r--r-- | manuals/en/main/releasenotes.tex | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/manuals/en/main/bareos.sty b/manuals/en/main/bareos.sty index aa43555..18fa4b9 100644 --- a/manuals/en/main/bareos.sty +++ b/manuals/en/main/bareos.sty @@ -258,8 +258,8 @@ \newcommand{\mysql}{MySQL/MariaDB\xspace} \newcommand{\postgresql}{PostgreSQL\xspace} \newcommand{\sqlite}{Sqlite\xspace} -\newcommand{\vmware}{VMware\registered} -\newcommand{\vSphere}{VMware vSphere\registered} +\newcommand{\vmware}{VMware\registered\xspace} +\newcommand{\vSphere}{VMware vSphere\registered\xspace} % NDMP \newcommand{\DataManagementAgent}{Data Management Agent\xspace} diff --git a/manuals/en/main/plugins-vmware-plugin.tex b/manuals/en/main/plugins-vmware-plugin.tex index 9cabf9b..484ba35 100644 --- a/manuals/en/main/plugins-vmware-plugin.tex +++ b/manuals/en/main/plugins-vmware-plugin.tex @@ -36,10 +36,10 @@ Current limitations amongst others are: it is also possible to restore to local VMDK files, see below for more details.} \subsubsection{Requirements} -As the Plugin is based on the \vSphere\ Storage APIs for Data Protection, -which requires at least a \vSphere\ Essentials License. -It does not work with standalone unlicensed -VMware® ESXi\trademark. +As the Plugin is based on the \vSphere Storage APIs for Data Protection, +which requires at least a \vSphere Essentials License. +It is tested against \vSphere Storage APIs for Data Protection of \vmware 5.x. +It does not work with standalone unlicensed \vmware ESXi\trademark. \subsubsection{Installation} diff --git a/manuals/en/main/releasenotes.tex b/manuals/en/main/releasenotes.tex index 9716a54..66a5f0e 100644 --- a/manuals/en/main/releasenotes.tex +++ b/manuals/en/main/releasenotes.tex @@ -59,7 +59,7 @@ This release contains several bugfixes and enhancements. Excerpt: \item Windows: fixes silent upgrade (\command{winbareos-*.exe /S}) \item Windows: restore attributes also on directories (not only on files) \item Fixes problem with SHA1 signature when compiled without OpenSSL (not relevant for bareos.org/bareos.com packages) - \item Packages for openSUSE Leap 42.3 have been added. + \item Packages for openSUSE Leap 42.3 and Fedora 26 have been added. \end{itemize} } |