Skip to content

Commit

Permalink
Merge pull request opencontainers#447 from wking/array-values
Browse files Browse the repository at this point in the history
*: Replace '*array*' with '*array of {type}*'
  • Loading branch information
jonboulle authored Nov 21, 2016
2 parents d4ecfe7 + 674b414 commit d65dbee
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion config.md
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ Note: Any OPTIONAL field MAY also be set to null, which is equivalent to being a
MUST be set to `layers`.
Implementations MUST generate an error if they encounter a unknown value while verifying or unpacking an image.

- **diff_ids** *array*, REQUIRED
- **diff_ids** *array of strings*, REQUIRED

An array of layer content hashes (`DiffIDs`), in order from first to last.

Expand Down
2 changes: 1 addition & 1 deletion descriptor.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ The following fields contain the primary properties that constitute a Descriptor
This property exists so that a client will have an expected size for the content before processing.
If the length of the retrieved content does not match the specified length, the content SHOULD NOT be trusted.

- **`urls`** *array*
- **`urls`** *array of strings*

This OPTIONAL property specifies a list of URIs from which this object MAY be downloaded.
Each entry MUST conform to [RFC 3986][rfc3986].
Expand Down
6 changes: 3 additions & 3 deletions manifest-list.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ This section defines the `application/vnd.oci.image.manifest.list.v1+json` [medi
For this version of the specification, this MUST be set to `application/vnd.oci.image.manifest.list.v1+json`.
For the media type(s) that this is compatible with, see the [matrix](media-types.md#compatibility-matrix).

- **`manifests`** *array*
- **`manifests`** *array of objects*

This REQUIRED property contains a list of manifests for specific platforms.
While the property MUST be present, the size of the array MAY be zero.
Expand Down Expand Up @@ -52,15 +52,15 @@ This section defines the `application/vnd.oci.image.manifest.list.v1+json` [medi

This OPTIONAL property specifies the operating system version, for example `10.0.10586`.

- **`os.features`** *array*
- **`os.features`** *array of strings*

This OPTIONAL property specifies an array of strings, each specifying a mandatory OS feature (for example on Windows `win32k`).

- **`variant`** *string*

This OPTIONAL property specifies the variant of the CPU, for example `armv6l` to specify a particular CPU variant of the ARM CPU.

- **`features`** *array*
- **`features`** *array of strings*

This OPTIONAL property specifies an array of strings, each specifying a mandatory CPU feature (for example `sse4` or `aes`).

Expand Down
2 changes: 1 addition & 1 deletion manifest.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Unlike the [Manifest List](manifest-list.md), which contains information about a

Manifests concerned with portability SHOULD use one of the above media types.

- **`layers`** *array*
- **`layers`** *array of objects*

Each item in the array MUST be a [descriptor](descriptor.md).
The array MUST have the base image at index 0.
Expand Down

0 comments on commit d65dbee

Please sign in to comment.