From 5c174ee121a1917fb82736a7b9fa2f85c838c93d Mon Sep 17 00:00:00 2001
From: Marie-Helene Bourget <bourgetmarieh@gmail.com>
Date: Thu, 27 May 2021 09:24:32 -0400
Subject: [PATCH 1/5] 02-common-principles.md: Add sample entity definition

---
 src/02-common-principles.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/02-common-principles.md b/src/02-common-principles.md
index f69e448bdc..9eba29913c 100644
--- a/src/02-common-principles.md
+++ b/src/02-common-principles.md
@@ -32,6 +32,14 @@ misunderstanding we clarify them here.
     context, a session may also indicate a group of related scans,
     taken in one or more visits.
 
+1.  **Sample** - a tissue sample, volume or slice pertaining to a subject.
+    The `sample-<label>` key/value is used to distinguish between different
+    samples from a same subject.
+    Samples can be of different sample types such as tissue, primary cell,
+    cell-free sample, etc.
+    The label MUST be unique per subject and is RECOMMENDED to be unique
+    throughout the dataset.
+
 1.  **Data acquisition** - a continuous uninterrupted block of time during which
     a brain scanning instrument was acquiring data according to particular
     scanning sequence/protocol.

From 063784d17e8f03fe4d13712c02dfdb3f4c3f473e Mon Sep 17 00:00:00 2001
From: Marie-Helene Bourget <bourgetmarieh@gmail.com>
Date: Thu, 27 May 2021 09:25:44 -0400
Subject: [PATCH 2/5] src/schema/entities.yaml: Add sample entity definition

---
 src/schema/entities.yaml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/schema/entities.yaml b/src/schema/entities.yaml
index 6c7bab8e31..11d2be1be7 100644
--- a/src/schema/entities.yaml
+++ b/src/schema/entities.yaml
@@ -25,6 +25,18 @@ session:
     often in the case of some intervention between sessions
     (for example, training).
   format: label
+sample:
+  name: Sample
+  entity: sample
+  description: |
+    A tissue sample, volume or slice pertaining to a subject.
+    The `sample-<label>` key/value is used to distinguish between different
+    samples from a same subject.
+    Samples can be of different sample types such as tissue, primary cell,
+    cell-free sample, etc.
+    The label MUST be unique per subject and is RECOMMENDED to be unique
+    throughout the dataset.
+  format: label
 task:
   name: Task
   entity: task

From dd0cc0d5661f7ba39213d5703924aa954b5e2e2d Mon Sep 17 00:00:00 2001
From: Marie-Helene Bourget <bourgetmarieh@gmail.com>
Date: Mon, 31 May 2021 14:02:50 -0400
Subject: [PATCH 3/5] Update sample description

---
 src/02-common-principles.md | 5 ++---
 src/schema/entities.yaml    | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/02-common-principles.md b/src/02-common-principles.md
index 9eba29913c..a18d031926 100644
--- a/src/02-common-principles.md
+++ b/src/02-common-principles.md
@@ -32,11 +32,10 @@ misunderstanding we clarify them here.
     context, a session may also indicate a group of related scans,
     taken in one or more visits.
 
-1.  **Sample** - a tissue sample, volume or slice pertaining to a subject.
+1.  **Sample** - a sample pertaining to a subject such as tissue, primary cell
+    or cell-free sample.
     The `sample-<label>` key/value is used to distinguish between different
     samples from a same subject.
-    Samples can be of different sample types such as tissue, primary cell,
-    cell-free sample, etc.
     The label MUST be unique per subject and is RECOMMENDED to be unique
     throughout the dataset.
 
diff --git a/src/schema/entities.yaml b/src/schema/entities.yaml
index 11d2be1be7..255908d307 100644
--- a/src/schema/entities.yaml
+++ b/src/schema/entities.yaml
@@ -29,11 +29,10 @@ sample:
   name: Sample
   entity: sample
   description: |
-    A tissue sample, volume or slice pertaining to a subject.
+    A sample pertaining to a subject such as tissue, primary cell
+    or cell-free sample.
     The `sample-<label>` key/value is used to distinguish between different
     samples from a same subject.
-    Samples can be of different sample types such as tissue, primary cell,
-    cell-free sample, etc.
     The label MUST be unique per subject and is RECOMMENDED to be unique
     throughout the dataset.
   format: label

From 63da959edfd088759a540b948a503b21bcae3d1f Mon Sep 17 00:00:00 2001
From: mariehbourget <54086142+mariehbourget@users.noreply.github.com>
Date: Mon, 31 May 2021 16:18:08 -0400
Subject: [PATCH 4/5] Update src/02-common-principles.md

Co-authored-by: Julien Cohen-Adad <jcohen@polymtl.ca>
---
 src/02-common-principles.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/02-common-principles.md b/src/02-common-principles.md
index a18d031926..5f30945740 100644
--- a/src/02-common-principles.md
+++ b/src/02-common-principles.md
@@ -35,7 +35,7 @@ misunderstanding we clarify them here.
 1.  **Sample** - a sample pertaining to a subject such as tissue, primary cell
     or cell-free sample.
     The `sample-<label>` key/value is used to distinguish between different
-    samples from a same subject.
+    samples from the same subject.
     The label MUST be unique per subject and is RECOMMENDED to be unique
     throughout the dataset.
 

From 92113f95b47e0f3eb924ade7efc9af1ddd80f8e0 Mon Sep 17 00:00:00 2001
From: mariehbourget <54086142+mariehbourget@users.noreply.github.com>
Date: Mon, 31 May 2021 16:18:12 -0400
Subject: [PATCH 5/5] Update src/schema/entities.yaml

Co-authored-by: Julien Cohen-Adad <jcohen@polymtl.ca>
---
 src/schema/entities.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/schema/entities.yaml b/src/schema/entities.yaml
index 255908d307..6836c818eb 100644
--- a/src/schema/entities.yaml
+++ b/src/schema/entities.yaml
@@ -32,7 +32,7 @@ sample:
     A sample pertaining to a subject such as tissue, primary cell
     or cell-free sample.
     The `sample-<label>` key/value is used to distinguish between different
-    samples from a same subject.
+    samples from the same subject.
     The label MUST be unique per subject and is RECOMMENDED to be unique
     throughout the dataset.
   format: label