Skip to content

Commit 2cff040

Browse files
committed
Remove essential and advanced topics, merge into single topics category
1 parent b82853c commit 2cff040

26 files changed

+41
-69
lines changed

src/advanced-topics/index.md

Lines changed: 0 additions & 31 deletions
This file was deleted.

src/conf.py

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -93,33 +93,33 @@
9393
redirects = {
9494
'01-introduction/index.md': '../introduction/quick-start.html',
9595
'02-1st-example/index.md': '../introduction/quick-start.html',
96-
'03-input/index.md': '../essential-topics/inputs.html',
97-
'04-output/index.md': '../essential-topics/outputs.html',
98-
'05-stdout/index.md': '../essential-topics/outputs.html',
99-
'06-params/index.md': '../essential-topics/parameter-references.html',
100-
'07-containers/index.md': '../advanced-topics/using-containers.html',
101-
'08-arguments/index.md': '../essential-topics/additional-arguments-and-parameters.html',
102-
'09-array-inputs/index.md': '../essential-topics/inputs.html',
103-
'10-array-outputs/index.md': '../essential-topics/outputs.html',
104-
'11-records/index.md': '../essential-topics/inputs.html',
105-
'12-env/index.md': '../essential-topics/environment-variables.html',
106-
'13-expressions/index.md': '../essential-topics/expressions.html',
107-
'14-runtime/index.md': '../advanced-topics/creating-files-at-runtime.html',
108-
'15-staging/index.md': '../advanced-topics/staging-input-files.html',
109-
'16-file-formats/index.md': '../advanced-topics/file-formats.html',
110-
'17-metadata/index.md': '../advanced-topics/metadata-and-authorship.html',
111-
'19-custom-types/index.md': '../essential-topics/custom-types.html',
112-
'20-software-requirements/index.md': '../advanced-topics/specifying-software-requirements.html',
113-
'21-1st-workflow/index.md': '../essential-topics/workflows.html',
114-
'22-nested-workflows/index.md': '../essential-topics/workflows.html#nested-workflows',
115-
'23-scatter-workflow/index.md': '../essential-topics/workflows.html#scattering-workflows',
116-
'24_conditional-workflow/index.md': '../essential-topics/workflows.html#conditional-workflows',
117-
'rec-practices/index.md': '../advanced-topics/best-practices.html',
96+
'03-input/index.md': '../topics/inputs.html',
97+
'04-output/index.md': '../topics/outputs.html',
98+
'05-stdout/index.md': '../topics/outputs.html',
99+
'06-params/index.md': '../topics/parameter-references.html',
100+
'07-containers/index.md': '../topics/using-containers.html',
101+
'08-arguments/index.md': '../topics/additional-arguments-and-parameters.html',
102+
'09-array-inputs/index.md': '../topics/inputs.html',
103+
'10-array-outputs/index.md': '../topics/outputs.html',
104+
'11-records/index.md': '../topics/inputs.html',
105+
'12-env/index.md': '../topics/environment-variables.html',
106+
'13-expressions/index.md': '../topics/expressions.html',
107+
'14-runtime/index.md': '../topics/creating-files-at-runtime.html',
108+
'15-staging/index.md': '../topics/staging-input-files.html',
109+
'16-file-formats/index.md': '../topics/file-formats.html',
110+
'17-metadata/index.md': '../topics/metadata-and-authorship.html',
111+
'19-custom-types/index.md': '../topics/custom-types.html',
112+
'20-software-requirements/index.md': '../topics/specifying-software-requirements.html',
113+
'21-1st-workflow/index.md': '../topics/workflows.html',
114+
'22-nested-workflows/index.md': '../topics/workflows.html#nested-workflows',
115+
'23-scatter-workflow/index.md': '../topics/workflows.html#scattering-workflows',
116+
'24_conditional-workflow/index.md': '../topics/workflows.html#conditional-workflows',
117+
'rec-practices/index.md': '../topics/best-practices.html',
118118
'misc/index.md': '../faq.html',
119119
'episodes.md': 'index.html#table-of-contents',
120120
'setup.md': 'introduction/prerequisites.html',
121121
'extras.md': '/index.html',
122-
'yaml/index.md': '../essential-topics/yaml-guide.html',
122+
'yaml/index.md': '../topics/yaml-guide.html',
123123
'CODE_OF_CONDUCT.html': 'https://github.com/common-workflow-language/user_guide/blob/main/CODE_OF_CONDUCT.md'
124124
}
125125

src/index.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ each page.
1717

1818
If you are a beginner user get started with the [Introduction](/introduction/index.md)
1919
section. For advanced users the subsections of the
20-
[Core Concepts](/essential-topics/index.md) have detailed information about the
20+
[Core Concepts](/topics/index.md) have detailed information about the
2121
most common topics for CWL.
2222

