only allow use of stderr/stdout shortcuts as types for the Outputs. Better place the docs

Author: mr-c

draft-4/CommandLineTool.yml

@@ -382,7 +382,86 @@ $graph:
       specializeTo: "#CommandOutputArraySchema"
     - specializeFrom: "#OutputBinding"
       specializeTo: "#CommandOutputBinding"
+  fields:
+    - name: type
+      type:
+        - "null"
+        - "#CWLType"
+        - "#stdout"
+        - "#stderr"
+        - "sld:RecordSchema"
+        - "sld:EnumSchema"
+        - "sld:ArraySchema"
+        - string
+        - type: array
+          items:
+            - "#CWLType"
+            - "sld:RecordSchema"
+            - "sld:EnumSchema"
+            - "sld:ArraySchema"
+            - string
+      jsonldPredicate:
+        "_id": "sld:type"
+        "_type": "@vocab"
+        refScope: 2
+        typeDSL: True
+      doc: |
+        Specify valid types of data that may be assigned to this parameter.
 
+- name: stdout
+  type: enum
+  symbols: [ "cwl:stdout" ]
+  docParent: "#CommandOutputParameter"
+  doc: |
+    Only valid as a `type` for an output.
+
+    The following
+    ```
+    outputs:
+       an_output_name:
+       type: stdout
+
+    stdout: a_stdout_file
+    ```
+    is equivalent to
+    ```
+    outputs:
+       an_output_name:
+         type: File
+         outputBinding:
+           glob: a_stdout_file
+
+    stdout: a_stdout_file
+    ```
+
+    If there is no `stdout` name provided, a random filename will be created.
+
+
+- name: stderr
+  type: enum
+  symbols: [ "cwl:stderr" ]
+  docParent: "#CommandOutputParameter"
+  doc: |
+    Only valid as a `type` for an output.
+
+    The following
+    ```
+    outputs:
+       an_output_name:
+       type: stderr
+
+    stderr: a_stderr_file
+    ```
+    is equivalent to
+    ```
+    outputs:
+       an_output_name:
+         type: File
+         outputBinding:
+           glob: a_stderr_file
+    ```
+
+    If there is no `stderr` name provided, a random filename will be created.
 
 - type: record
   name: CommandLineTool

draft-4/Process.yml

@@ -138,61 +138,6 @@ $graph:
     #   type: ["null", long]
     #   doc: Optional directory size.
 
-- name: CWLStdOut
-  type: enum
-  symbols: [ "cwl:stdout" ]
-  doc: |
-    Only valid as a `type` for an output.
-
-    The following
-    ```
-    outputs:
-       an_output_name:
-       type: stdout
-
-    stdout: a_stdout_file
-    ```
-    is equivalent to
-    ```
-    outputs:
-       an_output_name:
-         type: File
-         outputBinding:
-           glob: a_stdout_file
-
-    stdout: a_stdout_file
-    ```
-
-    If there is no `stdout` name provided, a random filename will be created.
-
-
-- name: CWLStdErr
-  type: enum
-  symbols: [ "cwl:stderr" ]
-  doc: |
-    Only valid as a `type` for an output.
-
-    The following
-    ```
-    outputs:
-       an_output_name:
-       type: stderr
-
-    stderr: a_stderr_file
-    ```
-    is equivalent to
-    ```
-    outputs:
-       an_output_name:
-         type: File
-         outputBinding:
-           glob: a_stderr_file
-
-    stderr: a_stderr_file
-    ```
-
-    If there is no `stderr` name provided, a random filename will be created.
-
 - name: SchemaBase
   type: record
   abstract: true
@@ -263,31 +208,6 @@ $graph:
     Define an input or output parameter to a process.
 
   fields:
-    - name: type
-      type:
-        - "null"
-        - "#CWLType"
-        - "#CWLStdOut"
-        - "#CWLStdErr"
-        - "sld:RecordSchema"
-        - "sld:EnumSchema"
-        - "sld:ArraySchema"
-        - string
-        - type: array
-          items:
-            - "#CWLType"
-            - "sld:RecordSchema"
-            - "sld:EnumSchema"
-            - "sld:ArraySchema"
-            - string
-      jsonldPredicate:
-        "_id": "sld:type"
-        "_type": "@vocab"
-        refScope: 2
-        typeDSL: True
-      doc: |
-        Specify valid types of data that may be assigned to this parameter.
-
     - name: label
       type:
         - "null"
@@ -458,6 +378,29 @@ $graph:
     - specializeFrom: "sld:ArraySchema"
       specializeTo: "#InputArraySchema"
   fields:
+    - name: type
+      type:
+        - "null"
+        - "#CWLType"
+        - "sld:RecordSchema"
+        - "sld:EnumSchema"
+        - "sld:ArraySchema"
+        - string
+        - type: array
+          items:
+            - "#CWLType"
+            - "sld:RecordSchema"
+            - "sld:EnumSchema"
+            - "sld:ArraySchema"
+            - string
+      jsonldPredicate:
+        "_id": "sld:type"
+        "_type": "@vocab"
+        refScope: 2
+        typeDSL: True
+      doc: |
+        Specify valid types of data that may be assigned to this parameter.
+
     - name: id
       type: string
       jsonldPredicate: "@id"