Merge branch 'master' into update-nf-training

nextflow-io · Jun 18, 2024 · d454393 · d454393
2 parents f810a52 + bbda37f
commit d454393
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/docs/basic_training/executors.fr.md b/docs/basic_training/executors.fr.md
@@ -282,7 +282,7 @@ aws.batch.cliPath = '/home/ec2-user/miniconda/bin/aws' // (6)!
     nextflow run script7.nf -profile amazon
     ```
 
-Les détails complets sur le déploiement par lots d'AWS sont disponibles sur [ce lien](https://www.nextflow.io/docs/latest/awscloud.html#aws-batch).
+Les détails complets sur le déploiement par lots d'AWS sont disponibles sur [ce lien](https://www.nextflow.io/docs/latest/aws.html#aws-batch).
 
 ## Montages des volumes
 
@@ -396,7 +396,7 @@ Nextflow permet l'utilisation de plusieurs exécuteurs dans la même application
 
 Pour activer cette fonctionnalité, utilisez un ou plusieurs [selecteur de processes](https://www.nextflow.io/docs/latest/config.html#config-process-selectors) dans votre fichier de configuration Nextflow.
 
-Par exemple, appliquez la [configuration AWS Batch](https://www.nextflow.io/docs/latest/awscloud.html#awscloud-batch-config) uniquement à un sous-ensemble de processus dans votre flux de travail. Vous pouvez essayer ce qui suit :
+Par exemple, appliquez la [configuration AWS Batch](https://www.nextflow.io/docs/latest/aws.html#configuration) uniquement à un sous-ensemble de processus dans votre flux de travail. Vous pouvez essayer ce qui suit :
 
 ```groovy linenums="1"
 process {

diff --git a/docs/basic_training/executors.md b/docs/basic_training/executors.md
@@ -274,7 +274,7 @@ aws.batch.cliPath = '/home/ec2-user/miniconda/bin/aws' // (6)!
     nextflow run script7.nf -profile amazon
     ```
 
-The complete details about AWS Batch deployment are available at [this link](https://www.nextflow.io/docs/latest/awscloud.html#aws-batch).
+The complete details about AWS Batch deployment are available at [this link](https://www.nextflow.io/docs/latest/aws.html#aws-batch).
 
 !!! cboard-list-2 "Summary"
 
@@ -409,7 +409,9 @@ Nextflow allows the use of multiple executors in the same workflow application.
 
 To enable this feature use one or more [process selectors](https://www.nextflow.io/docs/latest/config.html#config-process-selectors) in your Nextflow configuration file.
 
-For example, apply the [AWS Batch configuration](https://www.nextflow.io/docs/latest/awscloud.html#awscloud-batch-config) only to a subset of processes in your workflow. You can try the following:
+When running a hybrid workflow, `-bucket-dir` and `-work-dir` should be used to define separate work directories for remote tasks and local tasks, respectively.
+
+For example, apply the [AWS Batch configuration](https://www.nextflow.io/docs/latest/aws.html#configuration) only to a subset of processes in your workflow. You can try the following:
 
 ```groovy linenums="1" title="nextflow.config"
 process {
@@ -436,6 +438,12 @@ aws {
 6. Set the container image to deploy for the process(es) with the `bigTask` label
 7. Define the region for Batch execution
 
+The workflow can then be executed with:
+
+```bash
+nextflow run <script> -bucket-dir 's3://my-bucket' -work-dir /path/to/scratch/dir
+```
+
 !!! cboard-list-2 "Summary"
 
     In this step you have learned:

diff --git a/docs/basic_training/executors.pt.md b/docs/basic_training/executors.pt.md
@@ -281,7 +281,7 @@ aws.batch.cliPath = '/home/ec2-user/miniconda/bin/aws' // (6)!
     nextflow run script7.nf -profile amazon
     ```
 
-Os detalhes completos sobre a implantação no AWS Batch estão disponíveis [nesse link](https://www.nextflow.io/docs/latest/awscloud.html#aws-batch).
+Os detalhes completos sobre a implantação no AWS Batch estão disponíveis [nesse link](https://www.nextflow.io/docs/latest/aws.html#aws-batch).
 
 ## Montagens de volume
 
@@ -395,7 +395,7 @@ O Nextflow permite o uso de vários executores na mesma aplicação do fluxo de
 
 Para ativar esse recurso, use um ou mais [seletores de processo](https://www.nextflow.io/docs/latest/config.html#config-process-selectors) em seu arquivo de configuração do Nextflow.
 
-Por exemplo, aplique a [configuração do AWS Batch](https://www.nextflow.io/docs/latest/awscloud.html#awscloud-batch-config) apenas a um subconjunto de processos em seu fluxo de trabalho. Você pode tentar o seguinte:
+Por exemplo, aplique a [configuração do AWS Batch](https://www.nextflow.io/docs/latest/aws.html#configuration) apenas a um subconjunto de processos em seu fluxo de trabalho. Você pode tentar o seguinte:
 
 ```groovy linenums="1"
 process {

diff --git a/docs/basic_training/groovy.md b/docs/basic_training/groovy.md
@@ -260,7 +260,7 @@ println '$x $y'
 
 ```console title="Output"
 The quick brown fox
-$x + $y
+$x $y
 ```
 
 !!! info
@@ -270,7 +270,7 @@ $x + $y
 
 !!! question "Exercise"
 
-    Modify the script above to print `Hello World` instead of `$x + $y`.
+    Modify the script above to print `Hello World` instead of `$x $y`.
 
     ??? Solution