Skip to content

Commit cbfa491

Browse files
authored
Made docs adhere to style guide (#51)
* made docs adhere to style guide * formatting change * more doc changes * changed toc b/c renamed doc; more doc changes * final doc changes Co-authored-by: jc-berger <>
1 parent 364f205 commit cbfa491

9 files changed

+60
-75
lines changed

docs/modules/user-guide/nav.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
1717
** xref:adding-attributes-to-a-devfile.adoc[]
1818
** xref:adding-event-bindings.adoc[]
19-
** xref:refering-to-a-parent-devfile-in-a-devfile.adoc[]
19+
** xref:referring-to-a-parent-devfile-in-a-devfile.adoc[]
2020
2121
* xref:migrating-to-devfile-v2.adoc[]
2222
** xref:migrating-schema-version.adoc[]
@@ -25,7 +25,7 @@
2525
** xref:migrating-plug-ins.adoc[]
2626
** xref:migrating-commands.adoc[]
2727
** xref:adding-event-bindings.adoc[]
28-
** xref:refering-to-a-parent-devfile-in-a-devfile.adoc[]
28+
** xref:referring-to-a-parent-devfile-in-a-devfile.adoc[]
2929
3030
* xref:api-reference.adoc[]
3131
* xref:devfile-samples.adoc[]

docs/modules/user-guide/partials/assembly_migrating-to-devfile-v2.adoc

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ endif::[]
1111

1212
:context: assembly_migrating-to-devfile-v2
1313

14-
This guide explains how to migrate an existing v1.0 devfile to v2.0.
14+
The following documents explain how to migrate an existing v1.x devfile to a v2.x devfile:
1515

1616
* xref:migrating-schema-version.adoc[]
1717
* xref:migrating-projects.adoc[]
@@ -24,10 +24,11 @@ This guide explains how to migrate an existing v1.0 devfile to v2.0.
2424
[role="_additional-resources"]
2525
.Additional resources
2626

27-
* New metadata: `version`. See link:https://github.com/che-incubator/devworkspace-api/issues/10[corresponding issue].
28-
* New mandatory metadata for plugins. See link:https://github.com/devfile/api/issues/31[corresponding issue].
27+
For more information on migrating devfiles, go to the following GitHub issues:
28+
29+
* link:https://github.com/devfile/api/issues/10[Devfile schema]
30+
* link:https://github.com/devfile/api/issues/31[Plug-in mechanism]
2931
3032
3133
ifdef::parent-context-of-assembly_migrating-to-devfile-v2[:context: {parent-context-of-assembly_migrating-to-devfile-v2}]
3234
ifndef::parent-context-of-assembly_migrating-to-devfile-v2[:!context:]
33-

docs/modules/user-guide/partials/proc_adding-event-bindings.adoc

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@
22
= Adding event bindings
33

44
[role="_abstract"]
5-
Commands can be bound to events to form four different types of events: `preStart`, `postStart`, `preStop`, and `postStop`.
6-
7-
.Prerequisites
8-
9-
5+
This section describes how to add an event to a v2.x devfile. An event specified in a v1.x devfile still works in a v2.x devfile.
106

117
.Procedure
128

@@ -46,4 +42,5 @@ events:
4642

4743
[role="_additional-resources"]
4844
.Additional resources
49-
* See https://github.com/che-incubator/devworkspace-api/issues/32[corresponding issue].
45+
46+
For more information on adding event bindings, go to the following GitHub issue: link:https://github.com/devfile/api/issues/32[lifecycle bindings to bind commands].

docs/modules/user-guide/partials/proc_migrating-commands.adoc

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
= Migrating commands
33

44
[role="_abstract"]
5-
This section describes how to migrate the `commands` section to devfile v2.x. A command specified in a v1.0 devfile does not work as it is in a devfile v2.x.
5+
This section describes how to migrate the `commands` section to a v2.x devfile. A command specified in a v1.x devfile does not work in a v2.x devfile.
66

77
.Procedure
88

@@ -18,17 +18,13 @@ This section describes how to migrate the `commands` section to devfile v2.x. A
1818
[role="_additional-resources"]
1919
.Additional resources
2020

21-
* Command groups: build, run, test, debug. See https://github.com/che-incubator/devworkspace-api/issues/27[corresponding issue].
22-
* Apply Command. See https://github.com/devfile/api/issues/56[corresponding issue].
21+
For more information on migrating commands, go to the following GitHub issues:
2322

24-
* Environment variables for a specific command. See https://github.com/che-incubator/devworkspace-api/issues/21[corresponding issue].
25-
26-
* Renaming workdir into workingDir. See https://github.com/che-incubator/devworkspace-api/issues/22[corresponding issue].
27-
28-
* Id and label for composite commands. See https://github.com/che-incubator/devworkspace-api/issues/18[corresponding issue].
29-
30-
* Run exec commands as specific user. See https://github.com/che-incubator/devworkspace-api/issues/34[corresponding issue].
31-
32-
* Devfile metadata: add a link to an external website. See https://github.com/che-incubator/devworkspace-api/issues/38[corresponding issue].
33-
34-
* Stack and devfile matching rules. See https://github.com/che-incubator/devworkspace-api/issues/40[corresponding issue].
23+
* link:https://github.com/devfile/api/issues/27[Command groups: build, run, test, debug]
24+
* link:https://github.com/devfile/api/issues/56[Apply command]
25+
* link:https://github.com/devfile/api/issues/21[Environment variables for a specific command]
26+
* link:https://github.com/devfile/api/issues/22[Renaming workdir into workingDir]
27+
* link:https://github.com/devfile/api/issues/18[Id and label for composite commands]
28+
* link:https://github.com/devfile/api/issues/34[Run exec commands as specific user]
29+
* link:https://github.com/devfile/api/issues/38[Devfile metadata: add a link to an external website]
30+
* link:https://github.com/devfile/api/issues/40[Stack or devfile matching rules]

docs/modules/user-guide/partials/proc_migrating-components.adoc

Lines changed: 11 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
= Migrating components
33

44
[role="_abstract"]
5-
This section describes how to migrate components to devfile v2. There ARE major changes in the `components` section of the devfile. A component specified in a v1.0 devfile will NOT work as it is in a devfile v2.0.
5+
This section describes how to migrate components to v2.x devfiles. A component specified in a v1.x devfile no longer works in a v2.x devfile.
66

77
.Procedure
88

99
. Component is a polymorphic type
1010
+
11-
For a better syntax validation component now is defined as a polymorphic type and can be implemented as `container`, `kubernetes`, `openshift`, `plugin` or `volume`.
11+
The validation component is now defined as a polymorphic type and can be implemented as `container`, `kubernetes`, `openshift`, `plugin`, or `volume`.
1212
+
1313
[source,yaml]
1414
----
@@ -26,32 +26,17 @@ components:
2626
uri: https://.../mongo.yaml
2727
----
2828
+
29-
See https://github.com/devfile/api/issues/4[corresponding issue].
30-
31-
. Shared Volumes Across Components. See https://github.com/devfile/api/issues/19[corresponding issue].
32-
33-
. Out of Main Pod Components. See https://github.com/devfile/api/issues/48[corresponding issue].
34-
35-
. Replace Alias with Name. See https://github.com/devfile/api/issues/9[corresponding issue].
36-
37-
. Renaming dockerimage component type. See https://github.com/devfile/api/issues/8[corresponding issue].
38-
39-
. Specify sources path for containers. See https://github.com/devfile/api/issues/17[corresponding issue].
40-
41-
. Specify size of volume for component. See https://github.com/devfile/api/issues/14[corresponding issue].
42-
43-
. Containers endpoints (routes/ingresses). See https://github.com/devfile/api/issues/33[corresponding issue].
44-
4529

4630
[role="_additional-resources"]
4731
.Additional resources
4832

33+
For more information on migrating components, go to the following GitHub issues:
4934

50-
* Component is a polymorphic type. See https://github.com/devfile/api/issues/4[corresponding issue].
51-
* Shared Volumes Across Components. See https://github.com/devfile/api/issues/19[corresponding issue].
52-
* Out of Main Pod Components. See https://github.com/devfile/api/issues/48[corresponding issue].
53-
* Replace Alias with Name. See https://github.com/devfile/api/issues/9[corresponding issue].
54-
* Renaming dockerimage component type. See https://github.com/devfile/api/issues/8[corresponding issue].
55-
* Specify sources path for containers. See https://github.com/devfile/api/issues/17[corresponding issue].
56-
* Specify size of volume for component. See https://github.com/devfile/api/issues/14[corresponding issue].
57-
* Containers endpoints (routes/ingresses). See https://github.com/devfile/api/issues/27[corresponding issue].
35+
* link:https://github.com/devfile/api/issues/4[Polymorphic component type]
36+
* link:https://github.com/devfile/api/issues/19[Shared volumes across components]
37+
* link:https://github.com/devfile/api/issues/48[Out of main pod containers]
38+
* link:https://github.com/devfile/api/issues/9[Replace alias with name]
39+
* link:https://github.com/devfile/api/issues/8[Rename dockerimage component type]
40+
* link:https://github.com/devfile/api/issues/17[Specify source path for containers]
41+
* link:https://github.com/devfile/api/issues/14[Specify size of volume for components]
42+
* link:https://github.com/devfile/api/issues/27[Container endpoints: routes and ingresses]

docs/modules/user-guide/partials/proc_migrating-plug-ins.adoc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
= Migrating plug-ins
33

44
[role="_abstract"]
5-
This section describes how to migrate plug-ins to devfile v2.x. Plug-ins are now specified using a devfile. A plug-in specified in a v1.0 `meta.yaml` does not work as it is in a devfile v2.x.
5+
This section describes how to migrate plug-ins to a v2.x devfile. A plug-in specified in a `meta.yaml` for a v1.x devfile no longer works in a v2.x devfile.
66

77
Additionally, v2.x devfiles include the following new features:
88

@@ -13,9 +13,9 @@ Additionally, v2.x devfiles include the following new features:
1313
[role="_additional-resources"]
1414
.Additional resources
1515

16-
To learn more about plug-ins in v2.x devfiles, go to the GitHub issues on the following topics:
16+
For more information on plug-ins in v2.x devfiles, go to the following GitHub issues:
1717

18-
* link:https://github.com/eclipse/che/issues/18669[Devfile plugins not suited to specify Che-Theia plugins].
19-
* link:https://github.com/eclipse/che/issues/18668[Che editors and Che-Theia plugins support in devfile v2.x].
20-
* link:https://github.com/devfile/api/issues/364[Plugins' replacement].
21-
* link:https://github.com/devfile/api/issues/31[Better plugin mechanism].
18+
* link:https://github.com/eclipse/che/issues/18669[Devfile plug-ins not suited to specify Che-Theia plug-ins]
19+
* link:https://github.com/eclipse/che/issues/18668[Che editors and Che-Theia plug-ins support in v2.x devfile]
20+
* link:https://github.com/devfile/api/issues/364[Plug-ins' replacement]
21+
* link:https://github.com/devfile/api/issues/31[Better plug-in mechanism]

docs/modules/user-guide/partials/proc_migrating-projects.adoc

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,25 @@
22
= Migrating projects
33

44
[role="_abstract"]
5-
There are NO major changes in the `projects` section of the devfile. A project specified in a v1.0 devfile will work as it is in a devfile v2.0.
5+
This section describes how to migrate projects to v2.x devfiles. A project specified in a v1.x devfile still works in a v2.x devfile.
66

77
.Procedure
88

9-
* The only major change is the addition of a new kind of project: `starterProjects`. Those are supposed to be used in interactive mode only (user pick one) and the git repo get not be cloned but only source code get copied (kind of what `git archive --remote=<repository URL> | tar -t` would do).
10-
+
9+
A new `starterProject` project type can be defined in v2.x devfiles. Pick only one `starterProject` and use it in interactive mode. With a `starterProject`, you only need to copy your source code, so you no longer need to clone your Git repository.
10+
1111
.starterProjects and projects description
1212
====
1313
[source,yaml]
14-
----
1514
v2.0
1615
---
1716
starterProjects:
1817
- name: "kafka-project"
1918
description: "Use this app to get a nodejs application for working with kafka"
2019
- name: "simple-project"
2120
description: "Use this app to get a simple "hello world" nodejs application"
22-
----
2321
====
2422

2523
[role="_additional-resources"]
2624
.Additional resources
27-
* See link:https://github.com/che-incubator/devworkspace-api/issues/42[corresponding issue].
25+
26+
For more information on migrating projects, go to the following GitHub issue: link:https://github.com/devfile/api/issues/42[starterProjects].

docs/modules/user-guide/partials/proc_migrating-schema-version.adoc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
= Migrating schema version
33

44
[role="_abstract"]
5-
This section describes how to migrate schema version.
5+
This section describes how to migrate the existing schema version to a v2.x devfile. The schema version specified in a v1.x devfile still works in a v2.x devfile.
66

77
.Procedure
88

9-
* Replace `apiVersion: 1.0.0` by `schemaVersion: 2.0.0`:
10-
9+
. To migrate a schema version from a v1.x devfile to a v2.x devfile, replace `apiVersion: 1.0.0` with `schemaVersion: 2.0.0`:
10+
+
1111
[cols="1a,1a"]
1212
|====
1313
|
@@ -29,9 +29,9 @@ metadata:
2929
name: devfile-sample
3030
----
3131
|====
32-
33-
32+
+
3433

3534
[role="_additional-resources"]
3635
.Additional resources
37-
* See link:https://github.com/che-incubator/devworkspace-api/issues/7[corresponding issue]
36+
37+
For more information on migrating schema versions, go to the following GitHub issue: link:https://github.com/devfile/api/issues/7[schemaVersion attribute].

docs/modules/user-guide/partials/proc_refering-to-a-parent-devfile-in-a-devfile.adoc renamed to docs/modules/user-guide/partials/proc_referring-to-a-parent-devfile-in-a-devfile.adoc

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,23 @@
11
[id="proc_refering-to-a-parent-devfile-in-a-devfile_{context}"]
2-
= Refering to a parent devfile in a devfile
2+
= Referring to a parent devfile in a devfile
33

44
[role="_abstract"]
5-
It is possible to refer to another devfile as a parent to a given devfile. If a parent is specified, the devfile will inherit all behaviour from the parent. Part of the content of the parent can be overridden in the child devfile. That allows refering a devfile (the parent) from a distinct devfile and makes it possible to reuse in multiple devfiles the same parent (the stack).
5+
This section describes how to designate a parent devfile to a given devfile. If you designate a parent devfile, the given devfile inherits all its behavior from its parent. Still, you can use the child devfile to override certain content from the parent devfile. If you override the correct content, you can reuse the same parent devfile in multiple other devfiles. If you do reuse a parent devfile, the parent turns into a stack that is used in multiple other devfiles.
66

77
.Prerequisites
88

9-
* xref:adding-schema-version-to-a-devfile.adoc[]
10-
* xref:adding-a-name-to-a-devfile.adoc[]
9+
* Define the `schemaVersion` to v2.x. If you need to define your `schemaVersion`, go to xref:adding-schema-version-to-a-devfile.adoc[].
10+
* Define a name for the devfile. If you need to define a name for your devfile, go to xref:adding-a-name-to-a-devfile.adoc[].
1111

1212

1313
.Procedure
1414

15-
* A parent devfile can be referenced in 3 different ways: `registry`, `uri` or `kubernetes`.
15+
You can refer to a parent devfile in three different ways:
16+
17+
* `registry`
18+
* `uri`
19+
* `kubernetes`
20+
1621
+
1722
.Parent referred by registry
1823
====
@@ -62,5 +67,7 @@ parent:
6267
[role="_additional-resources"]
6368
.Additional resources
6469

70+
For more information on referring to parent devfiles, go to the following topics:
71+
6572
* xref:api-reference.adoc[]
6673
* xref:devfile-samples.adoc[]

0 commit comments

Comments
 (0)