Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop

diff --git a/doc/building.md b/doc/building.md
index cc3d7f2..5f5fa6d 100644 (file)
--- a/doc/building.md
+++ b/doc/building.md
@@ -24,7 +24,7 @@ java -jar getdown-launcher.jar . jalview
 The method here is described in terms of using a command line.  You can easily do this on linux or in a Terminal window in macOS.  You can do it in Windows.
 
 * Java 11 compliant JDK
-* gradle 5.1 or above
+* gradle 5.2 or above
 * git
 
 > The versions and installation methods here are just suggestions (which we have tested 

diff --git a/help/help/html/features/jvlfiles.html b/help/help/html/features/jvlfiles.html
index 15df5d4..8661860 100644 (file)
--- a/help/help/html/features/jvlfiles.html
+++ b/help/help/html/features/jvlfiles.html
@@ -39,7 +39,7 @@
     text editor and save them as a file with the extension '.jvl'. To
     test, open your saved .jvl file via the OSX File Chooser or Windows
     file explorer, or pass it to Jalview via the <a
-      href="../commandline.html">command line</a>
+      href="./commandline.html">command line</a>
   </p>
   <p>
     <strong>Passing command line arguments</strong>