Merge branch 'master' of https://gitlab.unimelb.edu.au/resplat-mediaflux/unimelb-mf-clients.git

src/main/java/unimelb/mf/client/sync/cli/MFUpload.java

@@ -49,7 +49,7 @@ public class MFUpload extends MFSyncApp {
         System.out.println("    Upload local files to Mediaflux.  If the file pre-exists in Mediaflux and is the same as that being uploaded, the Mediaflux asset is not modified. However, if the files differ, a new version of the asset will be created. In Daemon mode, the process will only upload new files since the process last executed.");
         System.out.println();
         System.out.println("OPTIONS:");
-        System.out.println("    --config <config.xml>                     A single configuration file including all required settings (Mediaflux server details, user credentials, application settings). If conflicts with all the other options.");
+        System.out.println("    --config <config.xml>                     A single configuration file including all required settings (Mediaflux server details, user credentials, application settings). If supplied, all other configuration options are ignored.");
         System.out.println();
         System.out.println("    --mf.config <mflux.cfg>                   Path to the config file that contains Mediaflux server details and user credentials.");
         System.out.println("    --mf.host <host>                          Mediaflux server host.");