2323
The Table of Contents is displayed at the top menu and also on the left sidebar.
@@ -32,8 +32,7 @@ the left sidebar.
3232
:numbered:
3333
3434
introduction/index.md
35-
essential-topics/index.md
36-
advanced-topics/index.md
35+
topics/index.md
3736
tutorials.md
3837
faq.md
3938
LICENSE.md

src/introduction/basic-concepts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,4 +181,4 @@ vendors.
181181
- The current CWL specification on GitHub: {{ '<https://github.com/common-workflow-language/cwl-{}>'.format(cwl_version_text) }}
182182
- The list of Implementations in the CWL website: <https://www.commonwl.org/implementations/>
183183
- PROV-O: The PROV Ontology - <https://www.w3.org/TR/prov-o/>
184-
- CWL Operations are covered in the [Operations](../essential-topics/operations.md) section of this user guide.
184+
- CWL Operations are covered in the [Operations](../topics/operations.md) section of this user guide.

src/introduction/quick-start.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ must be comfortable following instructions for the command-line.
99
```{include} /_includes/what-is-cwl.md
1010
```
1111

12-
CWL documents are written in [YAML](../essential-topics/index.md) (and/or JSON).
12+
CWL documents are written in [YAML](../topics/index.md) (and/or JSON).
1313
The example below shows a simple CWL “Hello World” workflow annotated
1414
with comments:
1515

File renamed without changes.

src/essential-topics/command-line-tool.md renamed to src/topics/command-line-tool.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ outputs:
7272
```{note}
7373
7474
The example above uses a simplified form to define inputs and outputs.
75-
You will learn more about in the [Inputs](../essential-topics/inputs.md)
76-
and in the [Outputs](../essential-topics/outputs.md) sections.
75+
You will learn more about in the [Inputs](../topics/inputs.md)
76+
and in the [Outputs](../topics/outputs.md) sections.
7777
```
7878

7979
% TODO

src/advanced-topics/creating-files-at-runtime.md renamed to src/topics/creating-files-at-runtime.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ To generate such files we can use the `InitialWorkDirRequirement`.
1212
:name: createfile.cwl
1313
```
1414

15-
Any [expressions](../essential-topics/expressions.md) like `$(inputs.message)` are
15+
Any [expressions](../topics/expressions.md) like `$(inputs.message)` are
1616
expanded by the CWL engine before creating the file;
1717
here inserting the value at the input `message`.
1818

@@ -48,7 +48,7 @@ which is YAML quoting syntax, and means that you are using a multiline string
4848

4949
```{note}
5050
51-
See the [YAML Guide](../essential-topics/yaml-guide.md#maps) for more about the formatting.
51+
See the [YAML Guide](../topics/yaml-guide.md#maps) for more about the formatting.
5252
```
5353

5454
Now invoke `cwl-runner` with the tool wrapper and the input object on the
File renamed without changes.

src/essential-topics/expressions.md renamed to src/topics/expressions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ JavaScript expressions should only be used when absolutely necessary.
1010
When manipulating file names, extensions, paths etc, consider whether one of the
1111
[built in `File` properties][file-prop] like `basename`, `nameroot`, `nameext`,
1212
etc, could be used instead.
13-
See the [list of best practices](../advanced-topics/best-practices).
13+
See the [list of best practices](best-practices.md).
1414
1515
```{literalinclude} /_includes/cwl/13-expressions/expression.cwl
1616
:language: cwl
File renamed without changes.

src/essential-topics/index.md renamed to src/topics/index.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
# Essential Topics
2-
3-
In this section you will find fundamental concepts for CWL. This content
4-
should be enough to get you started reading and writing CWL workflows.
1+
# Topics
52

63
```{toctree}
74
:maxdepth: 2
@@ -17,4 +14,11 @@ expression-tool.md
1714
workflows.md
1815
operations.md
1916
environment-variables.md
17+
using-containers.md
18+
creating-files-at-runtime.md
19+
staging-input-files.md
20+
best-practices.md
21+
file-formats.md
22+
metadata-and-authorship.md
23+
specifying-software-requirements.md
2024
```

src/essential-topics/inputs.md renamed to src/topics/inputs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ parameter were not provided in the input, nothing would appear on the
123123
command line.
124124

125125
Input files are read-only. If you wish to update an input file, you must
126-
[first copy it to the output directory](../advanced-topics/staging-input-files.md).
126+
[first copy it to the output directory](staging-input-files.md).
127127

128128
The value of `position` is used to determine where parameter should
129129
appear on the command line. Positions are relative to one another, not
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)