Merge remote-tracking branch 'upstream/master' into common-derivatives

bids-standard · Jun 4, 2020 · affa960 · affa960
2 parents 7bfc0e4 + 60ab047
commit affa960
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 16 deletions.
diff --git a/src/03-modality-agnostic-files.md b/src/03-modality-agnostic-files.md
@@ -7,25 +7,26 @@ Templates:
 -   `dataset_description.json`
 -   `README`
 -   `CHANGES`
+-   `LICENSE`
 
 ### `dataset_description.json`
 
-The file dataset_description.json is a JSON file describing the dataset. Every
-dataset MUST include this file with the following fields:
+The file `dataset_description.json` is a JSON file describing the dataset.
+Every dataset MUST include this file with the following fields:
 
-| Field name         | Definition                                                                                                                                                                                                                           |
+| Field name         | Definition                                                                                                                                                                                                                                                         |
 | ------------------------------------------------------------------------------| ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Name               | REQUIRED. Name of the dataset.                                                                                                                                                                                                       |
-| BIDSVersion        | REQUIRED. The version of the BIDS standard that was used.                                                                                                                                                                            |
-| DatasetType        | RECOMMENDED. The interpretaton of the dataset. MUST be one of `"raw"` or `"derivative"`. For backwards compatibility, the default value is `"raw"`.                                                                                  |
-| License            | RECOMMENDED. What license is this dataset distributed under? The use of license name abbreviations is suggested for specifying a license. A list of common licenses with suggested abbreviations can be found in Appendix II.        |
-| Authors            | OPTIONAL. List of individuals who contributed to the creation/curation of the dataset.                                                                                                                                               |
-| Acknowledgements   | OPTIONAL. Text acknowledging contributions of individuals or institutions beyond those listed in Authors or Funding.                                                                                                                 |
-| HowToAcknowledge   | OPTIONAL. Text containing instructions on how researchers using this dataset should acknowledge the original authors. This field can also be used to define a publication that should be cited in publications that use the dataset. |
-| Funding            | OPTIONAL. List of sources of funding (grant numbers).                                                                                                                                                                                |
-| EthicsApprovals    | OPTIONAL. List of ethics committee approvals of the research protocols and/or protocol identifiers.                                                                                                                                  |                                                                                                                |
-| ReferencesAndLinks | OPTIONAL. List of references to publication that contain information on the dataset, or links.                                                                                                                                       |
-| DatasetDOI         | OPTIONAL. The Document Object Identifier of the dataset (not the corresponding paper).                                                                                                                                               |
+| Name               | REQUIRED. Name of the dataset.                                                                                                                                                                                                                                     |
+| BIDSVersion        | REQUIRED. The version of the BIDS standard that was used.                                                                                                                                                                                                          |
+| DatasetType        | RECOMMENDED. The interpretaton of the dataset. MUST be one of `"raw"` or `"derivative"`. For backwards compatibility, the default value is `"raw"`.                                                                                                                |
+| License            | RECOMMENDED. The license for the dataset. The use of license name abbreviations is RECOMMENDED for specifying a license (see [Appendix II](./99-appendices/02-licenses.md)). The corresponding full license text MAY be specified in an additional `LICENSE` file. |
+| Authors            | OPTIONAL. List of individuals who contributed to the creation/curation of the dataset.                                                                                                                                                                             |
+| Acknowledgements   | OPTIONAL. Text acknowledging contributions of individuals or institutions beyond those listed in Authors or Funding.                                                                                                                                               |
+| HowToAcknowledge   | OPTIONAL. Text containing instructions on how researchers using this dataset should acknowledge the original authors. This field can also be used to define a publication that should be cited in publications that use the dataset.                               |
+| Funding            | OPTIONAL. List of sources of funding (grant numbers).                                                                                                                                                                                                              |
+| EthicsApprovals    | OPTIONAL. List of ethics committee approvals of the research protocols and/or protocol identifiers.                                                                                                                                                                |
+| ReferencesAndLinks | OPTIONAL. List of references to publication that contain information on the dataset, or links.                                                                                                                                                                     |
+| DatasetDOI         | OPTIONAL. The Document Object Identifier of the dataset (not the corresponding paper).                                                                                                                                                                             |
 
 Example:
 
@@ -121,8 +122,8 @@ That is, in a directory `<dataset>/derivatives/<pipeline>[-<variant>]/`, the fir
 ### `README`
 
 In addition a free form text file (`README`) describing the dataset in more
-details SHOULD be provided. The `README` file MUST be either in ASCII or UTF-8
-encoding.
+details SHOULD be provided.
+The `README` file MUST be either in ASCII or UTF-8 encoding.
 
 ### `CHANGES`
 
@@ -142,6 +143,13 @@ Example:
   - Initial release.
 ```
 
+### `LICENSE`
+
+A `LICENSE` file MAY be provided in addition to the short specification of the
+used license in the `dataset_description.json` `"License"` field.
+The `"License"` field and `LICENSE` file MUST correspond.
+The `LICENSE` file MUST be either in ASCII or UTF-8 encoding.
+
 ## Participants file
 
 Template:

diff --git a/src/CHANGES.md b/src/CHANGES.md
@@ -2,6 +2,10 @@
 
 ## [Unreleased](https://github.com/bids-standard/bids-specification/tree/HEAD)
 
+-   Clarify mask/dseg/probseg in common derivatives [#489](https://github.com/bids-standard/bids-specification/pull/489) ([effigies](https://github.com/effigies))
+-   Reorganize derivatives [#488](https://github.com/bids-standard/bids-specification/pull/488) ([effigies](https://github.com/effigies))
+-   Enh/prov [#486](https://github.com/bids-standard/bids-specification/pull/486) ([satra](https://github.com/satra))
+-   \[ENH] optionally allow LICENSE file [#483](https://github.com/bids-standard/bids-specification/pull/483) ([sappelhoff](https://github.com/sappelhoff))
 -   \[INFRA] linkchecker - ignore github pull and tree URLs [#477](https://github.com/bids-standard/bids-specification/pull/477) ([yarikoptic](https://github.com/yarikoptic))
 -   \[ENH] Allow fractional seconds in scans file datetimes [#470](https://github.com/bids-standard/bids-specification/pull/470) ([tsalo](https://github.com/tsalo))
 -   \[MISC] Maintainers - `Scope` responsibility [#467](https://github.com/bids-standard/bids-specification/pull/467) ([franklin-feingold](https://github.com/franklin-feingold))