Merge branch 'bareos-16.2' into bareos-17.2

bareos · Oct 12, 2017 · 757b863 · 757b863
2 parents a5ebfa4 + abde7a4
commit 757b863
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -36,10 +36,10 @@ \subsubsection{Status}
     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
@@ -59,7 +59,7 @@
     \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}
 
 }