Merge remote-tracking branch 'origin/dev-thomas-1.1.0' into dev-denys…

…-1.1.0
dlr-eoc · Aug 9, 2024 · d271ffe · d271ffe
2 parents 5489b76 + 9f2d8d5
commit d271ffe
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,4 @@ bin/
 **/*~
 **/.DS_Store
 /integration-tests
+/dev/
diff --git a/ui/cli/src/main/resources/ui-cli-syntax.yml b/ui/cli/src/main/resources/ui-cli-syntax.yml
@@ -8,7 +8,7 @@ description: |
     command [subcommand...] [option...] [parameter...]
   
   Commands can be entered after the "prosEO>" command prompt. They can also be invoked on the shell command line 
-  following the name of the prosEO executable (e. g. "proseo") and at least one whitespace character.
+  following the CLI execution command (e. g. "java -jar proseo-ui-cli.jar") and at least one whitespace character.
   
   Commands may have subcommands, which precede all options and parameters.
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,3 +10,4 @@ bin/ @@
     **/*~
     **/.DS_Store
     /integration-tests
+    /dev/