Merge branch 'master' into suffix-schema

.circleci/config.yml

@@ -37,7 +37,7 @@ jobs:
           name: check links
           command: |
             git status
-            if (! git log -1 --pretty=%b | grep REL:) ; then
+            if (! git log -1 --pretty=oneline | grep REL:) ; then
               chmod a+rX -R ~
               linkchecker -t 1 ~/project/site/
               # check external separately by pointing to all *html so no

.remarkrc

@@ -6,6 +6,7 @@
     ["lint-emphasis-marker", "consistent"],
     ["lint-maximum-line-length", false],
     ["lint-maximum-heading-length", false],
-    ["lint-no-shortcut-reference-link", false]
+    ["lint-no-shortcut-reference-link", false],
+    ["lint-no-trailing-spaces"]
   ]
 }

mkdocs.yml

@@ -1,4 +1,4 @@
-site_name: Brain Imaging Data Structure v1.6.0-dev
+site_name: Brain Imaging Data Structure v1.6.1-dev
 theme:
     name: material
     custom_dir: theme_customizations/

npm-requirements.txt

@@ -4,3 +4,4 @@ remark-lint@8.0.0
 remark-preset-lint-recommended@5.0.0
 remark-preset-lint-markdown-style-guide@4.0.0
 remark-lint-list-item-indent@2.0.0
+remark-lint-no-trailing-spaces@2

src/02-common-principles.md

@@ -254,7 +254,7 @@ This specification does not prescribe anything about the contents of `sourcedata
 folders in the above example - nor does it prescribe the `sourcedata`,
 `derivatives`, or `rawdata` folder names.
 The above example is just a convention that can be useful for organizing raw,
-source, and derived data while maintaining BIDS compliancy of the raw data
+source, and derived data while maintaining BIDS compliance of the raw data
 folder. When using this convention it is RECOMMENDED to set the `SourceDatasets`
 field in `dataset_description.json` of each subfolder of `derivatives` to:
 

src/03-modality-agnostic-files.md

@@ -339,15 +339,15 @@ The purpose of this file is to describe timing and other properties of each
 imaging acquisition sequence (each *run* file) within one session.
 
 Each neural recording *file* SHOULD be described by exactly one row.
-Some recordings consist of multiple parts, that span several files, 
+Some recordings consist of multiple parts, that span several files,
 for example through `echo-`, `part-`, or `split-` entities.
 Such recordings MUST be documented with one row per file.
 
 Relative paths to files should be used under a compulsory `filename` header.
 
 If acquisition time is included it should be listed under the `acq_time` header.
 Acquisition time refers to when the first data point in each run was acquired.
-Furthermore, if this header is provided, the acquisition times of all files that 
+Furthermore, if this header is provided, the acquisition times of all files that
 belong to a recording MUST be identical.
 
 Datetime should be expressed as described in [Units](./02-common-principles.md#units).

src/04-modality-specific-files/02-magnetoencephalography.md

@@ -40,14 +40,14 @@ limit.
 For example Neuromag/Elekta/Megin, which can produce several files
 for a single recording.
 Both `some_file.fif` and `some_file-1.fif` would belong to a single recording.
-In BIDS, the [`split`](../99-appendices/09-entities.md#split) entity is RECOMMENDED to deal 
-with split files. 
+In BIDS, the [`split`](../99-appendices/09-entities.md#split) entity is RECOMMENDED to deal
+with split files.
 If there are multiple parts of a recording and the optional `scans.tsv` is provided,
-remember to list all files separately in `scans.tsv` and that the entries for the 
+remember to list all files separately in `scans.tsv` and that the entries for the
 `acq_time` column in `scans.tsv` MUST all be identical, as described in
 [Scans file](../03-modality-agnostic-files.md#scans-file).
 
-Another manufacturer-specific detail pertains to the KIT/Yokogawa/Ricoh sytem,
+Another manufacturer-specific detail pertains to the KIT/Yokogawa/Ricoh system,
 which saves the MEG sensor coil positions in a separate file with two possible filename extensions  (`.sqd`, `.mrk`).
 For these files, the `markers` suffix MUST be used.
 For example: `sub-01_task-nback_markers.sqd`

src/04-modality-specific-files/03-electroencephalography.md

@@ -198,7 +198,7 @@ about the channels.
 Note that electrode positions SHOULD NOT be added to this file, but to [`*_electrodes.tsv`](./03-electroencephalography.md#electrodes-description-_electrodestsv).
 Furthermore, the entries in `*_electrodes.tsv` and `*_channels.tsv` do not have to match exactly,
 as for example in the case of recording a single `EOG` channel from a bipolar referencing scheme
-of two electrodes, or a data channel originating from an auxilliary, non-electrode device.
+of two electrodes, or a data channel originating from an auxiliary, non-electrode device.
 That is, in most cases `*_electrodes.tsv` will have more entries than `*_channels.tsv`.
 See the examples for `*_channels.tsv` below, and for `*_electrodes.tsv` in
 ["Electrodes description"](./03-electroencephalography.md#electrodes-description-_electrodestsv).