diff --git a/doc/xml/release.xml b/doc/xml/release.xml index 5a9ca0f66..74e29c13c 100644 --- a/doc/xml/release.xml +++ b/doc/xml/release.xml @@ -186,6 +186,14 @@ + + + + Debian/Ubuntu documentation now builds on Ubuntu 16. + + + + diff --git a/doc/xml/user-guide.xml b/doc/xml/user-guide.xml index 85e709cc3..6fc314464 100644 --- a/doc/xml/user-guide.xml +++ b/doc/xml/user-guide.xml @@ -67,7 +67,7 @@ {[db-path]}/recovery.conf - u14 + u16 co6 use English; getpwuid($UID) eq 'root' ? 'ubuntu' : getpwuid($UID) . '' diff --git a/test/travis.pl b/test/travis.pl index 465a00bf1..2fdd057e3 100755 --- a/test/travis.pl +++ b/test/travis.pl @@ -122,8 +122,8 @@ eval executeTest("${strTestExe} --vm-build --vm=" . VM_CO6, {bShowOutputAsync => true}); processEnd(); - processBegin(VM_U14 . ' build'); - executeTest("${strTestExe} --vm-build --vm=" . VM_U14, {bShowOutputAsync => true}); + processBegin(VM_U16 . ' build'); + executeTest("${strTestExe} --vm-build --vm=" . VM_U16, {bShowOutputAsync => true}); processEnd(); processBegin('release documentation doc'); @@ -156,7 +156,7 @@ eval processBegin("${strVm} test" . (defined($strParam) ? ": ${strParam}" : '')); executeTest( - "${strTestExe} --vm-host=u14 --vm-max=2 --vm=${strVm}" . (defined($strParam) ? " ${strParam}" : ''), + "${strTestExe} --vm-host=" . VM_U14 . " --vm-max=2 --vm=${strVm}" . (defined($strParam) ? " ${strParam}" : ''), {bShowOutputAsync => true}); processEnd(); }
Debian/Ubuntu documentation now builds on Ubuntu 16.