diff --git a/docs/expert/infrastructure/p5.md b/docs/expert/infrastructure/p5.md
index a778cad8936092601efe06bc8ceb6ab67f802767..52f3f9375402308253c4529f3a3f566a22e64211 100644
--- a/docs/expert/infrastructure/p5.md
+++ b/docs/expert/infrastructure/p5.md
@@ -1,61 +1,48 @@
# Infrastructure at p5
-The GEM infrastructure at P5 is partly managed by the CMS sysadmin team,
-and partly managed by the GEM DAQ group. The sysadmins are responsible
-for computer hardware and ensuring software is able to be installed in
-an automatic (puppetized) way. THey are also responsible for the network
-configuration.
+The GEM infrastructure at p5 is partly managed by the CMS sysadmin team, and partly managed by the GEM DAQ group.
+The sysadmins are responsible for computer hardware and ensuring software is able to be installed in an automatic (Puppetized) way.
+They are also responsible for the network configuration.
-The GEM DAQ experts are responsible for the GEM back-end harware (in
-rack `S2E01`) and updating software repository profiles in the software
-dropbox.
+The GEM DAQ experts are responsible for the GEM DAQ harware and updating software repository profiles in the software dropbox.
## Sysadmin support
-Support from the sysadmin team can be sought several ways. The on-call
-CMS DAQ expert can initiate support for issues related to the central
-DAQ infrastructure (e.g., miniDAQ). For all other issues, the CMS
-sysadmins utilize a Jira ticketing system ([described
-here](https://twiki.cern.ch/twiki/bin/view/CMS/Net-and-Sys-admin-Users)).
-To open a ticket you must be a member of the appropriate egroup and then
-use the [CMSONS Jira portal](https://its.cern.ch/jira/browse/CMSONS).
+Support from the sysadmin team can be sought several ways.
+The on-call CMS DAQ expert can initiate support for issues related to the central DAQ infrastructure (e.g. miniDAQ).
+For all other issues, the CMS sysadmins utilize a Jira ticketing system ([described here](https://twiki.cern.ch/twiki/bin/view/CMS/Net-and-Sys-admin-Users)).
+To open a ticket you must be a member of the appropriate e-group and then use the [CMSONS Jira portal](https://its.cern.ch/jira/browse/CMSONS).
## Computers
----------------------------------------------------------------------------------
-GEM machine alias Host name Rack Notes
- location
-------------------- ------------------------- ------------ ----------------------
-`ctrlhub-gem-01` `ctrl-s2c17-22-01` `S2C17-22` `sysmgr` and
-`bridge-s2e01-14` (non-GEM; can change) `control_hub` host
-`bridge-s2e01-23`
+GEM machines:
-`gem-daq01` `srv-s2g18-33-01` `S2G18-33`
+| Hostname | Machine alias | Notes |
+|-------------------------|----------------|------------------------------------------|
+| `srv-s2g18-33-01` | `gem-daq01` | Data taking applications, PowerEdge R340 |
+| `srv-s2g18-31-01` | `gem-daq02` | DAQ services, PowerEdge R340 |
+| `srv-s2g18-34-01` | `gem-locdaq01` | Local DAQ readout, PowerEdge R440 |
+| `srv-s2g18-32-01` | `gem-locdaq02` | Analysis suite, PowerEdge R440 |
+| `kvm-s3562-1-ip151-107` | `gemvm-legacy` | Legacy software installation, VM |
+| `kvm-s3562-1-ip151-74` | `gemvm-test` | VM |
-`gem-daq02` `srv-s2g18-34-01` `S2G18-34`
+Machines used by GEM:
-`gemvm-test` `kvm-s3562-1-ip151-74`
+| Hostname | Machine alias | Notes |
+|-------------------------|-----------------------------|-------------------------------------------|
+| `ctrl-s2c17-22-01` | `ctrlhub-gem-01`[^1] | `sysmgr` and `control_hub` host |
+| `kvm-s3562-1-ip151-110` | `cmsrc-gem`, `gemrc-gemdev` | `RCMS` host (i.e., function managers) |
+| `bu-c2f13-16-01` | | DAQ2 BU (access to the Lustre filesystem) |
+| `fu-c2f11-23-03` | | MiniDAQ DQM |
-`gemvm-legacy` `kvm-s3562-1-ip151-107` Legacy software
- installation
-
-`cmsrc-gem` `kvm-s3562-1-ip151-110` `RCMS` host (`tomcat`,
-`cmsrc-gemdev` (non-GEM; can change) i.e., function
- managers)
-
-`cmsdropbox` `dropbox2` service
- host
----------------------------------------------------------------------------------
+[^1]: Additional aliases: `bridge-s2e01-04`, `bridge-s2e01-14`, `bridge-s2e01-23`
### Remote powering
-Instructions on remotely powering on/off the centrally managed GEM
-machines can be found on the P5 cluster users guide twiki [ipmi
-instructions](https://twiki.cern.ch/twiki/bin/view/CMS/ClusterUsersGuide#IPMI).
+Instructions on remotely powering on/off the centrally managed GEM machines can be found on the P5 cluster users guide twiki [IPMI instructions](https://twiki.cern.ch/twiki/bin/view/CMS/ClusterUsersGuide#IPMI).
-!!! important
- These on/off actions should **only** be taken after confirmation that it
- is OK from the CMS sysadmins
+!!! warning
+ These on/off actions should **only** be taken after confirmation that it is OK from the CMS Technical Coordination and CMS sysadmins.
### Software dropbox
@@ -68,103 +55,25 @@ link](https://twiki.cern.ch/twiki/bin/view/CMS/ClusterUsersGuide#How_to_use_the_
If a package has not previously been included in a GEM puppet profile, a
[Jira ticket](https://its.cern.ch/jira/projects/CMSONS) should be
opened, providing the initial RPM. Following this, updating the RPM is
- done in the normal way with the `dropbox2` tool
+ done in the normal way with the `dropbox2` tool.
### Monitoring (icinga)
-Monitoring of central infrastructure is provided via `icinga`
-([GPN](http://cmsicinga2.cern.ch/icinga-web/)) or
-([P5](http://cmsicinga2.cms/icinga-web/)) SMS notifications are sent to
-a list of CERN mobile numbers, the DAQ expert phone is one. Email
-notifications are sent to the members of the `cms-gem-daq-notifications`
-e-group. The notification polices can be changed by opening a [Jira
-ticket](https://its.cern.ch/jira/projects/CMSONS), using any
-configuration defined in [this
-documentation](https://docs.icinga.com/latest/en/notifications.html).
-
-## μTCA shelves
-
- ------------------------------------------
- GEM μTCA shelf Rack location Notes
- ----------------- --------------- --------
- `gem-shelf01` `S2E01-23` GE-1/1
-
- `gem-shelf02` `S2E01-14` GE+1/1
- ------------------------------------------
-
-=== "Shelf 1"
-
- -------------------------------------------------------------------------
- Slot S/N Chambers Notes
- ------- ----------- ----------------- -----------------------------------
- MCH NAT, no password
-
- AMC13 386
-
- AMC1 `eagle32`
-
- AMC2 Empty slot
-
- AMC3 `eagle16`
-
- AMC4 Empty slot
-
- AMC5 `eagle33`
-
- AMC6 Empty slot
-
- AMC7 `eagle26`
-
- AMC8 Empty slot
-
- AMC9 `eagle34`
-
- AMC10 Empty slot
+Monitoring of central infrastructure is provided via `icinga` ([GPN](http://cmsicinga2.cern.ch/icinga-web/)) or ([P5](http://cmsicinga2.cms/icinga-web/)).
+SMS notifications are sent to a list of CERN mobile numbers, the DAQ expert phone is one.
+Email notifications are sent to the members of the `cms-gem-online-notifications` e-group via the `cms-gem-daq-notifications` email address.
+The notification polices can be changed by opening a [Jira ticket](https://its.cern.ch/jira/projects/CMSONS), using any configuration defined in [this documentation](https://docs.icinga.com/latest/en/notifications.html).
- AMC11 `eagle45`
+## DAQ hardware
- AMC12 Empty slot
- -------------------------------------------------------------------------
-
-=== "Shelf 2"
-
- -------------------------------------------------------------------------
- Slot S/N Chambers Notes
- ------- ----------- ----------------- -----------------------------------
- MCH NAT, no password
-
- AMC13 410
-
- AMC1 `eagle48`
-
- AMC2 Empty slot
-
- AMC3 `eagleAA`
-
- AMC4 Empty slot
-
- AMC5 `eagleBB`
-
- AMC6 Empty slot
-
- AMC7 `eagleCC`
-
- AMC8 Empty slot
-
- AMC9 `eagleDD`
-
- AMC10 Empty slot
-
- AMC11 `eagleEE`
-
- AMC12 Empty slot
- -------------------------------------------------------------------------
-
-### Remote powering
+### Racks
-Instructions on remotely powering on/off the μTCA shelves is not
-currently available.
+#### S2E01
-!!! important
- These on/off actions should **only** be taken after confirmation that it
- is OK from the CMS TC
+| Device | Notes |
+|-------------------|------------------------------------------------------|
+| `mch-s2e01-04-01` | GE2/1 demonstrator µTCA crate (GEMPILOT -- FED1469) |
+| `psu-s2e01-05-01` | GE2/1 Aspiro PSU |
+| `mch-s2e01-14-01` | GE+1/1 µTCA crate (GEM+ -- FED1468) |
+| `mch-s2e01-23-01` | GE-1/1 µTCA crate (GEM- -- FED1467) |
+| `psu-s2e01-24-01` | GE1/1 Aspiro PSU |
diff --git a/mkdocs.yml b/mkdocs.yml
index 2f04b286390a25bcbb18651eec14d53a1172c738..5bbe141f45909f4713b7d8bd91f3acc40aca97b2 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -14,6 +14,7 @@ theme:
markdown_extensions:
- admonition
+ - footnotes
- pymdownx.details
- pymdownx.superfences
- pymdownx.tabbed: