diff --git a/docs/glossary.md b/docs/glossary.md
new file mode 100644
index 0000000..42b47c0
--- /dev/null
+++ b/docs/glossary.md
@@ -0,0 +1,123 @@
+---
+sidebar_position: 4
+---
+
+# Glossary
+
+## A
+- **AA:** Authentication and Authorisation
+- **AAA:** Authentication, Authorisation and Accounting
+- **AAI:** Authentication and Authorisation Infrastructure
+- **AARC:** Authentication and Authorisation for Research and Collaboration
+- **API:** Application Programming Interface
+- **AS:** Authorisation Server
+- **AUP:** Acceptable Use Policy
+- **AuthN:** Authentication
+- **AuthZ:** Authorisation
+
+## B
+- *(No entries)*
+
+## C
+- **CoCo:** GÉANT data protection Code of Conduct
+- **CSIRT:** Computer Security Incident Response Team
+
+## D
+- *(No entries)*
+
+## E
+- **EC:** European Commission
+- **eduGAIN:** AAI confederation interconnecting national and community-wide R&E identity federations
+- **eduroam:** education roaming – International roaming service for users in R&E
+- **eID:** Electronic Identification
+- **EOSC:** European Open Science Cloud
+- **EU:** European Union
+
+## F
+- **FAIR:** Findable, Accessible, Interoperable and Reusable (data principles)
+- **FAQ:** Frequently Asked Questions
+- **FIM4R:** Federated Identity Management for Research
+- **FQDN:** Fully Qualified Domain Name
+
+## G
+- **GDPR:** General Data Protection Regulation
+- **GÉANT:** The pan-European research and education network
+- **GUI:** Graphical User Interface
+
+## H
+- **HA:** High Availability
+- **HO:** Home Organisation
+- **HTTP:** Hypertext Transfer Protocol
+- **HTTPS:** Hypertext Transfer Protocol Secure
+
+## I
+- **IAM:** Identity and Access Management
+- **IdM:** Identity Management
+- **IdP:** Identity Provider
+- **IP:** Internet Protocol
+
+## J
+- *(No entries)*
+
+## K
+- *(No entries)*
+
+## L
+- **LDAP:** Lightweight Directory Access Protocol
+
+## M
+- **MFA:** Multi-Factor Authentication
+
+## N
+- **NREN:** National Research and Education Network
+
+## O
+- **OA:** Open Access
+- **OIDC:** OpenID Connect
+- **OpenAIRE:** Open Access Infrastructure for Research in Europe
+
+## P
+- **PKI:** Public Key Infrastructure
+
+## Q
+- *(No entries)*
+
+## R
+- **R&E:** Research and Education
+- **R&S:** Research & Scholarship
+- **RAF:** REFEDS Assurance Framework
+- **REFEDS:** Research and Education FEDerations
+
+## S
+- **SAML:** Security Assertion Markup Language
+- **SFA:** Single-Factor Authentication
+- **Shibboleth:** An Internet2 project to investigate technology to support inter-institutional Authentication and Authorisation
+- **SIRTFI:** Security Incident Response Trust Framework for Federated Identity
+- **SP:** Service Provider
+- **SSO:** Single sign-on
+
+## T
+- **T&I:** Trust and Identity
+
+## U
+- **UI:** User Interface
+- **UMA:** User Managed Access
+- **URI:** Uniform Resource Identifier
+- **URL:** Uniform Resource Locator
+- **URN:** Uniform Resource Name
+
+## V
+- **VO:** Virtual Organisation
+
+## W
+- **WebSSO:** Web Single Sign-On
+- **WISE:** Wise Information Security for Collaborating e-Infrastructures
+
+## X
+- **XML:** Extensible Markup Language
+
+## Y
+- *(No entries)*
+
+## Z
+- *(No entries)*
diff --git a/docusaurus.config.js b/docusaurus.config.js
index 2d078b3..87ea5db 100644
--- a/docusaurus.config.js
+++ b/docusaurus.config.js
@@ -61,12 +61,12 @@ const darkCodeTheme = require('prism-react-renderer/themes/dracula');
             position: 'left',
             label: 'Developer',
           },
-          // {
-          //   type: 'doc',
-          //   docId: 'glossary',
-          //   position: 'left',
-          //   label: 'Glossary',
-          // },
+          {
+             type: 'doc',
+             docId: 'glossary',
+             position: 'left',
+             label: 'Glossary',
+          },
           // {
           //   type: 'doc',
           //   docId: 'features',