From 5239526c52a0e83395b269824e762f3fc18a3b77 Mon Sep 17 00:00:00 2001
From: Albert Engstfeld <albert.engstfeld@gmail.com>
Date: Fri, 1 Mar 2024 14:57:06 +0100
Subject: [PATCH 1/2] Allow both manufacturer and supplier as source for
 instruments, materials and components

---
 schemas/experimental/instrumentation.json | 3 +++
 schemas/system/electrode.json             | 3 +++
 schemas/system/electrolyte.json           | 7 +++++--
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/schemas/experimental/instrumentation.json b/schemas/experimental/instrumentation.json
index cfca714..376de19 100644
--- a/schemas/experimental/instrumentation.json
+++ b/schemas/experimental/instrumentation.json
@@ -20,6 +20,9 @@
                 },
                 "model": {
                     "type": "string"
+                },
+                "supplier": {
+                    "type": "string"
                 }
             },
             "required": [
diff --git a/schemas/system/electrode.json b/schemas/system/electrode.json
index 9b520c9..218581f 100644
--- a/schemas/system/electrode.json
+++ b/schemas/system/electrode.json
@@ -80,6 +80,9 @@
                 "url": {
                     "$ref": "../general/url.json",
                     "description": "A url to a pdf or description of the electrode."
+                },
+                "supplier": {
+                    "type": "string"
                 }
             },
             "title": "ElectrodeSource"
diff --git a/schemas/system/electrolyte.json b/schemas/system/electrolyte.json
index ee4ccb4..a27fe0f 100644
--- a/schemas/system/electrolyte.json
+++ b/schemas/system/electrolyte.json
@@ -58,7 +58,7 @@
                         {"const": "acid", "description": "An acid added to the solvent."},
                         {"const": "base", "description": "A base added to the solvent."},
                         {"const": "gas", "description": "A gas passed through the solvent."},
-                        {"const": "solute", "description": "A solute added to the solvent, which is not a salt, acid, base, or a gas, i.e., water."}
+                        {"const": "solute", "description": "A solute added to the solvent, which is not a salt, acid, base or a gas, i.e., water."}
                     ]
                 },
                 "source": {
@@ -96,6 +96,9 @@
                 "supplier": {
                     "type": "string"
                 },
+                "manufacturer": {
+                    "type": "string"
+                },
                 "LOT": {
                     "type": "string"
                 },
@@ -117,7 +120,7 @@
             "properties": {
                 "description": {
                     "type": "string",
-                    "description": "The vessel in which the supplying electrolyte as prepared or stored before the measurment."
+                    "description": "The vessel in which the supplying electrolyte as prepared or stored before the measurement."
                 },
                 "components": {
                     "type": "array",

From 65928f1ed3ba190f11c2dff6de1118c98dbb1bd1 Mon Sep 17 00:00:00 2001
From: Albert Engstfeld <albert.engstfeld@gmail.com>
Date: Fri, 1 Mar 2024 14:58:47 +0100
Subject: [PATCH 2/2] Add news

---
 doc/news/del-manufacturer.rst | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 doc/news/del-manufacturer.rst

diff --git a/doc/news/del-manufacturer.rst b/doc/news/del-manufacturer.rst
new file mode 100644
index 0000000..545eb20
--- /dev/null
+++ b/doc/news/del-manufacturer.rst
@@ -0,0 +1,3 @@
+**Added:**
+
+* Added `supplier` and/or `manufacturer` to the source of components, instruments, materials, etc.