diff --git a/.gitignore b/.gitignore
index bb34b618..dfbfb8d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ Thumbs.db
.DS_Store?
*.jar
*.bak
+.index.json
diff --git a/hbtemplate/content/.index.json b/hbtemplate/content/.index.json
index 943da9df..7ee6e2c5 100644
--- a/hbtemplate/content/.index.json
+++ b/hbtemplate/content/.index.json
@@ -1,4 +1,4 @@
-{
- "index-version": 1,
- "files": []
-}
\ No newline at end of file
+{
+ "index-version" : 2,
+ "files" : []
+}
diff --git a/hbtemplate/content/assets/.index.json b/hbtemplate/content/assets/.index.json
index 943da9df..7ee6e2c5 100644
--- a/hbtemplate/content/assets/.index.json
+++ b/hbtemplate/content/assets/.index.json
@@ -1,4 +1,4 @@
-{
- "index-version": 1,
- "files": []
-}
\ No newline at end of file
+{
+ "index-version" : 2,
+ "files" : []
+}
diff --git a/hbtemplate/content/assets/css/.index.json b/hbtemplate/content/assets/css/.index.json
index 943da9df..7ee6e2c5 100644
--- a/hbtemplate/content/assets/css/.index.json
+++ b/hbtemplate/content/assets/css/.index.json
@@ -1,4 +1,4 @@
-{
- "index-version": 1,
- "files": []
-}
\ No newline at end of file
+{
+ "index-version" : 2,
+ "files" : []
+}
diff --git a/hbtemplate/content/assets/ico/.index.json b/hbtemplate/content/assets/ico/.index.json
index 943da9df..7ee6e2c5 100644
--- a/hbtemplate/content/assets/ico/.index.json
+++ b/hbtemplate/content/assets/ico/.index.json
@@ -1,4 +1,4 @@
-{
- "index-version": 1,
- "files": []
-}
\ No newline at end of file
+{
+ "index-version" : 2,
+ "files" : []
+}
diff --git a/hbtemplate/content/assets/images/.index.json b/hbtemplate/content/assets/images/.index.json
index 943da9df..7ee6e2c5 100644
--- a/hbtemplate/content/assets/images/.index.json
+++ b/hbtemplate/content/assets/images/.index.json
@@ -1,4 +1,4 @@
-{
- "index-version": 1,
- "files": []
-}
\ No newline at end of file
+{
+ "index-version" : 2,
+ "files" : []
+}
diff --git a/hbtemplate/includes/.index.json b/hbtemplate/includes/.index.json
index 943da9df..7ee6e2c5 100644
--- a/hbtemplate/includes/.index.json
+++ b/hbtemplate/includes/.index.json
@@ -1,4 +1,4 @@
-{
- "index-version": 1,
- "files": []
-}
\ No newline at end of file
+{
+ "index-version" : 2,
+ "files" : []
+}
diff --git a/hbtemplate/includes/fragment-css.html b/hbtemplate/includes/fragment-css.html
index 4622f92d..139597f9 100644
--- a/hbtemplate/includes/fragment-css.html
+++ b/hbtemplate/includes/fragment-css.html
@@ -1,10 +1,2 @@
-
-
-
diff --git a/hbtemplate/package/.index.json b/hbtemplate/package/.index.json
deleted file mode 100644
index 943da9df..00000000
--- a/hbtemplate/package/.index.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "index-version": 1,
- "files": []
-}
\ No newline at end of file
diff --git a/input/fsh/alcohols.fsh b/input/fsh/alcohols.fsh
index 8d7adff0..f08a215e 100644
--- a/input/fsh/alcohols.fsh
+++ b/input/fsh/alcohols.fsh
@@ -2,6 +2,7 @@ CodeSystem: HBAlcohol
Title: "Alcohol List"
Description: "Alcohols to be added, if desired"
* ^caseSensitive = false
+* ^experimental = false
* #BOURBON "bourbon"
* #RUM "rum"
* #BAILEYS "Baileys"
@@ -16,4 +17,5 @@ ValueSet: HBAlcoholVS
Title: "Alcohol Additive Value Set"
Description: "Alcohol liquids for use in coffee"
+* ^experimental = false
* include codes from system HBAlcohol
diff --git a/input/fsh/patient.fsh b/input/fsh/beverage.fsh
similarity index 100%
rename from input/fsh/patient.fsh
rename to input/fsh/beverage.fsh
diff --git a/input/fsh/brewed.fsh b/input/fsh/brewed.fsh
index 7b3f1bb0..05709afd 100644
--- a/input/fsh/brewed.fsh
+++ b/input/fsh/brewed.fsh
@@ -11,7 +11,7 @@ Description: "An AuditEvent profile for when request to brew a Hot Beverage a
* recorded 1..1
// failures are recorded differently
* outcome = http://terminology.hl7.org/CodeSystem/audit-event-outcome#0 "Success"
-* agent ^slicing.discriminator.type = #pattern
+* agent ^slicing.discriminator.type = #value
* agent ^slicing.discriminator.path = "type"
* agent ^slicing.rules = #closed
* agent 2..3
@@ -51,7 +51,7 @@ Description: "An AuditEvent profile for when request to brew a Hot Beverage a
* agent[human].network 0..0 // humans are not network devices
* agent[human].purposeOfUse MS // if the OAuth token includes a PurposeOfUse it is recorded here
* source MS // what agent recorded the event. Likely the client or server but might be an intermediary
-* entity ^slicing.discriminator.type = #pattern
+* entity ^slicing.discriminator.type = #value
* entity ^slicing.discriminator.path = "type"
* entity ^slicing.rules = #closed
* entity 1..1
diff --git a/input/fsh/coffees.fsh b/input/fsh/coffees.fsh
index 6138e450..3dca13b1 100644
--- a/input/fsh/coffees.fsh
+++ b/input/fsh/coffees.fsh
@@ -2,6 +2,7 @@ CodeSystem: HBBeverages
Title: "Hot Beverage List"
Description: "Legal Beverages to be made in coffee pot"
* ^caseSensitive = false
+* ^experimental = false
* #DRIP "Drip or filtered"
* #FRENCHPRESS "French press or cafetière"
* #COLDBREW "Cold brew"
@@ -30,5 +31,5 @@ Description: "Legal Beverages to be made in coffee pot"
ValueSet: HBBeverageVS
Title: "Hot Beverages Value Set"
Description: "All beverages allowed to be made via Hot Beverage"
-
+* ^experimental = false
* include codes from system HBBeverages
diff --git a/input/fsh/instances.fsh b/input/fsh/instances.fsh
index 3515c14c..4771c874 100644
--- a/input/fsh/instances.fsh
+++ b/input/fsh/instances.fsh
@@ -1,17 +1,17 @@
Instance: hbbrew
InstanceOf: OperationDefinition
Usage: #definition
-* url = "http://hl7.org/fhir/OperationDefinition/Brew"
-* version = "4.0.1"
+* url = "http://fhir.org/guides/acme/HotBeverage/OperationDefinition/hbbrew"
+* version = "1.4.2024"
* name = "HBbrew"
* status = #draft
* kind = #operation
-* date = "2020-04-01T09:29:23+11:00"
-* publisher = "Acme (FHIR Project)"
+* date = "2024-11-13T09:29:23+11:00"
+* publisher = "Dave Pyke & John Moehrke"
* contact[0].telecom[0].system = #url
-* contact[0].telecom[0].value = "http://hl7.org/fhir/acme"
+* contact[0].telecom[0].value = "https://github.com/DavidPyke/HotBeverage"
* contact[0].telecom[1].system = #email
-* contact[0].telecom[1].value = "fhir@lists.hl7.org"
+* contact[0].telecom[1].value = "david@pyke.ca"
* description = "The brew operation sends the BrewedBeverage resource to the Coffee/Tea brewing Device"
* code = #data-requirements
* comment = "The effect of invoking this operation is to initiate the Brew operation on the appropriate device with the inclusion of the \r\n requested additions"
@@ -29,17 +29,17 @@ Usage: #definition
Instance: hbstop
InstanceOf: OperationDefinition
Usage: #definition
-* url = "http://hl7.org/fhir/OperationDefinition/BB-Stop"
-* version = "4.0.1"
+* url = "http://fhir.org/guides/acme/HotBeverage/OperationDefinition/hbstop"
+* version = "1.4.2024"
* name = "HBstop"
* status = #draft
* kind = #operation
-* date = "2020-04-01T09:29:23+11:00"
-* publisher = "Acme (FHIR Project)"
+* date = "2024-11-13T09:29:23+11:00"
+* publisher = "Dave Pyke & John Moehrke"
* contact[0].telecom[0].system = #url
-* contact[0].telecom[0].value = "http://hl7.org/fhir/acme"
+* contact[0].telecom[0].value = "https://github.com/DavidPyke/HotBeverage"
* contact[0].telecom[1].system = #email
-* contact[0].telecom[1].value = "fhir@lists.hl7.org"
+* contact[0].telecom[1].value = "david@pyke.ca"
* description = "The stop operation sends the Device a direction to stop the brew of the beverage (primarily tea) to check for doneness. Used in combination with the Start operation to make the tea just right"
* code = #data-requirements
//* comment = "TBA--need text from RFC"
@@ -56,18 +56,18 @@ Usage: #definition
Instance: hbwhen
InstanceOf: OperationDefinition
Usage: #definition
-* url = "http://hl7.org/fhir/OperationDefinition/BB-When"
-* version = "4.0.1"
+* url = "http://fhir.org/guides/acme/HotBeverage/OperationDefinition/hbwhen"
+* version = "1.4.2024"
* name = "HBwhen"
* status = #draft
* kind = #operation
-* date = "2020-04-01T09:29:23+11:00"
-* publisher = "HL7 (FHIR Project)"
+* date = "2024-11-13T09:29:23+11:00"
+* publisher = "Dave Pyke & John Moehrke"
* contact[0].telecom[0].system = #url
-* contact[0].telecom[0].value = "http://hl7.org/fhir"
+* contact[0].telecom[0].value = "https://github.com/DavidPyke/HotBeverage"
* contact[0].telecom[1].system = #email
-* contact[0].telecom[1].value = "fhir@lists.hl7.org"
-* description = " When coffee is poured, and milk is offered, it is necessary for the holder of the recipient of milk to say \"when\" at the time when\r\n sufficient milk has been introduced into the coffee. For this purpose, the \"WHEN\" operation has been added to FHIR. "
+* contact[0].telecom[1].value = "david@pyke.ca"
+* description = "When coffee is poured, and milk is offered, it is necessary for the holder of the recipient of milk to say \"when\" at the time when\r\n sufficient milk has been introduced into the coffee. For this purpose, the \"WHEN\" operation has been added to FHIR. "
* code = #data-requirements
* comment = "Enough? Say WHEN."
* system = false
diff --git a/input/fsh/milks.fsh b/input/fsh/milks.fsh
index a164d929..132aecfa 100644
--- a/input/fsh/milks.fsh
+++ b/input/fsh/milks.fsh
@@ -2,6 +2,7 @@ CodeSystem: HBMilks
Title: "Milks List"
Description: "Milks to be added, if desired"
* ^caseSensitive = false
+* ^experimental = false
* #RICEMILK "Rice Milk"
* #ALMOND "Almond Milk"
* #SKIM "Skim Milk"
@@ -15,5 +16,5 @@ Description: "Milks to be added, if desired"
ValueSet: HBMilkVS
Title: "Milk Additive Value Set"
Description: "Milk and milk-like liquids for use in coffee"
-
+* ^experimental = false
* include codes from system HBMilks
diff --git a/input/fsh/sizes.fsh b/input/fsh/sizes.fsh
index 7a33cb33..bf2b1ea6 100644
--- a/input/fsh/sizes.fsh
+++ b/input/fsh/sizes.fsh
@@ -1,6 +1,7 @@
CodeSystem: HBDrinkSize
Title: "Drink Size"
Description: "How much did you want?"
+* ^experimental = false
* ^caseSensitive = false
* #SMALL "Small" "You call that a coffee?"
* #MED "Medium" "Not enough"
@@ -11,7 +12,7 @@ Description: "How much did you want?"
ValueSet: HBDrinkSizeVS
Title: "Size of Beverage to be Consumed"
Description: "You want how much?"
-
+* ^experimental = false
* include codes from system HBDrinkSize
Instance: StarSizeVsDrinkSize
@@ -21,6 +22,7 @@ Description: "map between commonly understood drink sizes and the formal drink s
Usage: #definition
* name = "StarSizeVsDrinkSize"
* status = #active
+* experimental = false
* date = 2022-03-09
* targetCanonical = "http://www.fhir.org/guides/hotbeverage/ValueSet/HBDrinkSizeVS"
* group.source = "https://customerservice.starbucks.com/app/answers/detail/a_id/3113"
diff --git a/input/fsh/spice.fsh b/input/fsh/spice.fsh
index 505a32fe..57ca7c46 100644
--- a/input/fsh/spice.fsh
+++ b/input/fsh/spice.fsh
@@ -2,6 +2,7 @@ CodeSystem: HBSpice
Title: "Spice List"
Description: "Spice to be added, if desired"
* ^caseSensitive = false
+* ^experimental = false
* #CINNAMON "cinnamon"
* #NUTMEG "nutmeg"
* #LAVENDER "lavender"
@@ -12,7 +13,7 @@ Description: "Spice to be added, if desired"
ValueSet: HBSpiceVS
Title: "Spice Additive Value Set"
Description: "Spice liquids for use in coffee"
-
+* ^experimental = false
* include codes from system HBSpice
Alias: SCT = http://snomed.info/sct
@@ -20,7 +21,7 @@ Alias: SCT = http://snomed.info/sct
ValueSet: NoDecaf
Title: "Decaf is for the weak"
Description: "No, Just No"
-
+* ^experimental = false
* SCT#64100000 "No"
diff --git a/input/fsh/sweet.fsh b/input/fsh/sweet.fsh
index c60c917f..44365d74 100644
--- a/input/fsh/sweet.fsh
+++ b/input/fsh/sweet.fsh
@@ -2,6 +2,7 @@ CodeSystem: HBSweeteners
Title: "Sweeteners List"
Description: "Sweeteners to be added, if desired"
* ^caseSensitive = false
+* ^experimental = false
* #STEVIA "Stevia"
* #HONEY "Honey"
* #WSUGAR "White Sugar"
@@ -14,5 +15,5 @@ Description: "Sweeteners to be added, if desired"
ValueSet: HBSweetenersVS
Title: "Sweeteners Additive Value Set"
Description: "Sweeteners liquids for use in coffee"
-
+* ^experimental = false
* include codes from system HBSweeteners
diff --git a/input/fsh/syrops.fsh b/input/fsh/syrops.fsh
index 5eee67ed..aac3b3f0 100644
--- a/input/fsh/syrops.fsh
+++ b/input/fsh/syrops.fsh
@@ -2,6 +2,7 @@ CodeSystem: HBSyrups
Title: "Syrups List"
Description: "Syrups to be added, if desired"
* ^caseSensitive = false
+* ^experimental = false
* #VANILLA "Vanilla"
* #CARAMEL "Caramel"
* #HAZELNUT "Hazelnut"
@@ -18,5 +19,5 @@ Description: "Syrups to be added, if desired"
ValueSet: HBSyrupVS
Title: "Syrup Additive Value Set"
Description: "Syrups for use in coffee"
-
+* ^experimental = false
* include codes from system HBSyrups
diff --git a/input/ignoreWarnings.txt b/input/ignoreWarnings.txt
index d03142bc..b231e1e0 100644
--- a/input/ignoreWarnings.txt
+++ b/input/ignoreWarnings.txt
@@ -2,4 +2,7 @@
# Add warning and/or information messages here after you've confirmed that they aren't really a problem
# (And include comments like this justifying why)
-# See https://github.com/FHIR/sample-ig/blob/master/input/ignoreWarnings.txt for examples
\ No newline at end of file
+# See https://github.com/FHIR/sample-ig/blob/master/input/ignoreWarnings.txt for examples
+
+# Yes we know that the codeSystem can't be obtained by the validator
+WARNING: ConceptMap/StarSizeVsDrinkSize: ConceptMap.group[0].source: The Source Code System https://customerservice.starbucks.com/app/answers/detail/a_id/3113 is not fully defined and populated, and no sourceScope is specified, so the source code checking will not be performed
diff --git a/input/pagecontent/download.md b/input/pagecontent/download.md
new file mode 100644
index 00000000..3df21a46
--- /dev/null
+++ b/input/pagecontent/download.md
@@ -0,0 +1,24 @@
+
+You can also download:
+
+- [this entire guide](full-ig.zip),
+- the definition resources in [json](definitions.json.zip), [xml](definitions.xml.zip), or [ttl](definitions.ttl.zip)
+- the example resources in [json](examples.json.zip), [xml](examples.xml.zip) or [ttl](examples.ttl.zip) format.
+
+The source code for this Implementation Guide can be found on [Github](https://github.com/DavidPyke/HotBeverage)
+
+#### Cross Version Analysis
+
+{% include cross-version-analysis.xhtml %}
+
+#### Dependency Table
+
+{% include dependency-table.xhtml %}
+
+#### Globals Table
+
+{% include globals-table.xhtml %}
+
+#### IP Statements
+
+{% include ip-statements.xhtml %}
diff --git a/sushi-config.yaml b/sushi-config.yaml
index b31a6371..8863192a 100644
--- a/sushi-config.yaml
+++ b/sushi-config.yaml
@@ -19,12 +19,12 @@ contact:
- system: email
value: JohnMoehrke@gmail.com
use: work
-version: 1.4.2022
+version: 1.4.2024
license: CC0-1.0
fhirVersion: 4.0.1
copyrightYear: 2021+
releaseLabel: release
-date: 2022-04-01
+#date: 2022-04-01
jurisdiction: 'http://unstats.un.org/unsd/methods/m49/m49.htm#001'
parameters: # see https://confluence.hl7.org/display/FHIR/Implementation+Guide+Parameters
@@ -45,3 +45,4 @@ parameters: # see https://confluence.hl7.org/display/FHIR/Implementation+Guide+
menu:
Home: index.html
Artifacts: artifacts.html
+ Download: download.html