From c7fd00c225dcb8555e065681a000100e0fcce896 Mon Sep 17 00:00:00 2001
From: Cam Proudlock <cam.proudlock@gmail.com>
Date: Tue, 25 Aug 2026 07:47:56 -0400
Subject: [PATCH] One canonical name per vendor in the shipped catalog

---
 CHANGELOG.md             | 12 +++++++++++-
 shopdb/data/catalog.json | 11 -----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8b2050e7..1d46109c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,7 +24,7 @@ ADR-007 and ADR-002.
   `rename` fixes a stripped name with no twin, which neither of the others can
   reach. All three report and change nothing unless `--apply` is passed, and
   `dedupe` is idempotent. References are discovered from the live schema, not
-  listed in code: there are 15 foreign keys into these three tables, and
+  listed in code: there are 14 foreign keys into these three tables, and
   `machines.controllervendorid` is not one anybody would enumerate by hand.
 
 - **Secure Send: hand somebody a password without leaving it in a chat
@@ -90,6 +90,16 @@ ADR-007 and ADR-002.
 
 ### Fixed
 
+- **The shipped catalog offered two ways to spell the same vendor, and one row
+  that should never have left a test.** `HP Inc.` and `Zebra Technologies` were
+  empty rows duplicating `HP` and `Zebra`, which carry every model between
+  them; neither exists in this site's database, so they would have arrived as
+  duplicates at a new site and nowhere else. `UnscopedLiveVendor` was a test
+  artifact: `export_catalog.py` reads the live development database, so a row
+  left behind by a lab run was published as reference data. The canonical name
+  is whichever spelling holds the entries, which is why it is `Dell Inc.` but
+  `HP` and `Zebra`. Vendors 51 to 48.
+
 - **The shipped seed catalog contained duplicate vendors, models and operating
   systems.** Four space-stripped twins, each with a correctly spaced original
   already present, so a new site inherited the same company listed twice.
diff --git a/shopdb/data/catalog.json b/shopdb/data/catalog.json
index 34aaf6cc..1eb0a684 100644
--- a/shopdb/data/catalog.json
+++ b/shopdb/data/catalog.json
@@ -471,10 +471,6 @@
     {
       "vendor": "HP"
     },
-    {
-      "vendor": "HP Inc.",
-      "website": "https://www.hp.com"
-    },
     {
       "vendor": "Hwacheon"
     },
@@ -537,9 +533,6 @@
     {
       "vendor": "Toshulin"
     },
-    {
-      "vendor": "UnscopedLiveVendor"
-    },
     {
       "vendor": "VM-Ware"
     },
@@ -552,10 +545,6 @@
     {
       "vendor": "Zebra"
     },
-    {
-      "vendor": "Zebra Technologies",
-      "website": "https://www.zebra.com"
-    },
     {
       "vendor": "Zeiss"
     },