fix merge

Author: Steve Lee (POWERSHELL HE/HIM) (from Dev Box)

dsc/examples/PSConfEU_2024_Demo.md

@@ -44,7 +44,6 @@ dsc resource get -r Microsoft/osinfo
 ### Tracing
 
 - Error, Warn, Info, Debug, Trace
-- Logging to ETW/Syslog and files
 
 ### WhatIf
 
@@ -56,6 +55,10 @@ dsc resource get -r Microsoft/osinfo
 - Args, JSON Input, Env Var
 - JSON Schema
 
+```powershell
+dsc resource schema -r Test/Echo
+```
+
 ### Resource Kinds
 
 - Resource
@@ -77,14 +80,15 @@ dsc resource get -r Microsoft/osinfo
 
 - Functions
   - reference()
-  - env()
+  - envvar()
 - Dot-notation
 
 ### Group Resources
 
 - Scope, examples:
   - DependsOn
   - Reference
+- AssertionGroup
 
 ### PowerShell Adapter
 

dsc/examples/osinfo_parameters.dsc.yaml

@@ -17,3 +17,7 @@ resources:
   type: Microsoft/OSInfo
   properties:
     family: macOS
+- name: path
+  type: Test/Echo
+  properties:
+    output: "[envvar('PATH')]"