Merge branch 'master' into 'add-panosc-outcomes'

# Conflicts:
#   _data/facilities.yml

_data/facilities.yml

@@ -17,6 +17,8 @@
       - DS-wizard
       - AAI
     under-eval:
+      - PaN-training
+      - PaN-learning
       - PaNET
     not:
       - VINYL
@@ -40,6 +42,8 @@
       - Search-API
       - FAIR-IF
       - OAI-PMH
+    under-eval:
+      - PaN-training
 
 - short-name: Diamond
   pid:
@@ -62,6 +66,7 @@
       - Search-API
       - Search
     under-eval:
+      - PaN-training
       - VISA
 
 - short-name: ESRF
@@ -79,6 +84,9 @@
       - Search
     wip:
       - PaNET
+    under-eval:
+      - PaN-training
+      - PaN-learning
 
 - short-name: ESS
   pid:
@@ -105,12 +113,14 @@
       - Search
     wip:
       - VISA
+      - PaN-training
+      - PaN-learning
+      - PaNET
 
 - short-name: FELIX
-  # 2023-07-05 request for inclusion submitted to ROR
-  #     For details on the progress, see:
-  #
-  #      https://github.com/ror-community/ror-updates/issues/4321
+  pid:
+    - type: ROR
+      id: 03tkwyq76
 
 - short-name: HZB
   pid:
@@ -131,6 +141,7 @@
       id: 01zy2cs03
   adoption:
     adopted:
+      - PaN-training
       - OAI-PMH
     wip:
       - Search-API
@@ -182,6 +193,7 @@
     not:
       - VISA
       - VINYL
+      - PaN-training
 
 - short-name: SOLEIL
   pid:
@@ -189,6 +201,7 @@
       id: 01ydb3330
   adoption:
     adopted:
+      - PaN-training
       - OAI-PMH
       - Search-API
     wip: